Changeset 12887 in josm for trunk/src/org

Timestamp:

2017-09-22T16:13:52+02:00 (8 years ago)

Author:

Don-vip

Message:

see #15343 - catch Java 9 exceptions

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (2 diffs)
• tools/PlatformHookWindows.java (modified) (1 diff)
• tools/WinRegistry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -151 +151 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -1091 +1092 @@
                     UIManager.put("FileChooser.useSystemExtensionHiding", Boolean.FALSE);
                 }
-            } catch (NumberFormatException | ReflectiveOperationException e) {
+            } catch (NumberFormatException | ReflectiveOperationException | JosmRuntimeException e) {
                 Logging.error(e);
             }

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -310 +310 @@
             }
             sb.append(" (").append(getCurrentBuild()).append(')');
-        } catch (ReflectiveOperationException e) {
+        } catch (ReflectiveOperationException | JosmRuntimeException e) {
             Logging.error(e);
         }

trunk/src/org/openstreetmap/josm/tools/WinRegistry.java

@@ -63 +63 @@
             regEnumKeyEx = userClass.getDeclaredMethod("WindowsRegEnumKeyEx", int.class, int.class, int.class);
             Utils.setObjectsAccessible(regOpenKey, regCloseKey, regQueryValueEx, regEnumValue, regQueryInfoKey, regEnumKeyEx);
-        } catch (SecurityException | ReflectiveOperationException e) {
+        } catch (RuntimeException | ReflectiveOperationException e) {
             throw new JosmRuntimeException(e);
         }