Revision 26866 branches/v2_0_0_prep/libraries/libFMap_geometries/src-test/org/gvsig/fmap/geom/aggregate/MultiPrimitiveTest.java

View differences:

MultiPrimitiveTest.java
33 33
import org.gvsig.fmap.geom.GeometryLibrary;
34 34
import org.gvsig.fmap.geom.GeometryLocator;
35 35
import org.gvsig.fmap.geom.GeometryManager;
36
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
37
import org.gvsig.fmap.geom.Geometry.TYPES;
36 38
import org.gvsig.fmap.geom.primitive.Curve;
37 39
import org.gvsig.fmap.geom.primitive.Curve2D;
38 40
import org.gvsig.fmap.geom.primitive.GeneralPathX;
......
66 68
	}
67 69
	
68 70
	public void testCreateMultiGeometry() throws InstantiationException, IllegalAccessException{
69
		Curve curve1 = (Curve)manager.create(Curve2D.CODE);
71
		Curve curve1 = (Curve)manager.create(TYPES.CURVE, SUBTYPES.GEOM2D);
70 72
		GeneralPathX generalPathX1 = new GeneralPathX();
71 73
		generalPathX1.moveTo(0, 0);
72 74
		generalPathX1.lineTo(1, 1);
73 75
		generalPathX1.lineTo(2, 1);		
74 76
		curve1.setGeneralPath(generalPathX1);	
75 77
		
76
		Curve curve2 = (Curve)manager.create(Curve2D.CODE);
78
		Curve curve2 = (Curve)manager.create(TYPES.CURVE, SUBTYPES.GEOM2D);
77 79
		GeneralPathX generalPathX2 = new GeneralPathX();
78 80
		generalPathX2.moveTo(0, 0);
79 81
		generalPathX2.lineTo(1, 1);
80 82
		generalPathX2.lineTo(2, 1);		
81 83
		curve2.setGeneralPath(generalPathX2);	
82 84
		
83
		Point point = (Point)manager.create(Point2D.CODE);
85
		Point point = (Point)manager.create(TYPES.POINT, SUBTYPES.GEOM2D);
84 86
		point.setCoordinateAt(0, 1.0);
85 87
		point.setCoordinateAt(1, 2.0);
86 88
		
87
		Surface surface = (Surface)manager.create(Surface2D.CODE);
89
		Surface surface = (Surface)manager.create(TYPES.SURFACE, SUBTYPES.GEOM2D);
88 90
		GeneralPathX generalPathX = new GeneralPathX();
89 91
		generalPathX.moveTo(0, 0);
90 92
		generalPathX.lineTo(1, 1);
91 93
		generalPathX.lineTo(2, 1);
92 94
		surface.setGeneralPath(generalPathX);	
93 95
		
94
		MultiPrimitive multiPrimitive = (MultiPrimitive)manager.create(BaseMultiPrimitive.CODE);
96
		MultiPrimitive multiPrimitive = (MultiPrimitive)manager.create(TYPES.AGGREGATE, SUBTYPES.GEOM2D);
95 97
		multiPrimitive.addPrimitive(curve1);
96 98
		multiPrimitive.addPrimitive(point);
97 99
		multiPrimitive.addPrimitive(surface);

Also available in: Unified diff