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

Timestamp:

2009-11-07T20:28:14+01:00 (15 years ago)

Author:

jttt

Message:

Save reference to dataset in OsmPrimitive

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/AddPrimitivesCommand.java (modified) (1 diff)
• command/Command.java (modified) (2 diffs)
• data/osm/DataSet.java (modified) (5 diffs)
• data/osm/Node.java (modified) (2 diffs)
• data/osm/NodeData.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (2 diffs)
• data/osm/PrimitiveData.java (modified) (1 diff)
• data/osm/Relation.java (modified) (3 diffs)
• data/osm/RelationData.java (modified) (1 diff)
• data/osm/Way.java (modified) (2 diffs)
• data/osm/WayData.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -32 +32 @@
 
         for (int i=0; i<createdPrimitives.size(); i++) {
-            createdPrimitives.get(i).load(data.get(i), getLayer().data);
+            createdPrimitives.get(i).load(data.get(i));
         }
         getLayer().data.setSelected(createdPrimitives);

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -2 +2 @@
 package org.openstreetmap.josm.command;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.util.Collection;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -92 +93 @@
     public void undoCommand() {
         for (Entry<OsmPrimitive, PrimitiveData> e : cloneMap.entrySet()) {
-            e.getKey().load(e.getValue(), layer.data);
+            e.getKey().load(e.getValue());
         }
     }

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

@@ -190 +190 @@
         }
         allPrimitives.add(primitive);
+        primitive.setDataset(this);
     }
 
@@ -195 +196 @@
         OsmPrimitive result;
         if (data instanceof NodeData) {
-            result = new Node((NodeData)data, this);
+            result = new Node();
         } else if (data instanceof WayData) {
-            result = new Way((WayData)data, this);
+            result = new Way();
         } else if (data instanceof RelationData) {
-            result = new Relation((RelationData)data, this);
+            result = new Relation();
         } else
             throw new AssertionError();
+        result.setDataset(this);
+        result.load(data);
         addPrimitive(result);
         return result;
@@ -228 +231 @@
         selectedPrimitives.remove(primitive);
         allPrimitives.remove(primitive);
+        primitive.setDataset(null);
     }
 
@@ -797 +801 @@
                 selectedPrimitives.remove(primitive);
                 allPrimitives.remove(primitive);
+                primitive.setDataset(null);
                 changed = true;
                 it.remove();
@@ -811 +816 @@
     public void clear() {
         clearSelection();
+        for (OsmPrimitive primitive:allPrimitives) {
+            primitive.setDataset(null);
+        }
         nodes.clear();
         ways.clear();

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

@@ -85 +85 @@
     }
 
-    public Node(NodeData data, DataSet dataSet) {
-        super(data);
-        load(data, dataSet);
-    }
-
     @Override public void visit(Visitor visitor) {
         visitor.visit(this);
@@ -99 +94 @@
     }
 
-    @Override public void load(PrimitiveData data, DataSet dataSet) {
-        super.load(data, dataSet);
+    @Override public void load(PrimitiveData data) {
+        super.load(data);
         setCoor(((NodeData)data).getCoor());
     }

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

@@ -50 +50 @@
 
     @Override
-    public Node makePrimitive(DataSet dataSet) {
-        return new Node(this, dataSet);
-    }
-
-    @Override
     public String toString() {
         return super.toString() + " NODE " + coor;

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

@@ -131 +131 @@
      */
     private long id = 0;
+
+    private DataSet dataSet;
+
+    /**
+     * This method should never ever by called from somewhere else than Dataset.addPrimitive or removePrimitive methods
+     * @param dataSet
+     */
+    void setDataset(DataSet dataSet) {
+        if (this.dataSet != null && dataSet != null && this.dataSet != dataSet)
+            throw new DataIntegrityProblemException("Primitive cannot be included in more than one Dataset");
+        this.dataSet = dataSet;
+    }
+
+    /**
+     * 
+     * @return DataSet this primitive is part of.
+     * @throws DataIntegrityProblemException when primitive is not part of any dataset
+     */
+    public DataSet getDataSet() {
+        if (dataSet == null)
+            throw new DataIntegrityProblemException("Primitive must be part of the dataset");
+        return dataSet;
+    }
 
     private volatile byte flags = FLAG_VISIBLE;   // visible per default
@@ -798 +821 @@
      * Loads (clone) this primitive from provided PrimitiveData
      * @param data
-     * @param dataSet Dataset this primitive is part of. This parameter is used only
-     * temporarily. OsmPrimitive will have final field dataset in future
-     */
-    public void load(PrimitiveData data, DataSet dataSet) {
+     */
+    public void load(PrimitiveData data) {
         setKeys(data.getKeys());
         timestamp = data.getTimestamp();

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

@@ -99 +99 @@
     public abstract PrimitiveData makeCopy();
 
-    public abstract OsmPrimitive makePrimitive(DataSet dataSet);
-
     @Override
     public String toString() {

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

@@ -136 +136 @@
         super(id, false);
     }
-
-    public Relation(RelationData data, DataSet dataSet) {
-        super(data);
-        load(data, dataSet);
-    }
-
 
     @Override public void cloneFrom(OsmPrimitive osm) {
@@ -153 +147 @@
     }
 
-    @Override public void load(PrimitiveData data, DataSet dataSet) {
-        super.load(data, dataSet);
+    @Override public void load(PrimitiveData data) {
+        super.load(data);
 
         RelationData relationData = (RelationData) data;
@@ -160 +154 @@
         List<RelationMember> newMembers = new ArrayList<RelationMember>();
         for (RelationMemberData member : relationData.getMembers()) {
-            OsmPrimitive primitive = dataSet.getPrimitiveById(member);
+            OsmPrimitive primitive = getDataSet().getPrimitiveById(member);
             if (primitive == null)
                 throw new AssertionError("Data consistency problem - relation with missing member detected");

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

@@ -28 +28 @@
 
     @Override
-    public Relation makePrimitive(DataSet dataSet) {
-        return new Relation(this, dataSet);
-    }
-
-    @Override
     public String toString() {
         return super.toString() + " REL " + members;

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

@@ -161 +161 @@
     }
 
-    public Way(WayData data, DataSet dataSet) {
-        super(data);
-        load(data, dataSet);
-    }
-
     /**
      *
      * @param data
-     * @param dataSet Dataset this way is part of. This parameter will be removed in future
      */
     @Override
-    public void load(PrimitiveData data, DataSet dataSet) {
-        super.load(data, dataSet);
+    public void load(PrimitiveData data) {
+        super.load(data);
 
         WayData wayData = (WayData) data;
@@ -179 +173 @@
         List<Node> newNodes = new ArrayList<Node>(wayData.getNodes().size());
         for (Long nodeId : wayData.getNodes()) {
-            Node node = (Node)dataSet.getPrimitiveById(nodeId, OsmPrimitiveType.NODE);
+            Node node = (Node)getDataSet().getPrimitiveById(nodeId, OsmPrimitiveType.NODE);
             if (node != null) {
                 newNodes.add(node);

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

@@ -28 +28 @@
 
     @Override
-    public OsmPrimitive makePrimitive(DataSet dataSet) {
-        return new Way(this, dataSet);
-    }
-
-    @Override
     public String toString() {
         return super.toString() + " WAY" + nodes.toString();