From 55c2757ef3951f405b7ed199e419ef01bd9b4258 Mon Sep 17 00:00:00 2001 From: Ethan McCue Date: Fri, 20 Oct 2023 08:24:15 -0400 Subject: [PATCH] Collapse catch blocks in JavaSoundAudioDeviceFactory --- .../player/JavaSoundAudioDeviceFactory.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/dev/mccue/jlayer/player/JavaSoundAudioDeviceFactory.java b/src/main/java/dev/mccue/jlayer/player/JavaSoundAudioDeviceFactory.java index 5adbb85..396dcc9 100644 --- a/src/main/java/dev/mccue/jlayer/player/JavaSoundAudioDeviceFactory.java +++ b/src/main/java/dev/mccue/jlayer/player/JavaSoundAudioDeviceFactory.java @@ -47,15 +47,11 @@ public synchronized AudioDevice createAudioDevice() { return createAudioDeviceImpl(); } - catch (Exception ex) + catch (Exception | LinkageError ex) { throw new JavaLayerException("unable to create JavaSound device: " + ex); } - catch (LinkageError ex) - { - throw new JavaLayerException("unable to create JavaSound device: " + ex); - } - } + } protected JavaSoundAudioDevice createAudioDeviceImpl() throws JavaLayerException @@ -63,19 +59,14 @@ protected JavaSoundAudioDevice createAudioDeviceImpl() ClassLoader loader = getClass().getClassLoader(); try { - JavaSoundAudioDevice dev = (JavaSoundAudioDevice)instantiate(loader, DEVICE_CLASS_NAME); - return dev; - } - catch (Exception ex) - { - throw new JavaLayerException("Cannot create JavaSound device", ex); + return (JavaSoundAudioDevice)instantiate(loader, DEVICE_CLASS_NAME); } - catch (LinkageError ex) + catch (Exception | LinkageError ex) { throw new JavaLayerException("Cannot create JavaSound device", ex); } - - } + + } public void testAudioDevice() throws JavaLayerException {