[Yanel-commits] rev 32791 -
public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client
michi at wyona.com
michi at wyona.com
Mon Mar 3 11:38:42 CET 2008
Author: michi
Date: 2008-03-03 11:38:41 +0100 (Mon, 03 Mar 2008)
New Revision: 32791
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/AsynchronousPolicyGetter.java
public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java
Log:
users and groups reading fixed
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 2008-03-03 10:31:57 UTC (rev 32790)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java 2008-03-03 10:38:41 UTC (rev 32791)
@@ -40,7 +40,8 @@
String[] users;
String[] groups;
String[] rights;
- String[] policyIdentities;
+ User[] policyUsers;
+ Group[] policyGroups;
boolean useInheritedPolicies = true;
IdentitiesListBoxWidget identitiesLBW;
@@ -116,7 +117,7 @@
identitiesLBW = new IdentitiesListBoxWidget(visibleItemCount, users, groups);
- policyLBW = new PolicyListBoxWidget(visibleItemCount, policyIdentities, useInheritedPolicies);
+ policyLBW = new PolicyListBoxWidget(visibleItemCount, policyUsers, policyGroups, useInheritedPolicies);
AddRemoveIdentitiesWidget ariw = new AddRemoveIdentitiesWidget(identitiesLBW.getListBox(), policyLBW.getListBox());
@@ -178,9 +179,10 @@
// TODO: Show loading ...
scheduleRepeating(10);
} else {
- policyIdentities = apg.getIdentities();
+ policyUsers = apg.getUsers();
+ policyGroups = apg.getGroups();
// "Redraw" Listbox
- policyLBW.setIdentities(visibleItemCount, policyIdentities);
+ policyLBW.setIdentities(visibleItemCount, policyUsers, policyGroups);
useInheritedPolicies = apg.getUseInheritedPolicies();
policyLBW.setInheritRightsFlag(useInheritedPolicies);
Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicyGetter.java
===================================================================
--- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicyGetter.java 2008-03-03 10:31:57 UTC (rev 32790)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AsynchronousPolicyGetter.java 2008-03-03 10:38:41 UTC (rev 32791)
@@ -32,7 +32,8 @@
public class AsynchronousPolicyGetter extends AsynchronousAgent {
boolean useInheritedPolicies = true;
- Vector identities = new Vector();
+ Vector users = new Vector();
+ Vector groups = new Vector();
/**
*
@@ -66,37 +67,51 @@
Element worldElement = getFirstChildElement(rootElement, "world");
if (worldElement != null) {
- identities.add("WORLD (Read,Write)");
+ // TODO: ...
+ //identities.add("WORLD (Read,Write)");
//Window.alert("World: " + (String) identities.elementAt(identities.size() - 1));
}
NodeList userElements = rootElement.getElementsByTagName("user");
for (int i = 0; i < userElements.getLength(); i++) {
- identities.add("u: " + ((Element) userElements.item(i)).getAttribute("id") + " (Write,Read)");
- //Window.alert("User: " + (String) identities.elementAt(identities.size() - 1));
+ String[] rights = {"Write", "Read"};
+ users.add(new User(((Element) userElements.item(i)).getAttribute("id"), rights));
+ //Window.alert("User: " + ((User) users.elementAt(users.size() - 1)).getId());
}
NodeList groupElements = rootElement.getElementsByTagName("group");
for (int i = 0; i < groupElements.getLength(); i++) {
- identities.add("g: " + ((Element) groupElements.item(i)).getAttribute("id") + " (Write,Read)");
- //Window.alert("Group: " + (String) identities.elementAt(identities.size() - 1));
+ String[] rights = {"Write", "Read"};
+ groups.add(new Group(((Element) groupElements.item(i)).getAttribute("id"), rights));
+ //Window.alert("Group: " + ((Group) groups.elementAt(groups.size() - 1)).getId());
}
//Window.alert("Policy response processed!");
}
/**
- * Get identities from access policy
+ * Get users from access policy
*/
- public String[] getIdentities() {
- String[] ids = new String[identities.size()];
+ public User[] getUsers() {
+ User[] ids = new User[users.size()];
for (int i = 0; i < ids.length; i++) {
- ids[i] = (String)identities.elementAt(i);
+ ids[i] = (User)users.elementAt(i);
}
return ids;
}
/**
+ * Get groups from access policy
+ */
+ public Group[] getGroups() {
+ Group[] ids = new Group[groups.size()];
+ for (int i = 0; i < ids.length; i++) {
+ ids[i] = (Group)groups.elementAt(i);
+ }
+ return ids;
+ }
+
+ /**
* Get flag use-inherited-policies
*/
public boolean getUseInheritedPolicies() {
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 10:31:57 UTC (rev 32790)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java 2008-03-03 10:38:41 UTC (rev 32791)
@@ -47,7 +47,7 @@
/**
*
*/
- public PolicyListBoxWidget(int visibleItemCount, String[] identities, boolean useInheritedPolicies) {
+ public PolicyListBoxWidget(int visibleItemCount, User[] users, Group[] groups, boolean useInheritedPolicies) {
initWidget(vp);
vp.add(new Label("Policy"));
@@ -58,7 +58,7 @@
lb = new ListBox(true);
lb.addClickListener(this);
- setIdentities(visibleItemCount, identities);
+ setIdentities(visibleItemCount, users, groups);
vp.add(lb);
readCB = new CheckBox("Read");
@@ -72,13 +72,26 @@
/**
*
*/
- public void setIdentities(int visibleItemCount, String[] identities) {
+ public void setIdentities(int visibleItemCount, User[] users, Group[] groups) {
lb.clear();
lb.setVisibleItemCount(visibleItemCount);
- if (identities != null) {
- for (int i = 0; i < identities.length; i++) {
- lb.addItem(identities[i], identities[i]);
+ if (users != null || groups != null) {
+ if (users != null) {
+ for (int i = 0; i < users.length; i++) {
+ String label = "u: " + users[i].getId() + " (Read,Write)";
+ String value = "u: " + users[i].getId();
+ lb.addItem(label, value);
+ }
}
+ if (groups != null) {
+ for (int i = 0; i < groups.length; i++) {
+ String label = "g: " + groups[i].getId() + " (Read,Write)";
+ String value = "g: " + groups[i].getId();
+ lb.addItem(label, value);
+ }
+ } else {
+ Window.alert("No groups!");
+ }
} else {
lb.addItem("No identities yet!");
}
More information about the Yanel-commits
mailing list