Revision 40373

View differences:

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/persistence/MapContextPersistenceTest.java
9 9

  
10 10
import org.gvsig.fmap.crs.CRSFactory;
11 11
import org.gvsig.fmap.dal.feature.FeatureStore;
12
import org.gvsig.fmap.geom.Geometry;
12 13
import org.gvsig.fmap.geom.Geometry.TYPES;
14
import org.gvsig.fmap.geom.GeometryLocator;
15
import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
13 16
import org.gvsig.fmap.geom.primitive.Envelope;
14
import org.gvsig.fmap.geom.primitive.impl.Envelope2D;
15 17
import org.gvsig.fmap.mapcontext.MapContext;
16 18
import org.gvsig.fmap.mapcontext.MapContextLocator;
17 19
import org.gvsig.fmap.mapcontext.ViewPort;
......
24 26
import org.gvsig.fmap.mapcontext.rendering.symbol.DummyVectorLegend;
25 27
import org.gvsig.tools.ToolsLocator;
26 28
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
29
import org.gvsig.tools.locator.LocatorException;
27 30
import org.gvsig.tools.persistence.Persistent;
28 31
import org.gvsig.tools.persistence.PersistentState;
29 32
import org.slf4j.Logger;
......
101 104
	
102 105
	
103 106
	
104
	private ViewPort getViewPort() {
107
	private ViewPort getViewPort() throws LocatorException, CreateEnvelopeException {
105 108
		
106 109
		ViewPort vp = new ViewPort(CRSFactory.getCRS("EPSG:4326"));
107 110
		vp.setImageSize(new Dimension(640, 480));
108
		Envelope env = new Envelope2D(0, 0, 1000000, 1000000);
111
		Envelope env = createEnvelope2D(0, 0, 1000000, 1000000);
109 112
		vp.setEnvelope(env);
110
		env = new Envelope2D(200000, 200000, 500000, 500000);
113
		env = createEnvelope2D(200000, 200000, 500000, 500000);
111 114
		vp.setEnvelope(env);
112
		env = new Envelope2D(300000, 300000, 300000, 300000);
115
		env = createEnvelope2D(300000, 300000, 300000, 300000);
113 116
		vp.setEnvelope(env);
114
		env = new Envelope2D(400000, 400000, 200000, 200000);
117
		env = createEnvelope2D(400000, 400000, 200000, 200000);
115 118
		vp.setEnvelope(env);
116
		env = new Envelope2D(440000, 440000, 100000, 100000);
119
		env = createEnvelope2D(440000, 440000, 100000, 100000);
117 120
		vp.setEnvelope(env);
118
		env = new Envelope2D(480000, 480000, 30000, 30000);
121
		env = createEnvelope2D(480000, 480000, 30000, 30000);
119 122
		vp.setEnvelope(env);
120 123
		vp.setBackColor(Color.YELLOW);
121 124
		vp.setClipRect(new Rectangle2D.Double(0, 0, 10, 10));
122 125
		return vp;
123 126
	}
127
	
128
	private Envelope createEnvelope2D(double minX,double minY,double maxX, double maxY) throws LocatorException, CreateEnvelopeException {
129
		return GeometryLocator.getGeometryManager().createEnvelope(minX, minY, maxX, maxY, Geometry.SUBTYPES.GEOM2D);
130
	}
124 131

  
125 132
	private void addDummyLayers(MapContext mcon) throws Exception {
126 133
		

Also available in: Unified diff