Changeset 13839 in josm for trunk/src/org

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• data/imagery/WMTSCapabilities.java (modified) (5 diffs)
• gui/layer/AbstractTileSourceLayer.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;
+                }
             }
 

trunk/src/org/openstreetmap/josm/data/imagery/WMTSCapabilities.java

@@ -19 +19 @@
 
     /**
+     * Constructor for the class
      *
      * @param baseUrl of this service
@@ -29 +30 @@
 
     /**
-     *
+     * Adds layers to this WMTS service response
      * @param layers layers to add to this document
      */
@@ -37 +38 @@
 
     /**
-     *
+     * Layers of this WMTS service
      * @return layers defined by this service
      */
@@ -45 +46 @@
 
     /**
-     *
+     * base URL of this WMTS service
      * @return base url for this service
      */
@@ -53 +54 @@
 
     /**
-     *
+     * TransferMode for this service
      * @return transfer mode (KVP or RESTful) for this service
      */

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1358 +1358 @@
                     if (info == null) {
                         List<Tile> allTiles = this.allExistingTiles();
-                        info = new TileSetInfo();
-                        info.hasLoadingTiles = allTiles.size() < this.size();
-                        info.hasAllLoadedTiles = true;
+                        TileSetInfo newInfo = new TileSetInfo();
+                        newInfo.hasLoadingTiles = allTiles.size() < this.size();
+                        newInfo.hasAllLoadedTiles = true;
                         for (Tile t : allTiles) {
                             if ("no-tile".equals(t.getValue("tile-info"))) {
-                                info.hasOverzoomedTiles = true;
+                                newInfo.hasOverzoomedTiles = true;
                             }
                             if (t.isLoaded()) {
                                 if (!t.hasError()) {
-                                    info.hasVisibleTiles = true;
+                                    newInfo.hasVisibleTiles = true;
                                 }
                             } else {
-                                info.hasAllLoadedTiles = false;
+                                newInfo.hasAllLoadedTiles = false;
                                 if (t.isLoading()) {
-                                    info.hasLoadingTiles = true;
+                                    newInfo.hasLoadingTiles = true;
                                 }
                             }
                         }
+                        info = newInfo;
                     }
                 }