Changeset 2317 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-10-25T15:13:08+01:00 (15 years ago)

Author:

Gubaer

Message:

applied #3663: patch by singularita: Function to automatically download all missing relations members in all relations
Slightly updated and completed with context sensitive help, see also help

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -5 +5 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -16 +15 @@
 
 import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 /**
@@ -135 +133 @@
             relations.add(relation);
             return relation;
-        } else {
+        } else
             throw new AssertionError();
-        }
     }
 
@@ -170 +167 @@
         for (OsmPrimitive osm : selectedPrimitives) {
             if (osm instanceof Way ||
-                osm instanceof Node)
+                    osm instanceof Node) {
                 sel.add(osm);
+            }
         }
         return sel;
@@ -245 +243 @@
 
     public boolean toggleSelected(OsmPrimitive osm) {
-        if (!selectedPrimitives.remove(osm))
+        if (!selectedPrimitives.remove(osm)) {
             selectedPrimitives.add(osm);
+        }
         return true;
     }
@@ -480 +479 @@
             OsmPrimitive result = null;
             switch (type) {
-            case NODE: result = new Node(id, true); break;
-            case WAY: result = new Way(id, true); break;
-            case RELATION: result = new Relation(id, true); break;
+                case NODE: result = new Node(id, true); break;
+                case WAY: result = new Way(id, true); break;
+                case RELATION: result = new Relation(id, true); break;
             }
             addPrimitive(result);
             return result;
-        } else {
+        } else
             return null;
-        }
     }