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 09f4a21cfca394d64c0c36728c4e568acd1b2e9a..629154cc4476b783179da5380bac6fa837327b5b 100644 (file)
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -3,32 +3,35 @@ 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;
-       String id;
-       private MenuItem[] content;
-
-       public Menu(String menuName, String id, MenuItem... content) {
-               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 (MenuItem mi : content) {
-                       mi.output(out, l, vars);
-               }
-
-               out.println("</ul></div>");
-       }
+
+    private String menuName;
+
+    private String id;
+
+    private IMenuItem[] content;
+
+    public Menu(String menuName, String id, IMenuItem... content) {
+        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);
+        }
+
+        out.println("</ul></div>");
+    }
 }