Fix menu exploding (so that we don't need the id's anymore)

[gigi.git] / src / org / cacert / gigi / output / Menu.java

diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index aefdbea66f9ced245bc0f3a0017ab2cc364896f6..a57f531764467f413082f85fb07d9c87dfe2afd6 100644 (file)
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -1,37 +1,72 @@
 package org.cacert.gigi.output;
 
 import java.io.PrintWriter;
+import java.util.LinkedList;
 import java.util.Map;
 
+import org.cacert.gigi.User;
 import org.cacert.gigi.localisation.Language;
 
-public class Menu implements Outputable {
+public class Menu implements IMenuItem {
 
-    String menuName;
+    public static final String USER_VALUE = "user";
 
-    String id;
+    private String menuName;
 
     private IMenuItem[] content;
 
-    public Menu(String menuName, String id, IMenuItem... content) {
+    private LinkedList<IMenuItem> prepare = new LinkedList<IMenuItem>();
+
+    public Menu(String menuName) {
         this.menuName = menuName;
-        this.id = id;
-        this.content = content;
     }
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-        out.println("<div>");
-        out.print("<h3>+ ");
-        out.print(l.getTranslation(menuName));
-        out.print("</h3>");
-        out.print("<ul class=\"menu\" id=\"");
-        out.print(id);
-        out.print("\">");
-        for (Outputable mi : content) {
-            mi.output(out, l, vars);
+        boolean visible = false;
+        User u = (User) vars.get(USER_VALUE);
+        for (IMenuItem mi : content) {
+            if (mi.isPermitted(u)) {
+                if ( !visible) {
+                    visible = true;
+                    out.println("<div>");
+                    out.print("<h3 class='pointer'>+ ");
+                    out.print(l.getTranslation(menuName));
+                    out.println("</h3>");
+                    out.print("<ul class=\"menu\">");
+                }
+                mi.output(out, l, vars);
+            }
+        }
+        if (visible) {
+            out.println("</ul></div>");
+        }
+    }
+
+    public void addItem(IMenuItem item) {
+        prepare.add(item);
+    }
+
+    public void prepare() {
+        content = new IMenuItem[prepare.size()];
+        content = prepare.toArray(content);
+        prepare = null;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Menu) {
+            return menuName.equals(((Menu) obj).getMenuName());
         }
+        return super.equals(obj);
+    }
 
-        out.println("</ul></div>");
+    public String getMenuName() {
+        return menuName;
+    }
+
+    @Override
+    public boolean isPermitted(User u) {
+        return true;
     }
 }