Changeset 5171 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-04-06T15:56:23+02:00 (13 years ago)

Author:

Don-vip

Message:

history/osmChange handling: fix an issue when downloading osmChange that could lead to the creation of empty ways (0 node) + fix spelling of a getter

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmChangeTask.java (modified) (4 diffs)
• data/osm/history/History.java (modified) (1 diff)
• gui/history/HistoryBrowserDialog.java (modified) (1 diff)
• gui/history/HistoryLoadTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Future;
 
@@ -83 +85 @@
             try {
                 // A changeset does not contain all referred primitives, this is the list of incomplete ones
-                List<OsmPrimitive> toLoad = new ArrayList<OsmPrimitive>();
+                Set<OsmPrimitive> toLoad = new HashSet<OsmPrimitive>();
                 // For each incomplete primitive, we'll have to get its state at date it was referred
                 List<Pair<OsmPrimitive, Date>> toMonitor = new ArrayList<Pair<OsmPrimitive, Date>>();
@@ -95 +97 @@
                             }
                         }
-                        toLoad.add(p);
-                        toMonitor.add(new Pair<OsmPrimitive, Date>(p, timestamp));
+                        if (toLoad.add(p)) {
+                            toMonitor.add(new Pair<OsmPrimitive, Date>(p, timestamp));
+                        }
                     }
                 }
@@ -151 +154 @@
 
                         data.setUser(hp.getUser());
-                        data.setVisible(hp.isVisible());
+                        try {
+                            data.setVisible(hp.isVisible());
+                        } catch (IllegalStateException e) {
+                            System.err.println("Cannot change visibility for "+pair.a+": "+e.getMessage());
+                        }
                         data.setTimestamp(hp.getTimestamp());
                         data.setKeys(hp.getTags());

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -160 +160 @@
      * @return the primitive id
      */
-    public PrimitiveId getPrimitmiveId() {
+    public PrimitiveId getPrimitiveId() {
         return new SimplePrimitiveId(id, type);
     }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -123 +123 @@
     /* ---------------------------------------------------------------------------------- */
     public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
-        if (primitiveId == null || primitiveId.equals(browser.getHistory().getPrimitmiveId())) {
-            browser.populate(source.getHistory(browser.getHistory().getPrimitmiveId()));
+        if (primitiveId == null || primitiveId.equals(browser.getHistory().getPrimitiveId())) {
+            browser.populate(source.getHistory(browser.getHistory().getPrimitiveId()));
         }
     }

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -120 +120 @@
     public HistoryLoadTask add(History history) {
         CheckParameterUtil.ensureParameterNotNull(history, "history");
-        toLoad.add(history.getPrimitmiveId());
+        toLoad.add(history.getPrimitiveId());
         return this;
     }