On Sun, Sep 7, 2008 at 3:05 AM, Matthew Toseland
<toad at amphibian.dyndns.org> wrote:
> On Saturday 06 September 2008 07:34, j16sdiz at freenetproject.org wrote:
>> Author: j16sdiz
>> Date: 2008-09-06 06:34:51 +0000 (Sat, 06 Sep 2008)
>> New Revision: 22486
>>
>> Modified:
>> trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java
>> trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java
>> trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
>> trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
>> trunk/freenet/src/freenet/pluginmanager/PluginManager.java
>> Log:
>> unused variable, warning hunt: freenet.pluginmanager
>>
>> Modified:
> trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java
> 2008-09-05 23:26:43 UTC (rev 22485)
>> +++ trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderFreenet.java
> 2008-09-06 06:34:51 UTC (rev 22486)
>> @@ -14,13 +14,9 @@
>> import freenet.support.Logger;
>>
>> public class PluginDownLoaderFreenet extends PluginDownLoader<FreenetURI> {
>> -
>> - private boolean logMINOR;
>> -
>> final HighLevelSimpleClient hlsc;
>>
>> PluginDownLoaderFreenet(HighLevelSimpleClient hlsc) {
>> - logMINOR = Logger.shouldLog(Logger.MINOR, this);
>> this.hlsc = hlsc;
>> }
>>
>>
>> Modified:
> trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java
> 2008-09-05 23:26:43 UTC (rev 22485)
>> +++ trunk/freenet/src/freenet/pluginmanager/PluginDownLoaderOfficial.java
> 2008-09-06 06:34:51 UTC (rev 22486)
>> @@ -78,10 +78,10 @@
>> is = getCert();
>>
>> CertificateFactory cf =
>> CertificateFactory.getInstance("X.509");
>> - Collection c = cf.generateCertificates(is);
>> - Iterator it = c.iterator();
>> + Collection<? extends Certificate> c =
>> cf.generateCertificates(is);
>> + Iterator<? extends Certificate> it = c.iterator();
>> while(it.hasNext()) {
>> - Certificate cert = (Certificate) it.next();
>> + Certificate cert = it.next();
>>
>> ks.setCertificateEntry(cert.getPublicKey().toString(), cert);
>> }
>> FileOutputStream tmpFOS = new
>> FileOutputStream(TMP_KEYSTORE);
>>
>> Modified: trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
>> 2008-09-05
> 23:26:43 UTC (rev 22485)
>> +++ trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
>> 2008-09-06
> 06:34:51 UTC (rev 22486)
>> @@ -63,7 +63,7 @@
>> try {
>> if(!threadless) // Have to do it now
>> because threaded
>> pm.register(plugin, pi);
>> - ((FredPlugin)plugin).runPlugin(pr);
>> + plugin.runPlugin(pr);
>> if(threadless) // Don't want it to
>> receive callbacks until after it
> has the PluginRespirator, else get NPEs
>> pm.register(plugin, pi);
>> } catch (OutOfMemoryError e) {
>>
>> Modified: trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
> 2008-09-05 23:26:43 UTC (rev 22485)
>> +++ trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
> 2008-09-06 06:34:51 UTC (rev 22486)
>> @@ -8,6 +8,7 @@
>>
>> public class PluginInfoWrapper {
>> // Parameters to make the object OTP
>> + @SuppressWarnings("unused")
>
> Are you sure we can get rid of the warning here? We really shouldn't suppress
> unused variable warnings unless we're sure we do need the variable!
We don't really need this variable.
I guess this one may be useful in debug.
>
>> private boolean fedPluginThread = false;
>> // Public since only PluginHandler will know about it
>> private final String className;
>> @@ -89,7 +90,7 @@
>>
>> public synchronized boolean addPluginToadletSymlink(String linkfrom){
>> if (toadletLinks.size() < 1)
>> - toadletLinks = new HashSet();
>> + toadletLinks = new HashSet<String>();
>> return toadletLinks.add(linkfrom);
>> }
>>
>>
>> Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
>> ===================================================================
>> --- trunk/freenet/src/freenet/pluginmanager/PluginManager.java
>> 2008-09-05
> 23:26:43 UTC (rev 22485)
>> +++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java
>> 2008-09-06
> 06:34:51 UTC (rev 22486)
>> @@ -190,7 +190,7 @@
>> }
>>
>> try {
>> - FreenetURI uri = new FreenetURI(pluginname);
>> + new FreenetURI(pluginname); // test for
>> MalformedURLException
>> startPluginFreenet(pluginname, store);
>> return;
>> } catch(MalformedURLException e) {
>> @@ -224,7 +224,7 @@
>> realStartPlugin(new PluginDownLoaderFreenet(client), filename,
>> store);
>> }
>>
>> - private void realStartPlugin(final PluginDownLoader pdl, final String
> filename, final boolean store) {
>> + private void realStartPlugin(final PluginDownLoader<?> pdl, final
>> String
> filename, final boolean store) {
>> if(filename.trim().length() == 0)
>> return;
>> final PluginProgress pluginProgress = new
>> PluginProgress(filename);
>> @@ -591,7 +591,7 @@
>> * @throws PluginNotFoundException
>> * If anything goes wrong.
>> */
>> - private FredPlugin loadPlugin(PluginDownLoader pdl, String name) throws
> PluginNotFoundException {
>> + private FredPlugin loadPlugin(PluginDownLoader<?> pdl, String name)
>> throws
> PluginNotFoundException {
>>
>> pdl.setSource(name);
>>
>>
>> _______________________________________________
>> cvs mailing list
>> cvs at freenetproject.org
>> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
>>
>>
>
> _______________________________________________
> Devl mailing list
> Devl at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
>