Changeset 8365 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-05-16T15:13:38+02:00 (9 years ago)

Author:

Don-vip

Message:

fix Findbugs performance issues

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (2 diffs)
• MapView.java (modified) (2 diffs)
• actionsupport/DeleteFromRelationConfirmationDialog.java (modified) (1 diff)
• dialogs/NotesDialog.java (modified) (1 diff)
• dialogs/properties/PropertiesCellRenderer.java (modified) (2 diffs)
• mappaint/NodeElemStyle.java (modified) (2 diffs)
• preferences/projection/CodeProjectionChoice.java (modified) (1 diff)
• tagging/TaggingPresetItems.java (modified) (1 diff)

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

@@ -950 +950 @@
      * When user presses Enter key then selected item of "searchResultsMenu" is triggered.
      */
-    private class SearchFieldKeyListener implements KeyListener {
+    private static class SearchFieldKeyListener implements KeyListener {
 
         @Override
@@ -970 +970 @@
 
         @Override
-        public void keyTyped(KeyEvent e) { }
-
-        @Override
-        public void keyReleased(KeyEvent e) { }
+        public void keyTyped(KeyEvent e) {
+            // Not used
+        }
+
+        @Override
+        public void keyReleased(KeyEvent e) {
+            // Not used
+        }
     }
 

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

@@ -509 +509 @@
         }
         // sort according to position in the list of layers, with one exception:
-        // an active data layer always becomes a higher Z-Order than all other
-        // data layers
-        //
+        // an active data layer always becomes a higher Z-Order than all other data layers
         Collections.sort(
                 ret,
                 new Comparator<Layer>() {
-                    @Override public int compare(Layer l1, Layer l2) {
+                    @Override
+                    public int compare(Layer l1, Layer l2) {
                         if (l1 instanceof OsmDataLayer && l2 instanceof OsmDataLayer) {
                             if (l1 == getActiveLayer()) return -1;
                             if (l2 == getActiveLayer()) return 1;
-                            return Integer.valueOf(layers.indexOf(l1)).compareTo(layers.indexOf(l2));
+                            return Integer.compare(layers.indexOf(l1), layers.indexOf(l2));
                         } else
-                            return Integer.valueOf(layers.indexOf(l1)).compareTo(layers.indexOf(l2));
+                            return Integer.compare(layers.indexOf(l1), layers.indexOf(l2));
                     }
                 }
@@ -540 +539 @@
      * Draw the component.
      */
-    @Override public void paint(Graphics g) {
+    @Override
+    public void paint(Graphics g) {
         if (initialViewport != null) {
             zoomTo(initialViewport);

trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java

@@ -213 +213 @@
                             cmp = o1.getParent().getDisplayName(nf).compareTo(o2.getParent().getDisplayName(nf));
                             if (cmp != 0) return cmp;
-                            return Integer.valueOf(o1.getPosition()).compareTo(o2.getPosition());
+                            return Integer.compare(o1.getPosition(), o2.getPosition());
                         }
                     }

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

@@ -222 +222 @@
     }
 
-    private class NoteRenderer implements ListCellRenderer<Note> {
+    private static class NoteRenderer implements ListCellRenderer<Note> {
 
         private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();

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

@@ -40 +40 @@
         }
     }
-    
-    @Override 
+
+    @Override
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
@@ -53 +53 @@
                 Map<?, ?> v = (Map<?, ?>) value;
                 if (v.size() != 1) {    // Multiple values: give user a short summary of the values
-                    Integer blank_count;
-                    Integer other_count;
+                    Integer blankCount;
+                    Integer otherCount;
                     if (v.get("") == null) {
-                        blank_count = 0;
-                        other_count = v.size();
+                        blankCount = 0;
+                        otherCount = v.size();
                     } else {
-                        blank_count = (Integer)v.get("");
-                        other_count = v.size()-1;
+                        blankCount = (Integer)v.get("");
+                        otherCount = v.size()-1;
                     }
-                    str = "<";
-                    if (other_count == 1) {
+                    StringBuilder sb = new StringBuilder("<");
+                    if (otherCount == 1) {
                         for (Map.Entry<?, ?> entry : v.entrySet()) { // Find the non-blank value in the map
                             if ( entry.getKey() != "") {
                                 /* I18n: properties display partial string joined with comma, frst is count, second is value */
-                                str += tr("{0} ''{1}''", entry.getValue().toString(), entry.getKey());
+                                sb.append(tr("{0} ''{1}''", entry.getValue().toString(), entry.getKey()));
                             }
                         }
                     } else {
                         /* I18n: properties display partial string joined with comma */
-                        str += trn("{0} different", "{0} different", other_count, other_count);
+                        sb.append(trn("{0} different", "{0} different", otherCount, otherCount));
                     }
-                    if(blank_count > 0) {
+                    if(blankCount > 0) {
                         /* I18n: properties display partial string joined with comma */
-                        str += trn(", {0} unset", ", {0} unset", blank_count, blank_count);
+                        sb.append(trn(", {0} unset", ", {0} unset", blankCount, blankCount));
                     }
-                    str += ">";
+                    sb.append(">");
+                    str = sb.toString();
                     c.setFont(c.getFont().deriveFont(Font.ITALIC));
 

trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

@@ -4 +4 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Stroke;
@@ -29 +28 @@
     public final RotationAngle mapImageAngle;
     public final Symbol symbol;
-
-    private Image enabledNodeIcon;
-    private Image disabledNodeIcon;
-
-    private boolean enabledNodeIconIsTemporary;
-    private boolean disabledNodeIconIsTemporary;
 
     public enum SymbolShape { SQUARE, CIRCLE, TRIANGLE, PENTAGON, HEXAGON, HEPTAGON, OCTAGON, NONAGON, DECAGON }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

@@ -81 +81 @@
                         int num1 = Integer.parseInt(matcher1.group(2));
                         int num2 = Integer.parseInt(matcher2.group(2));
-                        return Integer.valueOf(num1).compareTo(num2);
+                        return Integer.compare(num1, num2);
                     } else
                         return -1;

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -1375 +1375 @@
             if (rows != null) {
                 double height = renderer.getListCellRendererComponent(list,
-                        new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * Integer.valueOf(rows);
+                        new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * Integer.parseInt(rows);
                 sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height));
             }