Author: jflesch
Date: 2006-07-18 19:40:36 +0000 (Tue, 18 Jul 2006)
New Revision: 9656
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
Log:
Fix a bug with the left panel
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-18 18:58:52 UTC
(rev 9655)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-18 19:40:36 UTC
(rev 9656)
@@ -391,7 +391,7 @@
public boolean stop(FCPQueueManager queueManager) {
if(removeRequest()) {
status = "Stopped";
- finished = true;
+ finished = false;
successful = false;
running = false;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2006-07-18 18:58:52 UTC
(rev 9655)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2006-07-18 19:40:36 UTC
(rev 9656)
@@ -205,13 +205,19 @@
private boolean isTheSame(FCPTransferQuery queryA,
FCPTransferQuery queryB) {
if(queryA.getIdentifier() != null && queryB.getIdentifier() !=
null) {
- Logger.debug(this, "isTheSame(): Identifier");
- return
queryA.getIdentifier().equals(queryB.getIdentifier());
+
if(queryA.getIdentifier().equals(queryB.getIdentifier())) {
+ Logger.debug(this, "isTheSame(): Identifier");
+ return true;
+ }
+ return false;
}
if(queryA.getFileKey() != null && queryB.getFileKey() != null) {
- Logger.debug(this, "isTheSame(): FileKey");
- return queryA.getFileKey().equals(queryB.getFileKey());
+ if(queryA.getFileKey().equals(queryB.getFileKey())) {
+ Logger.debug(this, "isTheSame(): FileKey");
+ return true;
+ }
+ return false;
}
if(queryA.getFilename().equals(queryB.getFilename())) {
Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-07-18 18:58:52 UTC
(rev 9655)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-07-18 19:40:36 UTC
(rev 9656)
@@ -67,12 +67,12 @@
if(core.getConfig().getValue("detailPanelFolded") == null
|| ((new
Boolean(core.getConfig().getValue("detailPanelFolded"))).booleanValue()) ==
true) {
folded = true;
+ detailPanel.getPanel().setVisible(false);
mainPanel.setDividerLocation(1);
- detailPanel.getPanel().setVisible(false);
} else {
- folded = false;
+ folded = true; /* Don't ask me why */
+ detailPanel.getPanel().setVisible(true);
mainPanel.setDividerLocation(-1);
- detailPanel.getPanel().setVisible(true);
}
mainPanel.addPropertyChangeListener(this);
@@ -159,14 +159,14 @@
folded = !folded;
- if(folded)
+ if(folded) {
+ detailPanel.getPanel().setVisible(false);
mainPanel.setDividerLocation(1);
- else
+ } else {
+ detailPanel.getPanel().setVisible(true);
mainPanel.setDividerLocation(-1);
+ }
- detailPanel.getPanel().setVisible(!folded);
-
-
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-07-18 18:58:52 UTC (rev 9655)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-07-18 19:40:36 UTC (rev 9656)
@@ -294,7 +294,6 @@
if(e.getSource() == removeItem) {
if(query.stop(core.getQueueManager())) {
-
core.getQueueManager().remove(query);
tableModel.removeQuery(query);
}
