Changeset 2448 in josm for trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

Timestamp:

2009-11-14T17:59:10+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3352: History doesn't get invalidated on upload?
fixed #3912: Extend history dialog to contain the currently modified version
new: zoom to node in list of nodes in history dialog (popup menu)
new: load history of node from node list in history dialog (popup menu or double click)
fixed: close all history dialogs when the number of layers drop to 0
fixed: implemented equals() and hashCode() on SimplePrimitiveId
fixed: history features now usePrimitiveId instead of long.

File:

• trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified) (7 diffs)

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.NoSuchElementException;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 
 /**
@@ -15 +19 @@
  */
 public class HistoryDataSet {
+    private final static Logger logger = Logger.getLogger(HistoryDataSet.class.getName());
 
     /** the unique instance */
@@ -32 +37 @@
 
     /** the history data */
-    private HashMap<Long, ArrayList<HistoryOsmPrimitive>> data;
+    private HashMap<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;
     private CopyOnWriteArrayList<HistoryDataSetListener> listeners;
 
     public HistoryDataSet() {
-        data = new HashMap<Long, ArrayList<HistoryOsmPrimitive>>();
+        data = new HashMap<PrimitiveId, ArrayList<HistoryOsmPrimitive>>();
         listeners = new CopyOnWriteArrayList<HistoryDataSetListener>();
     }
@@ -56 +61 @@
     }
 
-    protected void fireHistoryUpdated(long id) {
+    protected void fireHistoryUpdated(SimplePrimitiveId id) {
         for (HistoryDataSetListener l : listeners) {
             l.historyUpdated(this, id);
@@ -64 +69 @@
     /**
      * Replies the history primitive for the primitive with id <code>id</code>
-     * and version <code>version</code>
+     * and version <code>version</code>. null, if no such primitive exists.
      * 
-     * @param id the id of the primitive
-     * @param version the version of the primitive
-     * @return the history primitive for the primitive with id <code>id</code>
-     * and version <code>version</code>
-     * @throws NoSuchElementException thrown if this dataset doesn't include the respective
-     * history primitive
+     * @param id the id of the primitive. > 0 required.
+     * @param type the primitive type. Must not be null.
+     * @param version the version of the primitive. > 0 required
+     * @return the history primitive for the primitive with id <code>id</code>,
+     * type <code>type</code>, and version <code>version</code>
      */
-    public HistoryOsmPrimitive get(long id, long version) throws NoSuchElementException{
-        ArrayList<HistoryOsmPrimitive> versions = data.get(id);
+    public HistoryOsmPrimitive get(long id, OsmPrimitiveType type, long version){
+        if (id <= 0)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected, got {1}", "id", id));
+        if (type == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "type"));
+        if (version <= 0)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected, got {1}", "version", version));
+
+        SimplePrimitiveId pid = new SimplePrimitiveId(id, type);
+        ArrayList<HistoryOsmPrimitive> versions = data.get(pid);
         if (versions == null)
-            throw new NoSuchElementException(tr("Didn't find an primitive with id {0} in this dataset", id));
-
+            return null;
         for (HistoryOsmPrimitive primitive: versions) {
             if (primitive.matches(id, version))
                 return primitive;
         }
-        throw new NoSuchElementException(tr("Didn't find an primitive with id {0} and version {1} in this dataset", id, version));
+        return null;
     }
 
@@ -91 +102 @@
      */
     public void put(HistoryOsmPrimitive primitive) {
-        if (data.get(primitive.getId()) == null) {
-            data.put(primitive.getId(), new ArrayList<HistoryOsmPrimitive>());
+        SimplePrimitiveId id = new SimplePrimitiveId(primitive.getId(), primitive.getType());
+        if (data.get(id) == null) {
+            data.put(id, new ArrayList<HistoryOsmPrimitive>());
         }
-        data.get(primitive.getId()).add(primitive);
-        fireHistoryUpdated(primitive.getId());
+        data.get(id).add(primitive);
+        fireHistoryUpdated(id);
     }
 
     /**
      * Replies the history for a given primitive with id <code>id</code>
+     * and type <code>type</code>.
      * 
-     * @param id the id
-     * @return the history
+     * @param id the id the if of the primitive. > 0 required
+     * @param type the type of the primitive. Must not be null.
+     * @return the history. null, if there isn't a history for <code>id</code> and
+     * <code>type</code>.
+     * @throws IllegalArgumentException thrown if id <= 0
+     * @throws IllegalArgumentException thrown if type is null
      */
-    public History getHistory(long id) {
-        ArrayList<HistoryOsmPrimitive> versions = data.get(id);
+    public History getHistory(long id, OsmPrimitiveType type) throws IllegalArgumentException{
+        if (id <= 0)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected, got {1}", "id", id));
+        if (type == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "type"));
+        SimplePrimitiveId pid = new SimplePrimitiveId(id, type);
+        return getHistory(pid);
+    }
+
+    /**
+     * Replies the history for a primitive with id <code>id</code>. null, if no
+     * such history exists.
+     * 
+     * @param pid the primitive id. Must not be null.
+     * @return the history for a primitive with id <code>id</code>. null, if no
+     * such history exists
+     * @throws IllegalArgumentException thrown if pid is null
+     */
+    public History getHistory(PrimitiveId pid) throws IllegalArgumentException{
+        if (pid == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "pid"));
+        ArrayList<HistoryOsmPrimitive> versions = data.get(pid);
         if (versions == null)
             return null;
-        return new History(id, versions);
+        return new History(pid.getUniqueId(), pid.getType(), versions);
     }
 
@@ -119 +156 @@
         if (other == null)
             return;
-        for (Long id : other.data.keySet()) {
+        for (PrimitiveId id : other.data.keySet()) {
             this.data.put(id, other.data.get(id));
         }
-        fireHistoryUpdated(0);
+        fireHistoryUpdated(null);
     }
 }