From b23ccb81919ce871f7951547db2b4240534fcb9e Mon Sep 17 00:00:00 2001 From: "vyacheslav.raskulin" Date: Wed, 9 Sep 2020 14:48:21 +0300 Subject: [PATCH] since these branches are identical we may collapse them --- .../collection/viewer/MageBook.java | 28 ++----------------- .../mage/client/dialog/ConnectDialog.java | 4 +-- .../mage/client/dialog/NewTableDialog.java | 6 +--- .../client/dialog/TableWaitingDialog.java | 4 +-- .../main/java/mage/client/game/GamePanel.java | 4 +-- .../client/tournament/TournamentPanel.java | 4 +-- .../card/arcane/CardPanelComponentImpl.java | 4 +-- .../mage/card/arcane/CardPanelRenderImpl.java | 4 +-- 8 files changed, 9 insertions(+), 49 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java index ffab6f49d34..5b426f77d60 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java @@ -616,19 +616,7 @@ public class MageBook extends JComponent { emblems.add((Emblem) newEmblem); } - } catch (ClassNotFoundException ex) { - // Swallow exception - } catch (NoSuchMethodException ex) { - // Swallow exception - } catch (SecurityException ex) { - // Swallow exception - } catch (InstantiationException ex) { - // Swallow exception - } catch (IllegalAccessException ex) { - // Swallow exception - } catch (IllegalArgumentException ex) { - // Swallow exception - } catch (InvocationTargetException ex) { + } catch (ClassNotFoundException | InvocationTargetException | IllegalArgumentException | IllegalAccessException | InstantiationException | SecurityException | NoSuchMethodException ex) { // Swallow exception } } @@ -677,19 +665,7 @@ public class MageBook extends JComponent { planes.add((Plane) newPlane); } - } catch (ClassNotFoundException ex) { - // Swallow exception - } catch (NoSuchMethodException ex) { - // Swallow exception - } catch (SecurityException ex) { - // Swallow exception - } catch (InstantiationException ex) { - // Swallow exception - } catch (IllegalAccessException ex) { - // Swallow exception - } catch (IllegalArgumentException ex) { - // Swallow exception - } catch (InvocationTargetException ex) { + } catch (ClassNotFoundException | InvocationTargetException | IllegalArgumentException | IllegalAccessException | InstantiationException | SecurityException | NoSuchMethodException ex) { // Swallow exception } } diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java index 7e5203a75e1..08d463bc674 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -703,9 +703,7 @@ public class ConnectDialog extends MageDialog { } else { lblStatus.setText("Could not connect: " + lastConnectError); } - } catch (InterruptedException ex) { - logger.fatal("Update Players Task error", ex); - } catch (ExecutionException ex) { + } catch (InterruptedException | ExecutionException ex) { logger.fatal("Update Players Task error", ex); } catch (CancellationException ex) { logger.info("Connect: canceled"); diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java index 0e063c2f5a8..ca032396990 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -540,11 +540,7 @@ public class NewTableDialog extends MageDialog { this.hideDialog(); return; } - } catch (FileNotFoundException ex) { - handleError(ex); - } catch (IOException ex) { - handleError(ex); - } catch (ClassNotFoundException ex) { + } catch (ClassNotFoundException | IOException ex) { handleError(ex); } // JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Error joining table.", "Error", JOptionPane.ERROR_MESSAGE); diff --git a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java index a44b0a1f7c5..10c6d2bad09 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java @@ -456,9 +456,7 @@ class UpdateSeatsTask extends SwingWorker { protected void done() { try { get(); - } catch (InterruptedException ex) { - logger.fatal("Update Seats Task error", ex); - } catch (ExecutionException ex) { + } catch (InterruptedException | ExecutionException ex) { logger.fatal("Update Seats Task error", ex); } catch (CancellationException ex) { } diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index ce23d6c48af..0d6ecf38fa0 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -2782,9 +2782,7 @@ class ReplayTask extends SwingWorker> { protected void done() { try { get(); - } catch (InterruptedException ex) { - logger.fatal("Replay Match Task error", ex); - } catch (ExecutionException ex) { + } catch (InterruptedException | ExecutionException ex) { logger.fatal("Replay Match Task error", ex); } catch (CancellationException ex) { } diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java index 19eeb84fdbc..d2112da2dee 100644 --- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java +++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java @@ -626,9 +626,7 @@ class UpdateTournamentTask extends SwingWorker { protected void done() { try { get(); - } catch (InterruptedException ex) { - logger.fatal("Update Tournament Task error", ex); - } catch (ExecutionException ex) { + } catch (InterruptedException | ExecutionException ex) { logger.fatal("Update Tournament Task error", ex); } catch (CancellationException ex) { } diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java index 5af4e5c7f8a..f510efabdca 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java @@ -741,10 +741,8 @@ public class CardPanelComponentImpl extends CardPanel { setImage(srcImage); } }); - } catch (Exception e) { + } catch (Exception | Error e) { e.printStackTrace(); - } catch (Error err) { - err.printStackTrace(); } }); } diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java index f298ffb70da..b90d52cbda1 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java @@ -369,10 +369,8 @@ public class CardPanelRenderImpl extends CardPanel { } } }); - } catch (Exception e) { + } catch (Exception | Error e) { e.printStackTrace(); - } catch (Error err) { - err.printStackTrace(); } }); }