since these branches are identical we may collapse them

This commit is contained in:
vyacheslav.raskulin 2020-09-09 14:48:21 +03:00
parent e03b446601
commit b23ccb8191
8 changed files with 9 additions and 49 deletions

View file

@ -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
}
}

View file

@ -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");

View file

@ -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);

View file

@ -456,9 +456,7 @@ class UpdateSeatsTask extends SwingWorker<Void, TableView> {
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) {
}

View file

@ -2782,9 +2782,7 @@ class ReplayTask extends SwingWorker<Void, Collection<MatchView>> {
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) {
}

View file

@ -626,9 +626,7 @@ class UpdateTournamentTask extends SwingWorker<Void, TournamentView> {
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) {
}

View file

@ -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();
}
});
}

View file

@ -369,10 +369,8 @@ public class CardPanelRenderImpl extends CardPanel {
}
}
});
} catch (Exception e) {
} catch (Exception | Error e) {
e.printStackTrace();
} catch (Error err) {
err.printStackTrace();
}
});
}