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

Timestamp:

2009-06-28T11:37:21+02:00 (17 years ago)

Author:

Gubaer

Message:

new: history feature implemented

Location:

trunk/src/org/openstreetmap/josm/data/osm/history

Files:

• HistoryDataSet.java (modified) (2 diffs)
• HistoryOsmPrimitive.java (modified) (2 diffs)

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

@@ -9 +9 @@
 
 public class HistoryDataSet {
+
+    private static HistoryDataSet historyDataSet;
+
+    public static HistoryDataSet getInstance() {
+        if (historyDataSet == null) {
+            historyDataSet = new HistoryDataSet();
+        }
+        return  historyDataSet;
+    }
 
     private HashMap<Long, ArrayList<HistoryOsmPrimitive>> data;
@@ -44 +53 @@
         ArrayList<HistoryOsmPrimitive> versions = data.get(id);
         if (versions == null)
-            throw new NoSuchElementException(tr("Didn't find an historized primitive with id {0} in this dataset", id));
+            return null;
         return new History(id, versions);
     }
+
+    /**
+     * merges the histories from the {@see HistoryDataSet} other in this history data set
+     * 
+     * @param other the other history data set. Ignored if null.
+     */
+    public void mergeInto(HistoryDataSet other) {
+        if (other == null)
+            return;
+        for (Long id : other.data.keySet()) {
+            if (!this.data.keySet().contains(id)) {
+                this.data.put(id, other.data.get(id));
+            }
+        }
+    }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm.history;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -116 +118 @@
     }
 
+    public Map<String,String> getTags() {
+        return Collections.unmodifiableMap(tags);
+    }
+
     @Override
     public int hashCode() {