Permission and RolePermission changes

code/LanBortalUtilities/src/fi/insomnia/bortal/enums/Permission.java

@@ -13,49 +13,56 @@ import org.slf4j.LoggerFactory;
  */
  */
 public enum Permission {
 public enum Permission {
 
 
-    // NOTE. add conversion Value to RoleRight
-    // PERMISSION("Description"),
-    LOGIN("User can see loginbutton(r), create new user(w)"),
-    USER_MANAGEMENT("User has right to view all users(r), modify users(w), execute actions for user(x) "),
-    ACCOUNT_MANAGEMENT("Manage users account events. view(r), modify(w) and create(x)"),
-    BILL("View bills(r), Mark paid & modify(w), and create (buy) bills (x)"),
-    MAP("view maps(r), Modify(w), reserve places from maps(x)"),
-    ROLE_MANAGEMENT("User has right to view(r), modify(w) and assign(x) roles"),
-    PRODUCT("View(r), modify(w), and shop(x) products"),
-    SHOP("View shopped events(r), Modify AccountEvents() and Shop(x)"),
-    GAME("View(r) own, write(w) modify, view all(X)"),
-    POLL("View answers(r), create (w) and answer(x) to polls");
-    private String description;
-
-    private static final Logger logger = LoggerFactory.getLogger(Permission.class);
-
-    public static Permission getPermission(String name) {
-        if (name == null || name.isEmpty()) {
-            logger.warn("Trying to get permission for empty name {}", name);
-            return null;
-        }
-        try {
-            return valueOf(name);
-        } catch (IllegalArgumentException x) {
-            throw x;
-        }
-    }
-
-    Permission(String description) {
-        this.description = description;
-    }
-
-    Permission() {
-    }
-
-    public String getName() {
-        return name();
-    }
-
-    /**
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
+	// NOTE. add conversion Value to RoleRight
+	// PERMISSION("Description"),
+	LOGIN("User can see loginbutton(r), create new user(w), invite others (x)"),
+	USER_MANAGEMENT("View all users(r), modify users(w), execute actions for user(x) "),
+	ACCOUNT_MANAGEMENT("Manage others account events. view(r), modify(w) and create (shop)(x)"),
+	BILL("View all bills(r), Mark paid & modify(w), and create own bills (x)"),
+	MAP("view maps(r), Modify(w), reserve places from maps(x)"),
+	ROLE_MANAGEMENT("User has right to view(r), modify(w) and assign(x) roles"),
+	PRODUCT("View(r), modify(w), and shop(x) products"),
+	SHOP("View own shopped events(r), Modify own AccountEvents() and Shop(x)"),
+	GAME("View(r) own, modify(w), view all(X)"),
+	POLL("View answers(r), create polls (w), answer to polls(x)");
+	private String description;
+
+	private static final Logger logger = LoggerFactory.getLogger(Permission.class);
+	public static final String EXECUTE = "/EXECUTE";
+	public static final String READ = "/READ";
+	public static final String WRITE = "/WRITE";
+
+	public static Permission getPermission(String name) {
+		if (name == null || name.isEmpty()) {
+			logger.warn("Trying to get permission for empty name {}", name);
+			return null;
+		}
+		try {
+			return valueOf(name);
+		} catch (IllegalArgumentException x) {
+			throw x;
+		}
+	}
+
+	Permission(String description) {
+		this.description = description;
+	}
+
+	Permission() {
+	}
+
+	public String getName() {
+		return name();
+	}
+
+	/**
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	public String append(RolePermission permission) {
+		return name() + "/" + permission.name();
+	}
 }
 }

code/LanBortalUtilities/src/fi/insomnia/bortal/enums/RolePermission.java

 package fi.insomnia.bortal.enums;
 package fi.insomnia.bortal.enums;
 
 
 public enum RolePermission {
 public enum RolePermission {
-    READ, WRITE, EXECUTE
+	READ, WRITE, EXECUTE
 
 
 }
 }