Changeset 6977 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java

Timestamp:

2014-04-15T00:43:24+02:00 (12 years ago)

Author:

Don-vip

Message:

fix some sonar issues recently introduced

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (3 diffs)

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

@@ -717 +717 @@
     private class MapStatusPopupMenu extends JPopupMenu {
 
-        private final JMenuItem jumpButton = createActionComponent(Main.main.menu.jumpToAct);
+        private final JMenuItem jumpButton = add(Main.main.menu.jumpToAct);
         
         private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<JCheckBoxMenuItem>();
@@ -743 +743 @@
             }
             
-            add(jumpButton);
             add(separator);
             add(doNotHide);
@@ -751 +750 @@
                 public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                     Component invoker = ((JPopupMenu)e.getSource()).getInvoker();
-                    jumpButton.setVisible(invoker == latText || invoker == lonText);
-                    String currentSOM = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();;
+                    jumpButton.setVisible(latText.equals(invoker) || lonText.equals(invoker));
+                    String currentSOM = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();
                     for (JMenuItem item : somItems) {
                         item.setSelected(item.getText().equals(currentSOM));
-                        item.setVisible(invoker == distText);
+                        item.setVisible(distText.equals(invoker));
                     }
-                    separator.setVisible(invoker == distText);
+                    separator.setVisible(distText.equals(invoker));
                     doNotHide.setSelected(Main.pref.getBoolean("statusbar.always-visible", true));
                 }