Revision 43020 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/legend/styling/AttrInTableLabelingStrategy.java

View differences:

AttrInTableLabelingStrategy.java
30 30
import java.awt.image.BufferedImage;
31 31
import java.util.ArrayList;
32 32
import java.util.List;
33
import java.util.logging.Level;
34 33

  
35 34
import org.apache.batik.ext.awt.geom.PathLength;
36 35
import org.cresques.cts.ICoordTrans;
......
53 52
import org.gvsig.fmap.geom.primitive.Envelope;
54 53
import org.gvsig.fmap.geom.primitive.Point;
55 54
import org.gvsig.fmap.geom.type.GeometryType;
56
import org.gvsig.fmap.mapcontext.MapContext;
57 55
import org.gvsig.fmap.mapcontext.ViewPort;
58 56
import org.gvsig.fmap.mapcontext.layers.FLayer;
59 57
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
60
import org.gvsig.fmap.mapcontext.layers.vectorial.IntersectsEnvelopeEvaluator;
58
import org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory;
61 59
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelingMethod;
62 60
import org.gvsig.fmap.mapcontext.rendering.legend.styling.IPlacementConstraints;
63 61
import org.gvsig.fmap.mapcontext.rendering.legend.styling.IZoomConstraints;
......
66 64
import org.gvsig.tools.ToolsLocator;
67 65
import org.gvsig.tools.dispose.DisposableIterator;
68 66
import org.gvsig.tools.dynobject.DynStruct;
67
import org.gvsig.tools.evaluator.Evaluator;
69 68
import org.gvsig.tools.exception.BaseException;
70 69
import org.gvsig.tools.persistence.PersistenceManager;
71 70
import org.gvsig.tools.persistence.PersistentState;
......
247 246
                    /*
248 247
                     * view port does not contain layer completely
249 248
                     */
250
                    IntersectsEnvelopeEvaluator iee = null;
249
                    Evaluator iee = null;
251 250

  
252 251
                    IProjection data_proj = null;
253 252
                    Envelope env_in_store_crs = null;
......
260 259
                                ct.getInverted());
261 260
                        data_proj = ct.getPOrig();
262 261
                    }
263

  
264
                    iee = new IntersectsEnvelopeEvaluator(
265
                            env_in_store_crs,
266
                            data_proj,
267
                            featureStore.getDefaultFeatureType(),
268
                            geomName);
262
                    iee = SpatialEvaluatorsFactory.getInstance().intersects(
263
                            env_in_store_crs, 
264
                            data_proj, 
265
                            featureStore
266
                    );
269 267
                    featureQuery.setAttributeNames((String[]) fields.toArray(new String[fields.size()]));
270 268
                    featureQuery.setFilter(iee);
271 269
                    set = featureStore.getFeatureSet(featureQuery);

Also available in: Unified diff