/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/editing/memory/FeatureManager.java - Diff - Application: gvSIG desktop - gvSIG

Revision 44871 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/editing/memory/FeatureManager.java

     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.feature.impl.DefaultFeature;
     import org.gvsig.fmap.dal.feature.impl.DefaultFeatureReference;
     import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
     public class FeatureManager {
         private int deltaSize;
-...
             return added.size() > 0 || modifiedFromOriginal.size() > 0 || deleted.size() > 0;
+        }
         public Iterator getDeleted() {
             return new DeletedIterator();
+        }
         public long getPendingChangesCount() {
             long count = 0;
             if( this.added!=null ) {
-...
             return count;
+        }
         private class DeletedIterator implements Iterator {
         public Iterator<FeatureReference> getDeleted() {
             return new DeletedsFeatureReferencesIterator();
+        }
         private class DeletedsFeatureReferencesIterator implements Iterator<FeatureReference> {
             private Boolean hasnext = null;
             private final Iterator iter;
             private DefaultFeatureReference obj;
             private FeatureReference reference;
             public DeletedIterator() {
             public DeletedsFeatureReferencesIterator() {
                 iter = deleted.iterator();
+            }
-...
+                }
                 hasnext = false;
                 while (iter.hasNext()) {
                     obj = (DefaultFeatureReference) iter.next();
                     if (obj.isNewFeature()) {
                         continue;
                     reference = (FeatureReference) iter.next();
                     if (!reference.isNewFeature()) {
                       hasnext = true;
                       break;
+                    }
                     hasnext = true;
                     break;
+                }
                 return hasnext;
+            }
             @Override
             public Object next() {
             public FeatureReference next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
+                }
                 hasnext = null;
                 return obj;
                 return reference;
+            }
             @Override
-...
+        }
         public Iterator getInserted() {
             return new InsertedIterator();
         public Iterator<FeatureProvider> getInserted() {
             Iterator<Feature> it = new InsertedFeaturesIterator();
             return new Iterator<FeatureProvider>() {
               @Override
               public boolean hasNext() {
                 return it.hasNext();
+              }
               @Override
               public FeatureProvider next() {
                 return ((DefaultFeature)it.next()).getData();
+              }
             };
+        }
         private class InsertedIterator implements Iterator {
         public Iterator<Feature> getInsertedFeatures() {
             return new InsertedFeaturesIterator();
+        }
         private class InsertedFeaturesIterator implements Iterator<Feature> {
             private final Iterator addedIter;
             private DefaultFeature obj;
             private Feature feature;
             private Boolean hasnext = null;
             public InsertedIterator() {
             public InsertedFeaturesIterator() {
                 addedIter = added.values().iterator();
+            }
-...
                 int pos;
                 while (addedIter.hasNext()) {
                     pos = ((Integer) addedIter.next());
                     obj = (DefaultFeature) expansionAdapter.getObject(pos);
                     if (!deleted.contains(obj.getReference())) {
                     feature = (Feature) expansionAdapter.getObject(pos);
                     if (!deleted.contains(feature.getReference())) {
                         hasnext = true;
                         break;
+                    }
-...
+            }
             @Override
             public Object next() {
             public Feature next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
+                }
                 hasnext = null;
                 return obj.getData();
                 return feature;
+            }
             @Override
-...
+        }
         public Iterator getUpdated() {
             return new UpdatedIterator();
         public Iterator<Feature> getUpdatedFeatures() {
             return new UpdatedFeaturesIterator();
+        }
         private class UpdatedIterator implements Iterator {
         public Iterator<FeatureProvider> getUpdated() {
             Iterator<Feature> it = new UpdatedFeaturesIterator();
             return new Iterator<FeatureProvider>() {
               @Override
               public boolean hasNext() {
                 return it.hasNext();
+              }
               @Override
               public FeatureProvider next() {
                 return ((DefaultFeature)it.next()).getData();
+              }
             };
+        }
         private class UpdatedFeaturesIterator implements Iterator<Feature> {
             private Boolean hasnext = null;
             private final Iterator iter;
             private DefaultFeature obj;
             private Feature feature;
             private int pos;
             public UpdatedIterator() {
             public UpdatedFeaturesIterator() {
                 iter = expansionAdapter.iterator();
                 pos = -1;
+            }
-...
                 hasnext = false;
                 while (iter.hasNext()) {
                     pos++;
                     obj = (DefaultFeature) iter.next();
                     if (deleted.contains(obj.getReference())) {
                         continue;
                     } else if (!modifiedFromOriginal.containsValue(pos)) {
                         continue;
                     } else {
                     feature = (Feature) iter.next();
                     if ( !deleted.contains(feature.getReference()) &&
                          modifiedFromOriginal.containsValue(pos)) {
                         hasnext = true;
                         break;
+                    }
-...
+            }
             @Override
             public Object next() {
             public Feature next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
+                }
                 hasnext = null;
                 return obj.getData();
                 return feature;
+            }
             @Override

Also available in: Unified diff