/branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/SelectionCADTool.java - Diff - Application: gvSIG desktop - gvSIG

Revision 37504 branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/SelectionCADTool.java

     import java.awt.geom.Point2D;
     import java.util.ArrayList;
     import org.cresques.cts.ICoordTrans;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.fmap.dal.feature.EditableFeature;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureSelection;
     import org.gvsig.fmap.dal.feature.FeatureSet;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.exception.NeedEditingModeException;
-...
         protected Point2D firstPoint;
         protected String nextState;
         // Registros de los que se ha seleccionado alg?n handler.
         protected ArrayList rowselectedHandlers = new ArrayList();
         // These two arrays are used to save the current selected features and
         // geometries. The selected geometries contains an instance of the
         // geometry that can be reprojected.
         protected ArrayList selectedGeometries = new ArrayList();
         protected ArrayList selectedFeatures = new ArrayList();
         protected String type = PluginServices.getText(this, "simple");
         protected boolean multipleSelection = false;
-...
             DisposableIterator iterator = null;
             try {
                 featureStore.beginEditingGroup(description);
                 iterator =
                     ((FeatureSelection) featureStore.getSelection()).fastIterator();
                 while (iterator.hasNext()) {
                     Feature feature = (Feature) iterator.next();
                     Geometry geometry =
                         (feature.getDefaultGeometry()).cloneGeometry();
                     // Movemos los handlers que hemos seleccionado
                     // previamente dentro del m?todo select()
                     Handler[] handlers =
                         geometry.getHandlers(Geometry.SELECTHANDLER);
                 ICoordTrans coordTrans = getVLE().getLayer().getCoordTrans();
                 for (int i=0 ; i<selectedFeatures.size() ; i++){
                     Feature feature = (Feature) selectedFeatures.get(i);
                     Geometry geometry = (Geometry)selectedGeometries.get(i);
                     // Draw the moved geometry. It has been reprojected in the
                     // select handler method
                     for (int k = 0; k < selectedHandlers.size(); k++) {
                         Handler h = (Handler) selectedHandlers.get(k);
                         for (int j = 0; j < handlers.length; j++) {
                             if (h.getPoint().equals(handlers[j].getPoint())) {
                                 handlers[j].set(x, y);
+                            }
+                        }
+                    }
                         h.set(x, y);
+                    }
                     //If the layer is reprojected, It is necessary
                     //to reproject the geometry
                     if (coordTrans != null){
                         geometry = geometry.cloneGeometry();
                         geometry.reProject(coordTrans.getInverted());
+                    }
                     EditableFeature eFeature = feature.getEditable();
                     eFeature.setDefaultGeometry(geometry);
                     featureStore.update(eFeature);
+                }
                 firstPoint = new Point2D.Double(x, y);
-...
                 return;
             } else
                 //If there is a handler to move...
                 if (status.equals("Selection.WithHandlers")) {
                     // Movemos los handlers que hemos seleccionado
                     // previamente dentro del m?todo select()
                     double xPrev = 0;
                     double yPrev = 0;
                     for (int k = 0; k < selectedHandler.size(); k++) {
                         Handler h = (Handler) selectedHandler.get(k);
                         xPrev = h.getPoint().getX();
                         yPrev = h.getPoint().getY();
                         h.set(x, y);
+                    }
                     // Y una vez movidos los v?rtices (handles)
                     // redibujamos la nueva geometr?a.
                     for (int i = 0; i < rowselectedHandlers.size(); i++) {
                         Feature feature = (Feature) rowselectedHandlers.get(i);
                         Geometry geom =
                             (feature.getDefaultGeometry()).cloneGeometry();
                         renderer.setColor(Color.gray);
                         renderer.draw(geom,
                             mapControlManager.getAxisReferenceSymbol());
+                    }
                     for (int k = 0; k < selectedHandler.size(); k++) {
                         Handler h = (Handler) selectedHandler.get(k);
                         h.set(xPrev, yPrev);
+                    }
                     return;
                     drawWithHandlers(renderer, x, y, selectedHandler);
+                }
+        }
         /**
          * Draw method to draw a geometry with handlers
+         *
          * @param mapControlDrawer
          *            object used to draw.
          * @param x
          *            selected x coordinate.
          * @param y
          *            selected y coordinate.
          * @param selectedHandlers
          *            the selected handlers
          */
         protected void drawWithHandlers(MapControlDrawer mapControlDrawer, double x,
             double y, ArrayList selectedHandlers) {
             // Moving the handlers that have been selected
             // in the selectHandlers method
             double xPrev = 0;
             double yPrev = 0;
             for (int k = 0; k < selectedHandlers.size(); k++) {
                 Handler h = (Handler) selectedHandlers.get(k);
                 xPrev = h.getPoint().getX();
                 yPrev = h.getPoint().getY();
                 h.set(x, y);
+            }
             // Draw the moved geometry. It has been reprojected in the
             // select handler method
             for (int i = 0; i < selectedGeometries.size(); i++) {
                 Geometry geom = (Geometry) selectedGeometries.get(i);
                 mapControlDrawer.setColor(Color.gray);
                 mapControlDrawer.draw(geom,
                     mapControlManager.getAxisReferenceSymbol());
+            }
             for (int k = 0; k < selectedHandlers.size(); k++) {
                 Handler h = (Handler) selectedHandlers.get(k);
                 h.set(xPrev, yPrev);
+            }
+        }
         /**
          * Add a diferent option.
+         *
-...
             Point2D auxPoint = new Point2D.Double(x, y);
             VectorialLayerEdited vle = getVLE();
             //Gets the current selected handlers
             ArrayList selectedHandler = vle.getSelectedHandler();
             FeatureSet selection = null;
             DisposableIterator iterator = null;
-...
                     countSel);
                 selectedHandler.clear();
                 //Clear the previous selection
                 clearCurrentSelection();
                 // Se comprueba si se pincha en una gemometr?a
                 PluginServices.getMDIManager().setWaitCursor();
-...
                         .toMapDistance(mapControlManager.getTolerance());
                 Handler[] handlers = null;
                 rowselectedHandlers.clear();
                 selectedGeometries.clear();
                 iterator = selection.fastIterator();
                 ICoordTrans coordTrans = getVLE().getLayer().getCoordTrans();
                 while (iterator.hasNext()) {
                     Feature feature = (Feature) iterator.next();
                     handlers =
                         (feature.getDefaultGeometry())
                             .getHandlers(Geometry.SELECTHANDLER);
                     //If the layer is reprojected, the tolerance is not applicable. It is necessary
                     //to reproject the geometry
                     Geometry geometry = feature.getDefaultGeometry();
                     if (coordTrans != null){
                         geometry = geometry.cloneGeometry();
                         geometry.reProject(coordTrans);
+                    }
                     handlers = geometry.getHandlers(Geometry.SELECTHANDLER);
                     // y miramos los handlers de cada entidad seleccionada
                     double min = tam;
-...
                         if (distance <= min) {
                             min = distance;
                             selectedHandler.add(handlers[j]);
                             rowselectedHandlers.add(feature);
                             selectedGeometries.add(geometry);
                             selectedFeatures.add(feature);
+                        }
+                    }
+                }
-...
             return selectedHandler.size();
+        }
         protected void clearCurrentSelection(){
             selectedFeatures.clear();
             selectedGeometries.clear();
+        }
         public String getType() {
             return type;

Also available in: Unified diff