Changeset 4843 in josm for trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java

Timestamp:

2012-01-22T09:48:05+01:00 (12 years ago)

Author:

bastiK

Message:

see #7299 - Move features to expert mode

File:

• trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.lang.ref.WeakReference;
@@ -24 +25 @@
 
     private static final List<WeakReference<ExpertModeChangeListener>> listeners = new ArrayList<WeakReference<ExpertModeChangeListener>>();
+    private static final List<WeakReference<Component>> visibilityToggleListeners = new ArrayList<WeakReference<Component>>();
+
+    private static ExpertToggleAction INSTANCE = new ExpertToggleAction();
 
     private synchronized static void fireExpertModeChanged(boolean isExpert) {
-        Iterator<WeakReference<ExpertModeChangeListener>> it = listeners.iterator();
-        while (it.hasNext()) {
-            WeakReference<ExpertModeChangeListener> wr = it.next();
-            ExpertModeChangeListener listener = wr.get();
-            if (listener == null) {
-                it.remove();
-                continue;
+        {
+            Iterator<WeakReference<ExpertModeChangeListener>> it = listeners.iterator();
+            while (it.hasNext()) {
+                WeakReference<ExpertModeChangeListener> wr = it.next();
+                ExpertModeChangeListener listener = wr.get();
+                if (listener == null) {
+                    it.remove();
+                    continue;
+                }
+                listener.expertChanged(isExpert);
             }
-            listener.expertChanged(isExpert);
+        }
+        {
+            Iterator<WeakReference<Component>> it = visibilityToggleListeners.iterator();
+            while (it.hasNext()) {
+                WeakReference<Component> wr = it.next();
+                Component c = wr.get();
+                if (c == null) {
+                    it.remove();
+                    continue;
+                }
+                c.setVisible(isExpert);
+            }
         }
     }
@@ -55 +73 @@
         listeners.add(new WeakReference<ExpertModeChangeListener>(listener));
         if (fireWhenAdding) {
-            listener.expertChanged(Main.main.menu.expert.isSelected());
+            listener.expertChanged(isExpert());
         }
     }
@@ -72 +90 @@
             // collected in the meantime
             if (wr.get() == null || wr.get() == listener) {
+                it.remove();
+            }
+        }
+    }
+
+    public synchronized static void addVisibilitySwitcher(Component c) {
+        if (c == null) return;
+        for (WeakReference<Component> wr : visibilityToggleListeners) {
+            // already registered ? => abort
+            if (wr.get() == c) return;
+        }
+        visibilityToggleListeners.add(new WeakReference<Component>(c));
+        c.setVisible(isExpert());
+    }
+
+    public synchronized static void removeVisibilitySwitcher(Component c) {
+        if (c == null) return;
+        Iterator<WeakReference<Component>> it = visibilityToggleListeners.iterator();
+        while (it.hasNext()) {
+            WeakReference<Component> wr = it.next();
+            // remove the listener - and any other listener which god garbage
+            // collected in the meantime
+            if (wr.get() == null || wr.get() == c) {
                 it.remove();
             }
@@ -126 +167 @@
         return selected;
     }
+
+    public static ExpertToggleAction getInstance() {
+        return INSTANCE;
+    }
+
+    public static boolean isExpert() {
+        return INSTANCE.isSelected();
+    }
 }