Changeset 10627 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2016-07-24T14:48:47+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1166 - Exception handlers should preserve the original exceptions

Location:

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

Files:

• ExpressionFactory.java (modified) (5 diffs)
• Selector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -261 +261 @@
                 return new Color(r, g, b);
             } catch (IllegalArgumentException e) {
+                Main.trace(e);
                 return null;
             }
@@ -279 +280 @@
                 return new Color(r, g, b, alpha);
             } catch (IllegalArgumentException e) {
+                Main.trace(e);
                 return null;
             }
@@ -294 +296 @@
                 return Color.getHSBColor(h, s, b);
             } catch (IllegalArgumentException e) {
+                Main.trace(e);
                 return null;
             }
@@ -628 +631 @@
                 return RotationAngle.parseCardinalRotation(cardinal);
             } catch (IllegalArgumentException ignore) {
+                Main.trace(ignore);
                 return null;
             }
@@ -668 +672 @@
                 m = SearchCompiler.compile(searchStr);
             } catch (ParseError ex) {
+                Main.trace(ex);
                 return null;
             }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -331 +331 @@
                     };
                 } catch (NoSuchElementException ignore) {
+                    Main.trace(ignore);
                     containsFinder = new ContainsFinder(e);
                 }
@@ -468 +469 @@
                     if (!c.applies(env)) return false;
                 } catch (PatternSyntaxException e) {
-                    Main.error("PatternSyntaxException while applying condition" + c +": "+e.getMessage());
+                    Main.error(e, "PatternSyntaxException while applying condition" + c + ':');
                     return false;
                 }