Author: jflesch
Date: 2008-01-26 13:04:31 +0000 (Sat, 26 Jan 2008)
New Revision: 17302
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
Log:
Fix a typo in the reconnection process
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2008-01-26 12:41:48 UTC (rev
17301)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2008-01-26 13:04:31 UTC (rev
17302)
@@ -615,7 +615,7 @@
// brouzouf
}
- initialWait = false;
+ initialWait = true;
Logger.notice(this, "Trying to
reconnect ...");
if(initConnection())
Modified: trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2008-01-26
12:41:48 UTC (rev 17301)
+++ trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2008-01-26
13:04:31 UTC (rev 17302)
@@ -33,7 +33,10 @@
//refreshList();
mainPanel = new JPanel(new GridLayout(1, 1));
- mainPanel.add(new JScrollPane(pluginConfigPanel));
+
+ JScrollPane scroll = new JScrollPane(pluginConfigPanel);
+ scroll.getVerticalScrollBar().setUnitIncrement(10);
+ mainPanel.add(scroll);
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2008-01-26 12:41:48 UTC
(rev 17301)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2008-01-26 13:04:31 UTC
(rev 17302)
@@ -45,8 +45,6 @@
private int writersWaiting;
private Object monitor;
- private long lastWrite = 0; /* real writes ; System.currentTimeMillis()
*/
-
private boolean duplicationAllowed = true;
private boolean localSocket = false;
private boolean autoDownload = true;
@@ -201,7 +199,6 @@
rawBytesWaiting = 0;
writersWaiting = 0;
- lastWrite = 0;
Logger.info(this, "Connected");
@@ -243,8 +240,6 @@
protected synchronized boolean realRawWrite(final byte[] data) {
if((out != null) && (socket != null) && socket.isConnected()) {
try {
- lastWrite = System.currentTimeMillis();
-
out.write(data);
out.flush();
} catch(final java.io.IOException e) {
@@ -293,12 +288,13 @@
monitor.notify();
}
}
-
+
public boolean isWriting() {
- if( !isConnected() )
+ if( !isConnected() ) {
return false;
+ }
- return ( (writersWaiting > 0) || ((System.currentTimeMillis() -
lastWrite) < 300) );
+ return (writersWaiting > 0);
}
public boolean write(final String toWrite) {
@@ -435,7 +431,7 @@
if(c == -1) {
if(isConnected())
- Logger.error(this,
"Unable to read but still connected");
+ Logger.warning(this,
"Unable to read but still connected");
else
Logger.notice(this,
"Disconnected");
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2008-01-26 12:41:48 UTC
(rev 17301)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2008-01-26 13:04:31 UTC
(rev 17302)
@@ -480,12 +480,10 @@
try {
if(queryManager.getConnection().isConnected()
- &&
!queryManager.getConnection().isWriting()
&& queueCompleted)
schedule();
-
if(queryManager.getConnection().isConnected()
- &&
!queryManager.getConnection().isWriting())
+
if(queryManager.getConnection().isConnected())
updateStats();
Modified: trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2008-01-26 12:41:48 UTC
(rev 17301)
+++ trunk/apps/Thaw/src/thaw/plugins/StatusBar.java 2008-01-26 13:04:31 UTC
(rev 17302)
@@ -178,7 +178,7 @@
public void stop() {
running = false;
-
+ Logger.removeLogListener(this);
core.getMainWindow().setStatus(IconBox.blueBunny, "Thaw
"+Main.VERSION);
}
