[freenet-cvs] r11731 - in trunk/freenet/src/freenet: client/async clients/http

[toad at freenetproject.org]

Author: toad
Date: 2007-02-10 00:17:03 +0000 (Sat, 10 Feb 2007)
New Revision: 11731

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileInserter.java
   trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
   trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
Log:
Trivial code simplifications

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserter.java	2007-02-10 00:09:29 UTC (rev 11730)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserter.java	2007-02-10 00:17:03 UTC (rev 11731)
@@ -49,17 +49,17 @@
 		// don't save basic infrastructure such as ctx and parent
 		// only save details of the request
 		fs.putSingle("Type", "SplitFileInserter");
-		fs.putSingle("DataLength", Long.toString(dataLength));
-		fs.putSingle("CompressionCodec", Short.toString(compressionCodec));
-		fs.putSingle("SplitfileCodec", Short.toString(splitfileAlgorithm));
-		fs.putSingle("Finished", Boolean.toString(finished));
-		fs.putSingle("SegmentSize", Integer.toString(segmentSize));
-		fs.putSingle("CheckSegmentSize", Integer.toString(checkSegmentSize));
+		fs.put("DataLength", dataLength);
+		fs.put("CompressionCodec", compressionCodec);
+		fs.put("SplitfileCodec", splitfileAlgorithm);
+		fs.put("Finished", finished);
+		fs.put("SegmentSize", segmentSize);
+		fs.put("CheckSegmentSize", checkSegmentSize);
 		SimpleFieldSet segs = new SimpleFieldSet();
 		for(int i=0;i<segments.length;i++) {
 			segs.put(Integer.toString(i), segments[i].getProgressFieldset());
 		}
-		segs.putSingle("Count", Integer.toString(segments.length));
+		segs.put("Count", segments.length);
 		fs.put("Segments", segs);
 		return fs;
 	}

Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java	2007-02-10 00:09:29 UTC (rev 11730)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java	2007-02-10 00:17:03 UTC (rev 11731)
@@ -231,14 +231,14 @@
 	public synchronized SimpleFieldSet getProgressFieldset() {
 		SimpleFieldSet fs = new SimpleFieldSet();
 		fs.putSingle("Type", "SplitFileInserterSegment");
-		fs.putSingle("Finished", Boolean.toString(finished));
+		fs.put("Finished", finished);
 		// If true, check blocks which are null are finished 
-		fs.putSingle("Encoded", Boolean.toString(encoded));
+		fs.put("Encoded", encoded);
 		// If true, data blocks which are null are finished
-		fs.putSingle("Started", Boolean.toString(started));
+		fs.put("Started", started);
 		fs.put("Errors", errors.toFieldSet(false));
 		SimpleFieldSet dataFS = new SimpleFieldSet();
-		dataFS.putSingle("Count", Integer.toString(dataBlocks.length));
+		dataFS.put("Count", dataBlocks.length);
 		for(int i=0;i<dataBlocks.length;i++) {
 			SimpleFieldSet block = new SimpleFieldSet();
 			if(dataURIs[i] != null)
@@ -270,7 +270,7 @@
 		}
 		fs.put("DataBlocks", dataFS);
 		SimpleFieldSet checkFS = new SimpleFieldSet();
-		checkFS.putSingle("Count", Integer.toString(checkBlocks.length));
+		checkFS.put("Count", checkBlocks.length);
 		for(int i=0;i<checkBlocks.length;i++) {
 			SimpleFieldSet block = new SimpleFieldSet();
 			if(checkURIs[i] != null)

Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java	2007-02-10 00:09:29 UTC (rev 11730)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java	2007-02-10 00:17:03 UTC (rev 11731)
@@ -132,12 +132,12 @@
 					try {
 						long now = System.currentTimeMillis();
 						SimpleFieldSet fs = new SimpleFieldSet();
-						fs.putSingle("type", Integer.toString(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT));
+						fs.put("type", Node.N2N_TEXT_MESSAGE_TYPE_USERALERT);
 						fs.putSingle("source_nodename", Base64.encode(node.getMyName().getBytes()));
 						fs.putSingle("target_nodename", Base64.encode(pn.getName().getBytes()));
 						fs.putSingle("text", Base64.encode(message.getBytes()));
-						fs.putSingle("composedTime", Long.toString(now));
-						fs.putSingle("sentTime", Long.toString(now));
+						fs.put("composedTime", now);
+						fs.put("sentTime", now);
 						Message n2ntm;
 						if(Version.buildNumber() < 1000) {  // FIXME/TODO: This test shouldn't be needed eventually
 							n2ntm = DMT.createNodeToNodeTextMessage(Node.N2N_TEXT_MESSAGE_TYPE_USERALERT, node.getMyName(), pn.getName(), message);