Changeset 4666 in josm

Timestamp:

Dec 15, 2011 9:12:57 PM (18 months ago)

Author:

Don-vip

Message:

see #7136 and #7128 - Downloading data on Mac OS X produces an exception

File:

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

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

@@ -61 +61 @@
             ((Destroyable) action).destroy();
         }
-        action.removePropertyChangeListener(this);
+        if (action != null) {
+            action.removePropertyChangeListener(this);
+        }
     }
     
     @Override
     public void applyButtonHiddenPreferences() {
-            String actionName = (String) getAction().getValue(AbstractAction.NAME);
-            boolean hiddenFlag =
-                    Main.pref.getBoolean(actionName + ".itbutton_hidden", false);
-            setVisible(!hiddenFlag);   
+        String actionName = (String) getSafeActionValue(AbstractAction.NAME);
+        boolean hiddenFlag = Main.pref.getBoolean(actionName + ".itbutton_hidden", false);
+        setVisible(!hiddenFlag);   
     }
 
     @Override
     public void setButtonHidden(boolean b) {
-            String actionName = (String) getAction().getValue(AbstractAction.NAME);
-            setVisible(!b);
-            if (listener!=null) { // if someone wants to know about changes of visibility
-                if (!b) listener.buttonShown(); else listener.buttonHidden();
-            }
-            Main.pref.put(actionName + ".itbutton_hidden", b);
-            
+        String actionName = (String) getSafeActionValue(AbstractAction.NAME);
+        setVisible(!b);
+        if (listener!=null) { // if someone wants to know about changes of visibility
+            if (!b) listener.buttonShown(); else listener.buttonHidden();
+        }
+        Main.pref.put(actionName + ".itbutton_hidden", b);
     }
+    
     @Override
     public void showButton() {
         setButtonHidden(false);
     }
+    
     @Override
     public void hideButton() {
@@ -93 +95 @@
     @Override
     public String getActionName() {
-        return (String) getAction().getValue(Action.NAME);
+        return (String) getSafeActionValue(Action.NAME);
     }
 
     @Override
     public Icon getIcon() {
-        return (Icon) getAction().getValue(Action.SMALL_ICON);
+        return (Icon) getSafeActionValue(Action.SMALL_ICON);
     }
 
@@ -111 +113 @@
     }
 
- 
+    protected final Object getSafeActionValue(String key) {
+        // Mac OS X Aqua L&F can call accessors from constructor, so getAction() can be null in those cases
+        return getAction() != null ? getAction().getValue(key) : null;
+    }
 }