/ - Diff - | gvSIG desktop 1 - gvSIG

     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Curve;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /* CVS MESSAGES:
+     *
      * $Id: MultiCurve.java,v 1.1 2008/03/12 08:46:20 cvs Exp $
      * $Log: MultiCurve.java,v $
      * Revision 1.1  2008/03/12 08:46:20  cvs
      * *** empty log message ***
+     *
+     *
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Curve;
     import org.gvsig.fmap.geom.primitive.OrientableCurve;
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_Curve specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * MultiCurve is an aggregate class containing only instances of {@link OrientableCurve}.
      * The association role "element" shall be the set of {@link OrientableCurve}'s contained in
      * this MultiCurve.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface MultiCurve extends Aggregate{
     	//public final static int CODE = TYPES.MULTICURVE;
     	/**
     	 * Adds a new curve to the  multi curve
     	 * @param curve
     	 * The curve to add
     	 */
     	void addCurve(Curve curve);
     	/**
     	 * Gets the curve that is on a concrete position
     	 * inside the multi curve
     	 * @param index
     	 * The position
     	 * @return
     	 * The selected curve
     	 */
     	Curve getCurveAt(int index);
+    }

     		return null;
+    	}
     	public int getShapeType() {
     		return FShape.MULTI;
+    	}
     	public Handler[] getHandlers(int type) {
     		int numPrimitives = getPrimitivesNumber();
     		Handler[] handlers = new Handler[numPrimitives];
-...
     		return null;
+    	}
     	public int getType() {
     		return CODE;
+    	}
     	public GeneralPathX getGeneralPath() {
     		// TODO Auto-generated method stub
     		return null;

     	public GeometryType getGeometryType() {
     		return geomType;
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.geom.Geometry#getType()
     	 */
     	public int getType() {
     		return geomType.getType();
+    	}
+    }

     	public double[] getZs() {
     		return z;
+    	}
     	/**
     	 * @see org.gvsig.fmap.geom.Geometry#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.MULTIPOINT | FShape.Z;
+    	}
+    }

     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.aggregate.MultiCurve;
     import org.gvsig.fmap.geom.primitive.Curve;
     import org.gvsig.fmap.geom.primitive.FShape;
     import org.gvsig.fmap.geom.primitive.impl.Curve2D;
     import org.gvsig.fmap.geom.type.GeometryType;
-...
     		return auxCurve;
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.core.FGeometryCollection#getGeometryType()
     	 */
     	public int getShapeType() {
     		return FShape.MULTIPOLYLINE;
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.geom.primitive.AbstractPrimitive#getGeometryType()
     	 */
-...
     	public void addCurve(Curve curve) {
     		addPrimitive(curve);
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.geom.aggregate.MultiCurve#getCurveAt(int)
     	 */
     	public Curve getCurveAt(int index) {
     		return (Curve)getPrimitiveAt(index);
+    	}
+    }

     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.aggregate.MultiSolid;
     import org.gvsig.fmap.geom.primitive.Solid;
     import org.gvsig.fmap.geom.primitive.impl.Solid2DZ;
-...
     	private static final long serialVersionUID = 1L;
     	private static GeometryType geomType = GeometryLocator.getGeometryManager()
     			.registerGeometryType(MultiSolid2DZ.class, null, MultiSolid.CODE, SUBTYPES.GEOM2DZ);
     			.registerGeometryType(MultiSolid2DZ.class, TYPES.MULTISOLID, SUBTYPES.GEOM2DZ);
     	public static int CODE = geomType.getId();
     	/**
-...
     		addPrimitive(solid);
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.geom.aggregate.MultiSolid#getSolidAt(int)
     	 */
     	public Solid getSolidAt(int index) {
     		return (Solid)getPrimitiveAt(index);
+    	}
+    }

     		return auxSurface;
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.core.FGeometryCollection#getGeometryType()
     	 */
     	public int getShapeType() {
     		return FShape.MULTIPOLYGON;
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.geom.primitive.AbstractPrimitive#getGeometryType()
     	 */
-...
     		addPrimitive(surface);
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.geom.aggregate.MultiSurface#getSurfaceAt(int)
     	 */
     	public Surface getSurfaceAt(int index) {
     		return (Surface)getPrimitiveAt(index);
+    	}
+    }

     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.core.FShape#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.MULTIPOINT;
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.core.FShape#cloneFShape()
     	 */
     	public FShape cloneFShape() {

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Primitive;
-...
     /**
      * <p>
      * This interface is equivalent to the GM_MultiPrimitive specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * MultiPrimitive is the root class for all primitive aggregates.
      * The association role "element" shall be the set of {@link Primitive}'s contained
      * in this MultiPrimitive.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface MultiPrimitive extends Aggregate {
     	/**
     	 * Adds a new primitive to the primitive
     	 * @param primitive
     	 * The primitive to add
     	 */
     	void addPrimitive(Primitive primitive);

     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Surface;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /* CVS MESSAGES:
+     *
      * $Id: MultiSurface.java,v 1.1 2008/03/12 08:46:20 cvs Exp $
      * $Log: MultiSurface.java,v $
      * Revision 1.1  2008/03/12 08:46:20  cvs
      * *** empty log message ***
+     *
+     *
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.OrientableSurface;
     import org.gvsig.fmap.geom.primitive.Surface;
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_MultiSurface specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * MultiSurface is an aggregate class containing only instances of {@link OrientableSurface}.
      * The association role "element" shall be the set of {@link OrientableSurface}'s
      * contained in this GMultiSurface.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface MultiSurface extends Aggregate{
     	//public final static int CODE = TYPES.MULTISURFACE;
     	/**
     	 * Adds a new surface to the  multi surface
     	 * @param surface
     	 * The surface to add
     	 */
     	void addSurface(Surface surface);
     	/**
     	 * Gets the surface that is on a concrete position
     	 * inside the multi surface
     	 * @param index
     	 * The position
     	 * @return
     	 * The selected surface
     	 */
     	Surface getSurfaceAt(int index);
+    }

     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Point;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /* CVS MESSAGES:
+     *
      * $Id: MultiPoint.java,v 1.1 2008/03/12 08:46:20 cvs Exp $
      * $Log: MultiPoint.java,v $
      * Revision 1.1  2008/03/12 08:46:20  cvs
      * *** empty log message ***
+     *
+     *
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Point;
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_MultiPoint specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * MultiPoint is an aggregate class containing only points.
      * The association role "element" shall be the set of {@link Point}'s contained in
      * this MultiPoint.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface MultiPoint extends Aggregate {
     	/**
     	 * Adds a new point to the multipoint
     	 * @param point
     	 * The point to add
     	 */
     	void addPoint(Point point);
     	/**
     	 * Gets the point that is on a concrete position
     	 * inside the multi point
     	 * @param index
     	 * The position
     	 * @return
     	 * The selected point
     	 */
     	Point getPointAt(int index);
+    }

     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Solid;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /* CVS MESSAGES:
+     *
      * $Id: MultiSolid.java,v 1.1 2008/03/12 08:46:20 cvs Exp $
      * $Log: MultiSolid.java,v $
      * Revision 1.1  2008/03/12 08:46:20  cvs
      * *** empty log message ***
+     *
+     *
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.primitive.Solid;
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_MultiSolid specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * MultiSolid is an aggregate class containing only solids. The association role "element"
      * shall be the set of {@link Solid}'s contained in this MultiSolid.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface MultiSolid extends Aggregate{
     	//public final static int CODE = TYPES.MULTISOLID;
     	/**
     	 * Adds a new solid to the  multi solid
     	 * @param solid
     	 * The solid to add
     	 */
     	void addSolid(Solid solid);
     	/**
     	 * Gets the solid that is on a concrete position
     	 * inside the multi solid
     	 * @param index
     	 * The position
     	 * @return
     	 * The selected solid
     	 */
     	Solid getSolidAt(int index);
+    }

     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.primitive.Primitive;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /* CVS MESSAGES:
+     *
      * $Id: MultiGeometry.java,v 1.1 2008/03/12 08:46:20 cvs Exp $
      * $Log: MultiGeometry.java,v $
      * Revision 1.1  2008/03/12 08:46:20  cvs
      * *** empty log message ***
+     *
+     *
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.fmap.geom.aggregate;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.primitive.Primitive;
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_Aggregate specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * The aggregates gather geometric objects. Since they will often use orientation
      * modification, the curve reference and surface references do not go directly to
      * the {@link Curve} and {@link Surface}, but are directed to {@link OrientableCurve}
      * and {@link OrientableSurface}.
      * </p>
      * <p>
      * Most geometric objects are contained in features, and cannot be held in
      * collections that are strong aggregations. For this reason, the collections
      * described on this package are all weak aggregations, and shall use
      * references to include geometric objects.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface Aggregate extends Geometry{
     	public final static int CODE = TYPES.AGGREGATE;
     public interface Aggregate extends Geometry{
     	/**
     	 * @return the number of GM_Primitives that composes
     	 * this multi geometry
     	 * this multi geometry.
     	 */
     	public int getPrimitivesNumber();
     	/**
     	 * Returns one of the GM_Primitive's that is in
     	 * a concrete position
     	 * Returns one of the Primitive's that is in
     	 * a concrete position.
     	 * @param i
     	 * Geometry position
     	 * Geometry position.
     	 * @return
     	 * A simple geometry
     	 * A simple geometry.
     	 */
     	public Primitive getPrimitiveAt(int i);

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 {Iver T.I.}   {Task}
     */
     package org.gvsig.fmap.geom.complex;
     /**
      * <p>
      * This interface is equivalent to the GM_Composite specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * A geometric composite shall be a geometric complex with an underlying core
      * geometry that is isomorphic to a primitive. Thus, a composite curve is
      * a collection of curves whose geometry interface could be satisfied
      * by a single curve (albeit a much more complex one).
      * </p>
      * <p>
      * Composites are intended for use as attribute values in datasets in
      * which the underlying geometry has been decomposed, usually to expose its topological nature.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface Composite extends Complex {
+    }

     package org.gvsig.fmap.geom.complex;
     import org.gvsig.fmap.geom.Geometry;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /* CVS MESSAGES:
+     *
      * $Id: GeometricComplex.java,v 1.1 2008/03/12 08:46:21 cvs Exp $
      * $Log: GeometricComplex.java,v $
      * Revision 1.1  2008/03/12 08:46:21  cvs
      * *** empty log message ***
+     *
+     *
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.fmap.geom.complex;
     import org.gvsig.fmap.geom.Geometry;
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_Complex specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * A Complex is a collection of geometrically disjoint, simple {@link Primitive}'s.
      * If a {@link Primitive} (other than a {@link Point}) is in a particular Complex,
      * then there exists a set of primitives of lower dimension in the same complex
      * that form the boundary of this primitive.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface Complex extends Geometry {

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 {Iver T.I.}   {Task}
     */
     package org.gvsig.fmap.geom.complex;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id: CompositeCurve.java,v 1.1 2008/03/12 08:46:21 cvs Exp $
      * $Log: CompositeCurve.java,v $
      * Revision 1.1  2008/03/12 08:46:21  cvs
      * *** empty log message ***
+     *
+     *
      */
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_CompositeCurve specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * A composite curve shall be a {@link Composite} with all the geometric
      * properties of a curve. These properties are instantiated in the operation "curve".
      * Essentially, a composite curve is a list of orientable curves ({@link OrientableCurve})
      * agreeing in orientation in a manner such that each curve (except the first) begins
      * where the previous one ends.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface CompositeCurve extends Complex{
     public interface CompositeCurve extends Composite{
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 {Iver T.I.}   {Task}
     */
     package org.gvsig.fmap.geom.complex;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id: CompositeSurface.java,v 1.1 2008/03/12 08:46:21 cvs Exp $
      * $Log: CompositeSurface.java,v $
      * Revision 1.1  2008/03/12 08:46:21  cvs
      * *** empty log message ***
+     *
+     *
      */
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_CompositeSurface specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * A composite surface shall be a {@link Complex} with all the geometric properties
      * of a surface, and thus can be considered as a type of orientable surface
      * ({@link OrientableSurface}). Essentially, a composite surface is a collection
      * of oriented surfaces that join in pairs on common boundary curves and which,
      * when considered as a whole, form a single surface.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface CompositeSurface extends Complex{
     public interface CompositeSurface extends Composite{
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 {Iver T.I.}   {Task}
     */
     package org.gvsig.fmap.geom.complex;
     /**
      * <p>
      * This interface is equivalent to the GM_CompositePoint specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * A separate class for composite point is included for completeness.
      * It is a {@link Complex} containing one and only one Point.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface CompositePoint {
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 {Iver T.I.}   {Task}
     */
     package org.gvsig.fmap.geom.complex;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id: CompositeSolid.java,v 1.1 2008/03/12 08:46:21 cvs Exp $
      * $Log: CompositeSolid.java,v $
      * Revision 1.1  2008/03/12 08:46:21  cvs
      * *** empty log message ***
+     *
+     *
      */
     /**
      * @author Jorge Piera Llodr? (jorge.piera@iver.es)
      * <p>
      * This interface is equivalent to the GM_CompositeSolid specified in
      * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>.
      * A CompositeSolid shall be a {@link Complex} with all the geometric properties of a solid.
      * Essentially, a composite solid is a set of solids that join in pairs on common
      * boundary surfaces to form a single solid.
      * </p>
      * @see <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26012">ISO 19107</a>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public interface CompositeSolid extends Complex{
     public interface CompositeSolid extends Composite{
+    }

     	 * @see org.gvsig.fmap.geom.primitive.impl.Curve2D#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.ARC;
     		return TYPES.ARC;
+    	}
     	/*

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/impl/DefaultNullGeometry.java
207	207	}
208	208
209	209	public int getShapeType() {
210		return FShape.NULL;
	210	return TYPES.NULL;
211	211	}
212	212
213	213	public Handler[] getStretchingHandlers() {

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/impl/AbstractPrimitive.java
378	378	}
379	379	return true;
380	380	}
	381
	382	/* (non-Javadoc)
	383	* @see org.gvsig.fmap.geom.primitive.FShape#getShapeType()
	384	*/
	385	public int getShapeType() {
	386	return getType();
	387	}
	388
	389
381	390	}

     	 * @see org.gvsig.fmap.geom.primitive.impl.Curve2D#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.LINE | FShape.Z;
     		return TYPES.CURVE;
+    	}
     	/*

     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.Geometry.TYPES;
     import org.gvsig.fmap.geom.primitive.FShape;
     import org.gvsig.fmap.geom.primitive.GeneralPathX;
     import org.gvsig.fmap.geom.primitive.Surface;
-...
     	 * @see org.gvsig.fmap.geom.primitive.impl.Surface2D#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.POLYGON | FShape.Z;
     		return TYPES.SURFACE;
+    	}
     	/* (non-Javadoc)

     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.Geometry.TYPES;
     import org.gvsig.fmap.geom.primitive.FShape;
     import org.gvsig.fmap.geom.primitive.Point;
     import org.gvsig.fmap.geom.type.GeometryType;
-...
     	 * @see org.gvsig.fmap.geom.primitive.impl.Point2D#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.POINT | FShape.Z;
     		return TYPES.POINT;
+    	}
     	/*

     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.Geometry.TYPES;
     import org.gvsig.fmap.geom.primitive.Curve;
     import org.gvsig.fmap.geom.primitive.FShape;
     import org.gvsig.fmap.geom.primitive.GeneralPathX;
-...
     	 * @see org.gvsig.fmap.geom.Geometry#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.LINE;
     		return TYPES.CURVE;
+    	}
     	/*

     	 * @see org.gvsig.fmap.geom.Geometry#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.POLYGON;
     		return TYPES.SURFACE;
+    	}
     	/*

     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.geom.DirectPosition;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.Geometry.TYPES;
     import org.gvsig.fmap.geom.handler.AbstractHandler;
     import org.gvsig.fmap.geom.handler.FinalHandler;
     import org.gvsig.fmap.geom.handler.Handler;
-...
     	 * @see org.gvsig.fmap.geom.primitive.FShape#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.POINT;
     		return TYPES.POINT;
+    	}
     	/**

     	 * @see org.gvsig.fmap.geom.primitive.impl.Curve2D#getShapeType()
     	 */
     	 public int getShapeType() {
     		 return FShape.LINE;
     		 return TYPES.CURVE;
+    	 }
     	 /* (non-Javadoc)

     	 * @see org.gvsig.fmap.geom.primitive.impl.Curve2D#getShapeType()
     	 */
     	public int getShapeType() {
     		return FShape.ARC;
     		return TYPES.ELLIPTICARC;
+    	}
     	/*

     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.Geometry.TYPES;
     import org.gvsig.fmap.geom.handler.AbstractHandler;
     import org.gvsig.fmap.geom.handler.CuadrantHandler;
     import org.gvsig.fmap.geom.handler.Handler;
-...
          * @see org.gvsig.fmap.geom.primitive.impl.Surface2D#getShapeType()
          */
     	public int getShapeType() {
     		return FShape.ELLIPSE;
     		return TYPES.ELLIPSE;
+    	}
     	/*

| gvSIG desktop 1

Revision 28996