/ - Diff - gvSIG tools: Vector editing - gvSIG

Revision 367

     key_b_splines = 3
     columns_number = N\u00famero de columnas
     rows_number = N\u00famero de filas
     space_between_columns = Espacio entre columnas
     space_between_rows = Espacio entre filas
     distance_between_columns = Distancia entre columnas
     distance_between_rows = Distancia entre filas
     key_yes= S
     key_no = N
     yes = Si

     key_b_splines = 3
     columns_number = Number of columns
     rows_number = Number of rows
     space_between_columns = Space between columns
     space_between_rows = Space between rows
     distance_between_columns = Distance between columns
     distance_between_rows = Distance between rows
     key_yes= Y
     key_no = N
     yes = Yes

         private EditingServiceParameter basePoint;
         private EditingServiceParameter columnSpacing;
         private EditingServiceParameter columnDistance;
         private EditingServiceParameter rowSpacing;
         private EditingServiceParameter rowDistance;
         /**
          * Default constructor.
-...
                 new DefaultEditingServiceParameter("rows_number", "rows_number",
                     EditingServiceParameter.TYPE.VALUE);
             this.columnSpacing =
                 new DefaultEditingServiceParameter("space_between_columns",
                     "space_between_columns", EditingServiceParameter.TYPE.VALUE,
             this.columnDistance =
                 new DefaultEditingServiceParameter("distance_between_columns",
                     "distance_between_columns", EditingServiceParameter.TYPE.VALUE,
                     EditingServiceParameter.TYPE.POSITION);
             this.rowSpacing =
                 new DefaultEditingServiceParameter("space_between_rows",
                     "space_between_rows", EditingServiceParameter.TYPE.VALUE,
             this.rowDistance =
                 new DefaultEditingServiceParameter("distance_between_rows",
                     "distance_between_rows", EditingServiceParameter.TYPE.VALUE,
                     EditingServiceParameter.TYPE.POSITION);
+        }
-...
                 return rows;
             } else if (values.get(basePoint) == null) {
                 return basePoint;
             } else if (values.get(columnSpacing) == null) {
                 return columnSpacing;
             } else if (values.get(rowSpacing) == null) {
                 return rowSpacing;
             } else if (values.get(columnDistance) == null) {
                 return columnDistance;
             } else if (values.get(rowDistance) == null) {
                 return rowDistance;
+            }
             return null;
+        }
-...
             Integer columnsValue = (Integer) values.get(columns);
             Integer rowsValue = (Integer) values.get(rows);
             Point basePointValue = (Point) values.get(basePoint);
             Double spacingColumnsValue = (Double) values.get(columnSpacing);
             Double spacingRowsValue = (Double) values.get(rowSpacing);
             Double columnDistanceValue = (Double) values.get(columnDistance);
             Double rowDistanceValue = (Double) values.get(rowDistance);
             if (featureSelection != null && columnsValue != null
                 && rowsValue != null && basePointValue != null) {
                 int subtype = basePointValue.getGeometryType().getSubType();
                 if (spacingColumnsValue == null) {
                     spacingColumnsValue =
                 if (columnDistanceValue == null) {
                     columnDistanceValue =
                         mousePosition.getX() - basePointValue.getX();
+                }
                 if (spacingRowsValue == null) {
                     spacingRowsValue = mousePosition.getY() - basePointValue.getY();
                 if (rowDistanceValue == null) {
                     rowDistanceValue = mousePosition.getY() - basePointValue.getY();
+                }
                 // Creation of symbology
-...
                     String columnsText =
                         i18nManager.getTranslation("space_between_columns")
                             .concat(" ")
                             .concat(String.valueOf(spacingColumnsValue));
                             .concat(String.valueOf(columnDistanceValue));
                     Geometry pointText =
                         geometryManager.createPoint(
                             mousePosition.getX() + textDistance
-...
                     String rowsText =
                         i18nManager.getTranslation("space_between_rows")
                             .concat(" ").concat(String.valueOf(spacingRowsValue));
                             .concat(" ").concat(String.valueOf(rowDistanceValue));
                     pointText =
                         geometryManager.createPoint(
                             mousePosition.getX() + textDistance
-...
                         Geometry geometry = feature.getDefaultGeometry();
                         Geometry[][] matrix =
                             createRectangularMatrix(geometry, columnsValue,
                                 rowsValue, basePointValue, spacingColumnsValue,
                                 spacingRowsValue);
                                 rowsValue, basePointValue, columnDistanceValue,
                                 rowDistanceValue);
                         for (int i = 0; i < matrix.length; i++) {
                             for (int j = 0; j < matrix[i].length; j++) {
-...
             parameters.add(basePoint);
             parameters.add(columns);
             parameters.add(rows);
             parameters.add(columnSpacing);
             parameters.add(rowSpacing);
             parameters.add(columnDistance);
             parameters.add(rowDistance);
             return parameters;
+        }
-...
                 values.put(basePoint, value);
                 insertedValue = true;
             } else if (parameter.equals(columnSpacing)
                 || parameter.equals(rowSpacing)) {
             } else if (parameter.equals(columnDistance)
                 || parameter.equals(rowDistance)) {
                 if (value instanceof Double) {
                     Double doubleValue = (Double) value;
-...
                     Point basePointValue = (Point) values.get(basePoint);
                     Point valuePoint = (Point) value;
                     double distance = 0;
                     if (parameter.equals(columnSpacing)) {
                     if (parameter.equals(columnDistance)) {
                         distance = valuePoint.getX() - basePointValue.getX();
                         values.put(columnSpacing, distance);
                     } else if (parameter.equals(rowSpacing)) {
                         values.put(columnDistance, distance);
                     } else if (parameter.equals(rowDistance)) {
                         distance = valuePoint.getY() - basePointValue.getY();
                         values.put(rowSpacing, distance);
                         values.put(rowDistance, distance);
+                    }
                     insertedValue = true;
+                }
-...
             final Integer columnsValue = (Integer) values.get(columns);
             final Integer rowsValue = (Integer) values.get(rows);
             final Point basePointValue = (Point) values.get(basePoint);
             final Double spacingColumnsValue = (Double) values.get(columnSpacing);
             final Double spacingRowsValue = (Double) values.get(rowSpacing);
             final Double spacingColumnsValue = (Double) values.get(columnDistance);
             final Double spacingRowsValue = (Double) values.get(rowDistance);
             final EditingProviderServices editingProviderServices =
                 (EditingProviderServices) getProviderServices();

Also available in: Unified diff

Application: gvSIG desktop » gvSIG tools: Vector editing

Revision 367