Changeset 4725 in josm

Timestamp:

Dec 27, 2011 5:30:32 PM (17 months ago)

Author:

jttt

Message:

Fix #7074 Crash after purging some data

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (3 diffs)
• tools/template_engine/ContextSwitchTemplate.java (modified) (1 diff)

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

@@ -819 +819 @@
      * <code>Way wnew = new Way(existingWay)</code>
      *
+     * @param allowWithoutDataset If true, method will return empty list if primitive is not part of the dataset. If false,
+     * exception will be thrown in this case
+     *
      * @return a collection of all primitives that reference this primitive.
      */
 
-    public final List<OsmPrimitive> getReferrers() {
+    public final List<OsmPrimitive> getReferrers(boolean allowWithoutDataset) {
         // Method copied from OsmPrimitive in josm-ng
         // Returns only referrers that are members of the same dataset (primitive can have some fake references, for example
         // when way is cloned
+
+        if (dataSet == null && allowWithoutDataset)
+            return Collections.emptyList();
+
         checkDataset();
         Object referrers = this.referrers;
@@ -846 +853 @@
     }
 
+    public final List<OsmPrimitive> getReferrers() {
+        return getReferrers(false);
+    }
+
     /**
      * <p>Visits {@code visitor} for all referrers.</p>
@@ -966 +977 @@
         if (!isNew() &&  id != other.id)
             return false;
-//        if (isIncomplete() && ! other.isIncomplete() || !isIncomplete()  && other.isIncomplete())
+        //        if (isIncomplete() && ! other.isIncomplete() || !isIncomplete()  && other.isIncomplete())
         if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
             return false;

trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java

@@ -68 +68 @@
             List<OsmPrimitive> result = new ArrayList<OsmPrimitive>();
             for (OsmPrimitive child: children) {
-                for (OsmPrimitive parent: child.getReferrers()) {
+                for (OsmPrimitive parent: child.getReferrers(true)) {
                     if (condition == null || condition.match(parent)) {
                         result.add(parent);