Revision 41193 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
182 182
		IntersectsEnvelopeEvaluator iee = new IntersectsEnvelopeEvaluator(
183 183
				vp_env, ipro, fty, geo_field_name); 
184 184
		
185
		FeatureQuery fq = null;
186 185
		FeatureStore fsto = layer.getFeatureStore();
186
		FeatureQuery fq = fsto.createFeatureQuery();
187 187
		
188
		
189
		if (usedFields != null) {
190
            fq.setAttributeNames(usedFields);
191
        }
192
		
188 193
		if (!LabelClassUtils.isUseSqlQuery(lc)) {
189 194
			/*
190 195
			 * No SQL, use only view port filter
191 196
			 */
192
			fq = fsto.createFeatureQuery();
193 197
			fq.addFilter(iee);
194 198
			return fsto.getFeatureSet(fq);
195 199
		}
......
208 212
		 */
209 213
		AndEvaluator and_ev = new AndEvaluator(iee);
210 214
		and_ev.addEvaluator(eval);
211
		fq = fsto.createFeatureQuery();
212 215
		fq.addFilter(and_ev);
213 216
		return fsto.getFeatureSet(fq);
214 217
	}

Also available in: Unified diff