Changeset 3178 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

Timestamp:

2010-04-11T20:29:30+02:00 (16 years ago)

Author:

bastiK

Message:

• disable all filters if the filter dialog is not visible
• show the number of hidden/disabled object on screen in the upper right corner
• slightly different behaviour for showNotify and hideNotify in ToggleDialog (Now, expanding and collapsing a dialog does not trigger these notifications.)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (9 diffs)

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

@@ -108 +108 @@
         setMinimumSize(new Dimension(0,0));
         this.preferredHeight = preferredHeight;
-        toggleAction = new ToggleDialogAction(this, name, "dialogs/"+iconName, tooltip, shortcut, iconName);
+        toggleAction = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut, iconName);
         String helpId = "Dialog/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);
         toggleAction.putValue("help", helpId.substring(0, helpId.length()-6));
@@ -136 +136 @@
      *
      */
-    public final static class ToggleDialogAction extends JosmAction {
-
-        private ToggleDialog dialog;
-
-        private ToggleDialogAction(ToggleDialog dialog, String name, String iconName, String tooltip, Shortcut shortcut, String prefname) {
+    public final class ToggleDialogAction extends JosmAction {
+
+        private ToggleDialogAction(String name, String iconName, String tooltip, Shortcut shortcut, String prefname) {
             super(name, iconName, tooltip, shortcut, false);
-            if (dialog == null)
-                throw new IllegalArgumentException("The ToggleDialog supplied for " + name + " cannot be null.");
-            this.dialog = dialog;
         }
 
         public void actionPerformed(ActionEvent e) {
-            dialog.toggleButtonHook();
-            if (dialog.isShowing) {
-                dialog.hideDialog();
-                dialog.dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+            toggleButtonHook();
+            if (isShowing) {
+                hideDialog();
+                dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+                hideNotify();
             } else {
-                dialog.showDialog();
-                if (dialog.isDocked && dialog.isCollapsed) {
-                    dialog.expand();
+                showDialog();
+                if (isDocked && isCollapsed) {
+                    expand();
                 }
-                if (dialog.isDocked) {
-                    dialog.dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, dialog);
+                if (isDocked) {
+                    dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
                 }
+                showNotify();
             }
         }
@@ -166 +163 @@
         public void destroy() {
             super.destroy();
-            dialog = null;
         }
     }
@@ -185 +181 @@
         toggleAction.putValue("selected", false);
         toggleAction.putValue("selected", true);
-        showNotify();
     }
 
@@ -218 +213 @@
         setIsShowing(false);
         toggleAction.putValue("selected", false);
-        hideNotify();
     }
 
@@ -259 +253 @@
             setMinimumSize(new Dimension(Integer.MAX_VALUE,20));
             lblMinimized.setIcon(ImageProvider.get("misc", "minimized"));
-            hideNotify();
         }
         else throw new IllegalStateException();
@@ -275 +268 @@
             setMaximumSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
             lblMinimized.setIcon(ImageProvider.get("misc", "normal"));
-            showNotify();
         }
         else throw new IllegalStateException();
@@ -402 +394 @@
                             hideDialog();
                             dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+                            hideNotify();
                         }
                     }
@@ -441 +434 @@
                     } else {
                         hideDialog();
+                        hideNotify();
                     }
                 }