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

Timestamp:

2009-08-31T08:06:25+02:00 (15 years ago)

Author:

Gubaer

Message:

Improved history feature

File:

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

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

@@ -7 +7 @@
 import java.util.HashMap;
 import java.util.NoSuchElementException;
+import java.util.concurrent.CopyOnWriteArrayList;
 
+/**
+ * A data set holding histories of OSM primitives.
+ * 
+ *
+ */
 public class HistoryDataSet {
 
+    /** the unique instance */
     private static HistoryDataSet historyDataSet;
 
+    /**
+     * Replies the unique instance of the history data set
+     * 
+     * @return the unique instance of the history data set
+     */
     public static HistoryDataSet getInstance() {
         if (historyDataSet == null) {
@@ -19 +31 @@
     }
 
+    /** the history data */
     private HashMap<Long, ArrayList<HistoryOsmPrimitive>> data;
+    private CopyOnWriteArrayList<HistoryDataSetListener> listeners;
 
     public HistoryDataSet() {
         data = new HashMap<Long, ArrayList<HistoryOsmPrimitive>>();
+        listeners = new CopyOnWriteArrayList<HistoryDataSetListener>();
     }
 
-    public HistoryOsmPrimitive get(long id, long version) {
+    public void addHistoryDataSetListener(HistoryDataSetListener listener) {
+        synchronized(listeners) {
+            if (!listeners.contains(listener)) {
+                listeners.add(listener);
+            }
+        }
+    }
+
+    public void removeHistoryDataSetListener(HistoryDataSetListener listener) {
+        synchronized(listeners) {
+            if (listeners.contains(listener)) {
+                listeners.remove(listener);
+            }
+        }
+    }
+
+    protected void fireHistoryUpdated(long id) {
+        for (HistoryDataSetListener l : listeners) {
+            l.historyUpdated(this, id);
+        }
+    }
+
+    /**
+     * Replies the history primitive for the primitive with id <code>id</code>
+     * and version <code>version</code>
+     * 
+     * @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
+     */
+    public HistoryOsmPrimitive get(long id, long version) throws NoSuchElementException{
         ArrayList<HistoryOsmPrimitive> versions = data.get(id);
         if (versions == null)
@@ -37 +85 @@
     }
 
+    /**
+     * Adds a history primitive to the data set
+     * 
+     * @param primitive  the history primitive to add
+     */
     public void put(HistoryOsmPrimitive primitive) {
         if (data.get(primitive.getId()) == null) {
@@ -42 +95 @@
         }
         data.get(primitive.getId()).add(primitive);
+        fireHistoryUpdated(primitive.getId());
     }
 
@@ -66 +120 @@
             return;
         for (Long id : other.data.keySet()) {
-            if (!this.data.keySet().contains(id)) {
-                this.data.put(id, other.data.get(id));
-            }
+            this.data.put(id, other.data.get(id));
         }
+        fireHistoryUpdated(0);
     }
 }