/ - Diff - Application: gvSIG desktop - gvSIG

Revision 1704

+    	{
     	    this.conn = conn;
     	    this.tableName = tableName;
     	    this.fields = fields;
     	    this.whereClause = whereClause;
     	    this.sqlOrig = "SELECT " + fields + " FROM " + tableName + " " + whereClause;
     	    try {
-...
                 ResultSet rs = st.executeQuery(sql);
                 geomIterator = new PostGisGeometryIterator(rs);
             } catch (SQLException e) {
                 e.printStackTrace();
                 throw new com.iver.cit.gvsig.fmap.DriverException(e);
+            }

      */
     public class DefaultStrategy implements Strategy {
     	private static Logger logger = Logger.getLogger(DefaultStrategy.class.getName());
     	private FLayer capa = null;
     	FLayer capa = null;
     	/**
     	 * Crea un nuevo DefaultStrategy.
-...
     			        bMustClone = attr.isLoadedInMemory();
+    			    }
+    			}
     			VectorialLegend l = (VectorialLegend) ((ClassifiableVectorial) capa).getLegend();
     			for (int i = 0; i < sc; i++) {
     				if (cancel.isCanceled()) {
     					break;
-...
     				        geom = geom.cloneGeometry();
     					geom.reProject(ct);
+    				}
     				VectorialLegend l = (VectorialLegend) ((ClassifiableVectorial) capa).getLegend();
     				// if (geom.intersects(extent)) {
     				if (geom.fastIntersects(extent.getMinX(), extent.getMinY(),
     				         extent.getWidth(), extent.getHeight())) {

     import java.awt.geom.Point2D;
     import java.awt.geom.Rectangle2D;
     import java.awt.image.BufferedImage;
     import java.sql.SQLException;
     import java.util.BitSet;
     import org.cresques.cts.ICoordTrans;
-...
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.fmap.core.IGeometry;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.drivers.jdbc.GeometryIterator;
     import com.iver.cit.gvsig.fmap.layers.FLayer;
     import com.iver.cit.gvsig.fmap.layers.VectorialAdapter;
     import com.iver.cit.gvsig.fmap.layers.VectorialDBAdapter;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.ClassifiableVectorial;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.SingleLayer;
     import com.iver.cit.gvsig.fmap.operations.Cancellable;
     import com.iver.cit.gvsig.fmap.rendering.VectorialLegend;
     /**
      * @author FJP
-...
          * @see com.iver.cit.gvsig.fmap.operations.strategies.Strategy#draw(java.awt.image.BufferedImage, java.awt.Graphics2D, com.iver.cit.gvsig.fmap.ViewPort, com.iver.cit.gvsig.fmap.operations.Cancellable)
          */
         public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort, Cancellable cancel) throws DriverException {
             // TODO Auto-generated method stub
             // Nos aprovechamos del SQL para lanzar la consulta
             // teniendo en cuenta el boundingbox que toca.
             FLayer capa = getCapa();
             VectorialDBAdapter dbAdapter = (VectorialDBAdapter) ((SingleLayer) capa).getSource();
             String sqlOrig = "SELECT " + dbAdapter.getFields() + " FROM " +
             			dbAdapter.getTableName() + " " + dbAdapter.getWhereClause();
             double xMin = viewPort.getAdjustedExtent().getMinX();
             double yMin = viewPort.getAdjustedExtent().getMinY();
             double xMax = viewPort.getAdjustedExtent().getMaxX();
             double yMax = viewPort.getAdjustedExtent().getMaxY();
             String strEPSG = viewPort.getProjection().getAbrev().substring(5);
             System.out.println(strEPSG);
             String wktBox = "GeometryFromText('LINESTRING(" + xMin + " " + yMin + ", "
             				+ xMax + " " + yMin + ", "
             				+ xMax + " " + yMax + ", "
             				+ xMin + " " + yMax + ")', "
             				+ strEPSG + ");";
             String sqlAux;
             if (dbAdapter.getWhereClause().startsWith("WHERE"))
                 sqlAux = sqlOrig + " the_geom && " + wktBox;
             else
                 sqlAux = sqlOrig + "WHERE the_geom && " + wktBox;
             GeometryIterator geomIt = dbAdapter.getGeometryIterator(sqlAux);
             VectorialLegend l = (VectorialLegend) ((ClassifiableVectorial) capa).getLegend();
             try {
                 while (geomIt.hasNext())
+                {
                 	if (cancel.isCanceled()) {
                 	    // TODO: Deber?amos cerrar el resulset que va dentro del iterator
                 		break;
+                	}
                     IGeometry geom = geomIt.next();
                     // TODO: CORREGIR LO DE LOS SIMBOLOS
                     // Es probable que necesitemos generar un Feature
                     // (Geometr?a + Atributos) para que opere con esa feature
                     // el gestor de leyendas. A la leyenda le pasar?amos un
                     // feature, y nos devolver? la colecci?n de s?mbolos a
                     // aplicar. Similar a lo de "processStylers" de GT2
                     geom.draw(g,viewPort,l.getDefaultSymbol());
+                }
             } catch (SQLException e) {
                 e.printStackTrace();
                 throw new DriverException(e);
+            }
+        }
     	/**
     	 * @see com.iver.cit.gvsig.fmap.operations.strategies.Strategy#process(com.iver.cit.gvsig.fmap.operations.strategies.FeatureVisitor,
     	 * 		java.util.BitSet)
     	 */
     	public void process(FeatureVisitor visitor, BitSet subset)
     		throws DriverException, VisitException {
     		try {
     		    FLayer capa = getCapa();
     			if (visitor.start(capa)) {
     				VectorialAdapter va = ((SingleLayer) capa).getSource();
     				va.start();
     				for (int i = 0; i < va.getShapeCount(); i++) {
     					if (subset.get(i)) {
     						visitor.visit(va.getShape(i), i);
+    					}
+    				}
     				va.stop();
     				visitor.stop(capa);
+    			}
     		} catch (DriverIOException e) {
     			throw new DriverException(e);
+    		}
+    	}
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @param visitor DOCUMENT ME!
+    	 *
     	 * @throws DriverException DOCUMENT ME!
     	 * @throws VisitException
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.operations.strategies.Strategy#process(com.iver.cit.gvsig.fmap.operations.strategies.FeatureVisitor)
     	 */
     	public void process(FeatureVisitor visitor)
     		throws DriverException, VisitException {
     		try {
     		    FLayer capa = getCapa();
     			if (visitor.start(capa)) {
     				VectorialDBAdapter va = (VectorialDBAdapter) ((SingleLayer) capa).getSource();
     				ICoordTrans ct = getCapa().getCoordTrans();
     				// GeometryIterator geomIt = va.getGeometryIterator();
     				va.start();
     				for (int i = 0; i < va.getShapeCount(); i++) {
     				    IGeometry geom = va.getShape(i);
     				    if (ct != null) {
     						geom.reProject(ct);
+    					}
     					visitor.visit(geom, i);
+    				}
     				va.stop();
     				visitor.stop(capa);
+    			}
     		} catch (DriverIOException e) {
     			throw new DriverException(e);
+    		}
+    	}
+    }

     		if (v.getSource().getDriver() instanceof BoundedShapes) {
     			return new ShpStrategy((FLayer) v);
     		} else {
     		    /* if (v.getSource() instanceof VectorialDBAdapter)
     		    if (v.getSource() instanceof VectorialDBAdapter)
     		        return new DBStrategy((FLayer) v);
     		    else */
     		    else
     		        return new DefaultStrategy((FLayer) v);
+    		}
+    	}

Also available in: Unified diff