Changeset 13741 in josm for trunk/src/org

Timestamp:

2018-05-13T09:15:15+02:00 (6 years ago)

Author:

wiktorn

Message:

PMD fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• gui/preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)
• gui/preferences/imagery/AddWMTSLayerPanel.java (modified) (2 diffs)
• io/CachedFile.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (1 diff)

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

@@ -186 +186 @@
 
             Collection<String> wmsFormats = wms.getFormats();
-            final JComboBox<String> formats = new JComboBox<>(wmsFormats.toArray(new String[wmsFormats.size()]));
+            final JComboBox<String> formats = new JComboBox<>(wmsFormats.toArray(new String[0]));
             formats.setSelectedItem(wms.getPreferredFormat());
             formats.setToolTipText(tr("Select image format for WMS layer"));

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

@@ -86 +86 @@
                 tree.updateTree(wms);
                 Collection<String> wmsFormats = wms.getFormats();
-                formats.setModel(new DefaultComboBoxModel<>(wmsFormats.toArray(new String[wmsFormats.size()])));
+                formats.setModel(new DefaultComboBoxModel<>(wmsFormats.toArray(new String[0])));
                 formats.setSelectedItem(wms.getPreferredFormat());
             } catch (MalformedURLException ex1) {

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

@@ -36 +36 @@
 public class AddWMTSLayerPanel extends AddImageryPanel {
     private final transient JPanel layerPanel = new JPanel(new GridBagLayout());
-    private transient JTable layerTable = null;
+    private transient JTable layerTable;
     private final JCheckBox setDefaultLayer = new JCheckBox(tr("Set default layer?"));
     private List<Entry<String, List<Layer>>> layers;
@@ -92 +92 @@
             if (layerTable == null) {
                 // did not call get capabilities
-                throw new RuntimeException("TODO");
+                throw new IllegalArgumentException(tr("You need to get fetch layers"));
             }
             int index = layerTable.getSelectedRow();
             if (index < 0) {
-                throw new RuntimeException("TODO");
+                throw new IllegalArgumentException(tr("Invalid layer selected. Index: {1}", index));
             }
             Layer selectedLayer = layers.get(layerTable.convertRowIndexToModel(index)).getValue().get(0);

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -551 +551 @@
 
     private static String truncatePath(String directory, String fileName) {
-        String ret = fileName;
         if (directory.length() + fileName.length() > 255) {
             // Windows doesn't support paths longer than 260, leave 5 chars as safe buffer, 4 will be used by ".tmp"

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

@@ -183 +183 @@
                 try {
                     capabilitiesUrl = new File(workingAddress).toURI().toURL();
-                } catch (MalformedURLException e1) {
+                } catch (MalformedURLException e1) { // NOPMD
                     // do nothing, raise original exception
                 }