/ - Diff - Application: gvSIG desktop - gvSIG

Revision 40355

     import org.gvsig.daltransform.swing.impl.components.FeatureTypeCombo;
     import org.gvsig.daltransform.swing.impl.components.NumericFeatureTypeAttributesCombo;
     import org.gvsig.fmap.crs.CRSFactory;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     /**
-...
     	 */
     	public void updatePanel() {
     		featureTypeCombo.addFeatureStore(getFeatureStore());
     		actionPerformed(null);
     		if (nameText != null) {
     		    nameText.setText(this.suggestedGeomFieldName(getFeatureStore()));
+    		}
     		// actionPerformed(null);
+    	}
     	public IProjection getProjection() {
     		return CRSFactory.getCRS(projectionText.getText());
+    	}
     	private String suggestedGeomFieldName(FeatureStore fsto) {
     	    if (fsto == null) {
     	        return "";
+    	    }
     	    FeatureType ft = null;
     	    try {
                 ft = fsto.getDefaultFeatureType();
             } catch (DataException e) {
                 logger.info("Error: unable to suggest geom field name.", e);
                 return "";
+            }
     	    if (ft.getAttributeDescriptor("geometry") == null) {
     	        return "geometry";
+    	    }
     	    if (ft.getAttributeDescriptor("geom") == null) {
     	        return "geom";
+    	    }
     	    String aux = "";
     	    int i = -1;
     	    do {
     	        i++;
     	        aux = "geom" + i;
     	    } while (ft.getAttributeDescriptor(aux) != null);
     	    return aux;
+    	}
+    }

     import org.gvsig.fmap.dal.feature.EditableFeatureType;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureSet;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
-...
     import org.gvsig.fmap.geom.type.GeometryTypeNotSupportedException;
     import org.gvsig.fmap.geom.type.GeometryTypeNotValidException;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dispose.DisposableIterator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.dynobject.exception.DynFieldNotFoundException;
     import org.gvsig.tools.persistence.PersistenceManager;
-...
+            }
             try {
                 envelope = geometryManager.createEnvelope(SUBTYPES.GEOM2D);
                 /*
                  * creates and updates envelope with all features
                  */
                 initEnvelope(store);
             } catch (CreateEnvelopeException e) {
                 throw new org.gvsig.fmap.dal.feature.exception.CreateGeometryException(e);
+            }
-...
             setFeatureTypes(Arrays.asList(types), types[0]);
+        }
         /**
          * creates and updates envelope with all features
+         *
          */
         private void initEnvelope(FeatureStore fsto) throws CreateEnvelopeException {
             envelope = geometryManager.createEnvelope(SUBTYPES.GEOM2D);
             FeatureSet fset = null;
             DisposableIterator diter = null;
             Feature feat = null;
             try {
                 fset = fsto.getFeatureSet();
                 diter = fset.fastIterator();
                 while (diter.hasNext()) {
                     feat = (Feature) diter.next();
                     this.updateEnvelope(feat);
+                }
                 diter.dispose();
             } catch (Exception dex) {
                 throw new CreateEnvelopeException(SUBTYPES.GEOM2D, dex);
+            }
+        }
         /* (non-Javadoc)
          * @see org.gvsig.fmap.dal.feature.FeatureStoreTransform#applyTransform(org.gvsig.fmap.dal.feature.Feature, org.gvsig.fmap.dal.feature.EditableFeature)
          */
         public void applyTransform(Feature source, EditableFeature target)
         throws DataException {
             this.copySourceToTarget(source, target);
             try {
             try {
                 Point point = geometryManager.createPoint(
                     new Double(source.get(xFieldName).toString()),
                     new Double(source.get(yFieldName).toString()),
                     SUBTYPES.GEOM2D);
                 target.set(geometryFieldName, point);
                 target.setDefaultGeometry(point);
                 target.setDefaultGeometry(point);
                 envelope.add(point.getEnvelope());
             } catch (CreateGeometryException e) {
                 throw new org.gvsig.fmap.dal.feature.exception.CreateGeometryException(TYPES.POINT, SUBTYPES.GEOM2D, e);
+            }
+            }
+        }
         /**
          * Used internally to initialize envelope
+         *
          */
         private void updateEnvelope(Feature feat) throws CreateGeometryException {
             Point point = geometryManager.createPoint(
                 new Double(feat.get(xFieldName).toString()),
                 new Double(feat.get(yFieldName).toString()),
                 SUBTYPES.GEOM2D);
             envelope.add(point.getEnvelope());
+        }
         /**
          * @param source
          * @param target

Also available in: Unified diff