X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FMenu.java;h=6c37617584a3f5012d413fdef2511a71c7354772;hb=3689dcd11a286c3c9204f96d9a6c3b33a968844a;hp=a57f531764467f413082f85fb07d9c87dfe2afd6;hpb=2fb0af2c1dd48272ffcc1d501324ff1f609331d4;p=gigi.git

diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index a57f5317..6c376175 100644
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -4,12 +4,12 @@ import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.cacert.gigi.User;
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.util.AuthorizationContext;
 
 public class Menu implements IMenuItem {
 
-    public static final String USER_VALUE = "user";
+    public static final String AUTH_VALUE = "ac";
 
     private String menuName;
 
@@ -24,7 +24,7 @@ public class Menu implements IMenuItem {
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         boolean visible = false;
-        User u = (User) vars.get(USER_VALUE);
+        AuthorizationContext u = (AuthorizationContext) vars.get(AUTH_VALUE);
         for (IMenuItem mi : content) {
             if (mi.isPermitted(u)) {
                 if ( !visible) {
@@ -58,7 +58,12 @@ public class Menu implements IMenuItem {
         if (obj instanceof Menu) {
             return menuName.equals(((Menu) obj).getMenuName());
         }
-        return super.equals(obj);
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return menuName.hashCode();
     }
 
     public String getMenuName() {
@@ -66,7 +71,7 @@ public class Menu implements IMenuItem {
     }
 
     @Override
-    public boolean isPermitted(User u) {
+    public boolean isPermitted(AuthorizationContext ac) {
         return true;
     }
 }