/ - Diff - gvSIG tools: Vector editing - gvSIG

Revision 64

     		FeatureSelection selected = (FeatureSelection) values
     				.get(selectionParameter);
     		try {
     			if (!selected.isEmpty()) {
     			if (selected != null && !selected.isEmpty()) {
     				Point p1 = (Point) values.get(firstPointParameter);
     				if (p1 != null) {
     					Object p2Value = values.get(secondPointParameter);

org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.prov/org.gvsig.vectorediting.lib.prov.polyline/src/main/java/org/gvsig/vectorediting/lib/prov/polyline/PolylineEditingProvider.java
567	567	}
568	568
569	569	public void start() throws StartServiceException {
	570	stop();
570	571	values = new ArrayList<MyPolyLinePoint>();
	572
571	573	}
572	574
573	575	public void stop() {

         addConsoleListener("ViewEditing", new ResponseListener() {
           public void acceptResponse(String response) {
             try{
             try {
               textEntered(response);
             } catch( VectorEditingException e){
+            }
             catch (VectorEditingException e) {
               showConsoleMessage(e.getMessage());
             } finally{
               getNextParameter();
+            }
             finally {
               if (activeService != null) {
                 getNextParameter();
+              }
+            }
+          }
         });
+      }
-...
           if (service != null) {
             this.activeService = service;
             try {
     			service.start();
     		} catch (StartServiceException e) {
     			logger.error(String.format("Can't start the service %(s)", service.getName()), e);
+    		}
               service.start();
+            }
             catch (StartServiceException e) {
               logger.error(
                   String.format("Can't start the service %(s)", service.getName()),
                   e);
+            }
             getNextParameter();
+          }
+        }
-...
         if (getConsolePanel() != null) {
           showConsoleMessage("\n#" + param.getDescription() + " > ");
+        }
+        }
+      }
       private void showConsoleMessage(String text) {
         getConsolePanel().addText(text, JConsole.MESSAGE);
-...
         currentParam = activeService.next();
         if (currentParam == null) {
           finishAndStartService();
           getNextParameter();
+        }
         else {
           askQuestion(currentParam);
-...
       private void finishAndStartService() {
         try {
     		activeService.finish();
+    	}
           activeService.finish();
+        }
         catch (VectorEditingException e) {
           logger.error("An error ocurred when try to finish service", e);
+        }
         mapControl.rePaintDirtyLayers();
         try {
     		activeService.start();
     	} catch (StartServiceException e) {
     		logger.error(String.format("Can't start the service %(s)", activeService.getName()), e);
+    	}
           activeService.start();
+        }
         catch (StartServiceException e) {
           logger.error(String.format("Can't start the service %(s)",
               activeService.getName()), e);
+        }
         getNextParameter();
+      }
       private void initMapControlListeners(MapControl mapControl) {
-...
               Point point;
               point = vp.convertToMapPoint(e.getX(), e.getY());
               try {
               this.activeService.value(point);
+            }
                 this.activeService.value(point);
+              }
               catch (VectorEditingException ex) {
                 logger.error("Invalid value %s", new Object[] { point });
+              }
-...
               Point point;
               point = vp.convertToMapPoint(e.getX(), e.getY());
               try {
               this.activeService.value(point);
                 this.activeService.value(point);
+              }
               catch (VectorEditingException ex) {
                 logger.error("Invalid value %s", new Object[] { point });
-...
+      }
       private void textEntered(String response) throws InvalidEntryException{
       private void textEntered(String response) throws InvalidEntryException {
         if (response == null) {
           this.activeService.stop();
           cleanBehavior();
           if(activeService != null){
             this.activeService.stop();
             cleanBehavior();
+          }
+        }
         else {
           List<TYPE> types = currentParam.getTypes();
-...
+            }
             catch (VectorEditingException e) {
               // Do nothing
+              }
+            }
+          }
           if (!insertedValue && types.contains(TYPE.VALUE)) {
             try {
               value = parseValue(response);
-...
               // Do nothing
+            }
+            }
+          }
           if (!insertedValue && types.contains(TYPE.OPTION)) {
             try {
               response = response.replace("\n", "");
               if (response != null) {
                 this.activeService.value(response);
                 insertedValue = true;
+          }
+              }
+            }
           catch (VectorEditingException e) {
             catch (VectorEditingException e) {
               // Do nothing
+            }
+          }
-...
           if (!insertedValue) {
             throw new InvalidEntryException(null);
+          }
+            }
+            }
+        }
+      }
       private Double parseValue(String response) throws ParseValueException {
         try{
         try {
           return Double.valueOf(response);
+        }
         catch (Exception e) {
           throw new ParseValueException(e);
+          }
+        }
+          }
+      }
       private Point parsePoint(String response) throws ParsePointException {
         String[] numbers = new String[1];
-...
           double[] values;
           try {
             values = new double[] { Double.parseDouble(numbers[0]),
               Double.parseDouble(numbers[1]) };
                 Double.parseDouble(numbers[1]) };
+          }
           catch (Exception e) {
             throw new ParsePointException(e);
-...
           Point point;
           try {
           point = geomManager.createPoint(values[0], values[1], currentLayer
               .getFeatureStore().getDefaultFeatureType()
               .getDefaultGeometryAttribute().getGeomType().getSubType());
             point = geomManager.createPoint(values[0], values[1], currentLayer
                 .getFeatureStore().getDefaultFeatureType()
                 .getDefaultGeometryAttribute().getGeomType().getSubType());
             // TODO: Maybe do util class to get type and subtype of a featureStore
             // or a method in manager
+          }

Also available in: Unified diff

Application: gvSIG desktop » gvSIG tools: Vector editing

Revision 64