/ - Diff - gvSIG tools: Vector editing - gvSIG

         @Override
         public void start() throws StartServiceException, InvalidEntryException {
             this.getProvider().start();
             this.getProvider().initDefaultValues();
             this.updateObservers(START_NOTIFICATION, null, null);
+        }
-...
         public void setShowPreviewSymbol(boolean showPreviewSymbol) {
             getProvider().setShowPreviewSymbol(showPreviewSymbol);
+        }
         @Override
         public void restart() throws StartServiceException, InvalidEntryException ,StopServiceException {
             this.getProvider().restart();
             this.updateObservers(RESTART_NOTIFICATION, null, null);
+        }
+    }

                             i18nManager.getTranslation("delete_original_geometries"),
                             consoleMsg,
                             deleteOriginalGeometriesOptions2,
                             i18nManager.getTranslation("_no"),
                             false,
                             TYPE.OPTION).setDataType(DataTypes.BOOLEAN);;
+        }

         public String getLabel(Object value);
         public String getConsoleValue(Object value);
         public interface ParameterOption extends LabeledValue {
             public String getConsoleValue();

         public static final String FINISH_AND_STORE_NOTIFICATION = "EditingService.FinishAndStore";
         public static final String FINISH_NOTIFICATION = "EditingService.Finish";
         public static final String START_NOTIFICATION = "EditingService.Start";
         public static final String RESTART_NOTIFICATION = "EditingService.Restart";
         /**
          * Gets state of drawing. If this service has sufficient values with mouse
-...
         public void setShowPreviewSymbol(boolean showPreviewSymbol);
         public void restart() throws StartServiceException, InvalidEntryException ,StopServiceException;
+    }

org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.api/src/main/java/org/gvsig/vectorediting/lib/api/EditingServiceParameter.java
107	107	*/
108	108	public void setDefaultValue(Object value);
109	109
	110	public String getConsoleDefaultValue();
110	111
111	112	/**
112	113	* If parameter is of type Geometry returns the type of geometry

org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.lib/org.gvsig.vectorediting.lib.spi/src/main/java/org/gvsig/vectorediting/lib/spi/DefaultEditingServiceParameterOptions.java
68	68	return option.getValue();
69	69	}
70	70	}
71		for (ParameterOption option : this.options) {
72		if(StringUtils.startsWithIgnoreCase(option.getConsoleValue(), s)){
73		return option.getValue();
	71	if(StringUtils.isNotBlank(s)){
	72	for (ParameterOption option : this.options) {
	73	if(StringUtils.startsWithIgnoreCase(option.getConsoleValue(), s)){
	74	return option.getValue();
	75	}
74	76	}
75	77	}
76	78	if(isValidValue(defaultValue)){
...	...
107	109	}
108	110	return null;
109	111	}
	112
	113	@Override
	114	public String getConsoleValue(Object value) {
	115	for (ParameterOption option : this.options) {
	116	if(ObjectUtils.equals(option.getValue(), value)) {
	117	return option.getConsoleValue();
	118	}
	119	}
	120	return "";
	121	}
110	122
111	123
112	124	public static class DefaultParameterOption<T> implements ParameterOption, Comparable{

     import java.util.Arrays;
     import java.util.HashSet;
     import java.util.Map;
     import java.util.Objects;
     import java.util.Set;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.primitive.Point;
     import org.gvsig.timesupport.DataTypes;
     import org.gvsig.vectorediting.lib.api.EditingServiceParameter;
-...
         public void setDefaultValue(Object value) {
             this.defaultValue = value;
+        }
         public String getConsoleDefaultValue() {
             if(this.defaultValue == null) {
                 return "";
+            }
             if (defaultValue instanceof Point) {
                 Point point = (Point) defaultValue;
                 StringBuilder builder = new StringBuilder();
                 for (int i = 0; i < point.getDimension(); i++) {
                     builder.append(point.getCoordinateAt(i));
                     if (i < point.getDimension() - 1) {
                         builder.append(" , ");
+                    }
+                }
                 return builder.toString();
+            }
             if (this.options2 != null) {
                 return this.options2.getConsoleValue(this.defaultValue);
+            }
             if (this.options != null) {
                 //FIXME: ????
                 return this.options.getOrDefault(defaultValue, "");
+            }
             return Objects.toString(defaultValue, "");
+        }
         @Override
         public boolean isOptional() {
             return optional;

         public void setShowPreviewSymbol(boolean showPreviewSymbol);
         public boolean isShowPreviewSymbol();
         /**
          * Restarts provider.
+         *
          * @throws StartServiceException
          *             if there are some error starting service.
          * @throws InvalidEntryException
          *             if the entry of provider is not valid
          */
         public void restart() throws StartServiceException, InvalidEntryException, StopServiceException;
         public void initDefaultValues();
+    }

     package org.gvsig.vectorediting.lib.spi;
     import java.util.List;
     import org.gvsig.fmap.dal.feature.EditableFeature;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.geom.Geometry;
-...
     import org.gvsig.tools.service.spi.ProviderServices;
     import org.gvsig.vectorediting.lib.api.EditingServiceParameter;
     import org.gvsig.vectorediting.lib.api.exceptions.InvalidEntryException;
     import org.gvsig.vectorediting.lib.api.exceptions.StartServiceException;
     import org.gvsig.vectorediting.lib.api.exceptions.StopServiceException;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     public abstract class AbstractEditingProvider extends AbstractProvider
     implements EditingProvider, Geometry.TYPES, Geometry.SUBTYPES {
         private static final Logger LOGGER = LoggerFactory
         protected static final Logger LOGGER = LoggerFactory
             .getLogger(AbstractEditingProvider.class);
         private boolean showPreviewSymbol;
-...
     //        }
     //    }
         @Override
         public void restart() throws StartServiceException, InvalidEntryException ,StopServiceException {
             this.stop();
             this.start();
+        }
         @Override
         public void initDefaultValues() {
             List<EditingServiceParameter> parameters = this.getParameters();
             for (EditingServiceParameter parameter : parameters) {
                 if(parameter.isOptional()){
                     try {
                         setValue(parameter, parameter.getDefaultValue());
                     } catch (InvalidEntryException ex) {
                         LOGGER.debug("Can't init default value of "+parameter.getName(), ex);
+                    }
+                }
+            }
+        }
+    }

             String activeServiceName =
                 i18nManager.getTranslation(getActiveService().getName());
             Object defaultValue = param.getDefaultValue();
             String strDefaultValue;
             if (defaultValue != null) {
                 if (defaultValue instanceof String) {
                     strDefaultValue =
                         i18nManager.getTranslation((String) defaultValue);
                 } else {
                     if(defaultValue instanceof Point){
                         Point point = (Point)defaultValue;
                         StringBuilder builder = new StringBuilder();
                         for(int i=0; i<point.getDimension(); i++){
                             builder.append(point.getCoordinateAt(i));
                             if(i < point.getDimension()-1){
                                 builder.append(" , ");
+                            }
+                        }
                         strDefaultValue = builder.toString();
                     } else {
                         strDefaultValue = defaultValue.toString();
+                    }
+                }
                 showConsoleMessage("\n" + activeServiceName + "# " + translation
                     + "<" + strDefaultValue + "> : ");
             String strDefaultValue = param.getConsoleDefaultValue();
             if(StringUtils.isBlank(strDefaultValue)) {
                 showConsoleMessage("\n" + activeServiceName + "# " + translation + " : ");
             } else {
                 showConsoleMessage("\n" + activeServiceName + "# " + translation
                     + " : ");
                 showConsoleMessage("\n" + activeServiceName + "# " + translation + "<" + strDefaultValue + "> : ");
+            }
+        }
-...
                     showConsoleMessage("\n"
                         + i18nManager.getTranslation(lastService.getName()) + "# "
                         + i18nManager.getTranslation("finished") + "\n");
                     lastService.stop();
     //                lastService.stop();
                     setActiveService(lastService);
                     lastService.start();
     //                lastService.start();
                     lastService.restart();
                     changeSelectedTool(getActiveService().getName());
+                }

Application: gvSIG desktop » gvSIG tools: Vector editing

Revision 2870