Changeset 13839 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2018-05-26T09:08:02+02:00 (6 years ago)

Author:

wiktorn

Message:

Sonar fixes and javadoc

• AddImageryLayerAction - do not use {{ }} initialization as it may be source of leaks
• AbstractTileSourceLayer - do not expose partially initialized object, first set all the values, then set the class field
• WMTSCapabilities - add javadocs

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (1 diff)

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

@@ -177 +177 @@
             formats.setToolTipText(tr("Select image format for WMS layer"));
 
-            if (!GraphicsEnvironment.isHeadless() &&
-                1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel")) { {
-                    final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
-                    scrollPane.setPreferredSize(new Dimension(400, 400));
-                    final JPanel panel = new JPanel(new GridBagLayout());
-                    panel.add(scrollPane, GBC.eol().fill());
-                    panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
-                    setContent(panel);
-            } }.showDialog().getValue()) {
-                return null;
+            if (!GraphicsEnvironment.isHeadless()) {
+                ExtendedDialog dialog = new ExtendedDialog(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel"));
+                final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
+                scrollPane.setPreferredSize(new Dimension(400, 400));
+                final JPanel panel = new JPanel(new GridBagLayout());
+                panel.add(scrollPane, GBC.eol().fill());
+                panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
+                dialog.setContent(panel);
+
+                if (dialog.showDialog().getValue() != 1) {
+                    return null;
+                }
             }