Changeset 13830 in josm for trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

Timestamp:

2018-05-25T01:42:16+02:00 (6 years ago)

Author:

Don-vip

Message:

SonarQube - remove code duplication

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -120 +120 @@
             }
         } catch (MalformedURLException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Invalid service URL."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Logging.log(Logging.LEVEL_ERROR, ex);
+            handleException(ex, tr("Invalid service URL."), tr("WMS Error"), null);
         } catch (IOException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Could not retrieve WMS layer list."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Logging.log(Logging.LEVEL_ERROR, ex);
+            handleException(ex, tr("Could not retrieve WMS layer list."), tr("WMS Error"), null);
         } catch (WMSGetCapabilitiesException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMS layer list."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Logging.log(Logging.LEVEL_ERROR, "Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData(), ex);
-        } catch (WMTSGetCapabilitiesException e) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMTS layer list."),
-                        tr("WMTS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Logging.log(Logging.LEVEL_ERROR, "Could not parse WMTS layer list.", e);
+            handleException(ex, tr("Could not parse WMS layer list."), tr("WMS Error"),
+                    "Could not parse WMS layer list. Incoming data:\n" + ex.getIncomingData());
+        } catch (WMTSGetCapabilitiesException ex) {
+            handleException(ex, tr("Could not parse WMTS layer list."), tr("WMTS Error"),
+                    "Could not parse WMTS layer list.");
         }
         return null;
@@ -223 +209 @@
             return ret;
         } catch (MalformedURLException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Invalid service URL."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Logging.log(Logging.LEVEL_ERROR, ex);
+            handleException(ex, tr("Invalid service URL."), tr("WMS Error"), null);
         } catch (IOException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Could not retrieve WMS layer list."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Logging.log(Logging.LEVEL_ERROR, ex);
+            handleException(ex, tr("Could not retrieve WMS layer list."), tr("WMS Error"), null);
         } catch (WMSGetCapabilitiesException ex) {
-            if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMS layer list."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            Logging.log(Logging.LEVEL_ERROR, "Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData(), ex);
+            handleException(ex, tr("Could not parse WMS layer list."), tr("WMS Error"),
+                    "Could not parse WMS layer list. Incoming data:\n" + ex.getIncomingData());
         }
         return null;
+    }
+
+    private static void handleException(Exception ex, String uiMessage, String uiTitle, String logMessage) {
+        if (!GraphicsEnvironment.isHeadless()) {
+            JOptionPane.showMessageDialog(Main.parent, uiMessage, uiTitle, JOptionPane.ERROR_MESSAGE);
+        }
+        Logging.log(Logging.LEVEL_ERROR, logMessage, ex);
     }