Changeset 3479 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2010-08-29T14:55:25+02:00 (15 years ago)

Author:

jttt

Message:

cosmetics

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• PseudoCommand.java (modified) (1 diff)
• PurgeCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/PseudoCommand.java

@@ -3 +3 @@
 
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.PrimitiveData;
 
 /**

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -104 +104 @@
                     PrimitiveData empty;
                     switch(osm.getType()) {
-                        case NODE: empty = new NodeData(); break;
-                        case WAY: empty = new WayData(); break;
-                        case RELATION: empty = new RelationData(); break;
-                        default: throw new AssertionError();
+                    case NODE: empty = new NodeData(); break;
+                    case WAY: empty = new WayData(); break;
+                    case RELATION: empty = new RelationData(); break;
+                    default: throw new AssertionError();
                     }
                     empty.setId(osm.getUniqueId());
@@ -154 +154 @@
          */
         outer:
-        for (Iterator<OsmPrimitive> it = in.iterator(); it.hasNext();) {
-            OsmPrimitive u = it.next();
-            if (u instanceof Node) {
-                Node n = (Node) u;
-                for (OsmPrimitive ref : n.getReferrers()) {
-                    if (ref instanceof Way && in.contains(ref))
-                        continue outer;
-                }
-                it.remove();
-                out.add(n);
-            }
-        }
+            for (Iterator<OsmPrimitive> it = in.iterator(); it.hasNext();) {
+                OsmPrimitive u = it.next();
+                if (u instanceof Node) {
+                    Node n = (Node) u;
+                    for (OsmPrimitive ref : n.getReferrers()) {
+                        if (ref instanceof Way && in.contains(ref)) {
+                            continue outer;
+                        }
+                    }
+                    it.remove();
+                    out.add(n);
+                }
+            }
 
         /**
@@ -171 +172 @@
          */
         top:
-        while (!in.isEmpty()) {
-            for (Iterator<OsmPrimitive> it = in.iterator(); it.hasNext();) {
-                OsmPrimitive u = it.next();
-                if (u instanceof Way) {
-                    Way w = (Way) u;
-                    it.remove();
-                    for (Node n : w.getNodes()) {
-                        if (in.contains(n)) {
-                            in.remove(n);
-                            out.add(n);
+            while (!in.isEmpty()) {
+                for (Iterator<OsmPrimitive> it = in.iterator(); it.hasNext();) {
+                    OsmPrimitive u = it.next();
+                    if (u instanceof Way) {
+                        Way w = (Way) u;
+                        it.remove();
+                        for (Node n : w.getNodes()) {
+                            if (in.contains(n)) {
+                                in.remove(n);
+                                out.add(n);
+                            }
                         }
-                    }
-                    out.add(w);
-                    continue top;
-                }
-            }
-            break; // no more ways left
-        }
-
-        /**
-         * Rest are relations. Do topological sorting on a DAG where each
-         * arrow points from child to parent. (Because it is faster to
-         * loop over getReferrers() than getMembers().)
-         */
-        Set<Relation> inR = (Set) in;
-        Set<Relation> childlessR = new HashSet<Relation>();
-        List<Relation> outR = new ArrayList<Relation>(inR.size());
-
-        HashMap<Relation, Integer> numChilds = new HashMap<Relation, Integer>();
-
-        // calculate initial number of childs
-        for (Relation r : inR) {
-            numChilds.put(r, 0);
-        }
-        for (Relation r : inR) {
-            for (OsmPrimitive parent : r.getReferrers()) {
-                if (!(parent instanceof Relation))
-                    throw new AssertionError();
-                Integer i = numChilds.get((Relation)parent);
-                if (i != null) {
-                    numChilds.put((Relation)parent, i+1);
-                }
-            }
-        }
-        for (Relation r : inR) {
-            if (numChilds.get(r).equals(0)) {
-                childlessR.add(r);
-            }
-        }
-
-        while (!childlessR.isEmpty()) {
-            // Identify one childless Relation and
-            // let it virtually die. This makes other
-            // relations childless.
-            Iterator<Relation> it  = childlessR.iterator();
-            Relation next = it.next();
-            it.remove();
-            outR.add(next);
-
-            for (OsmPrimitive parentPrim : next.getReferrers()) {
-                Relation parent = (Relation) parentPrim;
-                Integer i = numChilds.get(parent);
-                if (i != null) {
-                    numChilds.put(parent, i-1);
-                    if (i-1 == 0) {
-                        childlessR.add(parent);
-                    }
-                }
-            }
-        }
-
-        if (outR.size() != inR.size())
-            throw new AssertionError("topo sort algorithm failed");
-
-        out.addAll(outR);
-
-        return out;
-    }
-    
+                        out.add(w);
+                        continue top;
+                    }
+                }
+                break; // no more ways left
+            }
+
+            /**
+             * Rest are relations. Do topological sorting on a DAG where each
+             * arrow points from child to parent. (Because it is faster to
+             * loop over getReferrers() than getMembers().)
+             */
+            Set<Relation> inR = (Set) in;
+            Set<Relation> childlessR = new HashSet<Relation>();
+            List<Relation> outR = new ArrayList<Relation>(inR.size());
+
+            HashMap<Relation, Integer> numChilds = new HashMap<Relation, Integer>();
+
+            // calculate initial number of childs
+            for (Relation r : inR) {
+                numChilds.put(r, 0);
+            }
+            for (Relation r : inR) {
+                for (OsmPrimitive parent : r.getReferrers()) {
+                    if (!(parent instanceof Relation))
+                        throw new AssertionError();
+                    Integer i = numChilds.get(parent);
+                    if (i != null) {
+                        numChilds.put((Relation)parent, i+1);
+                    }
+                }
+            }
+            for (Relation r : inR) {
+                if (numChilds.get(r).equals(0)) {
+                    childlessR.add(r);
+                }
+            }
+
+            while (!childlessR.isEmpty()) {
+                // Identify one childless Relation and
+                // let it virtually die. This makes other
+                // relations childless.
+                Iterator<Relation> it  = childlessR.iterator();
+                Relation next = it.next();
+                it.remove();
+                outR.add(next);
+
+                for (OsmPrimitive parentPrim : next.getReferrers()) {
+                    Relation parent = (Relation) parentPrim;
+                    Integer i = numChilds.get(parent);
+                    if (i != null) {
+                        numChilds.put(parent, i-1);
+                        if (i-1 == 0) {
+                            childlessR.add(parent);
+                        }
+                    }
+                }
+            }
+
+            if (outR.size() != inR.size())
+                throw new AssertionError("topo sort algorithm failed");
+
+            out.addAll(outR);
+
+            return out;
+    }
+
     @Override
     public Object getDescription() {