[freenet-cvs] r22039 - trunk/freenet/src/freenet/clients/http

[sa...@freenetproject.org]

Author: saces
Date: 2008-08-19 19:44:54 +0000 (Tue, 19 Aug 2008)
New Revision: 22039

Modified:
   trunk/freenet/src/freenet/clients/http/PageMaker.java
Log:
fproxy and plugin mode for pagemaker

Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java       2008-08-19 
19:44:19 UTC (rev 22038)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java       2008-08-19 
19:44:54 UTC (rev 22039)
@@ -17,6 +17,7 @@

 import freenet.l10n.L10n;
 import freenet.node.NodeClientCore;
+import freenet.pluginmanager.FredPluginL10n;
 import freenet.support.HTMLNode;
 import freenet.support.Logger;
 import freenet.support.api.HTTPRequest;
@@ -41,16 +42,26 @@

        /** Cache for themes read from the JAR file. */
        private List jarThemesCache = null;
+       private final FredPluginL10n plugin; 
+       private final boolean pluginMode;

+       public PageMaker(FredPluginL10n plug, String t) {
+               setTheme(t);
+               plugin = plug;
+               pluginMode = true;
+       }
+       
        public PageMaker(String t) {
                setTheme(t);
+               plugin = null;
+               pluginMode = false;
        }

        void setOverride(File f) {
                this.override = f;
        }

-       void setTheme(String theme) {
+       public void setTheme(String theme) {
                if (theme == null) {
                        this.theme = DEFAULT_THEME;
                } else {
@@ -63,6 +74,7 @@
        }

        public void addNavigationLink(String path, String name, String title, 
boolean fullOnly, LinkEnabledCallback cb) {
+               if (pluginMode && (plugin == null)) throw new 
IllegalStateException("You need to implement FredPluginL10n to do so.");
                navigationLinkTexts.add(name);
                if(!fullOnly)
                        navigationLinkTextsNonFull.add(name);
@@ -122,7 +134,10 @@
                                String navigationTitle = (String) 
navigationLinkTitles.get(navigationLink);
                                String navigationPath = (String) 
navigationLinks.get(navigationLink);
                                HTMLNode listItem = navbarUl.addChild("li");
-                               listItem.addChild("a", new String[] { "href", 
"title" }, new String[] { navigationPath, L10n.getString(navigationTitle) }, 
L10n.getString(navigationLink));
+                               if (plugin != null)
+                                       listItem.addChild("a", new String[] { 
"href", "title" }, new String[] { navigationPath, 
plugin.getString(navigationTitle) }, plugin.getString(navigationLink));
+                               else
+                                       listItem.addChild("a", new String[] { 
"href", "title" }, new String[] { navigationPath, 
L10n.getString(navigationTitle) }, L10n.getString(navigationLink));
                        }
                }
                HTMLNode contentDiv = pageDiv.addChild("div", "id", "content");