Changeset 2566 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

Timestamp:

2009-12-03T22:15:17+01:00 (16 years ago)

Author:

bastiK

Message:

Moved the code from agpifoj plugin to JOSM core. Thanks to Christian Gallioz for this great (ex-)plugin.
In the current state it might be a little unstable.

• Did a view modification so it fits in better.
• Added the Thumbnail feature, but still work to be done.

New in JOSM core: Possibility to add toggle dialogs not only on startup, but also later.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (modified) (1 diff, 1 prop)

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

@@ -32 +32 @@
     }
 
-    private boolean initialized = false;
-    public void initialize(List<ToggleDialog> allDialogs) {
+    public boolean initialized = false; // read only from outside
+    
+    public void initialize(List<ToggleDialog> pAllDialogs) {
         if (initialized)
             throw new IllegalStateException();
         initialized = true;
-        this.allDialogs = allDialogs;
-
-        for (Integer i=0; i < allDialogs.size(); ++i) {
-            final ToggleDialog dlg = allDialogs.get(i);
-            dlg.setDialogsPanel(this);
-            dlg.setVisible(false);
-        }
-        for (int i=0; i < allDialogs.size() + 1; ++i) {
-            final JPanel p = new JPanel() {
-                /**
-                 * Honoured by the MultiSplitPaneLayout when the
-                 * entire Window is resized.
-                 */
-                @Override
-                public Dimension getMinimumSize() {
-                    return new Dimension(0, 40);
-                }
-            };
-            p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
-            p.setVisible(false);
-
-            mSpltPane.add(p, "L"+i);
-            panels.add(p);
-        }
-
-        for (Integer i=0; i < allDialogs.size(); ++i) {
-            final ToggleDialog dlg = allDialogs.get(i);
-            if (dlg.isDialogShowing()) {
-                dlg.showDialog();
-                if (dlg.isDialogInCollapsedView()) {
-                    dlg.isCollapsed = false;    // pretend to be in Default view, this will be set back by collapse()
-                    dlg.collapse();
-                }
-            } else {
-                dlg.hideDialog();
-            }
-        }
+        allDialogs = new ArrayList<ToggleDialog>();
+
+        for (Integer i=0; i < pAllDialogs.size(); ++i) {
+            add(pAllDialogs.get(i), false);
+        }
+        
         this.add(mSpltPane);
         reconstruct(Action.ELEMENT_SHRINKS, null);
+    }
+
+    public void add(ToggleDialog dlg) {
+        add(dlg, true);
+    }
+    
+    public void add(ToggleDialog dlg, boolean doReconstruct) {
+        allDialogs.add(dlg);
+        int i = allDialogs.size() - 1;
+        dlg.setDialogsPanel(this);
+        dlg.setVisible(false);
+        final JPanel p = new JPanel() {
+            /**
+             * Honoured by the MultiSplitPaneLayout when the
+             * entire Window is resized.
+             */
+            @Override
+            public Dimension getMinimumSize() {
+                return new Dimension(0, 40);
+            }
+        };
+        p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
+        p.setVisible(false);
+
+        mSpltPane.add(p, "L"+i);
+        panels.add(p);
+
+        if (dlg.isDialogShowing()) {
+            dlg.showDialog();
+            if (dlg.isDialogInCollapsedView()) {
+                dlg.isCollapsed = false;    // pretend to be in Default view, this will be set back by collapse()
+                dlg.collapse();
+            }
+            if (doReconstruct) {
+                reconstruct(Action.INVISIBLE_TO_DEFAULT, dlg);
+            }
+        } else {
+            dlg.hideDialog();
+        }
     }