[Thaw-dev] r9688 - trunk/apps/Thaw/src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-07-21 01:08:11 +0000 (Fri, 21 Jul 2006)
New Revision: 9688

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
   trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
Log:
Re-fix my conversions

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-07-21 01:00:02 UTC 
(rev 9687)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-07-21 01:08:11 UTC 
(rev 9688)
@@ -758,7 +758,7 @@
                filename       = (String)parameters.get("Filename");
                priority       = 
Integer.parseInt((String)parameters.get("Priority"));
                persistence    = 
Integer.parseInt((String)parameters.get("Persistence"));
-               globalQueue    = 
Boolean.parseBoolean((String)parameters.get("Global"));
+               globalQueue    = 
Boolean.getBoolean((String)parameters.get("Global"));
                destinationDir = (String)parameters.get("ClientToken");
                attempt        = 
Integer.parseInt((String)parameters.get("Attempt"));
                status         = (String)parameters.get("Status");
@@ -768,8 +768,8 @@

                progress       = 
Integer.parseInt((String)parameters.get("Progress"));
                fileSize       = 
Long.parseLong((String)parameters.get("FileSize"));
-               running        = 
Boolean.parseBoolean((String)parameters.get("Running"));
-               successful     = 
Boolean.parseBoolean((String)parameters.get("Successful"));
+               running        = 
Boolean.getBoolean((String)parameters.get("Running"));
+               successful     = 
Boolean.getBoolean((String)parameters.get("Successful"));

                if(persistence == 2 && !isFinished()) {
                        progress = 0;

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java    2006-07-21 01:00:02 UTC 
(rev 9687)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java    2006-07-21 01:08:11 UTC 
(rev 9688)
@@ -115,7 +115,7 @@
                                nodeFCPVersion = answer.getValue("FCPVersion");
                                nodeVersion = answer.getValue("Version");
                                nodeName = answer.getValue("Node");
-                               testnet = 
Boolean.parseBoolean(answer.getValue("Testnet"));
+                               testnet = 
Boolean.getBoolean(answer.getValue("Testnet"));
                                nmbCompressionCodecs = 
Integer.parseInt(answer.getValue("CompressionCodecs"));

                                queryManager.deleteObserver(this);

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2006-07-21 01:00:02 UTC 
(rev 9687)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2006-07-21 01:08:11 UTC 
(rev 9688)
@@ -840,7 +840,7 @@
                        publicKey = null;

                priority = Integer.parseInt((String)parameters.get("priority"));
-               global = Boolean.parseBoolean((String)parameters.get("global"));
+               global = Boolean.getBoolean((String)parameters.get("global"));
                persistence = 
Integer.parseInt((String)parameters.get("persistence"));
                progress = 
Integer.parseInt(((String)parameters.get("progress")));
                status = (String)parameters.get("status");
@@ -850,9 +850,9 @@
                if(identifier == null || identifier.equals(""))
                        identifier = null;

-               running = 
Boolean.parseBoolean((String)parameters.get("running"));
-               successful = 
Boolean.parseBoolean((String)parameters.get("successful"));
-               finished = 
Boolean.parseBoolean((String)parameters.get("finished"));
+               running = Boolean.getBoolean((String)parameters.get("running"));
+               successful = 
Boolean.getBoolean((String)parameters.get("successful"));
+               finished = 
Boolean.getBoolean((String)parameters.get("finished"));

                if(persistence == 2 && !isFinished()) {
                        progress = 0;

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java    2006-07-21 01:00:02 UTC 
(rev 9687)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java    2006-07-21 01:08:11 UTC 
(rev 9688)
@@ -110,7 +110,7 @@
                        long fileSize = 0;

                        if(msg.getValue("DataLength") != null)
-                               fileSize = 
Long.getLong(msg.getValue("DataLength"));
+                               fileSize = 
Long.parseLong(msg.getValue("DataLength"));

                        FCPClientPut clientPut = new 
FCPClientPut(msg.getValue("Identifier"),
                                                                  
msg.getValue("URI"), // key