UPD: More liberal menus

diff --git a/src/org/cacert/gigi/output/IMenuItem.java b/src/org/cacert/gigi/output/IMenuItem.java
new file mode 100644 (file)
index 0000000..8abdc83
--- /dev/null
+++ b/src/org/cacert/gigi/output/IMenuItem.java
@@ -0,0 +1,10 @@
+package org.cacert.gigi.output;
+
+/**
+ * Markerinterface for an {@link Outputable} speicially used in a {@link Menu}.
+ * 
+ * @author janis
+ */
+public interface IMenuItem extends Outputable {
+    // Nothing to see here.
+}

diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index b30badb7f79fea5dfe6b65fcfa52e457b65e2bd8..aefdbea66f9ced245bc0f3a0017ab2cc364896f6 100644 (file)
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -11,9 +11,9 @@ public class Menu implements Outputable {
 
     String id;
 
-    private MenuItem[] content;
+    private IMenuItem[] content;
 
-    public Menu(String menuName, String id, MenuItem... content) {
+    public Menu(String menuName, String id, IMenuItem... content) {
         this.menuName = menuName;
         this.id = id;
         this.content = content;
@@ -28,7 +28,7 @@ public class Menu implements Outputable {
         out.print("<ul class=\"menu\" id=\"");
         out.print(id);
         out.print("\">");
-        for (MenuItem mi : content) {
+        for (Outputable mi : content) {
             mi.output(out, l, vars);
         }
 

diff --git a/src/org/cacert/gigi/output/MenuItem.java b/src/org/cacert/gigi/output/MenuItem.java
index f307e3351ea657e1d9cbf2b80f90f2cedc2235c1..25e1b8cece0042124ad1fef1c0d900a3f1bcf1c3 100644 (file)
--- a/src/org/cacert/gigi/output/MenuItem.java
+++ b/src/org/cacert/gigi/output/MenuItem.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
 
-public class MenuItem implements Outputable {
+public class MenuItem implements Outputable, IMenuItem {
 
     final String href;