Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 9794)
+++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 9795)
@@ -61,6 +61,4 @@
     private final String mode;
 
-    protected transient ZoomChangeAdapter zoomChangeAdapter;
-    protected transient MapFrameAdapter mapFrameAdapter;
     /** Time of last zoom to bounds action */
     protected long lastZoomTime = -1;
@@ -358,6 +356,6 @@
         // 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();
     }
Index: /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 9794)
+++ /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 9795)
@@ -2,6 +2,4 @@
 package org.openstreetmap.josm.gui;
 
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -24,5 +22,4 @@
 public class IconToggleButton extends JToggleButton implements HideableButton, PropertyChangeListener, Destroyable, ExpertModeChangeListener {
 
-    public boolean groupbutton;
     private transient ShowHideButtonListener listener;
     private boolean hideIfDisabled;
@@ -53,10 +50,4 @@
 
         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,7 +124,8 @@
     }
 
-    /*
-     * 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) {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 9794)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 9795)
@@ -701,5 +701,5 @@
                 setLocationRelativeTo(Main.parent);
             }
-            setTitle(titleBar.getTitle());
+            super.setTitle(titleBar.getTitle());
             HelpUtil.setHelpContext(getRootPane(), helpTopic());
         }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 9794)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 9795)
@@ -521,5 +521,4 @@
         protected AutoCompletingComboBox keys;
         protected AutoCompletingComboBox values;
-        protected Component componentUnderMouse;
 
         AbstractTagsDialog(Component parent, String title, String[] buttonTexts) {