Author: j16sdiz
Date: 2009-04-24 03:53:25 +0000 (Fri, 24 Apr 2009)
New Revision: 27278
Added:
trunk/freenet/src/freenet/client/ArchiveExtractTag.java
trunk/freenet/src/freenet/client/async/BackgroundBlockEncoderTag.java
Modified:
trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java
trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
Log:
Move some top-level classes to correct location.
Why we can have two top-level classes in a same source file?
Added: trunk/freenet/src/freenet/client/ArchiveExtractTag.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveExtractTag.java
(rev 0)
+++ trunk/freenet/src/freenet/client/ArchiveExtractTag.java 2009-04-24
03:53:25 UTC (rev 27278)
@@ -0,0 +1,49 @@
+package freenet.client;
+
+import java.io.IOException;
+
+import com.db4o.ObjectContainer;
+import com.db4o.ObjectSet;
+import com.db4o.query.Predicate;
+
+import freenet.client.ArchiveManager.ARCHIVE_TYPE;
+import freenet.client.async.ClientContext;
+import freenet.client.async.DBJob;
+import freenet.keys.FreenetURI;
+import freenet.support.LogThresholdCallback;
+import freenet.support.Logger;
+import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
+import freenet.support.compress.Compressor.COMPRESSOR_TYPE;
+import freenet.support.io.BucketTools;
+import freenet.support.io.NativeThread;
+
+class ArchiveExtractTag {
+
+ final ArchiveHandlerImpl handler;
+ final Bucket data;
+ final boolean freeBucket;
+ final ArchiveContext actx;
+ final String element;
+ final ArchiveExtractCallback callback;
+ final long nodeDBHandle;
+
+ ArchiveExtractTag(ArchiveHandlerImpl handler, Bucket data, boolean
freeBucket, ArchiveContext actx, String element, ArchiveExtractCallback
callback, long nodeDBHandle) {
+ this.handler = handler;
+ this.data = data;
+ this.freeBucket = freeBucket;
+ this.actx = actx;
+ this.element = element;
+ this.callback = callback;
+ this.nodeDBHandle = nodeDBHandle;
+ }
+
+ public void activateForExecution(ObjectContainer container) {
+ container.activate(this, 1);
+ container.activate(data, 5);
+ handler.activateForExecution(container);
+ container.activate(actx, 5);
+ container.activate(callback, 1);
+ }
+
+}
Property changes on: trunk/freenet/src/freenet/client/ArchiveExtractTag.java
___________________________________________________________________
Added: svn:mime-type
+ text/x-java
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java 2009-04-24
03:40:37 UTC (rev 27277)
+++ trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java 2009-04-24
03:53:25 UTC (rev 27278)
@@ -269,33 +269,3 @@
}
}
-
-class ArchiveExtractTag {
-
- final ArchiveHandlerImpl handler;
- final Bucket data;
- final boolean freeBucket;
- final ArchiveContext actx;
- final String element;
- final ArchiveExtractCallback callback;
- final long nodeDBHandle;
-
- ArchiveExtractTag(ArchiveHandlerImpl handler, Bucket data, boolean
freeBucket, ArchiveContext actx, String element, ArchiveExtractCallback
callback, long nodeDBHandle) {
- this.handler = handler;
- this.data = data;
- this.freeBucket = freeBucket;
- this.actx = actx;
- this.element = element;
- this.callback = callback;
- this.nodeDBHandle = nodeDBHandle;
- }
-
- public void activateForExecution(ObjectContainer container) {
- container.activate(this, 1);
- container.activate(data, 5);
- handler.activateForExecution(container);
- container.activate(actx, 5);
- container.activate(callback, 1);
- }
-
-}
\ No newline at end of file
Modified: trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
2009-04-24 03:40:37 UTC (rev 27277)
+++ trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
2009-04-24 03:53:25 UTC (rev 27278)
@@ -139,19 +139,3 @@
};
}
-
-class BackgroundBlockEncoderTag {
- final Encodeable inserter;
- final long nodeDBHandle;
- /** For implementing FIFO ordering */
- final long addedTime;
- /** For implementing priority ordering */
- final short priority;
-
- BackgroundBlockEncoderTag(Encodeable inserter, short prio,
ClientContext context) {
- this.inserter = inserter;
- this.nodeDBHandle = context.nodeDBHandle;
- this.addedTime = System.currentTimeMillis();
- this.priority = prio;
- }
-}
Added: trunk/freenet/src/freenet/client/async/BackgroundBlockEncoderTag.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BackgroundBlockEncoderTag.java
(rev 0)
+++ trunk/freenet/src/freenet/client/async/BackgroundBlockEncoderTag.java
2009-04-24 03:53:25 UTC (rev 27278)
@@ -0,0 +1,29 @@
+package freenet.client.async;
+
+import java.lang.ref.SoftReference;
+import java.util.ArrayList;
+
+import com.db4o.ObjectContainer;
+import com.db4o.ObjectSet;
+import com.db4o.query.Query;
+
+import freenet.node.PrioRunnable;
+import freenet.support.Logger;
+import freenet.support.io.NativeThread;
+
+
+class BackgroundBlockEncoderTag {
+ final Encodeable inserter;
+ final long nodeDBHandle;
+ /** For implementing FIFO ordering */
+ final long addedTime;
+ /** For implementing priority ordering */
+ final short priority;
+
+ BackgroundBlockEncoderTag(Encodeable inserter, short prio,
ClientContext context) {
+ this.inserter = inserter;
+ this.nodeDBHandle = context.nodeDBHandle;
+ this.addedTime = System.currentTimeMillis();
+ this.priority = prio;
+ }
+}
Property changes on:
trunk/freenet/src/freenet/client/async/BackgroundBlockEncoderTag.java
___________________________________________________________________
Added: svn:mime-type
+ text/x-java
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
