Changeset 8575 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-07-06T12:38:22+02:00 (9 years ago)

Author:

bastiK

Message:

see #11607 - more debugging output for error in StyleCache

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

@@ -130 +130 @@
             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, e);
+            throw new AssertionError("Range violated: " + e.getMessage() + " (object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+                    + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b + ")", e);
         }
         osm.mappaintCacheIdx = cacheIdx;

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

@@ -148 +148 @@
     // by AssertionError
     public static class RangeViolatedError extends Error {
+        public RangeViolatedError() {
+        }
+
+        public RangeViolatedError(String message) {
+            super(message);
+        }
     }
 
@@ -167 +173 @@
         if (bd.get(i) == lower) {
             if (upper > bd.get(i+1))
-                throw new RangeViolatedError();
+                throw new RangeViolatedError("the new range must be within a single subrange (1)");
             if (data.get(i) != null)
-                throw new AssertionError("the new range must be within a subrange that has no data");
+                throw new RangeViolatedError("the new range must be within a subrange that has no data");
 
             if (bd.get(i+1) == upper) {
@@ -186 +192 @@
         } else {
             if (bd.get(i) < upper)
-                throw new AssertionError("the new range must be within a single subrange");
+                throw new RangeViolatedError("the new range must be within a single subrange (2)");
             if (data.get(i-1) != null)
                 throw new AssertionError();