[Thaw-dev] r11403 - trunk/apps/Thaw/src/thaw/plugins

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-14 20:49:58 +0000 (Thu, 14 Dec 2006)
New Revision: 11403

Modified:
   trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
   trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
   trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java
Log:
Fix bug #971 : Hide correctly toolbar buttons when stoping a plugin

Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2006-12-14 20:45:13 UTC 
(rev 11402)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java  2006-12-14 20:49:58 UTC 
(rev 11403)
@@ -110,6 +110,8 @@
                        browserPanel.saveState();
                }

+               purgeButtonList();
+
                hsqldb.unregisterChild(this);

                return true;

Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java  2006-12-14 20:45:13 UTC 
(rev 11402)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java  2006-12-14 20:49:58 UTC 
(rev 11403)
@@ -121,7 +121,7 @@

                double splitLocation;

-               splitLocation = ((double)split.getDividerLocation() - 
((double)split.getMinimumDividerLocation())) / 
(((double)split.getMaximumDividerLocation()) - 
((double)split.getMinimumDividerLocation())); 
+               splitLocation = ((double)split.getDividerLocation() - 
((double)split.getMinimumDividerLocation())) / 
(((double)split.getMaximumDividerLocation()) - 
((double)split.getMinimumDividerLocation()));

                core.getConfig().setValue("queuePanelSplitLocation",
                                          Double.toString(splitLocation));
@@ -129,6 +129,8 @@
                core.getConfig().setValue("detailPanelFolded", ((new 
Boolean(folded)).toString()));
                core.getMainWindow().removeTab(panelAdded);

+               purgeButtonList();
+
                return true;
        }


Modified: trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java       2006-12-14 
20:45:13 UTC (rev 11402)
+++ trunk/apps/Thaw/src/thaw/plugins/ToolbarModifier.java       2006-12-14 
20:49:58 UTC (rev 11403)
@@ -27,7 +27,6 @@
                setMainWindow(toolbarTarget);
        }

-
        public void setMainWindow(final MainWindow target) {
                mainWindow = target;
                mainWindow.resetLastKnowToolBarModifier();
@@ -68,4 +67,12 @@
                } else
                        Logger.error(this, "MainWindow not SET !");
        }
+
+       /**
+        * Don't forget to call it when the plugin is stopped !
+        */
+       public void purgeButtonList() {
+               hideButtonsInTheToolbar();
+               buttons = new Vector();
+       }
 }