Changeset 3056 in josm

Timestamp:

Feb 27, 2010 5:04:37 PM (3 years ago)

Author:

jttt

Message:

Revert fix for #4612

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) (1 diff)

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

@@ -955 +955 @@
         // Returns only referrers that are members of the same dataset (primitive can have some fake references, for example
         // when way is cloned
+        checkDataset();
         List<OsmPrimitive> result = new ArrayList<OsmPrimitive>();
         if (referrers != null) {

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

@@ -110 +110 @@
     }
 
+    @Test
+    public void nodeFromMultipleDatasets() {
+        // n has two referrers - w1 and w2. But only w1 is returned because it is in the same dataset as n
+        Node n = new Node();
+
+        Way w1 = new Way();
+        w1.addNode(n);
+        dataSet.addPrimitive(n);
+        dataSet.addPrimitive(w1);
+        new Way(w1);
+
+        Assert.assertEquals(n.getReferrers().size(), 1);
+        Assert.assertEquals(n.getReferrers().get(0), w1);
+    }
+
+    @Test(expected=DataIntegrityProblemException.class)
+    public void checkMustBeInDatasate() {
+        Node n = new Node();
+        n.getReferrers();
+    }
+
 }