Changeset 3486 in josm for trunk

Timestamp:

2010-08-29T16:20:19+02:00 (14 years ago)

Author:

bastiK

Message:

minor fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/PurgeCommand.java (modified) (1 diff)
• gui/tagging/TaggingPreset.java (modified) (1 diff)

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

@@ -191 +191 @@
             }
 
-            /**
-             * 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;
+        /**
+         * 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;
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -949 +949 @@
                     setButtonIcons(new String[] {"ok.png", "cancel.png" });
                     setContent(content);
+                    setDefaultButton(1);
                     setupDialog();
                     buttons.get(0).setEnabled(!disableApply);
                     buttons.get(0).setToolTipText(title);
-                    getRootPane().setDefaultButton(buttons.get(0));
-                    setVisible(true);
+                    showDialog();
                 }
             }