Changeset 9795 in josm for trunk

Timestamp:

2016-02-14T12:18:35+01:00 (8 years ago)

Author:

Don-vip

Message:

findbugs

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (2 diffs)
• gui/IconToggleButton.java (modified) (4 diffs)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)
• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)

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

@@ -61 +61 @@
     private final String mode;
 
-    protected transient ZoomChangeAdapter zoomChangeAdapter;
-    protected transient MapFrameAdapter mapFrameAdapter;
     /** Time of last zoom to bounds action */
     protected long lastZoomTime = -1;
@@ -358 +356 @@
         // make this action listen to zoom and mapframe change events
         //
-        MapView.addZoomChangeListener(zoomChangeAdapter = new ZoomChangeAdapter());
-        Main.addMapFrameListener(mapFrameAdapter = new MapFrameAdapter());
+        MapView.addZoomChangeListener(new ZoomChangeAdapter());
+        Main.addMapFrameListener(new MapFrameAdapter());
         initEnabledState();
     }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -24 +22 @@
 public class IconToggleButton extends JToggleButton implements HideableButton, PropertyChangeListener, Destroyable, ExpertModeChangeListener {
 
-    public boolean groupbutton;
     private transient ShowHideButtonListener listener;
     private boolean hideIfDisabled;
@@ -53 +50 @@
 
         action.addPropertyChangeListener(this);
-
-        addMouseListener(new MouseAdapter() {
-            @Override public void mousePressed(MouseEvent e) {
-                groupbutton = e.getX() > getWidth()/2 && e.getY() > getHeight()/2;
-            }
-        });
 
         ExpertToggleAction.addExpertModeChangeListener(this);
@@ -133 +124 @@
     }
 
-    /*
-     * This fuction should be called for plugins that want to enable auto-hiding
+    /**
+     * This function should be called for plugins that want to enable auto-hiding
      * custom buttons when they are disabled (because of incorrect layer, for example)
+     * @param b hide if disabled
      */
     public void setAutoHideDisabledButton(boolean b) {

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

@@ -701 +701 @@
                 setLocationRelativeTo(Main.parent);
             }
-            setTitle(titleBar.getTitle());
+            super.setTitle(titleBar.getTitle());
             HelpUtil.setHelpContext(getRootPane(), helpTopic());
         }

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

@@ -521 +521 @@
         protected AutoCompletingComboBox keys;
         protected AutoCompletingComboBox values;
-        protected Component componentUnderMouse;
 
         AbstractTagsDialog(Component parent, String title, String[] buttonTexts) {