Revision 28375 branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/styles/impl/SimpleRange.java

View differences:

SimpleRange.java
34 34

  
35 35
import org.gvsig.fmap.dal.exception.DataException;
36 36
import org.gvsig.fmap.dal.feature.Feature;
37
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
38 37
import org.gvsig.fmap.geom.Geometry;
39 38
import org.gvsig.fmap.geom.primitive.Point;
40 39
import org.gvsig.fmap.geom.util.Converter;
......
55 54
import org.slf4j.LoggerFactory;
56 55

  
57 56
/**
58
 * Geocoding style with search by numerical range. This style geocodes streets
57
 * Implemented Geocoding style with search by numerical range. This style geocodes streets
59 58
 * with even numbers and odd numbers followed.
60 59
 * 
61 60
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
......
126 125
			Address address) {
127 126
		Set<GeocodingResult> results = new TreeSet<GeocodingResult>();
128 127

  
129
		FeatureAttributeDescriptor firstNumberDesc = this.getFirstNumber()
130
				.getValue();
131
		FeatureAttributeDescriptor lastNumberDesc = this.getLastNumber()
132
				.getValue();
128
		String firstNumberDesc = this.getFirstNumber().getValue();
129
		String lastNumberDesc = this.getLastNumber().getValue();
133 130

  
134 131
		// Get the list
135 132
		List<ScoredFeature> sFeats = inLists.get(0);
......
221 218
	 * @param feat
222 219
	 * @return
223 220
	 */
224
	private int[] getNumberRange(Feature feat,
225
			FeatureAttributeDescriptor firstNumberDesc,
226
			FeatureAttributeDescriptor lastNumberDesc) {
221
	private int[] getNumberRange(Feature feat, String firstNumberDesc,
222
			String lastNumberDesc) {
227 223

  
228 224
		int[] range = new int[2];
229 225

  
230
		Object oFirst = feat.get(firstNumberDesc.getName());
231
		Object oLast = feat.get(lastNumberDesc.getName());
226
		Object oFirst = feat.get(firstNumberDesc);
227
		Object oLast = feat.get(lastNumberDesc);
232 228

  
233 229
		// FIRST
234 230
		if (oFirst instanceof Double) {
......
269 265
		for (Object obj : relLiteral) {
270 266
			RelationsComponent rel = (RelationsComponent) obj;
271 267
			String key = rel.getKeyElement();
272
			FeatureAttributeDescriptor desc = rel.getValue();
273
			String fieldName = desc.getName();
268
			String fieldName = rel.getValue();
274 269
			Object object = null;
275 270
			String value = "";
276 271
			try {
......
295 290
	 * @param state
296 291
	 */
297 292
	public void saveToState(PersistentState state) throws PersistenceException {
293
		super.saveToState(state);
298 294
		state.set(FIRSTNUMBER, this.firstNumber);
299 295
		state.set(LASTNUMBER, this.lastNumber);
300 296
	}
......
305 301
	 * @param state
306 302
	 */
307 303
	public void setState(PersistentState state) throws PersistenceException {
304
		super.setState(state);
308 305
		this.firstNumber = (RelationsComponent) state.get(FIRSTNUMBER);
309 306
		this.lastNumber = (RelationsComponent) state.get(LASTNUMBER);
310 307
	}

Also available in: Unified diff