Revision 43358 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/featureset/DefaultFeatureSet.java

View differences:

DefaultFeatureSet.java
317 317
            return;
318 318
        }
319 319
    }
320

  
320
  
321 321
    protected void checkSourceStoreModified() {
322 322
        if (sourceStoreModified) {
323 323
			throw new ConcurrentDataModificationException(store == null ? ""
......
325 325
        }
326 326
    }
327 327

  
328
    @Override
328 329
    public DisposableIterator fastIterator(long index) throws DataException {
330
        return fastIterator(index, 0);
331
    }
332
    
333
    @Override
334
    public DisposableIterator fastIterator(long index, long elements) throws DataException {
329 335
        if (index < 0) {
330 336
            throw new IndexOutOfBoundsException("The index (" + index
331 337
                + ") is less than 0");
......
334 340

  
335 341
        switch (mode) {
336 342
        case DEFAULT:
337
            return new FastDefaultIterator(this, index);
343
            return new FastDefaultIterator(this, index, elements);
338 344

  
339 345
        case FILTERED:
340 346
            return new FastFilteredIterator(this, index);
......
343 349
            if (this.orderedData != null) {
344 350
                return new FastOrderedIterator(this, index);
345 351
            } else {
346
                return new FastOrderedIterator(this, new FastDefaultIterator(
347
                    this, 0), index);
352
                return new FastOrderedIterator(this, new FastDefaultIterator(this, 0, elements), index);
348 353
            }
349 354

  
350 355
        case ORDERED_FILTERED:
......
382 387
    }
383 388

  
384 389

  
390
    @Override
385 391
    public DisposableIterator iterator(long index) throws DataException {
392
        return iterator(index,0);
393
    }
394
    
395
    @Override
396
    public DisposableIterator iterator(long index, long elements) throws DataException {        
386 397
        if (index < 0) {
387 398
            throw new IndexOutOfBoundsException("The index (" + index
388 399
                + ") is less than 0");
......
391 402

  
392 403
        switch (mode) {
393 404
        case DEFAULT:
394
            return new DefaultIterator(this, index);
405
            return new DefaultIterator(this, index, elements);
395 406

  
396 407
        case FILTERED:
397 408
            return new FilteredIterator(this, index);
......
401 412
                return new OrderedIterator(this, index);
402 413

  
403 414
            } else {
404
                return new OrderedIterator(this, new DefaultIterator(this, 0),
405
                    index);
415
                return new OrderedIterator(this, new DefaultIterator(this, 0, elements),index);
406 416
            }
407 417

  
408 418
        case ORDERED_FILTERED:
......
515 525
    public FeatureStore getFeatureStore() {
516 526
        return store;
517 527
    }
528

  
518 529
}

Also available in: Unified diff