Author: jflesch
Date: 2007-12-16 13:22:37 +0000 (Sun, 16 Dec 2007)
New Revision: 16596
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
Log:
Fix DDA once for all
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2007-12-16 12:55:07 UTC (rev
16595)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2007-12-16 13:22:37 UTC (rev
16596)
@@ -724,7 +724,6 @@
|| code == 13 /* Couldn't write file */
|| code == 14 /* Couldn't rename file */
|| code == 22 /* File parse error */
- || code == 25 /* DDA denied */
|| code == 26 /* Could not read file */) {
askToDisableDDA();
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-12-16 12:55:07 UTC
(rev 16595)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2007-12-16 13:22:37 UTC
(rev 16596)
@@ -406,7 +406,8 @@
if("ProtocolError".equals( message.getMessageName() )) {
Logger.debug(this, "ProtocolError !");
- if
(queueManager.getQueryManager().getConnection().isLocalSocket()
+ if ("25".equals(message.getValue("Code"))
+ &&
queueManager.getQueryManager().getConnection().isLocalSocket()
&& !noDDA
&& (destinationDir != null || finalPath !=
null)) {
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java 2007-12-16 12:55:07 UTC
(rev 16595)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java 2007-12-16 13:22:37 UTC
(rev 16596)
@@ -62,7 +62,8 @@
}
- if("ProtocolError".equals( getMessageName() ))
+ if("ProtocolError".equals( getMessageName() )
+ && !"25".equals(getValue("Code")) ) /* code 25 == need
to test DDA */
Logger.warning(this, "PROTOCOL ERROR:\n"+toString());
else if (Logger.getLogLevel() <= 3)
Logger.info(this, "Message (Node >> Thaw):
"+getMessageName());
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-12-16
12:55:07 UTC (rev 16595)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-12-16
13:22:37 UTC (rev 16596)
@@ -239,6 +239,11 @@
thaw.warning.unableToConnectTo=Impossible de se connecter ?
thaw.warning.autoreconnecting=D?connect?. Thaw est entrain d'essayer de se
reconnecter automagiquement ...
+thaw.warning.DDA.l0=Thaw a quelques probl?mes pour utiliser l'acc?s direct au
disque.
+thaw.warning.DDA.l1=Voulez-vous d?sactiver cette option ?
+thaw.warning.DDA.l2=Cette option peut ?tre r?activ?e en s?lectionnant
+thaw.warning.DDA.l3='#' dans la configuration.
+thaw.warning.DDA.l4=Si vous la d?sactiver, vous pouvez avoir ? red?marrer
certains transferts.
## Toolbar
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-12-16 12:55:07 UTC
(rev 16595)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-12-16 13:22:37 UTC
(rev 16596)
@@ -239,6 +239,11 @@
thaw.warning.unableToConnectTo=Impossible de se connecter \u00e0
thaw.warning.autoreconnecting=D\u00e9connect\u00e9. Thaw est entrain d'essayer
de se reconnecter automagiquement ...
+thaw.warning.DDA.l0=Thaw a quelques probl\u00e8mes pour utiliser l'acc\u00e8s
direct au disque.
+thaw.warning.DDA.l1=Voulez-vous d\u00e9sactiver cette option ?
+thaw.warning.DDA.l2=Cette option peut \u00eatre r\u00e9activ\u00e9e en
s\u00e9lectionnant
+thaw.warning.DDA.l3='#' dans la configuration.
+thaw.warning.DDA.l4=Si vous la d\u00e9sactiver, vous pouvez avoir \u00e0
red\u00e9marrer certains transferts.
## Toolbar
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2007-12-16 12:55:07 UTC (rev 16595)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2007-12-16 13:22:37 UTC (rev 16596)
@@ -88,7 +88,7 @@
if (config.getValue("indexBrowserPanelSplitPosition") != null)
split.setDividerLocation(Integer.parseInt(config.getValue("indexBrowserPanelSplitPosition")));
- leftSplit.setSize(150, MainWindow.DEFAULT_SIZE_Y - 150);
+ leftSplit.setSize(400, MainWindow.DEFAULT_SIZE_Y - 400);
leftSplit.setResizeWeight(0.5);
if (config.getValue("indexTreeUnknownListSplitLocation") ==
null) {
