Revision 43020 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.labeling.app/org.gvsig.labeling.app.mainplugin/src/main/java/org/gvsig/labeling/label/FeatureDependentLabeled.java

View differences:

FeatureDependentLabeled.java
57 57
package org.gvsig.labeling.label;
58 58

  
59 59

  
60
import java.awt.Color;
61
import java.awt.Font;
62 60
import java.util.ArrayList;
63 61
import java.util.Iterator;
64 62
import java.util.List;
......
68 66
import org.gvsig.fmap.dal.feature.FeatureQuery;
69 67
import org.gvsig.fmap.dal.feature.FeatureSet;
70 68
import org.gvsig.fmap.dal.feature.FeatureStore;
71
import org.gvsig.fmap.dal.feature.FeatureType;
72 69
import org.gvsig.fmap.geom.primitive.Envelope;
73 70
import org.gvsig.fmap.mapcontext.ViewPort;
74 71
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
75
import org.gvsig.fmap.mapcontext.layers.vectorial.IntersectsEnvelopeEvaluator;
72
import org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory;
76 73
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelClass;
77 74
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelingMethod;
78 75
import org.gvsig.labeling.lang.EvaluatorCreator;
79 76
import org.gvsig.labeling.lang.LabelClassUtils;
80
import org.gvsig.labeling.symbol.CharacterMarkerSymbol;
81
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.style.IMask;
82 77
import org.gvsig.tools.ToolsLocator;
83 78
import org.gvsig.tools.dynobject.DynStruct;
84 79
import org.gvsig.tools.evaluator.AndEvaluator;
......
176 171
		
177 172
		Envelope vp_env = viewPort.getAdjustedEnvelope();
178 173
		IProjection ipro = layer.getProjection();
179
		FeatureType fty = layer.getFeatureStore().getDefaultFeatureType();
180
		String geo_field_name = fty.getDefaultGeometryAttributeName();
181
		
182
		IntersectsEnvelopeEvaluator iee = new IntersectsEnvelopeEvaluator(
183
				vp_env, ipro, fty, geo_field_name); 
184
		
174
		Evaluator iee = SpatialEvaluatorsFactory.getInstance().intersects(
175
                        vp_env, 
176
                        ipro, 
177
                        layer.getFeatureStore()
178
                );
185 179
		FeatureStore fsto = layer.getFeatureStore();
186 180
		FeatureQuery fq = fsto.createFeatureQuery();
187 181
		

Also available in: Unified diff