Index: trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java (revision 7004)
@@ -32,5 +32,5 @@
/**
- * Loads a JOSM session
+ * Loads a JOSM session.
* @since 4668
*/
@@ -174,23 +174,7 @@
}
} catch (IllegalDataException e) {
- Main.error(e);
- HelpAwareOptionPane.showMessageDialogInEDT(
- Main.parent,
- tr("Could not load session file ''{0}''.
Error is:
{1}", uri != null ? uri : file.getName(), e.getMessage()),
- tr("Data Error"),
- JOptionPane.ERROR_MESSAGE,
- null
- );
- cancel();
+ handleException(tr("Data Error"), e);
} catch (IOException e) {
- Main.error(e);
- HelpAwareOptionPane.showMessageDialogInEDT(
- Main.parent,
- tr("Could not load session file ''{0}''.
Error is:
{1}", uri != null ? uri : file.getName(), e.getMessage()),
- tr("IO Error"),
- JOptionPane.ERROR_MESSAGE,
- null
- );
- cancel();
+ handleException(tr("IO Error"), e);
} catch (RuntimeException e) {
cancel();
@@ -201,5 +185,16 @@
}
}
+
+ private void handleException(String dialogTitle, Exception e) {
+ Main.error(e);
+ HelpAwareOptionPane.showMessageDialogInEDT(
+ Main.parent,
+ tr("Could not load session file ''{0}''.
Error is:
{1}", uri != null ? uri : file.getName(), e.getMessage()),
+ dialogTitle,
+ JOptionPane.ERROR_MESSAGE,
+ null
+ );
+ cancel();
+ }
}
}
-
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java (revision 7004)
@@ -5,5 +5,4 @@
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
@@ -54,9 +53,5 @@
loader = new Loader(Utils.openURL(u), u.toURI(), url.endsWith(".joz"));
return Main.worker.submit(loader);
- } catch (URISyntaxException e) {
- Main.error(e);
- } catch (MalformedURLException e) {
- Main.error(e);
- } catch (IOException e) {
+ } catch (URISyntaxException | IOException e) {
Main.error(e);
}
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 7004)
@@ -1167,7 +1167,5 @@
try {
structPrototype = klass.newInstance();
- } catch (InstantiationException ex) {
- throw new RuntimeException(ex);
- } catch (IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException ex) {
throw new RuntimeException(ex);
}
@@ -1187,7 +1185,5 @@
}
}
- } catch (IllegalArgumentException ex) {
- throw new RuntimeException(ex);
- } catch (IllegalAccessException ex) {
+ } catch (IllegalArgumentException | IllegalAccessException ex) {
throw new RuntimeException(ex);
}
@@ -1200,7 +1196,5 @@
try {
struct = klass.newInstance();
- } catch (InstantiationException ex) {
- throw new RuntimeException(ex);
- } catch (IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException ex) {
throw new RuntimeException(ex);
}
Index: trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 7004)
@@ -175,7 +175,5 @@
try {
fromXML(in);
- } catch (RuntimeException e) {
- Main.error(e);
- } catch (XMLStreamException e) {
+ } catch (RuntimeException | XMLStreamException e) {
Main.error(e);
}
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 7004)
@@ -268,11 +268,5 @@
Constructor c = activeRenderer.getConstructor(new Class[]{Graphics2D.class, NavigatableComponent.class, boolean.class});
return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
- } catch(NoSuchMethodException e){
- throw new MapRendererFactoryException(e);
- } catch (IllegalArgumentException e) {
- throw new MapRendererFactoryException(e);
- } catch (InstantiationException e) {
- throw new MapRendererFactoryException(e);
- } catch (IllegalAccessException e) {
+ } catch(NoSuchMethodException | IllegalArgumentException | InstantiationException | IllegalAccessException e){
throw new MapRendererFactoryException(e);
} catch (InvocationTargetException e) {
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java (revision 7004)
@@ -18,7 +18,5 @@
try {
proj = projClass.newInstance();
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException(e);
}
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 7004)
@@ -209,7 +209,5 @@
errors.add(new OpeningHoursTestError(tr("opening_hours value can be prettified"), Severity.OTHER, prettifiedValue));
}
- } catch (ScriptException ex) {
- Main.error(ex);
- } catch (NoSuchMethodException ex) {
+ } catch (ScriptException | NoSuchMethodException ex) {
Main.error(ex);
}
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 7004)
@@ -714,6 +714,5 @@
} catch (IllegalStateException e) {
return tr("Illegal expression ''{0}''", exp);
- }
- catch (PatternSyntaxException e) {
+ } catch (PatternSyntaxException e) {
return tr("Illegal regular expression ''{0}''", exp);
}
Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 7004)
@@ -217,7 +217,5 @@
UserInfo info = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE);
setFullyIdentified(info.getDisplayName(), info);
- } catch (IllegalArgumentException e) {
- Main.error(e);
- } catch (OsmTransferException e) {
+ } catch (IllegalArgumentException | OsmTransferException e) {
Main.error(e);
}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 7004)
@@ -638,10 +638,8 @@
}
});
- } catch(InterruptedException e) {
+ } catch(InterruptedException | InvocationTargetException e) {
// FIXME: signature of realRun should have a generic checked exception we
// could throw here
throw new RuntimeException(e);
- } catch(InvocationTargetException e) {
- throw new RuntimeException(e);
} finally {
monitor.finishTask();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 7004)
@@ -196,6 +196,4 @@
return;
lastException = e;
- } catch(RuntimeException e) {
- throw e;
}
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 7004)
@@ -552,9 +552,5 @@
dirExif = metadata.getDirectory(ExifIFD0Directory.class);
dirGps = metadata.getDirectory(GpsDirectory.class);
- } catch (CompoundException p) {
- e.setExifCoor(null);
- e.setPos(null);
- return;
- } catch (IOException p) {
+ } catch (CompoundException | IOException p) {
e.setExifCoor(null);
e.setPos(null);
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 7004)
@@ -83,7 +83,5 @@
parameterFunctions.add(Math.class.getMethod("tan", double.class));
parameterFunctions.add(Math.class.getMethod("tanh", double.class));
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- } catch (SecurityException ex) {
+ } catch (NoSuchMethodException | SecurityException ex) {
throw new RuntimeException(ex);
}
@@ -752,7 +750,5 @@
try {
result = m.invoke(FUNCTIONS_INSTANCE, convertedArgs);
- } catch (IllegalAccessException ex) {
- throw new RuntimeException(ex);
- } catch (IllegalArgumentException ex) {
+ } catch (IllegalAccessException | IllegalArgumentException ex) {
throw new RuntimeException(ex);
} catch (InvocationTargetException ex) {
@@ -815,7 +811,5 @@
try {
result = m.invoke(null, convertedArgs);
- } catch (IllegalAccessException ex) {
- throw new RuntimeException(ex);
- } catch (IllegalArgumentException ex) {
+ } catch (IllegalAccessException | IllegalArgumentException ex) {
throw new RuntimeException(ex);
} catch (InvocationTargetException ex) {
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 7004)
@@ -26,5 +26,4 @@
import oauth.signpost.OAuthProvider;
import oauth.signpost.basic.DefaultOAuthProvider;
-import oauth.signpost.exception.OAuthCommunicationException;
import oauth.signpost.exception.OAuthException;
@@ -110,11 +109,5 @@
con.disconnect();
}
- } catch (NoSuchFieldException e) {
- Main.error(e);
- Main.warn(tr("Failed to cancel running OAuth operation"));
- } catch (SecurityException e) {
- Main.error(e);
- Main.warn(tr("Failed to cancel running OAuth operation"));
- } catch (IllegalAccessException e) {
+ } catch (NoSuchFieldException | SecurityException | IllegalAccessException e) {
Main.error(e);
Main.warn(tr("Failed to cancel running OAuth operation"));
@@ -146,8 +139,4 @@
provider.retrieveRequestToken(consumer, "");
return OAuthToken.createToken(consumer);
- } catch(OAuthCommunicationException e){
- if (canceled)
- throw new OsmTransferCanceledException(e);
- throw new OsmOAuthAuthorizationException(e);
} catch(OAuthException e){
if (canceled)
@@ -180,8 +169,4 @@
provider.retrieveAccessToken(consumer, null);
return OAuthToken.createToken(consumer);
- } catch(OAuthCommunicationException e){
- if (canceled)
- throw new OsmTransferCanceledException(e);
- throw new OsmOAuthAuthorizationException(e);
} catch(OAuthException e){
if (canceled)
@@ -441,6 +426,4 @@
connection.setDoOutput(false);
connection.connect();
- } catch(MalformedURLException e) {
- throw new OsmOAuthAuthorizationException(e);
} catch(IOException e) {
throw new OsmOAuthAuthorizationException(e);
@@ -504,6 +487,4 @@
if (retCode != HttpURLConnection.HTTP_OK)
throw new OsmOAuthAuthorizationException(tr("Failed to authorize OAuth request ''{0}''", requestToken.getKey()));
- } catch(MalformedURLException e) {
- throw new OsmOAuthAuthorizationException(e);
} catch(IOException e) {
throw new OsmOAuthAuthorizationException(e);
Index: trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (revision 7004)
@@ -7,5 +7,4 @@
import java.io.IOException;
import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
import java.net.URL;
@@ -123,11 +122,7 @@
Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(connection.getInputStream());
return OsmServerUserInfoReader.buildFromXML(d);
- } catch(SAXException e) {
+ } catch(SAXException | ParserConfigurationException e) {
throw new XmlParsingException(e);
- } catch(ParserConfigurationException e){
- throw new XmlParsingException(e);
- } catch(MalformedURLException e) {
- throw new OsmTransferException(e);
- } catch(IOException e){
+ } catch(IOException e) {
throw new OsmTransferException(e);
} catch(OAuthException e) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 7004)
@@ -372,7 +372,5 @@
}
});
- } catch (InterruptedException e) {
- Main.error(e);
- } catch (InvocationTargetException e) {
+ } catch (InterruptedException | InvocationTargetException e) {
Main.error(e);
}
Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 7004)
@@ -374,8 +374,6 @@
}
model.fireTableDataChanged();
- } catch (PatternSyntaxException ex) {
+ } catch (PatternSyntaxException | ClassCastException ex) {
Main.warn(ex);
- } catch (ClassCastException ex2) {
- Main.warn(ex2);
}
}
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 7004)
@@ -82,15 +82,12 @@
try {
SwingUtilities.invokeAndWait(task);
- } catch (InterruptedException e) {
+ } catch (InterruptedException | InvocationTargetException e) {
Main.error(e);
- } catch (InvocationTargetException e) {
- Main.error(e);
- }
- }
- }
-
- /**
- * returns true if the user wants to cancel, false if they
- * want to continue
+ }
+ }
+ }
+
+ /**
+ * @return true if the user wants to cancel, false if they want to continue
*/
public static final boolean warnUser(String title, String content, ImageIcon baseActionIcon, String continueToolTip) {
Index: trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 7004)
@@ -85,11 +85,7 @@
InputSource inputSource = new InputSource(new StringReader(diffUploadResponse));
SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new Parser());
- } catch(IOException e) {
- throw new XmlParsingException(e);
- } catch(ParserConfigurationException e) {
- throw new XmlParsingException(e);
} catch(XmlParsingException e) {
throw e;
- } catch(SAXException e) {
+ } catch(IOException | ParserConfigurationException | SAXException e) {
throw new XmlParsingException(e);
} finally {
Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 7004)
@@ -356,7 +356,5 @@
merge(result.dataSet);
}
- } catch (InterruptedException e) {
- Main.error(e);
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
Main.error(e);
}
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 7004)
@@ -20,5 +20,4 @@
import java.net.SocketTimeoutException;
import java.net.URL;
-import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Collections;
@@ -716,12 +715,5 @@
throw new OsmApiException(retCode, errorHeader, errorBody);
}
- } catch (UnknownHostException e) {
- throw new OsmTransferException(e);
- } catch (SocketTimeoutException e) {
- if (retries-- > 0) {
- continue;
- }
- throw new OsmTransferException(e);
- } catch (ConnectException e) {
+ } catch (SocketTimeoutException | ConnectException e) {
if (retries-- > 0) {
continue;
@@ -730,6 +722,4 @@
} catch(IOException e) {
throw new OsmTransferException(e);
- } catch(OsmTransferCanceledException e) {
- throw e;
} catch(OsmTransferException e) {
throw e;
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 7004)
@@ -142,9 +142,5 @@
} catch(XmlParsingException e) {
throw e;
- } catch (ParserConfigurationException e) {
- throw new XmlParsingException(e);
- } catch(SAXException e) {
- throw new XmlParsingException(e);
- } catch(IOException e) {
+ } catch (ParserConfigurationException | SAXException | IOException e) {
throw new XmlParsingException(e);
} finally {
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 7004)
@@ -223,7 +223,5 @@
SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser.new Parser());
return parser.getChangesets();
- } catch(ParserConfigurationException e) {
- throw new IllegalDataException(e.getMessage(), e);
- } catch(SAXException e) {
+ } catch(ParserConfigurationException | SAXException e) {
throw new IllegalDataException(e.getMessage(), e);
} catch(Exception e) {
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 7004)
@@ -88,15 +88,6 @@
initOK = true;
}
- } catch (KeyStoreException e) {
- Main.error(e);
- } catch (NoSuchAlgorithmException e) {
- Main.error(e);
- } catch (CertificateException e) {
- Main.error(e);
- } catch (IOException e) {
- Main.error(e);
- } catch (UnrecoverableKeyException e) {
- Main.error(e);
- } catch (KeyManagementException e) {
+ } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException |
+ IOException | UnrecoverableKeyException | KeyManagementException e) {
Main.error(e);
}
Index: trunk/src/org/openstreetmap/josm/io/session/SessionReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 7004)
@@ -77,7 +77,5 @@
try {
importer = importerClass.newInstance();
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException(e);
}
@@ -457,7 +455,5 @@
try {
layer = imp.load(e, support, progressMonitor.createSubTaskMonitor(1, false));
- } catch (IllegalDataException ex) {
- exception = ex;
- } catch (IOException ex) {
+ } catch (IllegalDataException | IOException ex) {
exception = ex;
}
@@ -542,7 +538,5 @@
}
});
- } catch (InvocationTargetException ex) {
- throw new RuntimeException(ex);
- } catch (InterruptedException ex) {
+ } catch (InvocationTargetException | InterruptedException ex) {
throw new RuntimeException(ex);
}
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 7004)
@@ -1167,7 +1167,5 @@
GuiHelper.runInEDT(task);
return task.get();
- } catch (InterruptedException e) {
- Main.warn(e);
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
Main.warn(e);
}
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 7004)
@@ -320,11 +320,5 @@
Object plugin = c.newInstance(this);
return new PluginProxy(plugin, this);
- } catch(NoSuchMethodException e) {
- throw new PluginException(name, e);
- } catch(IllegalAccessException e) {
- throw new PluginException(name, e);
- } catch (InstantiationException e) {
- throw new PluginException(name, e);
- } catch(InvocationTargetException e) {
+ } catch(NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
throw new PluginException(name, e);
}
@@ -343,7 +337,5 @@
try {
return Class.forName(className, true, classLoader);
- } catch (ClassNotFoundException e) {
- throw new PluginException(name, e);
- } catch (ClassCastException e) {
+ } catch (ClassNotFoundException | ClassCastException e) {
throw new PluginException(name, e);
}
Index: trunk/src/org/openstreetmap/josm/tools/ExifReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 7004)
@@ -87,9 +87,5 @@
final Directory dir = metadata.getDirectory(ExifIFD0Directory.class);
return dir.getInt(ExifIFD0Directory.TAG_ORIENTATION);
- } catch (JpegProcessingException e) {
- Main.error(e);
- } catch (MetadataException e) {
- Main.error(e);
- } catch (IOException e) {
+ } catch (JpegProcessingException | MetadataException | IOException e) {
Main.error(e);
}
Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 7004)
@@ -28,7 +28,5 @@
url = URLDecoder.decode(url, "UTF-8");
}
- } catch (UnsupportedEncodingException x) {
- Main.error(x);
- } catch (IllegalArgumentException x) {
+ } catch (UnsupportedEncodingException | IllegalArgumentException x) {
Main.error(x);
}
@@ -72,9 +70,5 @@
z == null ? 18 : Integer.parseInt(z));
}
- } catch (NumberFormatException x) {
- Main.error(x);
- } catch (NullPointerException x) {
- Main.error(x);
- } catch (ArrayIndexOutOfBoundsException x) {
+ } catch (NumberFormatException | NullPointerException | ArrayIndexOutOfBoundsException x) {
Main.error(x);
}
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 7004)
@@ -57,7 +57,5 @@
}
return;
- } catch (IOException e) {
- Main.warn(e);
- } catch (URISyntaxException e) {
+ } catch (IOException | URISyntaxException e) {
Main.warn(e);
}
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 7003)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 7004)
@@ -461,8 +461,5 @@
return (String) t.getTransferData(DataFlavor.stringFlavor);
}
- } catch (UnsupportedFlavorException ex) {
- Main.error(ex);
- return null;
- } catch (IOException ex) {
+ } catch (UnsupportedFlavorException | IOException ex) {
Main.error(ex);
return null;