Author: jflesch
Date: 2006-12-27 00:30:05 +0000 (Wed, 27 Dec 2006)
New Revision: 11519
Modified:
trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/MainWindow.java
trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
Log:
Fix toolbar issues
Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2006-12-23 14:23:34 UTC
(rev 11518)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2006-12-27 00:30:05 UTC
(rev 11519)
@@ -182,7 +182,7 @@
/* should reinit the whole connection correctly */
core.getPluginManager().stopPlugins();
- if(needConnectionReset && !core.initNodeConnection()) {
+ if (needConnectionReset && !core.initNodeConnection()) {
new WarningWindow(core,
I18n.getMessage("thaw.warning.unableToConnectTo")+ "
"+core.getConfig().getValue("nodeAddress")+":"+
core.getConfig().getValue("nodePort"));
}
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2006-12-23 14:23:34 UTC (rev
11518)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2006-12-27 00:30:05 UTC (rev
11519)
@@ -109,7 +109,7 @@
splashScreen.setProgressionAndStatus(10, "Connecting ...");
if(!initNodeConnection())
new WarningWindow(this,
I18n.getMessage("thaw.warning.unableToConnectTo")+
- " "+config.getValue("nodeAddress")+
+ " "+ config.getValue("nodeAddress")+
":"+ config.getValue("nodePort"));
Modified: trunk/apps/Thaw/src/thaw/core/MainWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/MainWindow.java 2006-12-23 14:23:34 UTC
(rev 11518)
+++ trunk/apps/Thaw/src/thaw/core/MainWindow.java 2006-12-27 00:30:05 UTC
(rev 11519)
@@ -200,7 +200,7 @@
public void changeButtonsInTheToolbar(final Object modifier, final
Vector newButtons) {
JToolBar newToolBar;
- Logger.debug(this, "Called by "+modifier.getClass().getName());
+ Logger.debug(this, "changeButtonsInTheToolbar() : Called by
"+modifier.getClass().getName());
if ((lastToolBarModifier == null) || (newButtons != null) ||
(lastToolBarModifier == modifier)) {
lastToolBarModifier = modifier;
Modified: trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-12-23 14:23:34 UTC
(rev 11518)
+++ trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-12-27 00:30:05 UTC
(rev 11519)
@@ -61,7 +61,7 @@
menuItem.addActionListener(this);
if(core.getPluginManager().getPlugin("thaw.plugins.QueueWatcher") == null) {
- Logger.info(this, "Loading QueueWatcher plugin");
+ Logger.notice(this, "Loading QueueWatcher plugin");
if(!core.getPluginManager().loadPlugin("thaw.plugins.QueueWatcher")
||
!core.getPluginManager().runPlugin("thaw.plugins.QueueWatcher")) {
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2006-12-23 14:23:34 UTC
(rev 11518)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2006-12-27 00:30:05 UTC
(rev 11519)
@@ -3,6 +3,9 @@
import java.util.Iterator;
import java.util.Vector;
+import java.awt.BorderLayout;
+import javax.swing.JPanel;
+
import javax.swing.JButton;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -77,7 +80,7 @@
button = new JButton(IconBox.refreshAction);
button.setToolTipText(I18n.getMessage("thaw.plugin.index.downloadIndexes"));
action = new IndexManagementHelper.IndexDownloader(button);
- action.setTarget(browserPanel.getIndexTree().getRoot()); /*
TODO : Listen to tree to only refresh the selected node */
+ action.setTarget(browserPanel.getIndexTree().getRoot());
addButtonToTheToolbar(button);
toolbarActions.add(action);
@@ -101,17 +104,19 @@
stateChanged(null);
+
return true;
}
public boolean stop() {
+ core.getMainWindow().getTabbedPane().removeChangeListener(this);
+ purgeButtonList();
+
if (browserPanel != null) {
core.getMainWindow().removeTab(browserPanel.getPanel());
browserPanel.saveState();
}
- purgeButtonList();
-
hsqldb.unregisterChild(this);
return true;
Modified: trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-12-23 14:23:34 UTC
(rev 11518)
+++ trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-12-27 00:30:05 UTC
(rev 11519)
@@ -71,7 +71,7 @@
menuItem.addActionListener(this);
if(core.getPluginManager().getPlugin("thaw.plugins.QueueWatcher") == null) {
- Logger.info(this, "Loading QueueWatcher plugin");
+ Logger.notice(this, "Loading QueueWatcher plugin");
if(!core.getPluginManager().loadPlugin("thaw.plugins.QueueWatcher")
||
!core.getPluginManager().runPlugin("thaw.plugins.QueueWatcher")) {
Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-12-23 14:23:34 UTC
(rev 11518)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-12-27 00:30:05 UTC
(rev 11519)
@@ -125,6 +125,8 @@
double splitLocation;
+ core.getMainWindow().getTabbedPane().removeChangeListener(this);
+
splitLocation = ((double)split.getDividerLocation() -
((double)split.getMinimumDividerLocation())) /
(((double)split.getMaximumDividerLocation()) -
((double)split.getMinimumDividerLocation()));
core.getConfig().setValue("queuePanelSplitLocation",
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2006-12-23 14:23:34 UTC (rev 11518)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2006-12-27 00:30:05 UTC (rev 11519)
@@ -71,6 +71,7 @@
globalPanel.add(indexProgressBar.getProgressBar(),
BorderLayout.SOUTH);
}
+
public void restoreState() {
if (config.getValue("indexBrowserPanelSplitPosition") != null)
split.setDividerLocation(Integer.parseInt(config.getValue("indexBrowserPanelSplitPosition")));
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2006-12-23
14:23:34 UTC (rev 11518)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2006-12-27
00:30:05 UTC (rev 11519)
@@ -16,6 +16,7 @@
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
+import javax.swing.JButton;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTree;
