r26900 - in trunk/freenet/src/freenet: client client/async clients/http/filter
[email protected] Thu, 16 Apr 2009 18:57:29 +0000
| Newsgroups | gmane.network.freenet.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: saces
Date: 2009-04-16 18:57:28 +0000 (Thu, 16 Apr 2009)
New Revision: 26900
Modified:
trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java
trunk/freenet/src/freenet/client/FECJob.java
trunk/freenet/src/freenet/client/FECQueue.java
trunk/freenet/src/freenet/client/FailureCodeTracker.java
trunk/freenet/src/freenet/client/FetchException.java
trunk/freenet/src/freenet/client/InsertException.java
trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
trunk/freenet/src/freenet/client/async/ClientGetter.java
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java
trunk/freenet/src/freenet/client/async/ClientRequester.java
trunk/freenet/src/freenet/client/async/OfferedKeysList.java
trunk/freenet/src/freenet/client/async/RegisterMe.java
trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
trunk/freenet/src/freenet/client/async/SimpleSingleFileFetcher.java
trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
trunk/freenet/src/freenet/client/async/SplitFileInserter.java
trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
trunk/freenet/src/freenet/client/async/TransientChosenBlock.java
trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
trunk/freenet/src/freenet/client/async/USKInserter.java
trunk/freenet/src/freenet/client/async/USKManagerPersistent.java
trunk/freenet/src/freenet/client/async/USKRetriever.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
Log:
add missing @Override annotation
Modified: trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/ArchiveHandlerImpl.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -211,6 +211,7 @@
/** Called from ArchiveManager.init() */
static void init(ObjectContainer container, ClientContext context, final long nodeDBHandle) {
ObjectSet<ArchiveExtractTag> set = container.query(new Predicate<ArchiveExtractTag>() {
+ @Override
public boolean match(ArchiveExtractTag tag) {
return tag.nodeDBHandle == nodeDBHandle;
}
Modified: trunk/freenet/src/freenet/client/FECJob.java
===================================================================
--- trunk/freenet/src/freenet/client/FECJob.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/FECJob.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -35,6 +35,7 @@
private final int hashCode;
transient boolean running;
+ @Override
public int hashCode() {
return hashCode;
}
@@ -71,6 +72,7 @@
this.hashCode = super.hashCode();
}
+ @Override
public String toString() {
return super.toString()+":decode="+isADecodingJob+":callback="+callback+":persistent="+persistent;
}
Modified: trunk/freenet/src/freenet/client/FECQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/FECQueue.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/FECQueue.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -51,6 +51,7 @@
public static FECQueue create(final long nodeDBHandle, ObjectContainer container) {
@SuppressWarnings("serial")
ObjectSet<FECQueue> result = container.query(new Predicate<FECQueue>() {
+ @Override
public boolean match(FECQueue queue) {
if(queue.nodeDBHandle == nodeDBHandle) return true;
return false;
Modified: trunk/freenet/src/freenet/client/FailureCodeTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/FailureCodeTracker.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/FailureCodeTracker.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -215,6 +215,7 @@
if(map != null) container.activate(map, 5);
}
+ @Override
public FailureCodeTracker clone() {
FailureCodeTracker tracker = new FailureCodeTracker(insert);
tracker.merge(this);
Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/FetchException.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -434,6 +434,7 @@
container.delete(this);
}
+ @Override
public FetchException clone() {
return new FetchException(this);
}
Modified: trunk/freenet/src/freenet/client/InsertException.java
===================================================================
--- trunk/freenet/src/freenet/client/InsertException.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/InsertException.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -180,6 +180,7 @@
return new InsertException(mode, errors, null);
}
+ @Override
public InsertException clone() {
return new InsertException(this);
}
Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -70,6 +70,7 @@
logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
+ @Override
protected void loadFEC() {
synchronized(this) {
if(fec != null) return;
Modified: trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -302,6 +302,7 @@
return this;
}
+ @Override
public Key[] listKeys(ObjectContainer container) {
if(cancelled || finished)
return new Key[0];
@@ -341,6 +342,7 @@
return ret;
}
+ @Override
public void removeFrom(ObjectContainer container, ClientContext context) {
super.removeFrom(container, context);
if(deleteFetchContext) {
Modified: trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/BinaryBlobInserter.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -123,6 +123,7 @@
// FIXME duplicated code from SingleBlockInserter
// FIXME combine it somehow
+ @Override
public void onFailure(LowLevelPutException e, Object keyNum, ObjectContainer container, ClientContext context) {
synchronized(BinaryBlobInserter.this) {
if(inserters[blockNum] == null) return;
Modified: trunk/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientGetter.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/ClientGetter.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -261,6 +261,7 @@
* Cancel the request. This must result in onFailure() being called in order to
* send the client a cancel FetchException, and to removeFrom() the state.
*/
+ @Override
public void cancel(ObjectContainer container, ClientContext context) {
if(logMINOR) Logger.minor(this, "Cancelling "+this, new Exception("debug"));
ClientGetState s;
@@ -317,6 +318,7 @@
blockSetFinalized(container, context);
}
+ @Override
public void onTransition(ClientGetState oldState, ClientGetState newState, ObjectContainer container) {
synchronized(this) {
if(currentState == oldState) {
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -423,6 +423,7 @@
keyListeners = new HashSet<KeyListener>();
}
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append(super.toString());
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -80,10 +80,12 @@
token = t;
}
+ @Override
public int hashCode() {
return insert.hashCode() ^ token.hashCode();
}
+ @Override
public boolean equals(Object o) {
if(!(o instanceof RunningTransientInsert)) return false;
RunningTransientInsert r = (RunningTransientInsert) o;
@@ -110,6 +112,7 @@
public static ClientRequestSchedulerCore create(Node node, final boolean forInserts, final boolean forSSKs, ObjectContainer selectorContainer, long cooldownTime, PrioritizedSerialExecutor databaseExecutor, ClientRequestScheduler sched, ClientContext context) {
final long nodeDBHandle = node.nodeDBHandle;
ObjectSet<ClientRequestSchedulerCore> results = selectorContainer.query(new Predicate<ClientRequestSchedulerCore>() {
+ @Override
public boolean match(ClientRequestSchedulerCore core) {
if(core.nodeDBHandle != nodeDBHandle) return false;
if(core.isInsertScheduler != forInserts) return false;
@@ -621,6 +624,7 @@
RequestStarter.MINIMUM_PRIORITY_CLASS
};
+ @Override
boolean persistent() {
return true;
}
@@ -768,6 +772,7 @@
startRegisterMeRunner(runner);
}
+ @Override
public synchronized long countQueuedRequests(ObjectContainer container, ClientContext context) {
long ret = super.countQueuedRequests(container, context);
long cooldown = persistentCooldownQueue.size(container);
@@ -805,6 +810,7 @@
}
}
+ @Override
public void succeeded(BaseSendableGet succeeded, ObjectContainer container) {
RandomGrabArray array = succeeded.getParentGrabArray();
container.activate(array, 1);
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerNonPersistent.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -33,6 +33,7 @@
logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
+ @Override
boolean persistent() {
return false;
}
@@ -41,6 +42,7 @@
return null;
}
+ @Override
public void succeeded(BaseSendableGet succeeded, ObjectContainer container) {
// Do nothing.
// FIXME: Keep a list of recently succeeded ClientRequester's.
Modified: trunk/freenet/src/freenet/client/async/ClientRequester.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequester.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/ClientRequester.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -70,6 +70,7 @@
/**
* We need a hash code that persists across restarts.
*/
+ @Override
public int hashCode() {
return hashCode;
}
Modified: trunk/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- trunk/freenet/src/freenet/client/async/OfferedKeysList.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/OfferedKeysList.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -45,6 +45,7 @@
static {
Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ @Override
public void shouldUpdate(){
logMINOR = Logger.shouldLog(Logger.MINOR, this);
logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
@@ -217,6 +218,7 @@
return ((MySendableRequestItem) token).key;
}
+ @Override
public boolean isSSK() {
return isSSK;
}
Modified: trunk/freenet/src/freenet/client/async/RegisterMe.java
===================================================================
--- trunk/freenet/src/freenet/client/async/RegisterMe.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/RegisterMe.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -32,6 +32,7 @@
hashCode = hash;
}
+ @Override
public int hashCode() {
return hashCode;
}
Modified: trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -40,6 +40,7 @@
static {
Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ @Override
public void shouldUpdate(){
logMINOR = Logger.shouldLog(Logger.MINOR, this);
logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
Modified: trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -138,6 +138,7 @@
// Ignore
}
+ @Override
public void cancel(ObjectContainer container, ClientContext context) {
super.cancel();
}
Modified: trunk/freenet/src/freenet/client/async/SimpleSingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleSingleFileFetcher.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SimpleSingleFileFetcher.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -178,11 +178,13 @@
onFailure(e.getFetchException(), false, container, context);
}
+ @Override
public void removeFrom(ObjectContainer container, ClientContext context) {
super.removeFrom(container, context);
// rcb is definitely not our responsibility.
}
+ @Override
public void cancel(ObjectContainer container, ClientContext context) {
super.cancel(container, context);
if(persistent) container.activate(rcb, 1);
Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -203,6 +203,7 @@
return block;
}
+ @Override
public short getPriorityClass(ObjectContainer container) {
if(persistent) container.activate(parent, 1);
return parent.getPriorityClass(); // Not much point deactivating
@@ -359,6 +360,7 @@
}
}
+ @Override
public boolean isSSK() {
return isSSK;
}
@@ -673,10 +675,12 @@
copyBucket.free();
}
+ @Override
public int hashCode() {
return hashCode;
}
+ @Override
public boolean equals(Object o) {
if(o instanceof BlockItem) {
if(((BlockItem)o).parent == parent) return true;
@@ -699,10 +703,12 @@
return SingleBlockInserter.this;
}
+ @Override
public int hashCode() {
return SingleBlockInserter.this.hashCode();
}
+ @Override
public boolean equals(Object o) {
if(o instanceof BlockItem) {
if(((BlockItem)o).parent == SingleBlockInserter.this) return true;
Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -1195,6 +1195,7 @@
// Logger.minor(this, "ACTIVATING: "+this, new Exception("debug"));
// }
//
+ @Override
public void removeFrom(ObjectContainer container, ClientContext context) {
if(logMINOR) Logger.minor(this, "removeFrom() on "+this);
container.activate(uri, 5);
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -81,6 +81,7 @@
private final int hashCode;
+ @Override
public int hashCode() {
return hashCode;
}
@@ -510,6 +511,7 @@
private final int hashCode;
+ @Override
public int hashCode() {
return hashCode;
}
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -86,6 +86,7 @@
private final int hashCode;
+ @Override
public int hashCode() {
return hashCode;
}
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -117,6 +117,7 @@
private boolean fetcherFinished = false;
private boolean encoderFinished = false;
+ @Override
public int hashCode() {
return hashCode;
}
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -355,6 +355,7 @@
}
// Translate it, then call the real onFailure
+ @Override
public void onFailure(LowLevelGetException e, Object token, ObjectContainer container, ClientContext context) {
if(logMINOR)
Logger.minor(this, "onFailure("+e+" , "+token+" on "+this);
Modified: trunk/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserter.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserter.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -72,6 +72,7 @@
private final int hashCode;
+ @Override
public int hashCode() {
return hashCode;
}
Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -954,10 +954,12 @@
copyBucket.free();
}
+ @Override
public int hashCode() {
return hashCode;
}
+ @Override
public boolean equals(Object o) {
if(o instanceof BlockItem) {
if(((BlockItem)o).parent == parent && ((BlockItem)o).blockNum == blockNum) return true;
Modified: trunk/freenet/src/freenet/client/async/TransientChosenBlock.java
===================================================================
--- trunk/freenet/src/freenet/client/async/TransientChosenBlock.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/TransientChosenBlock.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -39,14 +39,17 @@
return false;
}
+ @Override
public void onFailure(LowLevelPutException e, ClientContext context) {
((SendableInsert) request).onFailure(e, token, null, context);
}
+ @Override
public void onInsertSuccess(ClientContext context) {
((SendableInsert) request).onSuccess(token, null, context);
}
+ @Override
public void onFailure(LowLevelGetException e, ClientContext context) {
((SendableGet) request).onFailure(e, token, null, context);
}
Modified: trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -72,6 +72,7 @@
// Ignore
}
+ @Override
public void cancel(ObjectContainer container, ClientContext context) {
super.cancel();
}
Modified: trunk/freenet/src/freenet/client/async/USKInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKInserter.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/USKInserter.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -246,6 +246,7 @@
}
}
+ @Override
public int hashCode() {
return hashCode;
}
Modified: trunk/freenet/src/freenet/client/async/USKManagerPersistent.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKManagerPersistent.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/USKManagerPersistent.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -13,6 +13,7 @@
static void init(USKManager manager, ObjectContainer container, final ClientContext context) {
ObjectSet<USKFetcherTag> set = container.query(new Predicate<USKFetcherTag>() {
+ @Override
public boolean match(USKFetcherTag tag) {
if(tag.nodeDBHandle != context.nodeDBHandle) return false;
if(tag.isFinished()) return false;
Modified: trunk/freenet/src/freenet/client/async/USKRetriever.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKRetriever.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/client/async/USKRetriever.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -118,6 +118,7 @@
return cb.getPollingPriorityProgress();
}
+ @Override
public void cancel(ObjectContainer container, ClientContext context) {
super.cancel();
}
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java 2009-04-16 18:56:03 UTC (rev 26899)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java 2009-04-16 18:57:28 UTC (rev 26900)
@@ -1324,6 +1324,7 @@
abstract void processStyle(HTMLParseContext pc);
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1395,14 +1396,17 @@
emptyStringArray);
}
+ @Override
void setStyle(boolean b, HTMLParseContext pc) {
pc.inStyle = b;
}
+ @Override
boolean getStyle(HTMLParseContext pc) {
return pc.inStyle;
}
+ @Override
void processStyle(HTMLParseContext pc) {
try {
pc.currentStyleScriptChunk =
@@ -1432,6 +1436,7 @@
*/
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> hn, ParsedTag p, HTMLParseContext pc)
throws DataFilterException {
// Call parent so we swallow the scripting
@@ -1439,14 +1444,17 @@
return null; // Lose the tags
}
+ @Override
void setStyle(boolean b, HTMLParseContext pc) {
pc.inScript = b;
}
+ @Override
boolean getStyle(HTMLParseContext pc) {
return pc.inScript;
}
+ @Override
void processStyle(HTMLParseContext pc) {
pc.currentStyleScriptChunk =
sanitizeScripting(pc.currentStyleScriptChunk);
@@ -1462,6 +1470,7 @@
super(tag, allowedAttrs, uriAttrs, inlineURIAttrs);
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1553,6 +1562,7 @@
}
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1582,6 +1592,7 @@
super(tag, allowedAttrs, uriAttrs, inlineURIAttrs, eventAttrs);
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1662,6 +1673,7 @@
super(tag, allowedAttrs, uriAttrs, null, eventAttrs);
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1718,6 +1730,7 @@
}
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1737,6 +1750,7 @@
super("meta", new String[] { "id" });
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1844,6 +1858,7 @@
DTDs.put("-//W3C//DTD HTML 3.2 Final//EN", new Object());
}
+ @Override
ParsedTag sanitize(ParsedTag t, HTMLParseContext pc) {
if (!((t.unparsedAttrs.length == 3) || (t.unparsedAttrs.length == 4)))
return null;
@@ -1869,6 +1884,7 @@
super("?xml", null);
}
+ @Override
ParsedTag sanitize(ParsedTag t, HTMLParseContext pc) {
if (t.unparsedAttrs.length != 2)
return null;
@@ -1891,6 +1907,7 @@
super("html", new String[] { "id", "version" });
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
@@ -1908,6 +1925,7 @@
super(string, strings, strings2, null);
}
+ @Override
Map<String, Object> sanitizeHash(Map<String, Object> h,
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {