/ - Diff - Application: gvSIG desktop - gvSIG

Revision 27398

     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.Geometry.TYPES;
     import org.gvsig.fmap.geom.aggregate.MultiPrimitive;
     import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
     import org.gvsig.fmap.geom.handler.Handler;
     import org.gvsig.fmap.geom.operation.Draw;
     import org.gvsig.fmap.geom.operation.DrawOperationContext;
-...
     	public void addTemporalCache(Geometry geom) {
     		temporalCache.add(geom);
     		insertSpatialCache(geom);
     		try {
     			insertSpatialCache(geom);
     		} catch (CreateEnvelopeException e) {
     			logger.error("Error adding the spatial cache", e);
+    		}
+    	}
     	public void clearTemporalCache() {
     		Geometry[] geoms = (Geometry[]) temporalCache.toArray(new Geometry[0]);
     		for (int i = 0; i < geoms.length; i++) {
     			removeSpatialCache(geoms[i]);
     			try {
     				removeSpatialCache(geoms[i]);
     			} catch (CreateEnvelopeException e) {
     				logger.error("Error removing the temporal cache", e);
+    			}
+    		}
     		temporalCache.clear();
+    	}
     	private void insertSpatialCache(Geometry geom) {
     	private void insertSpatialCache(Geometry geom) throws CreateEnvelopeException {
     		VectorialLayerEdited vle = getVLE();
     		SpatialCache spatialCache = ((FLyrVect) vle.getLayer())
     				.getSpatialCache();
     		Envelope r = geom.getEnvelope();
     		if (geom.getType() == Geometry.TYPES.POINT) {
     			r = UtilFunctions.createEnvelope(r.getMinimum(0), r.getMinimum(1), r
     					.getMinimum(0) + 1, r.getMinimum(1) + 1);// Rectangle2D.Double(r.getX(),r.getY(),1,1);
     			r = geomManager.createEnvelope(r.getMinimum(0), r.getMinimum(1), r
     					.getMinimum(0) + 1, r.getMinimum(1) + 1, SUBTYPES.GEOM2D);// Rectangle2D.Double(r.getX(),r.getY(),1,1);
+    		}
     		spatialCache.insert(r, geom);
+    	}
     	private void removeSpatialCache(Geometry geom) {
     	private void removeSpatialCache(Geometry geom) throws CreateEnvelopeException {
     		VectorialLayerEdited vle = getVLE();
     		SpatialCache spatialCache = ((FLyrVect) vle.getLayer())
     				.getSpatialCache();
     		Envelope r = geom.getEnvelope();
     		if (geom.getType() == Geometry.TYPES.POINT) {
     			r = UtilFunctions.createEnvelope(r.getMinimum(0), r.getMinimum(1), r
     					.getMinimum(0) + 1, r.getMinimum(1) + 1);// Rectangle2D.Double(r.getX(),r.getY(),1,1);
     			r = geomManager.createEnvelope(r.getMinimum(0), r.getMinimum(1), r
     					.getMinimum(0) + 1, r.getMinimum(1) + 1, SUBTYPES.GEOM2D);// Rectangle2D.Double(r.getX(),r.getY(),1,1);
+    		}
     		spatialCache.remove(r, geom);
-...
     			e.printStackTrace();
     		} catch (GeometryOperationException e) {
     			e.printStackTrace();
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			e.printStackTrace();
     		} catch (IllegalAccessException e) {
     			e.printStackTrace();
+    		}
+    		}
     		// draw(g,
     		// getCadToolAdapter().getMapControl().getViewPort(),
     		// symbol);
-...
     		} catch (DataException e) {
     			NotificationManager.addError(e.getMessage(), e);
     			return null;
     		} catch (CreateEnvelopeException e) {
     			NotificationManager.addError(e.getMessage(), e);
     			return null;
+    		}
+    	}
     	public Feature insertAndSelectGeometry(Geometry geometry){
-...
     		} catch (DataException e) {
     			NotificationManager.addError(e.getMessage(), e);
     			return null;
     		} catch (CreateEnvelopeException e) {
     			NotificationManager.addError(e.getMessage(), e);
     			return null;
+    		}
+    	}
-...
     //		vle.drawHandlers(geometry.cloneGeometry(), gh, vp);
     //		vle.setHandlersImage(handlersImage);
     //		vle.setSelectionImage(selectionImage);
     		insertSpatialCache(geometry);
     		try {
     			insertSpatialCache(geometry);
     		} catch (CreateEnvelopeException e) {
     			logger.error("Error creating the envelope", e);
+    		}
+    	}
-...
     		try {
     			curve = (Curve)geomManager.create(TYPES.CURVE, SUBTYPES.GEOM2D);
     			curve.setGeneralPath(gpx);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.CURVE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.CURVE, SUBTYPES.GEOM2D, e));
+    		}
     		return curve;
+    	}
-...
     		try {
     			surface = (Surface)geomManager.create(TYPES.SURFACE, SUBTYPES.GEOM2D);
     			surface.setGeneralPath(gpx);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.SURFACE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.SURFACE, SUBTYPES.GEOM2D, e));
+    		}
     		return surface;
+    	}
-...
     			point = (Point)geomManager.create(TYPES.POINT, SUBTYPES.GEOM2D);
     			point.setX(x);
     			point.setY(y);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.POINT, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.POINT, SUBTYPES.GEOM2D, e));
+    		}
+    		}
     		return point;
+    	}
-...
     		try {
     			arc = (Arc)geomManager.create(TYPES.ARC, SUBTYPES.GEOM2D);
     			arc.setPoints(p1, p2, p3);
     		} catch (InstantiationException e) {
     	    } catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.ARC, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.ARC, SUBTYPES.GEOM2D, e));
+    		}
     		return arc;
+    		}
     	    return arc;
+    	}
     	/**
-...
     		try {
     			circle = (Circle)geomManager.create(TYPES.CIRCLE, SUBTYPES.GEOM2D);
     			circle.setPoints(p1, p2, p3);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.CIRCLE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.CIRCLE, SUBTYPES.GEOM2D, e));
+    		}
+    		}
     		return circle;
+    	}
-...
     		try {
     			circle = (Circle)geomManager.create(TYPES.CIRCLE, SUBTYPES.GEOM2D);
     			circle.setPoints(p1, p2);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.CIRCLE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.CIRCLE, SUBTYPES.GEOM2D, e));
+    		}
+    		}
     		return circle;
+    	}
-...
     		try {
     			circle = (Circle)geomManager.create(TYPES.CIRCLE, SUBTYPES.GEOM2D);
     			circle.setPoints(p1, radious);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.CIRCLE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.CIRCLE, SUBTYPES.GEOM2D, e));
+    		}
     		return circle;
+    	}
-...
     		try {
     			ellipse = (Ellipse)geomManager.create(TYPES.ELLIPSE, SUBTYPES.GEOM2D);
     			ellipse.setPoints(p1, p2, d);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.ELLIPSE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.ELLIPSE, SUBTYPES.GEOM2D, e));
+    		}
+    		}
     		return ellipse;
+    	}
-...
     			for (int i=0 ; i<points.length ; i++){
     				spline.addVertex(createPoint(points[i]));
+    			}
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.SPLINE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.SPLINE, SUBTYPES.GEOM2D, e));
+    		}
     		return spline;
+    	}
-...
     			for (int i=0 ; i<geometries.length ; i++){
     				multiPrimitive.addPrimitive((Primitive)geometries[i]);
+    			}
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.SPLINE, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.SPLINE, SUBTYPES.GEOM2D, e));
+    		}
     		return multiPrimitive;
+    	}

     			e.printStackTrace();
     		} catch (GeometryOperationException e) {
     			e.printStackTrace();
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.MULTIPOINT, SUBTYPES.GEOM2D, e));
     			e.printStackTrace();
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.MULTIPOINT, SUBTYPES.GEOM2D, e));
     			e.printStackTrace();
+    		}
     		//		geomFactory.createMultipoint2D(xs,ys).draw((Graphics2D) g,
-...
     				multiPoint.addPoint(pointsAux[i]);
+    			}
     			insertAndSelectGeometry(multiPoint);
     		} catch (InstantiationException e) {
     		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
     			logger.error(new CreateGeometryException(TYPES.MULTIPOINT, SUBTYPES.GEOM2D, e));
     		} catch (IllegalAccessException e) {
     			logger.error(new CreateGeometryException(TYPES.MULTIPOINT, SUBTYPES.GEOM2D, e));
+    		}
     		end();
+    	}

     import org.gvsig.fmap.geom.GeometryManager;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.Geometry.TYPES;
     import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
     import org.gvsig.fmap.geom.exception.CreateGeometryException;
     import org.gvsig.fmap.geom.handler.Handler;
     import org.gvsig.fmap.geom.operation.Draw;
     import org.gvsig.fmap.geom.operation.DrawOperationContext;
-...
     import org.gvsig.tools.evaluator.Evaluator;
     import org.gvsig.tools.observer.Observable;
     import org.gvsig.tools.observer.Observer;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import com.iver.andami.PluginServices;
     import com.iver.andami.messages.NotificationManager;
-...
     public class VectorialLayerEdited extends DefaultLayerEdited implements
     		LayerDrawingListener, Observer {
     	private static final GeometryManager geomManager = GeometryLocator.getGeometryManager();
     	private static final Logger logger = LoggerFactory.getLogger(VectorialLayerEdited.class);
     	private ArrayList selectedHandler = new ArrayList();
     	private Point2D lastPoint;
     	private Point2D firstPoint;
-...
     			Point center = (org.gvsig.fmap.geom.primitive.Point)manager.create(TYPES.POINT, SUBTYPES.GEOM2D);
     			center.setX(x);
     			center.setY(y);
     			Circle circle = (Circle)manager.create(TYPES.CIRCLE, SUBTYPES.GEOM2D);
     			Circle circle = (Circle)geomManager.create(TYPES.CIRCLE, SUBTYPES.GEOM2D);
     			circle.setPoints(center, tol);
     			FeatureQuery fq=new FeatureQuery();
-...
     			NotificationManager.addError(e.getMessage(), e);
     		} catch (DataException e) {
     			NotificationManager.addError(e.getMessage(), e);
     		} catch (InstantiationException e) {
     		} catch (CreateGeometryException e) {
     			NotificationManager.addError(e.getMessage(), e);
     		} catch (IllegalAccessException e) {
     			NotificationManager.addError(e.getMessage(), e);
+    		}
+    	}
-...
     				h1 = firstPoint.getY() - lastPoint.getY();
+    			}
     			Envelope envelope = UtilFunctions.createEnvelope(x1, y1, x1 + w1, y1 + h1);
     			Envelope envelope = geomManager.createEnvelope(x1, y1, x1 + w1, y1 + h1, SUBTYPES.GEOM2D);
     			FeatureQuery fq=new FeatureQuery();
     			fq.setAttributeNames(new String[]{featureStore.getDefaultFeatureType().getDefaultGeometryAttributeName()});
-...
     			NotificationManager.addError(e.getMessage(), e);
     		} catch (DataException e) {
     			NotificationManager.addError(e.getMessage(), e);
     		} catch (CreateEnvelopeException e) {
     			NotificationManager.addError(e.getMessage(), e);
+    		}
+    	}

Also available in: Unified diff