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

[michi at wyona.com]

Author: michi
Date: 2009-10-15 00:07:59 +0200 (Thu, 15 Oct 2009)
New Revision: 45028

Modified:
   public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java
Log:
code cleaned and documentation added

Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java
===================================================================
--- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java	2009-10-14 21:55:45 UTC (rev 45027)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java	2009-10-14 22:07:59 UTC (rev 45028)
@@ -83,14 +83,14 @@
         }
 
         // Get identities/groups and available rights from server
-        getIdentitiesAndRights(identitiesURL); // TODO: Subtract policy identities!
+        getIdentitiesAndRights(identitiesURL);
 
         identitiesLBW = new IdentitiesListBoxWidget(visibleItemCount);
         identitiesLBW.set(visibleItemCount, identitiesAllUsers, identitiesAllGroups);
         
         policyLBW = new PolicyListBoxWidget(visibleItemCount, policyUsers, policyGroups, useInheritedPolicies, language);
 
-        // Get policy from server
+        // Get policy from server (within getPolicy() the identities list will be updated accordingly)
         getPolicy(readPolicyURL);
 
         // Setup GUI
@@ -283,47 +283,46 @@
 
                         this.cancel();
                         
-                        //remove policy users from users
+                        // Remove/Subtract policy-users/groups from "Identities"
                         ArrayList tmpUsers = new ArrayList(Arrays.asList(identitiesAllUsers));
                         ArrayList tmpGroups = new ArrayList(Arrays.asList(identitiesAllGroups));
                         
-                        
-                        
-                        
-//                        int itemCountUI = identitiesAllUsers.length;
-//                        for (int j = 0; j < itemCountUI; j++) {
-//                            String itemTextIAU = identitiesAllUsers[j];
-//                            if (!itemText.equals(itemTextIAU) && !tmpUsers.contains(itemTextIAU)) {
-//                                tmpUsers.add(itemTextIAU);
-//                            } else {
-//                                //Window.alert("not add: " + itemTextIAU + " = " +  itemText);
-//                            }
-//                        }
+/*
+                        int itemCountUI = identitiesAllUsers.length;
+                        for (int j = 0; j < itemCountUI; j++) {
+                            String itemTextIAU = identitiesAllUsers[j];
+                            if (!itemText.equals(itemTextIAU) && !tmpUsers.contains(itemTextIAU)) {
+                                tmpUsers.add(itemTextIAU);
+                            } else {
+                                //Window.alert("not add: " + itemTextIAU + " = " +  itemText);
+                            }
+                        }
+
+                        int itemCountUI = identitiesAllGroups.length;
+                        for (int j = 0; j < itemCountUI; j++) {
+                            String itemTextIAG = identitiesAllGroups[j];
+                            if (!itemText.equals(itemTextIAG)  && !tmpGroups.contains(itemTextIAG)) {
+                                tmpGroups.add(itemTextIAG);
+                            } else {
+                                //Window.alert("not add: " + itemTextIAG + " = " +  itemText);
+                            }
+                        }
+*/
+
+                        // Remove all users from identities list, which already exist within the policy
                         int itemCountUP = policyUsers.length;
                         for (int i = 0; i < itemCountUP; i++) {
                             String itemText = policyUsers[i].getId();
                             tmpUsers.remove(itemText);
-                            
                         }
 
+                        // Remove all groups from identities list, which already exist within the policy
                         int itemCountGP = policyGroups.length;
                         for (int i = 0; i < itemCountGP; i++) {
                             String itemText = policyGroups[i].getId();
                             tmpGroups.remove(itemText);
                         }
-
-//                        int itemCountUI = identitiesAllGroups.length;
-//                        for (int j = 0; j < itemCountUI; j++) {
-//                            String itemTextIAG = identitiesAllGroups[j];
-//                            if (!itemText.equals(itemTextIAG)  && !tmpGroups.contains(itemTextIAG)) {
-//                                tmpGroups.add(itemTextIAG);
-//                            } else {
-//                                //Window.alert("not add: " + itemTextIAG + " = " +  itemText);
-//                            }
-//                        }
                         
-                        
-                        
                         String tmpUsersStr [] = new String [tmpUsers.size ()];
                         tmpUsers.toArray(tmpUsersStr);
                         identitiesAllUsers = tmpUsersStr;