X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Foutput%2FMenu.java;fp=src%2Fclub%2Fwpia%2Fgigi%2Foutput%2FMenu.java;h=0de4140a160f075d029f70f4826fff843dcff5b1;hp=e83ce6e0155573ad28108e27658bcdd07b3eebfd;hb=d78ce634f5b5a4cc8ee00332b1c942cdae61adf7;hpb=68719e2645a89b5b2555252559d32af4daf602c4 diff --git a/src/club/wpia/gigi/output/Menu.java b/src/club/wpia/gigi/output/Menu.java index e83ce6e0..0de4140a 100644 --- a/src/club/wpia/gigi/output/Menu.java +++ b/src/club/wpia/gigi/output/Menu.java @@ -5,19 +5,20 @@ import java.util.LinkedList; import java.util.Map; import club.wpia.gigi.localisation.Language; +import club.wpia.gigi.output.template.Outputable; import club.wpia.gigi.util.AuthorizationContext; public class Menu implements IMenuItem { public static final String AUTH_VALUE = "ac"; - private String menuName; + private Outputable menuName; private IMenuItem[] content; private LinkedList prepare = new LinkedList(); - public Menu(String menuName) { + public Menu(Outputable menuName) { this.menuName = menuName; } @@ -30,7 +31,7 @@ public class Menu implements IMenuItem { if ( !visible) { visible = true; out.print("
  • "); - out.print(l.getTranslation(menuName)); + menuName.output(out, l, vars); out.print("
      "); } mi.output(out, l, vars); @@ -51,20 +52,7 @@ public class Menu implements IMenuItem { prepare = null; } - @Override - public boolean equals(Object obj) { - if (obj instanceof Menu) { - return menuName.equals(((Menu) obj).getMenuName()); - } - return false; - } - - @Override - public int hashCode() { - return menuName.hashCode(); - } - - public String getMenuName() { + public Outputable getMenuName() { return menuName; }