Use Multi-catch

java-native-access · Nov 21, 2023 · c8ef506 · c8ef506
1 parent c23851e
commit c8ef506
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 18 deletions.
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/util/ComThread.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/util/ComThread.java
@@ -116,9 +116,7 @@ public void run() {
 
             executor.shutdown();
 
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (ExecutionException e) {
+        } catch (InterruptedException | ExecutionException e) {
             e.printStackTrace();
         } catch (TimeoutException e) {
             executor.shutdownNow();

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/util/Factory.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/util/Factory.java
@@ -170,9 +170,7 @@ public IRunningObjectTable getRunningObjectTable() {
     private <T> T runInComThread(Callable<T> callable) {
         try {
             return comThread.execute(callable);
-        } catch (TimeoutException ex) {
-            throw new RuntimeException(ex);
-        } catch (InterruptedException ex) {
+        } catch (TimeoutException | InterruptedException ex) {
             throw new RuntimeException(ex);
         } catch (ExecutionException ex) {
             Throwable cause = ex.getCause();

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/DdemlUtil.java b/contrib/platform/src/com/sun/jna/platform/win32/DdemlUtil.java
@@ -1942,9 +1942,7 @@ public static class DdemlException extends RuntimeException {
                 if (name.startsWith("DMLERR_") && (!name.equals("DMLERR_FIRST")) && (!name.equals("DMLERR_LAST"))) {
                     try {
                         errorCodeMapBuilder.put(f.getInt(null), name);
-                    } catch (IllegalArgumentException ex) {
-                        throw new RuntimeException(ex);
-                    } catch (IllegalAccessException ex) {
+                    } catch (IllegalArgumentException | IllegalAccessException ex) {
                         throw new RuntimeException(ex);
                     }
                 }

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Win32Exception.java b/contrib/platform/src/com/sun/jna/platform/win32/Win32Exception.java
@@ -92,11 +92,7 @@ void addSuppressedReflected(Throwable exception) {
         }
         try {
             addSuppressedMethod.invoke(this, exception);
-        } catch (IllegalAccessException ex) {
-            throw new RuntimeException("Failed to call addSuppressedMethod", ex);
-        } catch (IllegalArgumentException ex) {
-            throw new RuntimeException("Failed to call addSuppressedMethod", ex);
-        } catch (InvocationTargetException ex) {
+        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
             throw new RuntimeException("Failed to call addSuppressedMethod", ex);
         }
     }

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/User32Test.java b/contrib/platform/test/com/sun/jna/platform/win32/User32Test.java
@@ -150,10 +150,7 @@ public void testRegisterHotKey() {
             robot.keyRelease(vk);
             msg = waitForMessage(500);
             assertNull(msg);
-        } catch (AWTException e) {
-            e.printStackTrace();
-            fail();
-        } catch (InterruptedException e) {
+        } catch (AWTException | InterruptedException e) {
             e.printStackTrace();
             fail();
         } finally {