[freenet-cvs] r22496 - trunk/freenet/src/freenet/pluginmanager

[sa...@freenetproject.org]

Author: saces
Date: 2008-09-06 11:46:41 +0000 (Sat, 06 Sep 2008)
New Revision: 22496

Modified:
   trunk/freenet/src/freenet/pluginmanager/PluginDownLoader.java
   trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFile.java
   trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java
   trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java
   trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderURL.java
   trunk/freenet/src/freenet/pluginmanager/PluginReplySenderDirect.java
   trunk/freenet/src/freenet/pluginmanager/PluginReplySenderFCP.java
Log:
java 1.5: override

Modified: trunk/freenet/src/freenet/pluginmanager/PluginDownLoader.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginDownLoader.java       
2008-09-06 09:03:44 UTC (rev 22495)
+++ trunk/freenet/src/freenet/pluginmanager/PluginDownLoader.java       
2008-09-06 11:46:41 UTC (rev 22496)
@@ -13,15 +13,15 @@
  */
 public abstract class PluginDownLoader<T> {

-       private T source;
+       private T _source;

        public String setSource(String source) throws PluginNotFoundException {
-               this.source = checkSource(source);
+               this._source = checkSource(source);
                return getPluginName(source);
        }

        public T getSource() {
-               return source;
+               return _source;
        }

        abstract InputStream getInputStream() throws IOException, 
PluginNotFoundException;

Modified: trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFile.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFile.java   
2008-09-06 09:03:44 UTC (rev 22495)
+++ trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFile.java   
2008-09-06 11:46:41 UTC (rev 22496)
@@ -10,6 +10,7 @@

 public class PluginDownLoaderFile extends PluginDownLoader<File> {

+       @Override
        public File checkSource(String source) {
                return new File(source);
        }

Modified: trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java        
2008-09-06 09:03:44 UTC (rev 22495)
+++ trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java        
2008-09-06 11:46:41 UTC (rev 22496)
@@ -20,6 +20,7 @@
                this.hlsc = hlsc;
        }

+       @Override
        public FreenetURI checkSource(String source) throws 
PluginNotFoundException {
                try {
                        return new FreenetURI(source);

Modified: trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java       
2008-09-06 09:03:44 UTC (rev 22495)
+++ trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java       
2008-09-06 11:46:41 UTC (rev 22496)
@@ -26,6 +26,7 @@
        private static final String certurl = 
"freenet/clients/http/staticfiles/startssl.pem";
        private static final String certfile = "startssl.pem";

+       @Override
        public URL checkSource(String source) throws PluginNotFoundException {
                return 
super.checkSource("https://checksums.freenetproject.org/latest/"; +
                source + ".jar");

Modified: trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderURL.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderURL.java    
2008-09-06 09:03:44 UTC (rev 22495)
+++ trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderURL.java    
2008-09-06 11:46:41 UTC (rev 22496)
@@ -14,6 +14,7 @@

 public class PluginDownLoaderURL extends PluginDownLoader<URL> {

+       @Override
        public URL checkSource(String source) throws PluginNotFoundException {
                try {
                        return new URL(source);

Modified: trunk/freenet/src/freenet/pluginmanager/PluginReplySenderDirect.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginReplySenderDirect.java        
2008-09-06 09:03:44 UTC (rev 22495)
+++ trunk/freenet/src/freenet/pluginmanager/PluginReplySenderDirect.java        
2008-09-06 11:46:41 UTC (rev 22496)
@@ -23,6 +23,7 @@
                target = target2;
        }

+       @Override
        public void send(final SimpleFieldSet params, final Bucket bucket) {

                node.executor.execute(new Runnable() {

Modified: trunk/freenet/src/freenet/pluginmanager/PluginReplySenderFCP.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginReplySenderFCP.java   
2008-09-06 09:03:44 UTC (rev 22495)
+++ trunk/freenet/src/freenet/pluginmanager/PluginReplySenderFCP.java   
2008-09-06 11:46:41 UTC (rev 22496)
@@ -21,6 +21,7 @@
                handler = handler2;
        }

+       @Override
        public void send(SimpleFieldSet params, Bucket bucket) {
                FCPPluginReply reply = new FCPPluginReply(pluginname, 
identifier, params, bucket);
                handler.outputHandler.queue(reply);