Changeset 10212 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2016-05-15T00:51:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2221 - "Exception" should not be caught when not required by called methods

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -731 +731 @@
     /* only for preferences */
     public synchronized String getColorName(String o) {
-        try {
-            Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
-            if (m.matches()) {
-                return tr("Paint style {0}: {1}", tr(I18n.escape(m.group(1))), tr(I18n.escape(m.group(2))));
-            }
-        } catch (Exception e) {
-            Main.warn(e);
-        }
-        try {
-            Matcher m = Pattern.compile("layer (.+)").matcher(o);
-            if (m.matches()) {
-                return tr("Layer: {0}", tr(I18n.escape(m.group(1))));
-            }
-        } catch (Exception e) {
-            Main.warn(e);
+        Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
+        if (m.matches()) {
+            return tr("Paint style {0}: {1}", tr(I18n.escape(m.group(1))), tr(I18n.escape(m.group(2))));
+        }
+        m = Pattern.compile("layer (.+)").matcher(o);
+        if (m.matches()) {
+            return tr("Layer: {0}", tr(I18n.escape(m.group(1))));
         }
         return tr(I18n.escape(colornames.containsKey(o) ? colornames.get(o) : o));
@@ -1336 +1328 @@
                 field.setAccessible(true);
                 field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
-            } catch (Exception | InternalError e) {
-                // Ignore all exceptions, including internal error raised by Java 9 Jigsaw EA:
-                // java.lang.InternalError: legacy getBundle can't be used to find sun.awt.resources.awt in module java.desktop
-                // InternalError catch to remove when https://bugs.openjdk.java.net/browse/JDK-8136804 is resolved
+            } catch (ReflectiveOperationException e) {
                 if (Main.isTraceEnabled()) {
                     Main.trace(e.getMessage());