[Yanel-commits] rev 32777 - public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client

[michi at wyona.com]

Author: michi
Date: 2008-03-03 10:50:59 +0100 (Mon, 03 Mar 2008)
New Revision: 32777

Modified:
   public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java
   public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java
   public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java
Log:
rights implemented

Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java
===================================================================
--- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java	2008-03-03 09:38:26 UTC (rev 32776)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicySetter.java	2008-03-03 09:50:59 UTC (rev 32777)
@@ -46,7 +46,14 @@
 	data.append("<policy>");
         if (users != null) {
             for (int i = 0; i < users.length; i++) {
-                data.append("<user id=\"" + users[i].getId() + "\"/>");
+                data.append("<user id=\"" + users[i].getId() + "\">");
+                String[] rights = users[i].getRights();
+                if (rights != null) {
+                    for (int k = 0; k < rights.length; k++) {
+                        data.append("<right id=\"" + rights[k] + "\">" + rights[k] + "</right>");
+                    }
+                }
+                data.append("</user>");
             }
         }
 	data.append("</policy>");

Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java
===================================================================
--- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java	2008-03-03 09:38:26 UTC (rev 32776)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java	2008-03-03 09:50:59 UTC (rev 32777)
@@ -257,7 +257,12 @@
     public User[] getUsers() {
         User[] users = new User[lb.getItemCount()];
         for (int i = 0; i < users.length; i++) {
-            users[i] = new User(lb.getItemText(i));
+            String itemText = lb.getItemText(i);
+            String[] rights = getRights(itemText);
+            String id = getIdentityWithoutRights(itemText);
+            if (id.startsWith("u:")) {
+                users[i] = new User(id.substring(2).trim(), rights);
+            }
         }
         return users;
     }

Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java
===================================================================
--- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java	2008-03-03 09:38:26 UTC (rev 32776)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/User.java	2008-03-03 09:50:59 UTC (rev 32777)
@@ -21,12 +21,14 @@
 public class User {
 
     private String id;
+    private String[] rights;
 
     /**
      *
      */
-    public User(String id) {
+    public User(String id, String[] rights) {
         this.id = id;
+        this.rights = rights;
     }
 
     /**
@@ -35,4 +37,11 @@
     public String getId() {
         return id;
     }
+
+    /**
+     *
+     */
+    public String[] getRights() {
+        return rights;
+    }
 }