Changeset 13828 in josm for trunk/src

Timestamp:

2018-05-24T23:53:37+02:00 (6 years ago)

Author:

wiktorn

Message:

Sonar fixes, javadocs.

See: #16249

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• data/imagery/GetCapabilitiesParseHelper.java (modified) (2 diffs)
• data/imagery/ImageryInfo.java (modified) (2 diffs)
• data/imagery/TileLoaderFactory.java (modified) (1 diff)
• data/imagery/WMTSTileSource.java (modified) (7 diffs)
• gui/preferences/imagery/AddWMSLayerPanel.java (modified) (2 diffs)
• gui/preferences/imagery/AddWMTSLayerPanel.java (modified) (2 diffs)
• gui/preferences/imagery/HeadersTable.java (modified) (2 diffs)
• io/imagery/WMSImagery.java (modified) (1 diff)

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

@@ -140 +140 @@
             if (!GraphicsEnvironment.isHeadless()) {
                 JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMTS layer list."),
-                        tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
+                        tr("WMTS Error"), JOptionPane.ERROR_MESSAGE);
             }
             Logging.log(Logging.LEVEL_ERROR, "Could not parse WMTS layer list.", e);

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

@@ -75 +75 @@
 
     /**
+     * Returns reader with properties set for parsing WM(T)S documents
+     *
      * @param in InputStream with pointing to GetCapabilities XML stream
      * @return safe XMLStreamReader, that is not validating external entities, nor loads DTD's
@@ -235 +237 @@
 
     /**
+     * Normalize url
+     *
      * @param url URL
      * @return normalized URL

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

@@ -24 +24 @@
 import javax.json.Json;
 import javax.json.JsonObject;
+import javax.json.JsonReader;
 import javax.json.stream.JsonCollectors;
 import javax.swing.ImageIcon;
@@ -556 +557 @@
         modTileFeatures = e.modTileFeatures;
         if (e.default_layers != null) {
-            defaultLayers = Json.createReader(new StringReader(e.default_layers)).
-                    readArray().
-                    stream().
-                    map(x -> DefaultLayer.fromJson((JsonObject) x, imageryType)).
-                    collect(Collectors.toList());
+            try (JsonReader jsonReader = Json.createReader(new StringReader(e.default_layers))) {
+                defaultLayers = jsonReader.
+                        readArray().
+                        stream().
+                        map(x -> DefaultLayer.fromJson((JsonObject) x, imageryType)).
+                        collect(Collectors.toList());
+            }
         }
         customHttpHeaders = e.customHttpHeaders;

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

@@ -17 +17 @@
 
     /**
+     * Creates TileLoaderFactory - factory that creates tile loaders with all options already set
+     *
      * @param listener that will be notified, when tile has finished loading
      * @param headers that will be sent with requests to TileSource. <code>null</code> indicates none

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

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -21 +23 @@
 import java.util.Optional;
 import java.util.SortedSet;
-import java.util.Stack;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
@@ -252 +253 @@
 
     /**
-     * Exception thrown when praser doesn't find expected information in GetCapabilities document
+     * Exception thrown when parser doesn't find expected information in GetCapabilities document
      *
      */
@@ -258 +259 @@
 
         /**
+         * Create WMTS exception
          * @param cause description of cause
          */
@@ -265 +267 @@
 
         /**
+         * Create WMTS exception
          * @param cause description of cause
          * @param t nested exception
@@ -373 +376 @@
 
     /**
+     * Call remote server and parse response to WMTSCapabilities object
+     *
      * @param url of the getCapabilities document
      * @param headers HTTP headers to set when calling getCapabilities url
@@ -479 +484 @@
     private static Layer parseLayer(XMLStreamReader reader) throws XMLStreamException {
         Layer layer = new Layer();
-        Stack<QName> tagStack = new Stack<>();
+        Deque<QName> tagStack = new LinkedList<>();
         List<String> supportedMimeTypes = new ArrayList<>(Arrays.asList(ImageIO.getReaderMIMETypes()));
         supportedMimeTypes.add("image/jpgpng");         // used by ESRI

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -42 +42 @@
     private final transient WMSLayerTree tree = new WMSLayerTree();
     private final JComboBox<String> formats = new JComboBox<>();
-    private final JLabel wmsInstruction;
     private final JosmTextArea wmsUrl = new JosmTextArea(3, 40).transferFocusOnTab();
     private final JButton showBounds = new JButton(tr("Show bounds"));
@@ -73 +72 @@
         addCommonSettings();
 
-        wmsInstruction = new JLabel(tr("{0} Edit generated {1} URL (optional)", "6.", "WMS"));
+        JLabel wmsInstruction = new JLabel(tr("{0} Edit generated {1} URL (optional)", "6.", "WMS"));
         add(wmsInstruction, GBC.eol());
         wmsInstruction.setLabelFor(wmsUrl);

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

@@ -46 +46 @@
         JButton getLayers = new JButton(tr("{0} Get layers", "3."));
         getLayers.setEnabled(setDefaultLayer.isSelected());
-        setDefaultLayer.addActionListener(e -> {
-                getLayers.setEnabled(setDefaultLayer.isSelected());
-        });
+        setDefaultLayer.addActionListener(e -> getLayers.setEnabled(setDefaultLayer.isSelected()));
         add(setDefaultLayer, GBC.eop());
         add(getLayers, GBC.eop().fill(GBC.HORIZONTAL));
@@ -76 +74 @@
                 layerPanel.revalidate();
             } catch (IOException | WMTSGetCapabilitiesException ex) {
+                Logging.trace(ex);
                 JOptionPane.showMessageDialog(
                         getParent(),

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java

@@ -81 +81 @@
     }
 
-    private final JTable table;
     private List<String[]> headers;
 
@@ -98 +97 @@
         super(new GridBagLayout());
         this.headers = getHeadersAsVector(headers);
-        table = new JTable(new HeaderTableModel());
+        JTable table = new JTable(new HeaderTableModel());
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         table.setAutoCreateRowSorter(true);

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -177 +177 @@
                 capabilitiesUrl = new URL(workingAddress);
             } catch (MalformedURLException e) {
-                if (savedExc != null) {
+                if (savedExc == null) {
                     savedExc = e;
                 }