FIX: Cleanup fields

[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 6e75eb900e97661d4901bd36498f5e57237805aa..629154cc4476b783179da5380bac6fa837327b5b 100644 (file)
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -3,17 +3,17 @@ package org.cacert.gigi.output;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 
 public class Menu implements Outputable {
 
-    String menuName;
+    private String menuName;
 
-    String id;
+    private 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);
         }