Changeset 34646 in osm for applications/editors/josm/plugins

Timestamp:

2018-09-14T21:59:49+02:00 (6 years ago)

Author:

donvip

Message:

spotbugs

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• actions/OpenLinkAction.java (modified) (2 diffs)
• datasets/SimpleDataSetHandler.java (modified) (2 diffs)
• gui/ChooserLauncher.java (modified) (1 diff)
• gui/ModulePreference.java (modified) (2 diffs)
• gui/ProjectionChooser.java (modified) (1 diff)
• io/geographic/GeographicReader.java (modified) (1 diff)
• io/geographic/KmlKmzImporter.java (modified) (2 diffs)
• io/geographic/MifReader.java (modified) (10 diffs)
• io/geographic/MifTabImporter.java (modified) (2 diffs)
• io/geographic/ShpImporter.java (modified) (1 diff)
• io/tabular/OdsDocument.java (modified) (3 diffs)
• modules/ModuleHandler.java (modified) (1 diff)
• modules/ModuleInformation.java (modified) (2 diffs)
• modules/ModuleListParser.java (modified) (1 diff)
• util/NamesFrUtils.java (modified) (2 diffs)
• util/OdUtils.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenLinkAction.java

@@ -3 +3 @@
 
 import java.awt.event.ActionEvent;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -42 +43 @@
                     OpenBrowser.displayUrl(uri);
                 }
-            } catch (Exception e2) {
+            } catch (IOException | URISyntaxException e2) {
                 Logging.error(e2);
             }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/SimpleDataSetHandler.java

@@ -40 +40 @@
         Tag tag;
         String[] kv = relevantTag.split("=");
-        if (kv != null && kv.length == 2) {
+        if (kv.length == 2) {
             tag = new Tag(kv[0], kv[1]);
         } else {
@@ -48 +48 @@
     }
 
-    public SimpleDataSetHandler(boolean relevantUnion, String ... relevantTags) {
+    public SimpleDataSetHandler(boolean relevantUnion, String... relevantTags) {
         addRelevantTag(relevantTags);
         this.relevantUnion = relevantUnion;
     }
 
-    public SimpleDataSetHandler(String ... relevantTags) {
+    public SimpleDataSetHandler(String... relevantTags) {
         this(false, relevantTags);
     }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ChooserLauncher.java

@@ -21 +21 @@
     public void run() {
         Component parent = progressMonitor == null ? MainApplication.getMainFrame() : progressMonitor.getWindowParent();
-        ProjectionChooser dialog = (ProjectionChooser) new ProjectionChooser(parent).showDialog();
+        ProjectionChooser dialog = new ProjectionChooser(parent).showDialog();
         if (dialog.getValue() == 1) {
             proj = dialog.getProjection();

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java

@@ -98 +98 @@
 
     private JTextField tfFilter;
-    private ModuleListPanel pnlModulePreferences;
-    private ModulePreferencesModel model;
+    private final ModulePreferencesModel model = new ModulePreferencesModel();
+    private final ModuleListPanel pnlModulePreferences = new ModuleListPanel(model);
     private JScrollPane spModulePreferences;
 
@@ -140 +140 @@
         JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(buildSearchFieldPanel(), BorderLayout.NORTH);
-        model = new ModulePreferencesModel();
-        spModulePreferences = new JScrollPane(pnlModulePreferences = new ModuleListPanel(model));
+        spModulePreferences = new JScrollPane(pnlModulePreferences);
         spModulePreferences.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
         spModulePreferences.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java

@@ -158 +158 @@
         }
     }
+
+    @Override
+    public ProjectionChooser showDialog() {
+        super.showDialog();
+        return this;
+    }
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

@@ -267 +267 @@
             Datum datum1 = ((AbstractSingleCRS) crs1).getDatum();
             Datum datum2 = ((AbstractSingleCRS) crs2).getDatum();
-            if (!compareDebug("datum", datum1, datum2)) {
+            if (!compareDebug("datum", datum1, datum2) && datum1 instanceof AbstractIdentifiedObject) {
                 AbstractIdentifiedObject adatum1 = (AbstractIdentifiedObject) datum1;
                 AbstractIdentifiedObject adatum2 = (AbstractIdentifiedObject) datum2;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlKmzImporter.java

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.opendata.core.io.AbstractImporter;
 
+/**
+ * Keyhole Markup Language (KML/KMZ) importer.
+ */
 public class KmlKmzImporter extends AbstractImporter {
 
@@ -27 +30 @@
             throws IllegalDataException {
         try {
-            if (file.getName().toLowerCase().endsWith(OdConstants.KML_EXT)) {
+            if (file != null && file.getName().toLowerCase().endsWith(OdConstants.KML_EXT)) {
                 return KmlReader.parseDataSet(in, instance);
             } else {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java

@@ -60 +60 @@
     private File file;
     private InputStream stream;
-    protected Charset charset;
-    protected BufferedReader midReader;
+    private Charset charset;
+    private BufferedReader midReader;
 
     private Character delimiter = '\t';
@@ -166 +166 @@
             params += param(Param.lat_0, originLat);
             break;
+        default:
+            Logging.trace("originLat not set for " + proj);
         }
 
@@ -182 +184 @@
             params += param(Param.lat_1, stdP1);
             break;
+        default:
+            Logging.trace("stdP1 not set for " + proj);
         }
 
@@ -193 +197 @@
             params += param(Param.lat_2, stdP2);
             break;
+        default:
+            Logging.trace("stdP2 not set for " + proj);
         }
 
@@ -216 +222 @@
             params += param(Param.k_0, scaleFactor);
             break;
+        default:
+            Logging.trace("scaleFactor not set for " + proj);
         }
 
@@ -249 +257 @@
             params += param(Param.y_0, falseNorthing);
             break;
+        default:
+            Logging.trace("falseEasting/falseNorthing not set for " + proj);
         }
 
@@ -257 +267 @@
             Double.parseDouble(words[8+offset]);
             // TODO: what's proj4 parameter ?
+        default:
+            Logging.trace("range not set for " + proj);
         }
 
@@ -276 +288 @@
             }
             break;
+        default:
+            Logging.trace("josmProj not set for " + proj);
         }
 
@@ -592 +606 @@
     }
 
-    protected void readAttributes(OsmPrimitive p) throws IOException {
+    private void readAttributes(OsmPrimitive p) throws IOException {
         if (midReader != null) {
             String midLine = midReader.readLine();
@@ -613 +627 @@
     }
 
-    protected Node createNode(String x, String y) {
+    private Node createNode(String x, String y) {
         Node node = new Node(josmProj.eastNorth2latlon(new EastNorth(Double.parseDouble(x), Double.parseDouble(y))));
         ds.addPrimitive(node);

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifTabImporter.java

@@ -14 +14 @@
 import org.openstreetmap.josm.plugins.opendata.core.io.AbstractImporter;
 
+/**
+ * MapInfo (MIF/TAB) importer.
+ */
 public class MifTabImporter extends AbstractImporter {
 
@@ -28 +31 @@
             throws IllegalDataException {
         try {
-            if (file.getName().toLowerCase().endsWith(OdConstants.MIF_EXT)) {
+            if (file != null && file.getName().toLowerCase().endsWith(OdConstants.MIF_EXT)) {
                 return MifReader.parseDataSet(in, file, handler, instance);
             } else {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpImporter.java

@@ -14 +14 @@
 import org.openstreetmap.josm.plugins.opendata.core.io.AbstractImporter;
 
+/**
+ * Shapefile (SHP) importer.
+ */
 public class ShpImporter extends AbstractImporter {
-    
+
     public static final ExtensionFileFilter SHP_FILE_FILTER = new ExtensionFileFilter(
             OdConstants.SHP_EXT, OdConstants.SHP_EXT, tr("Shapefiles") + " (*."+OdConstants.SHP_EXT+")");

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsDocument.java

@@ -9 +9 @@
 import java.util.zip.ZipInputStream;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.jopendocument.io.SaxContentUnmarshaller;
 import org.jopendocument.model.OpenDocument;
@@ -14 +16 @@
 import org.openstreetmap.josm.tools.XmlUtils;
 import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
@@ -51 +54 @@
             }
 
-        } catch (Exception e) {
+        } catch (IOException | SAXException | ParserConfigurationException e) {
             Logging.error(e);
         }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java

@@ -175 +175 @@
                 Config.getPref().put(togglePreferenceKey, "never");
                 break;
+            default:
+                Logging.trace(Integer.toString(ret));
             }
         } else {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java

@@ -139 +139 @@
     }
 
+    @SuppressWarnings("unused")
     private void scanManifest(Manifest manifest) {
         String lang = LanguageInfo.getLanguageCodeManifest();
@@ -149 +150 @@
         if (s != null) {
             try {
-                @SuppressWarnings("unused")
-                URL url = new URL(s);
+                new URL(s);
             } catch (MalformedURLException e) {
                 Logging.error(tr("Invalid URL ''{0}'' in module {1}", s, name));

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java

@@ -101 +101 @@
                 url = x[1];
                 manifest = new StringBuilder();
-
             }
             if (name != null) {
                 ModuleInformation info = createInfo(name, url, manifest.toString());
-                if (info != null) {
-                    for (Module module : ModuleHandler.moduleList) {
-                        if (module.getModuleInformation().name.equals(info.getName())) {
-                            info.localversion = module.getModuleInformation().localversion;
-                        }
+                for (Module module : ModuleHandler.moduleList) {
+                    if (module.getModuleInformation().name.equals(info.getName())) {
+                        info.localversion = module.getModuleInformation().localversion;
                     }
-                    ret.add(info);
                 }
+                ret.add(info);
             }
             return ret;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java

@@ -16 +16 @@
 import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * Utilities for French names.
+ */
 public abstract class NamesFrUtils {
 
@@ -36 +39 @@
                 SimpleDataSetHandler.class.getResourceAsStream(OdConstants.DICTIONARY_FR), OdConstants.UTF8))) {
             String line = reader.readLine(); // Skip first line
+            Logging.trace(line);
             while ((line = reader.readLine()) != null) {
                 String[] tab = line.split(";");

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java

@@ -34 +34 @@
             if (append) {
                 int index = result.size()-1;
-                if (split[i].endsWith("\"") && StringUtils.countMatches(split[i], "\"") % 2 == 1) {
+                if (split[i].endsWith("\"") && StringUtils.countMatches(split[i], "\"") % 2 != 0) {
                     append = false;
                 }