/ - Diff - Application: gvSIG desktop - gvSIG

branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/spi/AbstractFeatureStoreProvider.java
5	5	import org.gvsig.fmap.dal.DALLocator;
6	6	import org.gvsig.fmap.dal.DataServerExplorer;
7	7	import org.gvsig.fmap.dal.exception.*;
	8	import org.gvsig.fmap.dal.feature.FeatureLocks;
8	9	import org.gvsig.fmap.dal.feature.FeatureSelection;
9	10	import org.gvsig.fmap.dal.feature.FeatureType;
10	11	import org.gvsig.fmap.dal.feature.exception.PerformEditingException;

     		this.parameters = parameters;
     		this.transforms = new DefaultFeatureStoreTransforms(this);
     		this.provider.initialize(this);
     		try {
     			indexes=new DefaultFeatureIndexes(this);
     		} catch (DataException e) {
     			throw new InitializeException(e);
+    		}
+    	}
     	public Logger getLogger() {

branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/DefaultFeatureIndex.java
80	80	}
81	81
82	82	// FIXME Esto debe ir al provider
83		if (featureStore.getProvider().getFeatureReferenceOIDType() != DataTypes.INT) {
	83	if (featureStore.getProvider().getFeatureReferenceOIDType() != DataTypes.INT &&
	84	featureStore.getProvider().getFeatureReferenceOIDType() != DataTypes.LONG) {
84	85	throw new IllegalArgumentException();
85	86	}
86	87

     import org.gvsig.tools.persistence.PersistentState;
     /**
+     *
+     *
      * This transform adds a new attribute of type Geometry to the
      * original store's default FeatureType. When applying the transform
      * to a single feature this new attribute is assigned the value of a
      * original store's default FeatureType. When applying the transform
      * to a single feature this new attribute is assigned the value of a
      * point whose coordinates proceed from two numeric attributes from the
      * store, called xname, yname.
+     *
-...
     	private FeatureStore store;
     	private String geomName;
     	private String xname;
     	private String xname;
     	private String yname;
     	/**
     	 * Empty default constructor
     	 */
     	public MyTransform() {
+    	}
     	/**
     	 * Initializes the transform by assigning the source store and the names of the necessary attributes.
+    	 *
     	 * @param store
     	 * 			source store.
+    	 *
+    	 *
     	 * @param geomName
     	 * 			name of the geometry attribute in the default feature type from the source store.
+    	 *
+    	 *
     	 * @param xname
     	 * 			name of the attribute containing the X coordinates
+    	 *
+    	 *
     	 * @param yname
     	 * 			name of the attribute containing the Y coordinates
+    	 *
+    	 *
     	 * @throws DataException
     	 */
     	public void initialize(FeatureStore store, String geomName, String xname, String yname) throws DataException {
     		// Initialize some data
     		this.store = store;
     		this.geomName = geomName;
     		this.xname = xname;
     		this.yname = yname;
     		// obtain the feature type, add the new attribute and keep a reference to the resulting feature type
     		EditableFeatureType type = store.getDefaultFeatureType().getEditable();
     		type.add(geomName, DataTypes.GEOMETRY);
     		this.defaultFeatureType = type.getNotEditableCopy();
     		setDefaultFeatureType(type.getNotEditableCopy());
+    	}
     	/**
     	 * Applies this transform to a target editable feature, using data from the
     	 * Applies this transform to a target editable feature, using data from the
     	 * source feature.
     	 */
     	public void applyTransform(Feature source, EditableFeature target)
     			throws DataException {
     		// copy source feature data over target feature
     		target.copyFrom(source);
     		// calculate and assign new attribute's value
     		GeometryFactory geomFactory = GeometryManager.getInstance().getGeometryFactory();
     		Geometry geom = geomFactory.createPoint2D(
     			source.getDouble(xname),
     			source.getDouble(xname),
     			source.getDouble(yname)
     		);
     		target.setGeometry(this.geomName, geom);
-...
     	public void setState(PersistentState state) throws PersistenceException {
+    	}
+    }

     	/**
     	 * Initializes all the necessary data for this transform
+    	 *
+    	 *
     	 * @param store1
     	 *            store whose default feature type is the target of this
     	 *            transform
+    	 *
+    	 *
     	 * @param store2
     	 *            store whose default feature type will provide the new
     	 *            attributes to join
+    	 *
+    	 *
     	 * @param keyAttr1
     	 *            key attribute in store1 that matches keyAttr2 in store2
     	 *            (foreign key), used for joining both stores.
+    	 *
+    	 *
     	 * @param keyAttr2
     	 *            key attribute in store2 that matches keyAttr1 in store2
     	 *            (foreign key), used for joining both stores.
+    	 *
+    	 *
     	 * @param attrs
     	 *            names of the attributes in store2 that will be joined to
     	 *            store1.
-...
+    		}
     		// assign calculated feature type as this transform's feature type
     		this.defaultFeatureType = type.getNotEditableCopy();
     		setDefaultFeatureType(type.getNotEditableCopy());
+    	}
     	/**
+    	 *
+    	 *
+    	 *
+    	 *
     	 * @param source
+    	 *
+    	 *
     	 * @param target
+    	 *
+    	 *
     	 * @throws DataException
     	 */
     	public void applyTransform(Feature source, EditableFeature target)

Application: gvSIG desktop

Revision 25587