Author: toad
Date: 2009-04-03 20:46:26 +0000 (Fri, 03 Apr 2009)
New Revision: 26481
Modified:
trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
trunk/freenet/src/freenet/client/async/ClientPutState.java
trunk/freenet/src/freenet/client/async/ClientPutter.java
trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
trunk/freenet/src/freenet/client/async/SplitFileInserter.java
trunk/freenet/src/freenet/client/async/USKInserter.java
trunk/freenet/src/freenet/node/fcp/ClientPut.java
trunk/freenet/src/freenet/node/fcp/ClientRequest.java
Log:
Remove remaining getProgressFieldset's
Modified: trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
2009-04-03 20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
2009-04-03 20:46:26 UTC (rev 26481)
@@ -89,11 +89,6 @@
return parent;
}
- public SimpleFieldSet getProgressFieldset() {
- // FIXME not supported
- return null;
- }
-
public Object getToken() {
return clientContext;
}
Modified: trunk/freenet/src/freenet/client/async/ClientPutState.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientPutState.java 2009-04-03
20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/ClientPutState.java 2009-04-03
20:46:26 UTC (rev 26481)
@@ -30,10 +30,6 @@
*/
public Object getToken();
- /** Serialize current progress to a SimpleFieldSet.
- * Does not have to be complete! */
- public abstract SimpleFieldSet getProgressFieldset();
-
/**
* Once the callback has finished with this fetch, it will call
removeFrom() to instruct the fetch
* to remove itself and all its subsidiary objects from the database.
Modified: trunk/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientPutter.java 2009-04-03
20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/ClientPutter.java 2009-04-03
20:46:26 UTC (rev 26481)
@@ -325,11 +325,6 @@
blockSetFinalized(container, context);
}
- public SimpleFieldSet getProgressFieldset() {
- if(currentState == null) return null;
- return currentState.getProgressFieldset();
- }
-
public void onFetchable(ClientPutState state, ObjectContainer
container) {
if(persistent())
container.activate(client, 1);
Modified: trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-04-03 20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-04-03 20:46:26 UTC (rev 26481)
@@ -281,10 +281,6 @@
return token;
}
- public SimpleFieldSet getProgressFieldset() {
- return null;
- }
-
public void onFetchable(ClientPutState state, ObjectContainer
container) {
if(persistent)
container.activate(waitingForFetchable, 2);
Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-04-03 20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-04-03 20:46:26 UTC (rev 26481)
@@ -537,10 +537,6 @@
return tokenObject;
}
- public SimpleFieldSet getProgressFieldset() {
- return null;
- }
-
/** Attempt to encode the block, if necessary */
public void tryEncode(ObjectContainer container, ClientContext context)
{
synchronized(this) {
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2009-04-03 20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2009-04-03 20:46:26 UTC (rev 26481)
@@ -886,22 +886,6 @@
return token;
}
- public SimpleFieldSet getProgressFieldset() {
- ClientPutState curSFI;
- ClientPutState curMetadataPutter;
- synchronized(this) {
- curSFI = sfi;
- curMetadataPutter = metadataPutter;
- }
- SimpleFieldSet fs = new SimpleFieldSet(false);
- fs.putSingle("Type", "SplitHandler");
- if(curSFI != null)
- fs.put("SplitFileInserter",
curSFI.getProgressFieldset());
- if(curMetadataPutter != null)
- fs.put("MetadataPutter",
metadataPutter.getProgressFieldset());
- return fs;
- }
-
public void onFetchable(ClientPutState state, ObjectContainer
container) {
if(persistent) // FIXME debug-point
@@ -1036,10 +1020,6 @@
return token;
}
- public SimpleFieldSet getProgressFieldset() {
- return null;
- }
-
public void onStartCompression(COMPRESSOR_TYPE ctype, ObjectContainer
container, ClientContext context) {
if(persistent) {
container.activate(ctx, 2);
Modified: trunk/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserter.java
2009-04-03 20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserter.java
2009-04-03 20:46:26 UTC (rev 26481)
@@ -74,28 +74,6 @@
return hashCode;
}
- public SimpleFieldSet getProgressFieldset() {
- SimpleFieldSet fs = new SimpleFieldSet(false);
- // don't save basic infrastructure such as ctx and parent
- // only save details of the request
- fs.putSingle("Type", "SplitFileInserter");
- fs.put("DataLength", dataLength);
- fs.put("DecompressedLength", decompressedLength);
- if(compressionCodec != null)
- fs.putSingle("CompressionCodec",
compressionCodec.toString());
- fs.put("SplitfileCodec", splitfileAlgorithm);
- fs.put("Finished", finished);
- fs.put("SegmentSize", segmentSize);
- fs.put("CheckSegmentSize", checkSegmentSize);
- SimpleFieldSet segs = new SimpleFieldSet(false);
-// for(int i=0;i<segments.length;i++) {
-// segs.put(Integer.toString(i),
segments[i].getProgressFieldset());
-// }
- segs.put("Count", segments.length);
- fs.put("Segments", segs);
- return fs;
- }
-
public SplitFileInserter(BaseClientPutter put, PutCompletionCallback
cb, Bucket data, COMPRESSOR_TYPE bestCodec, long decompressedLength,
ClientMetadata clientMetadata, InsertContext ctx, boolean getCHKOnly, boolean
isMetadata, Object token, ARCHIVE_TYPE archiveType, boolean freeData, boolean
persistent, ObjectContainer container, ClientContext context) throws
InsertException {
hashCode = super.hashCode();
this.parent = put;
Modified: trunk/freenet/src/freenet/client/async/USKInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKInserter.java 2009-04-03
20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/client/async/USKInserter.java 2009-04-03
20:46:26 UTC (rev 26481)
@@ -352,10 +352,6 @@
return tokenObject;
}
- public SimpleFieldSet getProgressFieldset() {
- return null;
- }
-
public void onFetchable(ClientPutState state, ObjectContainer
container) {
// Ignore
}
Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java 2009-04-03 20:40:06 UTC
(rev 26480)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java 2009-04-03 20:46:26 UTC
(rev 26481)
@@ -404,35 +404,6 @@
}
@Override
- public SimpleFieldSet getFieldSet() {
- SimpleFieldSet fs = super.getFieldSet();
- // This is all fixed, so no need for synchronization.
- if(clientMetadata.getMIMEType() != null)
- fs.putSingle("Metadata.ContentType",
clientMetadata.getMIMEType());
- fs.putSingle("UploadFrom",
ClientPutMessage.uploadFromString(uploadFrom));
- if(uploadFrom == ClientPutMessage.UPLOAD_FROM_DISK) {
- fs.putSingle("Filename", origFilename.getPath());
- } else if(uploadFrom == ClientPutMessage.UPLOAD_FROM_DIRECT) {
- if(!finished) {
- // the bucket is a persistent encrypted temp
bucket
- bucketToFS(fs, "TempBucket", true, data);
- }
- } else if(uploadFrom == ClientPutMessage.UPLOAD_FROM_REDIRECT) {
- fs.putSingle("TargetURI", targetURI.toString());
- }
- if(putter != null) {
- SimpleFieldSet sfs = putter.getProgressFieldset();
- fs.put("progress", sfs);
- }
- if(targetFilename != null)
- fs.putSingle("TargetFilename", targetFilename);
- fs.putSingle("EarlyEncode", Boolean.toString(earlyEncode));
- fs.put("BinaryBlob", binaryBlob);
-
- return fs;
- }
-
- @Override
protected freenet.client.async.ClientRequester getClientRequest() {
return putter;
}
Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2009-04-03
20:40:06 UTC (rev 26480)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java 2009-04-03
20:46:26 UTC (rev 26481)
@@ -333,20 +333,6 @@
}
/**
- * Write a persistent request to disk.
- * @throws IOException
- */
- public void write(BufferedWriter w) throws IOException {
- if(persistenceType == ClientRequest.PERSIST_CONNECTION) {
- Logger.error(this, "Not persisting as
persistenceType="+persistenceType);
- return;
- }
- // Persist the request to disk
- SimpleFieldSet fs = getFieldSet();
- fs.writeTo(w);
- }
-
- /**
* Get a SimpleFieldSet representing this request.
*/
public abstract SimpleFieldSet getFieldSet() throws IOException;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
