Revision 27398 branches/v2_0_0_prep/extensions/extEditing/src/com/iver/cit/gvsig/layers/VectorialLayerEdited.java

View differences:

VectorialLayerEdited.java
20 20
import org.gvsig.fmap.geom.GeometryManager;
21 21
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
22 22
import org.gvsig.fmap.geom.Geometry.TYPES;
23
import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
24
import org.gvsig.fmap.geom.exception.CreateGeometryException;
23 25
import org.gvsig.fmap.geom.handler.Handler;
24 26
import org.gvsig.fmap.geom.operation.Draw;
25 27
import org.gvsig.fmap.geom.operation.DrawOperationContext;
......
48 50
import org.gvsig.tools.evaluator.Evaluator;
49 51
import org.gvsig.tools.observer.Observable;
50 52
import org.gvsig.tools.observer.Observer;
53
import org.slf4j.Logger;
54
import org.slf4j.LoggerFactory;
51 55

  
52 56
import com.iver.andami.PluginServices;
53 57
import com.iver.andami.messages.NotificationManager;
......
63 67

  
64 68
public class VectorialLayerEdited extends DefaultLayerEdited implements
65 69
		LayerDrawingListener, Observer {
70
	private static final GeometryManager geomManager = GeometryLocator.getGeometryManager();
71
	private static final Logger logger = LoggerFactory.getLogger(VectorialLayerEdited.class);
66 72
	private ArrayList selectedHandler = new ArrayList();
67 73
	private Point2D lastPoint;
68 74
	private Point2D firstPoint;
......
109 115
			Point center = (org.gvsig.fmap.geom.primitive.Point)manager.create(TYPES.POINT, SUBTYPES.GEOM2D);
110 116
			center.setX(x);
111 117
			center.setY(y);
112
			Circle circle = (Circle)manager.create(TYPES.CIRCLE, SUBTYPES.GEOM2D);
118
			Circle circle = (Circle)geomManager.create(TYPES.CIRCLE, SUBTYPES.GEOM2D);
113 119
			circle.setPoints(center, tol);
114 120

  
115 121
			FeatureQuery fq=new FeatureQuery();
......
126 132
			NotificationManager.addError(e.getMessage(), e);
127 133
		} catch (DataException e) {
128 134
			NotificationManager.addError(e.getMessage(), e);
129
		} catch (InstantiationException e) {
135
		} catch (CreateGeometryException e) {
130 136
			NotificationManager.addError(e.getMessage(), e);
131
		} catch (IllegalAccessException e) {
132
			NotificationManager.addError(e.getMessage(), e);
133 137
		}
134 138
	}
135 139

  
......
159 163
				h1 = firstPoint.getY() - lastPoint.getY();
160 164
			}
161 165

  
162
			Envelope envelope = UtilFunctions.createEnvelope(x1, y1, x1 + w1, y1 + h1);
166
			Envelope envelope = geomManager.createEnvelope(x1, y1, x1 + w1, y1 + h1, SUBTYPES.GEOM2D);
163 167

  
164 168
			FeatureQuery fq=new FeatureQuery();
165 169
			fq.setAttributeNames(new String[]{featureStore.getDefaultFeatureType().getDefaultGeometryAttributeName()});
......
180 184
			NotificationManager.addError(e.getMessage(), e);
181 185
		} catch (DataException e) {
182 186
			NotificationManager.addError(e.getMessage(), e);
187
		} catch (CreateEnvelopeException e) {
188
			NotificationManager.addError(e.getMessage(), e);
183 189
		}
184 190
	}
185 191

  

Also available in: Unified diff