[Yanel-commits] rev 45205 -
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 Oct 26 16:36:36 CET 2009
Author: michi
Date: 2009-10-26 16:36:36 +0100 (Mon, 26 Oct 2009)
New Revision: 45205
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/I18n.java
public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java
public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java
Log:
loading improved
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-26 15:32:40 UTC (rev 45204)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java 2009-10-26 15:36:36 UTC (rev 45205)
@@ -87,7 +87,7 @@
// Get identities/groups and available rights from server
getIdentitiesAndRights(identitiesURL);
- identitiesLBW = new IdentitiesListBoxWidget(visibleItemCount);
+ identitiesLBW = new IdentitiesListBoxWidget(visibleItemCount, language);
identitiesLBW.set(visibleItemCount, identitiesAllUsers, identitiesAllGroups);
policyLBW = new PolicyListBoxWidget(visibleItemCount, policyUsers, policyGroups, useInheritedPolicies, language);
@@ -202,7 +202,7 @@
saveButton.setStyleName("gwt-wyona-CancelButton");
buttonHP.add(cancelButton);
- vp.add(new Label("Wyona Access Control Policy (GWT) Editor version 1.0-dev-r45029"));
+ vp.add(new Label("Wyona Access Control Policy (GWT) Editor version 1.0-dev-r45198"));
@@ -236,7 +236,7 @@
Timer t = new Timer() {
public void run() {
if (request.isPending()) {
- // TODO: Show loading ...
+ identitiesLBW.displayLoadingIdentities();
scheduleRepeating(10);
} else {
// "Redraw" Listbox
Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java
===================================================================
--- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java 2009-10-26 15:32:40 UTC (rev 45204)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java 2009-10-26 15:36:36 UTC (rev 45205)
@@ -29,12 +29,16 @@
return "Search users and groups: ";
} else if(key.equals("inherit-rights-label")) {
return "Inherit rights from parent policies";
+ } else if(key.equals("list-box-identities")) {
+ return "Identities (Users and Groups)";
}
} else if (language.equals("de")) {
if (key.equals("search-box-label")) {
return "Suche Benutzer/Gruppen: ";
} else if(key.equals("inherit-rights-label")) {
return "Uebernehme vererbte Rechte der Eltern-Policies";
+ } else if(key.equals("list-box-identities")) {
+ return "Identitaeten (Benutzer und Gruppen)";
}
} else {
return "WARNING: No such language '" + language + "' implemented!";
Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java
===================================================================
--- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java 2009-10-26 15:32:40 UTC (rev 45204)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/IdentitiesListBoxWidget.java 2009-10-26 15:36:36 UTC (rev 45205)
@@ -31,7 +31,7 @@
import com.google.gwt.user.client.ui.Widget;
/**
- *
+ * List box containing users and groups to choose/select from
*/
public class IdentitiesListBoxWidget extends Composite implements ClickListener {
@@ -39,13 +39,16 @@
private VerticalPanel vp = new VerticalPanel();
+ private String language;
+
/**
*
*/
- public IdentitiesListBoxWidget(int visibleItemCount) {
+ public IdentitiesListBoxWidget(int visibleItemCount, String language) {
+ this.language = language;
initWidget(vp);
- vp.add(new Label("Identities:"));
+ vp.add(new Label(I18n.getLabel("list-box-identities", language) + ":"));
lb = new ListBox(true);
lb.addClickListener(this);
@@ -56,6 +59,14 @@
/**
*
*/
+ public void displayLoadingIdentities() {
+ lb.clear();
+ lb.addItem("Users/groups are being loaded from server ...");
+ }
+
+ /**
+ *
+ */
public void set(int visibleItemCount, String[] users, String[] groups) {
lb.clear();
lb.setVisibleItemCount(visibleItemCount);
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 2009-10-26 15:32:40 UTC (rev 45204)
+++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java 2009-10-26 15:36:36 UTC (rev 45205)
@@ -315,11 +315,9 @@
private String getListItemLabel(String type, String id, Right[] rights) {
/*
- if (availableRights == null) {
+ while (availableRights == null) {
Window.alert("INFO: Available rights not loaded yet! Wait some more seconds ...");
- for (int i = 0; i < 10; i ++) {
- // sleep(1);
- }
+ //sleep(1);
}
*/
More information about the Yanel-commits
mailing list