/ - Diff - | gvSIG desktop 1 - gvSIG

     	<build>
     		<sourceDirectory>src</sourceDirectory>
     		<testSourceDirectory>src-test</testSourceDirectory>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
                         <source>1.4</source>
                         <target>1.4</target>
                     </configuration>
                 </plugin>
             </plugins>
     	</build>
     	<profiles>

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/GeometryLibrary.java
44	44	*/
45	45	public class GeometryLibrary extends AbstractLibrary {
46	46
47		@Override
48	47	public void doRegistration() {
49	48	registerAsAPI(GeometryLibrary.class);
50	49	require(ToolsLibrary.class);

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/operation/impl/DefaultGeometryOperationLibrary.java
71	71	*/
72	72	public class DefaultGeometryOperationLibrary extends AbstractLibrary {
73	73
74		@Override
75	74	public void doRegistration() {
76	75	registerAsServiceOf(GeometryLibrary.class);
77	76	}

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/operation/perpendicular/Perpendicular.java
44	44	private static GeometryManager geomManager = GeometryLocator.getGeometryManager();
45	45	public static final int CODE = geomManager.getGeometryOperationCode(NAME);
46	46
47		@Override
48	47	public Object invoke(Geometry geom, GeometryOperationContext ctx)
49	48	throws GeometryOperationException {
50	49	Point point1 = (Point)geom;

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/operation/perpendicular/PerpendicularPointOperationContext.java
57	57	}
58	58
59	59	public double getDistance() {
60		return (Double) this.getAttribute(DISTANCE);
	60	return ((Double) this.getAttribute(DISTANCE)).doubleValue();
61	61	}
62	62
63	63	public void setDistance(double distance) {
64		this.setAttribute(DISTANCE, distance);
	64	this.setAttribute(DISTANCE, Double.valueOf(distance));
65	65	}
66	66	}

         private static GeometryManager geomManager = GeometryLocator.getGeometryManager();
         public static final int CODE = geomManager.getGeometryOperationCode(NAME);
         @Override
         public Object invoke(Geometry geom, GeometryOperationContext ctx)
             throws GeometryOperationException {
             Point perpendicularPoint = (Point)ctx.getAttribute(PerpendicularPointOperationContext.PERPENDICULAR_POINT);
             double dist = (Double)ctx.getAttribute(PerpendicularPointOperationContext.DISTANCE);
             double dist =
                 ((Double) ctx
                     .getAttribute(PerpendicularPointOperationContext.DISTANCE))
                     .doubleValue();
             try {
                 Point[] p = (Point[])geom.invokeOperation(Perpendicular.CODE, ctx);

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/impl/DefaultGeometryLibrary.java
80	80	*/
81	81	public class DefaultGeometryLibrary extends AbstractLibrary {
82	82
83		@Override
84	83	public void doRegistration() {
85	84	registerAsImplementationOf(GeometryLibrary.class);
86	85	}

                 point.setY(y);
             } else {
                 needRoom(1, 2, false);
                 pointTypes.add(SEG_MOVETO);
                 pointTypes.add(Byte.valueOf(SEG_MOVETO));
                 addPoint(x, y);
+            }
+        }
-...
                 addPoint(point);
             } else {
                 needRoom(1, 2, false);
                 pointTypes.add(SEG_MOVETO);
                 pointTypes.add(Byte.valueOf(SEG_MOVETO));
                 addPoint(point);
+            }
+        }
-...
          */
         public synchronized void lineTo(double x, double y) {
             needRoom(1, 2, true);
             pointTypes.add(SEG_LINETO);
             pointTypes.add(Byte.valueOf(SEG_LINETO));
             addPoint(x, y);
+        }
         public synchronized void lineTo(Point point) {
             needRoom(1, 2, true);
             pointTypes.add(SEG_LINETO);
             pointTypes.add(Byte.valueOf(SEG_LINETO));
             addPoint(point);
+        }
         @SuppressWarnings("unchecked")
         private void addPoint(double x, double y){
             try {
                 pointCoords.add(geomManager.createPoint(x, y, Geometry.SUBTYPES.GEOM2D));
-...
+            }
+        }
         @SuppressWarnings("unchecked")
         private void addPoint(Point point){
             pointCoords.add(point);
+        }
-...
          */
         public synchronized void quadTo(double x1, double y1, double x2, double y2) {
             needRoom(1, 4, true);
             pointTypes.add(SEG_QUADTO);
             pointTypes.add(Byte.valueOf(SEG_QUADTO));
             addPoint(x1, y1);
             addPoint(x2, y2);
             isSimple = false;
-...
         public synchronized void quadTo(Point point1, Point point2) {
             needRoom(1, 4, true);
             pointTypes.add(SEG_QUADTO);
             pointTypes.add(Byte.valueOf(SEG_QUADTO));
             addPoint(point1);
             addPoint(point2);
             isSimple = false;
-...
             double x2, double y2,
             double x3, double y3) {
             needRoom(1, 6, true);
             pointTypes.add(SEG_CUBICTO);
             pointTypes.add(Byte.valueOf(SEG_CUBICTO));
             addPoint(x1, y1);
             addPoint(x2, y2);
             addPoint(x3, y3);
-...
         public synchronized void curveTo(Point point1, Point point2, Point point3){
             needRoom(1, 6, true);
             pointTypes.add(SEG_CUBICTO);
             pointTypes.add(Byte.valueOf(SEG_CUBICTO));
             addPoint(point1);
             addPoint(point2);
             addPoint(point3);
-...
                 needRoom(1, 0, true);
                 //Adding a geometry like the last geometry
                 //addPoint(100, 100);
                 pointTypes.add(SEG_CLOSE);
                 pointTypes.add(Byte.valueOf(SEG_CLOSE));
+            }
+        }
-...
+        }
         public byte getTypeAt(int index){
             return (Byte)pointTypes.get(index);
             return ((Byte) pointTypes.get(index)).byteValue();
+        }
         /**
-...
         public void setPointTypes(byte[] pointTypes) {
             this.pointTypes.clear();
             for (int i=0 ; i<pointTypes.length ; i++){
                 this.pointTypes.add(pointTypes[i]);
                 this.pointTypes.add(Byte.valueOf(pointTypes[i]));
+            }
+        }
-...
         public byte[] getPointTypes() {
             byte[] bytes = new byte[pointTypes.size()];
             for (int i=0 ; i<pointTypes.size() ; i++){
                 bytes[i] = (Byte)pointTypes.get(i);
                 bytes[i] = ((Byte) pointTypes.get(i)).byteValue();
+            }
             return bytes;
+        }

| gvSIG desktop 1

Revision 36197