Revision 44041 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/WrappedSpatialIndex.java
| WrappedSpatialIndex.java | ||
|---|---|---|
| 63 | 63 |
|
| 64 | 64 |
} |
| 65 | 65 |
|
| 66 |
protected class Oid2FeatureReferenceIterator implements Iterator {
|
|
| 66 |
protected class Oid2FeatureReferenceIterator implements Iterator<FeatureReference> {
|
|
| 67 | 67 |
|
| 68 | 68 |
private final Iterator wrapedIterator; |
| 69 | 69 |
|
| ... | ... | |
| 77 | 77 |
} |
| 78 | 78 |
|
| 79 | 79 |
@Override |
| 80 |
public Object next() {
|
|
| 80 |
public FeatureReference next() {
|
|
| 81 | 81 |
Object oid = this.wrapedIterator.next(); |
| 82 | 82 |
DefaultFeatureReference ref = new DefaultFeatureReference(store, oid); |
| 83 | 83 |
return ref; |
| ... | ... | |
| 120 | 120 |
} |
| 121 | 121 |
|
| 122 | 122 |
@Override |
| 123 |
public Iterator query(Envelope envelope, long limit) {
|
|
| 123 |
public Iterator<FeatureReference> query(Envelope envelope, long limit) {
|
|
| 124 | 124 |
return new Oid2FeatureReferenceIterator(this.index.query(envelope, limit)); |
| 125 | 125 |
} |
| 126 | 126 |
|
| 127 | 127 |
@Override |
| 128 |
public Iterator query(Envelope envelope) {
|
|
| 128 |
public Iterator<FeatureReference> query(Envelope envelope) {
|
|
| 129 | 129 |
return new Oid2FeatureReferenceIterator(this.index.query(envelope)); |
| 130 | 130 |
} |
| 131 | 131 |
|
| 132 | 132 |
@Override |
| 133 |
public Iterator query(Geometry geom, long limit) {
|
|
| 133 |
public Iterator<FeatureReference> query(Geometry geom, long limit) {
|
|
| 134 | 134 |
return new Oid2FeatureReferenceIterator(this.index.query(geom, limit)); |
| 135 | 135 |
} |
| 136 | 136 |
|
| 137 | 137 |
@Override |
| 138 |
public Iterator query(Geometry geom) {
|
|
| 138 |
public Iterator<FeatureReference> query(Geometry geom) {
|
|
| 139 | 139 |
return new Oid2FeatureReferenceIterator(this.index.query(geom)); |
| 140 | 140 |
} |
| 141 | 141 |
|
| 142 | 142 |
@Override |
| 143 |
public Iterator queryNearest(Envelope envelope, long limit) {
|
|
| 143 |
public Iterator<FeatureReference> queryNearest(Envelope envelope, long limit) {
|
|
| 144 | 144 |
return new Oid2FeatureReferenceIterator(this.index.queryNearest(envelope, limit)); |
| 145 | 145 |
} |
| 146 | 146 |
|
| 147 | 147 |
@Override |
| 148 |
public Iterator queryNearest(Envelope envelope) {
|
|
| 148 |
public Iterator <FeatureReference>queryNearest(Envelope envelope) {
|
|
| 149 | 149 |
return new Oid2FeatureReferenceIterator(this.index.queryNearest(envelope)); |
| 150 | 150 |
} |
| 151 | 151 |
|
| 152 | 152 |
@Override |
| 153 |
public Iterator queryNearest(Geometry geom, long limit) {
|
|
| 153 |
public Iterator<FeatureReference> queryNearest(Geometry geom, long limit) {
|
|
| 154 | 154 |
return new Oid2FeatureReferenceIterator(this.index.queryNearest(geom, limit)); |
| 155 | 155 |
} |
| 156 | 156 |
|
| 157 | 157 |
@Override |
| 158 |
public Iterator queryNearest(Geometry geom) {
|
|
| 158 |
public Iterator<FeatureReference> queryNearest(Geometry geom) {
|
|
| 159 | 159 |
return new Oid2FeatureReferenceIterator(this.index.queryNearest(geom)); |
| 160 | 160 |
} |
| 161 | 161 |
|
| 162 | 162 |
@Override |
| 163 |
public Iterator queryAll() {
|
|
| 163 |
public Iterator<FeatureReference> queryAll() {
|
|
| 164 | 164 |
return new Oid2FeatureReferenceIterator(this.index.queryAll()); |
| 165 | 165 |
} |
| 166 | 166 |
|
| 167 | 167 |
@Override |
| 168 |
public List queryAsList(Envelope envelope) {
|
|
| 168 |
public List<FeatureReference> queryAsList(Envelope envelope) {
|
|
| 169 | 169 |
return asList( this.query(envelope)); |
| 170 | 170 |
} |
| 171 | 171 |
|
| 172 | 172 |
@Override |
| 173 |
public List queryAsList(Geometry geom) {
|
|
| 173 |
public List<FeatureReference> queryAsList(Geometry geom) {
|
|
| 174 | 174 |
return asList( this.query(geom)); |
| 175 | 175 |
} |
| 176 | 176 |
|
| 177 | 177 |
@Override |
| 178 |
public List queryAllAsList() {
|
|
| 178 |
public List<FeatureReference> queryAllAsList() {
|
|
| 179 | 179 |
return asList( this.queryAll()); |
| 180 | 180 |
} |
| 181 | 181 |
|
| ... | ... | |
| 246 | 246 |
throw new IllegalArgumentException("Can't get OID from object of type '"+obj.getClass().getName()+"'.");
|
| 247 | 247 |
} |
| 248 | 248 |
|
| 249 |
protected List asList(Iterator it) {
|
|
| 249 |
protected List<FeatureReference> asList(Iterator it) {
|
|
| 250 | 250 |
List l = new ArrayList(); |
| 251 | 251 |
while (it.hasNext()) {
|
| 252 | 252 |
l.add(it.next()); |
Also available in: Unified diff