Author: jflesch
Date: 2006-07-17 21:36:33 +0000 (Mon, 17 Jul 2006)
New Revision: 9649
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
Log:
Fix 1.4 compatibility
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2006-07-17 21:18:12 UTC (rev
9648)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2006-07-17 21:36:33 UTC (rev
9649)
@@ -297,11 +297,14 @@
public void exit(boolean force) {
if(!force) {
if(connection.isWriting()) {
- int ret = JOptionPane.showOptionDialog(null,
I18n.getMessage("thaw.warning.isWriting"),
+ int ret =
JOptionPane.showOptionDialog((java.awt.Component)null,
+
I18n.getMessage("thaw.warning.isWriting"),
I18n.getMessage("thaw.warning.title"),
JOptionPane.YES_NO_OPTION,
JOptionPane.WARNING_MESSAGE,
- null,
null, 0);
+
(javax.swing.Icon)null,
+
(java.lang.Object[])null,
+
(java.lang.Object)null);
if(ret == JOptionPane.CLOSED_OPTION || ret > 0)
return;
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-07-17 21:18:12 UTC
(rev 9648)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-07-17 21:36:33 UTC
(rev 9649)
@@ -216,7 +216,7 @@
public boolean isWriting() {
- return ( isConnected() && ((System.currentTimeMillis() -
lastWrite) < 300) );
+ return ( isConnected() && ( isWritingLocked() ||
((System.currentTimeMillis() - lastWrite) < 300) ) );
}
public boolean write(String toWrite) {
