Author: toad
Date: 2008-12-20 17:38:12 +0000 (Sat, 20 Dec 2008)
New Revision: 24680
Modified:
branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
branches/db4o/freenet/src/freenet/client/ArchiveManager.java
branches/db4o/freenet/src/freenet/keys/FreenetURI.java
Log:
In 1.5 we can override return type.
Modified: branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
2008-12-20 17:36:30 UTC (rev 24679)
+++ branches/db4o/freenet/src/freenet/client/ArchiveHandlerImpl.java
2008-12-20 17:38:12 UTC (rev 24680)
@@ -227,7 +227,7 @@
}
public ArchiveHandler cloneHandler() {
- return new ArchiveHandlerImpl(key.cloneKey(), archiveType,
compressorType, forceRefetchArchive);
+ return new ArchiveHandlerImpl(key.clone(), archiveType,
compressorType, forceRefetchArchive);
}
public void removeFrom(ObjectContainer container) {
Modified: branches/db4o/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/ArchiveManager.java
2008-12-20 17:36:30 UTC (rev 24679)
+++ branches/db4o/freenet/src/freenet/client/ArchiveManager.java
2008-12-20 17:38:12 UTC (rev 24680)
@@ -190,7 +190,7 @@
* @return An archive handler.
*/
public ArchiveHandler makeHandler(FreenetURI key, ARCHIVE_TYPE
archiveType, COMPRESSOR_TYPE ctype, boolean forceRefetch, boolean persistent) {
- return new ArchiveHandlerImpl(persistent ? key.cloneKey() :
key, archiveType, ctype, forceRefetch);
+ return new ArchiveHandlerImpl(persistent ? key.clone() : key,
archiveType, ctype, forceRefetch);
}
/**
Modified: branches/db4o/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- branches/db4o/freenet/src/freenet/keys/FreenetURI.java 2008-12-20
17:36:30 UTC (rev 24679)
+++ branches/db4o/freenet/src/freenet/keys/FreenetURI.java 2008-12-20
17:38:12 UTC (rev 24680)
@@ -151,7 +151,7 @@
}
@Override
- public final Object clone() {
+ public final FreenetURI clone() {
return new FreenetURI(this);
}
@@ -890,8 +890,4 @@
return new FreenetURI("USK", siteName, metaStr, routingKey,
cryptoKey, extra, edition);
}
-
- public FreenetURI cloneKey() {
- return new FreenetURI(this);
- }
}
\ No newline at end of file
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
