Changeset 8387 in josm for trunk/src

Timestamp:

2015-05-17T17:21:01+02:00 (9 years ago)

Author:

Don-vip

Message:

fix some Findbugs warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/HelpAwareOptionPane.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (1 diff)
• gui/dialogs/CommandStackDialog.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesCellRenderer.java (modified) (2 diffs)
• gui/preferences/plugin/PluginPreference.java (modified) (1 diff)
• gui/progress/PleaseWaitProgressMonitor.java (modified) (3 diffs)
• gui/tagging/ac/AutoCompletionItemPriority.java (modified) (1 diff)
• io/CachedFile.java (modified) (1 diff)
• io/InvalidXmlCharacterFilter.java (modified) (1 diff)
• tools/Geometry.java (modified) (1 diff)
• tools/ImageOverlay.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

@@ -244 +244 @@
         );
 
-        pane.getValue();
         final JDialog dialog = new JDialog(
                 JOptionPane.getFrameForComponent(parentComponent),

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -559 +559 @@
                             }
                         }
-                    } catch (Exception e) {
+                    } catch (IOException | SecurityException e) {
+                        if (Main.isDebugEnabled()) {
+                            Main.debug("Exception while checking IPv6 connectivity: "+e);
+                        }
                     }
                     if(wasv6 && !hasv6) {

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -306 +306 @@
 
         this.bbox = bbox;
-        double minLon = bbox.getMinLon();
-        double maxLon = bbox.getMaxLon();
-
-        if (bbox.crosses180thMeridian()) {
-            minLon -= 360.0;
-        }
-
         iSelectionRectStart = new Coordinate(bbox.getMinLat(), bbox.getMinLon());
         iSelectionRectEnd = new Coordinate(bbox.getMaxLat(), bbox.getMaxLon());
 
         // calc the screen coordinates for the new selection rectangle
-        MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon());
-        MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
+        MapMarkerDot min = new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon());
+        MapMarkerDot max = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
 
         List<MapMarker> marker = new ArrayList<>(2);
-        marker.add(xmin_ymin);
-        marker.add(xmax_ymax);
+        marker.add(min);
+        marker.add(max);
         setMapMarkerList(marker);
         setDisplayToFitMapMarkers();

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -376 +376 @@
         public void actionPerformed(ActionEvent e) {
             TreePath path;
-            undoTree.getSelectionPath();
             if (!undoTree.isSelectionEmpty()) {
                 path = undoTree.getSelectionPath();
@@ -386 +385 @@
             OsmDataLayer editLayer = Main.main.getEditLayer();
             if (editLayer == null) return;
-            editLayer.data.setSelected( getAffectedPrimitives(path));
+            editLayer.data.setSelected(getAffectedPrimitives(path));
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java

@@ -10 +10 @@
 import java.awt.Font;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.swing.JLabel;
@@ -65 +66 @@
                     if (otherCount == 1) {
                         for (Map.Entry<?, ?> entry : v.entrySet()) { // Find the non-blank value in the map
-                            if ( entry.getKey() != "") {
+                            if (!Objects.equals(entry.getKey(), "")) {
                                 /* I18n: properties display partial string joined with comma, frst is count, second is value */
                                 sb.append(tr("{0} ''{1}''", entry.getValue().toString(), entry.getKey()));

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -124 +124 @@
      */
     public static void notifyDownloadResults(final Component parent, PluginDownloadTask task, boolean restartRequired) {
-        final Collection<PluginInformation> downloaded = task.getDownloadedPlugins();
         final Collection<PluginInformation> failed = task.getFailedPlugins();
         final StringBuilder sb = new StringBuilder();

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -3 +3 @@
 
 import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -35 +32 @@
 
     public static final int PROGRESS_BAR_MAX = 10000;
-    private final Window dialogParent;
+    private final Component dialogParent;
 
     private int currentProgressValue = 0;
@@ -154 +151 @@
             public void run() {
                 Main.currentProgressMonitor = PleaseWaitProgressMonitor.this;
-                if (dialogParent instanceof Frame && dialog == null) {
-                    dialog = new PleaseWaitDialog(dialogParent);
-                } else if (dialogParent instanceof Dialog && dialog == null) {
+                if (dialogParent != null && dialog == null) {
                     dialog = new PleaseWaitDialog(dialogParent);
                 } else
-                    throw new ProgressException("PleaseWaitDialog parent must be either Frame or Dialog");
+                    throw new ProgressException("PleaseWaitDialog parent must be set");
 
                 if (windowTitle != null) {

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java

@@ -88 +88 @@
     @Override
     public int compareTo(AutoCompletionItemPriority other) {
-        int ui = -Integer.compare(userInput, other.userInput);
+        int ui = Integer.compare(other.userInput, userInput);
         if (ui != 0) return ui;
 

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

@@ -468 +468 @@
         checkOfflineAccess(downloadString);
 
-        HttpURLConnection con = null;
         int numRedirects = 0;
         while(true) {
-            con = Utils.openHttpConnection(downloadUrl);
-            if (con == null) {
-                throw new IOException("Cannot open http connection to "+downloadString);
-            }
+            HttpURLConnection con = Utils.openHttpConnection(downloadUrl);
             if (ifModifiedSince != null) {
                 con.setIfModifiedSince(ifModifiedSince);

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

@@ -62 +62 @@
 
     private char filter(char in) {
-        if (in < 0x20 && in >= 0 && INVALID_CHARS[in]) {
+        if (in < 0x20 && INVALID_CHARS[in]) {
             if (firstWarning) {
                 Main.warn("Invalid xml character encountered: '"+in+"'.");

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -631 +631 @@
         for (Node n : way.getNodes()) {
             if (lastN != null) {
-                n.getEastNorth().getX();
-
                 area += (calcX(n) * calcY(lastN)) - (calcY(n) * calcX(lastN));
             }

trunk/src/org/openstreetmap/josm/tools/ImageOverlay.java

@@ -84 +84 @@
         int x, y;
         if (width == -1 && offsetLeft < 0) {
-            x = new Double(w*offsetRight).intValue() - overlay.getIconWidth();
+            x = (int)(w*offsetRight) - overlay.getIconWidth();
         } else {
-            x = new Double(w*offsetLeft).intValue();
+            x = (int)(w*offsetLeft);
         }
         if (height == -1 && offsetTop < 0) {
-            y = new Double(h*offsetBottom).intValue() - overlay.getIconHeight();
+            y = (int)(h*offsetBottom) - overlay.getIconHeight();
         } else {
-            y = new Double(h*offsetTop).intValue();
+            y = (int)(h*offsetTop);
         }
         overlay.paintIcon(null, ground.getGraphics(), x, y);