Changeset 6211 in josm for trunk

Timestamp:

2013-08-31T10:23:58+02:00 (11 years ago)

Author:

bastiK

Message:

see #8997 - add more debug output in case of error

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyles.java (modified) (1 diff)
• StyleCache.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -113 +113 @@
         }
         StyleCache style = osm.mappaintStyle != null ? osm.mappaintStyle : StyleCache.EMPTY_STYLECACHE;
-        osm.mappaintStyle = style.put(p.a, p.b);
+        try {
+            osm.mappaintStyle = style.put(p.a, p.b);
+        } catch (StyleCache.RangeViolatedError e) {
+            throw new AssertionError("Range violated. object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+                    + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b);
+        }
         osm.mappaintCacheIdx = cacheIdx;
         return p;

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -14 +14 @@
 /**
  * Caches styles for a single primitive.
- * Splits the range of possible scale values (0 < scale < +Infinity) into multiple
+ * Splits the range of possible scale values (0 &lt; scale &lt; +Infinity) into multiple
  * subranges, for each scale range it keeps a list of styles.
  * Immutable class, equals & hashCode is required (the same for StyleList, ElemStyle
@@ -142 +142 @@
     }
 
+    // this exception type is for debugging #8997 and can later be replaced
+    // by AssertionError
+    public static class RangeViolatedError extends Error {
+    }
+
     /**
      * ASCII-art explanation:
@@ -159 +164 @@
         if (bd.get(i) == lower) {
             if (upper > bd.get(i+1))
-                throw new AssertionError("the new range must be within a single subrange");
+                throw new RangeViolatedError();
             if (data.get(i) != null)
                 throw new AssertionError("the new range must be within a subrange that has no data");