[freenet-cvs] r15048 - in trunk/freenet/src/freenet: clients/http l10n pluginmanager

[t...@freenetproject.org]

Author: toad
Date: 2007-09-08 15:53:42 +0000 (Sat, 08 Sep 2007)
New Revision: 15048

Modified:
   trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
   trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
Log:
Indicate on plugins page when a plugin is stopping.

Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java   2007-09-08 
15:49:53 UTC (rev 15047)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java   2007-09-08 
15:53:42 UTC (rev 15048)
@@ -277,6 +277,9 @@
                                        pluginRow.addChild("td", 
pi.getThreadName());
                                        pluginRow.addChild("td", new 
Date(pi.getStarted()).toString());
                                        HTMLNode actionCell = 
pluginRow.addChild("td");
+                                       if(pi.isStopping()) {
+                                               actionCell.addChild("#", 
l10n("pluginStopping"));
+                                       } else {
                                        if (pi.isPproxyPlugin()) {
                                                HTMLNode visitForm = 
actionCell.addChild("form", new String[] { "method", "action", "target" }, new 
String[] { "get", pi.getPluginClassName(), "_new" });
                                                visitForm.addChild("input", new 
String[] { "type", "name", "value" }, new String[] { "hidden", "formPassword", 
core.formPassword });
@@ -288,6 +291,7 @@
                                        HTMLNode reloadForm = 
ctx.addFormChild(actionCell, ".", "reloadPluginForm");
                                        reloadForm.addChild("input", new 
String[] { "type", "name", "value" }, new String[] { "hidden", "reload", 
pi.getThreadName() });
                                        reloadForm.addChild("input", new 
String[] { "type", "value" }, new String[] { "submit", l10n("reload") });
+                                       }
                                }
                        }


Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2007-09-08 
15:49:53 UTC (rev 15047)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2007-09-08 
15:53:42 UTC (rev 15048)
@@ -683,6 +683,7 @@
 PproxyToadlet.reload=Reload
 PproxyToadlet.returnToPluginPage=Return to plugin page
 PproxyToadlet.startedAtTitle=Started at
+PproxyToadlet.pluginStopping=Plugin Stopping
 PproxyToadlet.unload=Unload
 PproxyToadlet.unloadPluginTitle=Unload plugin?
 PproxyToadlet.unloadPluginWithName=Are you sure you wish to unload ${name}?

Modified: trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java      
2007-09-08 15:49:53 UTC (rev 15047)
+++ trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java      
2007-09-08 15:53:42 UTC (rev 15048)
@@ -20,8 +20,8 @@
        private boolean isIPDetectorPlugin;
        private boolean isPortForwardPlugin;
        private String filename;
-       private HashSet toadletLinks=new HashSet(); 
-       private boolean isExiting = false;
+       private HashSet toadletLinks=new HashSet();
+       private boolean stopping = false;
        //public String 

        public PluginInfoWrapper(FredPlugin plug, String filename) {
@@ -94,6 +94,7 @@
         **/
        public void stopPlugin(PluginManager manager, int maxWaitTime) {
                plug.terminate();
+               stopping = true;
                if(thread != null) {
                        thread.interrupt();
                        // Will be removed when the thread exits.
@@ -136,4 +137,7 @@
                return isPortForwardPlugin;
        }

+       public boolean isStopping() {
+               return stopping;
+       }
 }