Revision 29326 branches/v2_0_0_prep/libraries/libFMap_dalindex/src/org/gvsig/fmap/dal/index/spatial/gt2/GT2Quadtree.java

View differences:

GT2Quadtree.java
209 209
		}
210 210
		Point min = env.getLowerCorner();
211 211
		Point max = env.getUpperCorner();
212
		
212

  
213 213
		return new Envelope(min.getX(), max.getX(), min.getY(), max.getY());
214 214
	}
215 215

  
......
278 278
	}
279 279

  
280 280
	private FeatureStore getFeatureStore() {
281
		return getFeatureIndexProviderServices().getFeatureStore();
281
		return getFeatureIndexProviderServices()
282
				.getFeatureStoreProviderServices().getFeatureStore();
282 283
	}
283 284

  
284 285
	public void delete(Object value, FeatureReferenceProviderServices fref) {
285
		
286

  
286 287
		if (!isCompatibleOID(fref.getOID())) {
287 288
			throw new IllegalArgumentException("OID not compatible. Must be an instance of Number within the Integer range.");
288 289
		}
289
				
290

  
290 291
		delete(((org.gvsig.fmap.geom.Geometry) value).getEnvelope(), ((Number) fref.getOID()).intValue());
291 292
	}
292 293

  
......
295 296
		if (!isCompatibleOID(fref.getOID())) {
296 297
			throw new IllegalArgumentException("OID not compatible. Must be an instance of Number within the Integer range.");
297 298
		}
298
		
299

  
299 300
		insert(((org.gvsig.fmap.geom.Geometry) value).getEnvelope(), ((Number) fref.getOID()).intValue());
300 301
	}
301 302

  
......
346 347
	public List range(Object value1, Object value2) throws FeatureIndexException {
347 348
		throw new UnsupportedOperationException();
348 349
	}
349
	
350

  
350 351
	/**
351 352
	 * Indicates whether the given OID's type is compatible
352 353
	 * with this provider
353
	 * 
354
	 *
354 355
	 * @param oid
355
	 * 
356
	 *
356 357
	 * @return
357 358
	 * 		true if this index provider supports the given oid type
358 359
	 */
......
360 361
		if (!(oid instanceof Number)) {
361 362
			return false;
362 363
		}
363
		
364

  
364 365
		long num = ((Number) oid).longValue();
365
				 
366

  
366 367
		if (num > Integer.MAX_VALUE || num < Integer.MIN_VALUE) {
367 368
			return false;
368 369
		}
369
		
370

  
370 371
		return true;
371 372
	}
372 373

  

Also available in: Unified diff