[freenet-cvs] r23384 - trunk/plugins/WoT

[x...@freenetproject.org]

Author: xor
Date: 2008-11-07 19:31:29 +0000 (Fri, 07 Nov 2008)
New Revision: 23384

Modified:
   trunk/plugins/WoT/WoT.java
Log:
Bugfix (duplicate list of webinterface menu items), minor refactoring.

Modified: trunk/plugins/WoT/WoT.java
===================================================================
--- trunk/plugins/WoT/WoT.java  2008-11-07 18:49:37 UTC (rev 23383)
+++ trunk/plugins/WoT/WoT.java  2008-11-07 19:31:29 UTC (rev 23384)
@@ -67,10 +67,14 @@
  */
 public class WoT implements FredPlugin, FredPluginHTTP, FredPluginThreadless, 
FredPluginFCP, FredPluginVersioned, FredPluginL10n {

+       /* References from the node */
+       
        private PluginRespirator pr;
        private HighLevelSimpleClient client;
-       private PageMaker pm = null;
+       private PageMaker pm;

+       /* References from the plugin itself */
+       
        private ObjectContainer db;
        private WebInterface web;
        private IdentityInserter inserter;
@@ -91,6 +95,8 @@
                config = initConfig();
                seed = getSeedIdentity();

+               pm = pr.getPageMaker();
+               
                // Should disappear soon.
                web = new WebInterface(pr, db, config, client, SELF_URI);

@@ -775,14 +781,6 @@
        }

        public PageMaker getPageMaker() {
-               if(pm == null) {
-                       pm = pr.getPageMaker();
-                       pm.addNavigationLink(SELF_URI, "Home", "Home page", 
false, null);
-                       pm.addNavigationLink(SELF_URI + "?ownidentities", "Own 
Identities", "Manage your own identities", false, null);
-                       pm.addNavigationLink(SELF_URI + "?knownidentities", 
"Known Identities", "Manage others identities", false, null);
-                       pm.addNavigationLink(SELF_URI + "?configuration", 
"Configuration", "Configure the WoT plugin", false, null);
-                       pm.addNavigationLink("/plugins/", "Plugins page", "Back 
to Plugins page", false, null);
-               }
                return pm;
        }