Changeset 7084 in josm

Timestamp:

2014-05-09T06:19:22+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - use AssertionError constructor accepting a cause, new in Java 7

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (2 diffs)
• gui/mappaint/ElemStyles.java (modified) (1 diff)

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

@@ -767 +767 @@
                 reversedDirectionKeys = SearchCompiler.compile(reversedDirectionDefault, false, false);
             } catch (ParseError e2) {
-                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage());
+                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2);
             }
         }
@@ -778 +778 @@
                 directionKeys = SearchCompiler.compile(directionDefault, false, false);
             } catch (ParseError e2) {
-                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage());
+                throw new AssertionError("Unable to compile default pattern for direction keys: " + e2.getMessage(), e2);
             }
         }

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

@@ -118 +118 @@
             osm.mappaintStyle = style.put(p.a, p.b);
         } catch (StyleCache.RangeViolatedError e) {
-            AssertionError error = new AssertionError("Range violated. object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
-                    + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b);
-            error.initCause(e);
-            throw error;
+            throw new AssertionError("Range violated. object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+                    + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b, e);
         }
         osm.mappaintCacheIdx = cacheIdx;