/branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/DefaultFeatureSelection.java - Diff - | gvSIG desktop 1 - gvSIG

Revision 27525 branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/DefaultFeatureSelection.java

     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Map;
     import java.util.Map.Entry;
-...
     import org.gvsig.fmap.dal.feature.FeatureSelection;
     import org.gvsig.fmap.dal.feature.FeatureSet;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.feature.DisposableIterator;
     import org.gvsig.fmap.dal.feature.exception.ReversedSelectionIteratorException;
     import org.gvsig.tools.persistence.PersistenceException;
     import org.gvsig.tools.persistence.PersistentState;
-...
+            }
             disableNotifications();
             for (Iterator iter = features.fastIterator(); iter.hasNext();) {
             for (DisposableIterator iter = features.fastIterator(); iter.hasNext();) {
                 change |= select((Feature) iter.next(), undoable);
+            }
             enableNotifications();
-...
                 getCommands().startComplex("_selectionDeselectFeatureSet");
+            }
             disableNotifications();
             for (Iterator iter = features.fastIterator(); iter.hasNext();) {
             for (DisposableIterator iter = features.fastIterator(); iter.hasNext();) {
                 change |= deselect((Feature) iter.next(), undoable);
+            }
             enableNotifications();
-...
             // Go through the map of FeatureTypes, and return only the ones that
             // have at least a Feature.
             List types = new ArrayList();
             for (Iterator iterator = featureTypeCounts.entrySet().iterator(); iterator
             for (java.util.Iterator iterator = featureTypeCounts.entrySet()
     				.iterator(); iterator
                     .hasNext();) {
                 Map.Entry entry = (Entry) iterator.next();
                 FeatureType type = (FeatureType) entry.getKey();
-...
          * Returns the list of selected values, or the deselected ones if the
          * selection has been reversed.
          */
         public Iterator iterator() {
         public DisposableIterator iterator() {
             return iterator(0);
+        }
-...
+         *
          * WARN: not very good performance implementation.
          */
         public Iterator iterator(long index) {
         public DisposableIterator iterator(long index) {
             return iterator(index, false);
+        }
-...
+         *
          * WARN: not really a fast implementation.
          */
         public Iterator fastIterator() {
         public DisposableIterator fastIterator() {
             return fastIterator(0);
+        }
-...
+         *
          * WARN: not really a fast implementation.
          */
         public Iterator fastIterator(long index) {
         public DisposableIterator fastIterator(long index) {
             return iterator(index, true);
+        }
         public void loadState(PersistentState state) throws PersistenceException {
             super.loadState(state);
             for (Iterator iterator = fastIterator(); iterator.hasNext();) {
             for (DisposableIterator iterator = fastIterator(); iterator.hasNext();) {
                 Feature feature = (Feature) iterator.next();
                 getFeatureTypeCount(feature.getType()).add();
+            }
-...
         /**
          * Creates an iterator for the Selection.
          */
         private Iterator iterator(long index, boolean fastIterator) {
         private DisposableIterator iterator(long index, boolean fastIterator) {
             if (isReversed()) {
                 Iterator iter = new ReversedFeatureIteratorFacade(getData(),
                 DisposableIterator iter = new ReversedFeatureIteratorFacade(getData(),
                         getFeatureStore(), fastIterator);
                 for (long l = 0; l < index && iter.hasNext(); l++) {
                     iter.next();
-...
                 // TODO: maybe we could add a new referenceIterator(int index)
                 // method that could be implemented in a more performant way
                 Iterator iter = referenceIterator();
                 java.util.Iterator iter = referenceIterator();
                 for (long l = 0; l < index && iter.hasNext(); l++) {
                     iter.next();
+                }
-...
+         *
          * @author <a href="mailto:cordin@disid.com">C?sar Ordi?ana</a>
          */
         private class FeatureIteratorFacade implements Iterator {
         private class FeatureIteratorFacade implements DisposableIterator {
             final Logger logger = LoggerFactory
                     .getLogger(FeatureIteratorFacade.class);
             private Iterator refIterator;
             private java.util.Iterator refIterator;
             private DefaultFeatureStore featureStore;
             public FeatureIteratorFacade(Iterator refIterator,
             public FeatureIteratorFacade(java.util.Iterator iter,
                     DefaultFeatureStore featureStore) {
                 this.refIterator = refIterator;
                 this.refIterator = iter;
                 this.featureStore = featureStore;
+            }
-...
             protected Feature getFeature(FeatureReference ref) throws DataException {
                 return ref.getFeature();
+            }
     		public void dispose() {
     			refIterator = null;
     			featureStore = null;
+    		}
+        }
         /**
-...
+         *
          * @author <a href="mailto:cordin@disid.com">C?sar Ordi?ana</a>
          */
         private class ReversedFeatureIteratorFacade implements Iterator {
         private class ReversedFeatureIteratorFacade implements DisposableIterator {
             final Logger logger = LoggerFactory
                     .getLogger(ReversedFeatureIteratorFacade.class);
             private Iterator refIterator;
             private SelectionData selectionData;
             private Iterator iterator;
             private DisposableIterator iterator;
             private Feature nextFeature = null;
-...
                 return tmp;
+            }
             /**
              * Returns the next FeatureReference.
+             *
              * @return the next FeatureReference
              */
             public FeatureReference nextFeatureReference() {
                 return (FeatureReference) refIterator.next();
+            }
             public void remove() {
                 iterator.remove();
+            }
-...
+                    }
+                }
+            }
     		public void dispose() {
     			this.iterator.dispose();
     			this.selectionData = null;
     			this.nextFeature = null;
+    		}
+        }
         private class FeatureTypeCount {

Also available in: Unified diff