syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1447162 [3/3] - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/syncope/console/pages/panels/ console/src/main/java/org/apache/syncope/console/rest/ console/src/main/java/org/a...
Date Mon, 18 Feb 2013 09:19:27 GMT
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
Mon Feb 18 09:19:25 2013
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.syncope.common.to.AbstractAttributableTO;
 import org.apache.syncope.common.to.AttributeTO;
 import org.apache.syncope.common.to.RoleTO;
@@ -30,16 +29,17 @@ import org.apache.syncope.common.to.User
 import org.apache.syncope.common.to.VirtualSchemaTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
 import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
 import org.apache.wicket.Component;
+import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxCallListener;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -62,36 +62,37 @@ public class VirtualAttributesPanel exte
     private SchemaRestClient schemaRestClient;
 
     public <T extends AbstractAttributableTO> VirtualAttributesPanel(final String id,
final T entityTO,
-            final boolean templateMode) {
+            final boolean templateMode, final PageReference pageRef) {
 
         super(id);
 
         setOutputMarkupId(true);
 
-        final IModel<Map<String, VirtualSchemaTO>> schemas = new LoadableDetachableModel<Map<String,
VirtualSchemaTO>>() {
+        final IModel<Map<String, VirtualSchemaTO>> schemas =
+                new LoadableDetachableModel<Map<String, VirtualSchemaTO>>() {
 
-            private static final long serialVersionUID = -5489981430516587774L;
+                    private static final long serialVersionUID = -5489981430516587774L;
 
-            @Override
-            protected Map<String, VirtualSchemaTO> load() {
-                final List<VirtualSchemaTO> schemaTOs;
-                if (entityTO instanceof RoleTO) {
-                    schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.ROLE);
-                } else if (entityTO instanceof UserTO) {
-                    schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.USER);
-                } else {
-                    schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.MEMBERSHIP);
-                }
+                    @Override
+                    protected Map<String, VirtualSchemaTO> load() {
+                        final List<VirtualSchemaTO> schemaTOs;
+                        if (entityTO instanceof RoleTO) {
+                            schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.ROLE);
+                        } else if (entityTO instanceof UserTO) {
+                            schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.USER);
+                        } else {
+                            schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.MEMBERSHIP);
+                        }
 
-                final Map<String, VirtualSchemaTO> schemas = new HashMap<String,
VirtualSchemaTO>();
+                        final Map<String, VirtualSchemaTO> schemas = new HashMap<String,
VirtualSchemaTO>();
 
-                for (VirtualSchemaTO schemaTO : schemaTOs) {
-                    schemas.put(schemaTO.getName(), schemaTO);
-                }
+                        for (VirtualSchemaTO schemaTO : schemaTOs) {
+                            schemas.put(schemaTO.getName(), schemaTO);
+                        }
 
-                return schemas;
-            }
-        };
+                        return schemas;
+                    }
+                };
 
         final List<String> virtualSchemaNames = new ArrayList<String>(schemas.getObject().keySet());
 
@@ -100,20 +101,19 @@ public class VirtualAttributesPanel exte
         attributesContainer.setOutputMarkupId(true);
         add(attributesContainer);
 
-        AjaxButton addAttributeBtn = new IndicatingAjaxButton("addAttributeBtn", new ResourceModel("addAttributeBtn"))
{
+        AjaxButton addAttributeBtn = new ClearIndicatingAjaxButton("addAttributeBtn",
+                new ResourceModel("addAttributeBtn"), pageRef) {
 
             private static final long serialVersionUID = -4804368561204623354L;
 
             @Override
-            protected void onSubmit(final AjaxRequestTarget target, final Form<?> form)
{
-
+            protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?>
form) {
                 entityTO.addVirtualAttribute(new AttributeTO());
                 target.add(attributesContainer);
             }
 
             @Override
             protected void onError(final AjaxRequestTarget target, final Form<?> form)
{
-
                 target.add(attributesContainer);
             }
         };

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ApprovalRestClient.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ApprovalRestClient.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ApprovalRestClient.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ApprovalRestClient.java
Mon Feb 18 09:19:25 2013
@@ -19,7 +19,6 @@
 package org.apache.syncope.console.rest;
 
 import java.util.List;
-
 import org.apache.syncope.common.services.UserWorkflowService;
 import org.apache.syncope.common.to.WorkflowFormTO;
 import org.springframework.stereotype.Component;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java
Mon Feb 18 09:19:25 2013
@@ -19,21 +19,21 @@
 package org.apache.syncope.console.wicket.ajax.markup.html;
 
 import org.apache.wicket.Component;
+import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.attributes.AjaxCallListener;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
 import org.apache.wicket.model.IModel;
 
-public abstract class IndicatingDeleteOnConfirmAjaxLink<T> extends IndicatingAjaxLink<T>
{
+public abstract class IndicatingDeleteOnConfirmAjaxLink<T> extends ClearIndicatingAjaxLink<T>
{
 
     private static final long serialVersionUID = 2228670850922265663L;
 
-    public IndicatingDeleteOnConfirmAjaxLink(final String id, final IModel<T> model)
{
-        super(id, model);
+    public IndicatingDeleteOnConfirmAjaxLink(final String id, final PageReference pageRef)
{
+        super(id, pageRef);
     }
 
-    public IndicatingDeleteOnConfirmAjaxLink(final String id) {
-        super(id);
+    public IndicatingDeleteOnConfirmAjaxLink(final String id, final IModel<T> model,
final PageReference pageRef) {
+        super(id, model, pageRef);
     }
 
     @Override
@@ -41,7 +41,7 @@ public abstract class IndicatingDeleteOn
         super.updateAjaxAttributes(attributes);
 
         final AjaxCallListener ajaxCallListener = new AjaxCallListener() {
-            
+
             private static final long serialVersionUID = 7160235486520935153L;
 
             @Override

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
Mon Feb 18 09:19:25 2013
@@ -19,10 +19,11 @@
 package org.apache.syncope.console.wicket.markup.html.form;
 
 import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
 import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
+import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -41,8 +42,11 @@ public class ActionLinksPanel extends Pa
     @SpringBean
     protected XMLRolesReader xmlRolesReader;
 
-    public ActionLinksPanel(final String componentId, final IModel<?> model) {
+    private final PageReference pageRef;
+
+    public ActionLinksPanel(final String componentId, final IModel<?> model, final
PageReference pageRef) {
         super(componentId, model);
+        this.pageRef = pageRef;
 
         super.add(new Fragment("panelClaim", "emptyFragment", this));
         super.add(new Fragment("panelCreate", "emptyFragment", this));
@@ -84,12 +88,12 @@ public class ActionLinksPanel extends Pa
             case CLAIM:
                 fragment = new Fragment("panelClaim", "fragmentClaim", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("claimLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("claimLink", pageRef) {
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -98,12 +102,12 @@ public class ActionLinksPanel extends Pa
             case CREATE:
                 fragment = new Fragment("panelCreate", "fragmentCreate", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("createLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("createLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -112,12 +116,12 @@ public class ActionLinksPanel extends Pa
             case EDIT:
                 fragment = new Fragment("panelEdit", "fragmentEdit", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("editLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("editLink", pageRef) {
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -126,12 +130,12 @@ public class ActionLinksPanel extends Pa
             case USER_TEMPLATE:
                 fragment = new Fragment("panelUserTemplate", "fragmentUserTemplate", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("userTemplateLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("userTemplateLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -140,12 +144,12 @@ public class ActionLinksPanel extends Pa
             case ROLE_TEMPLATE:
                 fragment = new Fragment("panelRoleTemplate", "fragmentRoleTemplate", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("roleTemplateLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("roleTemplateLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -154,12 +158,12 @@ public class ActionLinksPanel extends Pa
             case ENABLE:
                 fragment = new Fragment("panelEnable", "fragmentEnable", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("enableLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("enableLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -168,12 +172,12 @@ public class ActionLinksPanel extends Pa
             case SEARCH:
                 fragment = new Fragment("panelSearch", "fragmentSearch", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("searchLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("searchLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -182,12 +186,12 @@ public class ActionLinksPanel extends Pa
             case EXECUTE:
                 fragment = new Fragment("panelExecute", "fragmentExecute", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("executeLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("executeLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -196,12 +200,12 @@ public class ActionLinksPanel extends Pa
             case DRYRUN:
                 fragment = new Fragment("panelDryRun", "fragmentDryRun", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("dryRunLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("dryRunLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -210,12 +214,12 @@ public class ActionLinksPanel extends Pa
             case DELETE:
                 fragment = new Fragment("panelDelete", "fragmentDelete", this);
 
-                fragment.addOrReplace(new IndicatingDeleteOnConfirmAjaxLink("deleteLink")
{
+                fragment.addOrReplace(new IndicatingDeleteOnConfirmAjaxLink("deleteLink",
pageRef) {
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -225,12 +229,12 @@ public class ActionLinksPanel extends Pa
             case SELECT:
                 fragment = new Fragment("panelSelect", "fragmentSelect", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("selectLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("selectLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });
@@ -240,12 +244,12 @@ public class ActionLinksPanel extends Pa
             case EXPORT:
                 fragment = new Fragment("panelExport", "fragmentExport", this);
 
-                fragment.addOrReplace(new IndicatingAjaxLink("exportLink") {
+                fragment.addOrReplace(new ClearIndicatingAjaxLink("exportLink", pageRef)
{
 
                     private static final long serialVersionUID = -7978723352517770644L;
 
                     @Override
-                    public void onClick(final AjaxRequestTarget target) {
+                    protected void onClickInternal(final AjaxRequestTarget target) {
                         link.onClick(target);
                     }
                 });

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
Mon Feb 18 09:19:25 2013
@@ -25,13 +25,13 @@ import org.apache.syncope.console.pages.
 import org.apache.syncope.console.pages.RoleModalPage;
 import org.apache.syncope.console.pages.Roles;
 import org.apache.syncope.console.rest.RoleRestClient;
+import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
 import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
 import org.apache.wicket.Page;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -61,7 +61,7 @@ public class TreeActionLinkPanel extends
     private Fragment fragment;
 
     public TreeActionLinkPanel(final String id, final long idRole, final IModel inputModel,
final ModalWindow window,
-            final PageReference callerPageRef) {
+            final PageReference pageRef) {
 
         super(id);
 
@@ -71,12 +71,12 @@ public class TreeActionLinkPanel extends
 
         fragment.setOutputMarkupId(true);
 
-        final AjaxLink createRoleLink = new IndicatingAjaxLink("createRoleLink") {
+        final AjaxLink createRoleLink = new ClearIndicatingAjaxLink("createRoleLink", pageRef)
{
 
             private static final long serialVersionUID = -7978723352517770644L;
 
             @Override
-            public void onClick(final AjaxRequestTarget target) {
+            protected void onClickInternal(final AjaxRequestTarget target) {
                 window.setPageCreator(new ModalWindow.PageCreator() {
 
                     private static final long serialVersionUID = -7834632442532690940L;
@@ -85,7 +85,7 @@ public class TreeActionLinkPanel extends
                     public Page createPage() {
                         RoleTO roleTO = new RoleTO();
                         roleTO.setParent(idRole);
-                        RoleModalPage form = new RoleModalPage(callerPageRef, window, roleTO);
+                        RoleModalPage form = new RoleModalPage(pageRef, window, roleTO);
                         return form;
                     }
                 });
@@ -101,12 +101,12 @@ public class TreeActionLinkPanel extends
         fragment.add(createRoleLink);
 
         if (idRole != 0) {
-            final AjaxLink updateRoleLink = new IndicatingAjaxLink("updateRoleLink") {
+            final AjaxLink updateRoleLink = new ClearIndicatingAjaxLink("updateRoleLink",
pageRef) {
 
                 private static final long serialVersionUID = -7978723352517770644L;
 
                 @Override
-                public void onClick(final AjaxRequestTarget target) {
+                protected void onClickInternal(final AjaxRequestTarget target) {
                     window.setPageCreator(new ModalWindow.PageCreator() {
 
                         private static final long serialVersionUID = -7834632442532690940L;
@@ -114,7 +114,7 @@ public class TreeActionLinkPanel extends
                         @Override
                         public Page createPage() {
                             RoleTO roleTO = restClient.read(idRole);
-                            RoleModalPage form = new RoleModalPage(callerPageRef, window,
roleTO);
+                            RoleModalPage form = new RoleModalPage(pageRef, window, roleTO);
                             return form;
                         }
                     });
@@ -129,16 +129,16 @@ public class TreeActionLinkPanel extends
             updateRoleLink.setOutputMarkupId(true);
             fragment.add(updateRoleLink);
 
-            final AjaxLink dropRoleLink = new IndicatingDeleteOnConfirmAjaxLink("dropRoleLink")
{
+            final AjaxLink dropRoleLink = new IndicatingDeleteOnConfirmAjaxLink("dropRoleLink",
pageRef) {
 
                 private static final long serialVersionUID = -7978723352517770644L;
 
                 @Override
-                public void onClick(final AjaxRequestTarget target) {
+                protected void onClickInternal(final AjaxRequestTarget target) {
                     try {
                         final RoleTO roleTO = (RoleTO) restClient.delete(idRole);
 
-                        ((Roles) callerPageRef.getPage()).setModalResult(true);
+                        ((Roles) pageRef.getPage()).setModalResult(true);
 
                         window.setPageCreator(new ModalWindow.PageCreator() {
 
@@ -153,7 +153,7 @@ public class TreeActionLinkPanel extends
                         window.show(target);
                     } catch (SyncopeClientCompositeErrorException scce) {
                         error(getString("operation_error") + ": " + scce.getMessage());
-                        target.add(((Roles) callerPageRef.getPage()).getFeedbackPanel());
+                        target.add(((Roles) pageRef.getPage()).getFeedbackPanel());
                     }
                 }
             };

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage.properties?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage.properties
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage.properties
Mon Feb 18 09:19:25 2013
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 title=Change display attributes
-tooMuchSelections=Too many columns to be shown
+tooManySelections=Too many columns to be shown
 schemas=User attributes
 derSchemas=User derived attributes
 virSchemas=User virtual attributes

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage_it.properties?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage_it.properties
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage_it.properties
Mon Feb 18 09:19:25 2013
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 title=Scegli attributi da visualizzare
-tooMuchSelections=Troppe colonne da visualizzare
+tooManySelections=Troppe colonne da visualizzare
 schemas=Attributi utente
 derSchemas=Attributi derivati utente
 virSchemas=Attributi virtuali utente

Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.html?rev=1447162&r1=1447161&r2=1447162&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.html
(original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.html
Mon Feb 18 09:19:25 2013
@@ -18,59 +18,59 @@ under the License.
 -->
 <wicket:extend>
 
-    <div id="tabs">
-        <ul>
-            <li class="tabs-selected">
-                <a href="#tabs-1"><span><wicket:message key="tab1"/></span></a>
-            </li>
-            <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
-        </ul>
-        <div id="tabs-1">
-            <div id="users-contain" class="ui-widget" style="width:inherit">
-                <span wicket:id="resourceContainer">
-                    <table class="ui-widget ui-widget-content table-hover"
-                           wicket:id="resourceDatatable"/>
-                </span>
-
-                <span style="float:right">
-                    <form wicket:id="resourcePaginatorForm" style="display:inline">
-                        <label><wicket:message key="displayRows"/></label>
-                        <select class="text ui-widget-content ui-corner-all"
-                                wicket:id="rowsChooser"/>
-                    </form>
-                </span>
-            </div>
-
-            <div wicket:id="createResourceWin">[Show modal window for creating resource]</div>
-            <div wicket:id="editResourceWin">[Show modal window for editing resource]</div>
-
-            <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="createResourceLink">
-                <wicket:message key="create-resource"/>
-            </a>
-        </div>
-        <div id="tabs-2">
-            <div id="users-contain" class="ui-widget" style="width:inherit">
-                <span wicket:id="connectorContainer">
-                    <table class="ui-widget ui-widget-content table-hover"
-                           wicket:id="connectorDatatable"/>
-                </span>
-
-                <span style="float:right">
-                    <form wicket:id="connectorPaginatorForm" style="display:inline">
-                        <label><wicket:message key="displayRows"/></label>
-                        <select class="text ui-widget-content ui-corner-all"
-                                wicket:id="rowsChooser"/>
-                    </form>
-                </span>
-            </div>
-
-            <div wicket:id="createConnectorWin">[Show modal window for creating connector]</div>
-            <div wicket:id="editConnectorWin">[Show modal window for editing connector]</div>
-
-            <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="createConnectorLink">
-                <wicket:message key="create-connector"/>
-            </a>
-        </div>
+  <div id="tabs">
+    <ul>
+      <li class="tabs-selected">
+        <a href="#tabs-1"><span><wicket:message key="tab1"/></span></a>
+      </li>
+      <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
+    </ul>
+    <div id="tabs-1">
+      <div id="users-contain" class="ui-widget" style="width:inherit">
+        <span wicket:id="resourceContainer">
+          <table class="ui-widget ui-widget-content table-hover"
+                 wicket:id="resourceDatatable"/>
+        </span>
+
+        <span style="float:right">
+          <form wicket:id="resourcePaginatorForm" style="display:inline">
+            <label><wicket:message key="displayRows"/></label>
+            <select class="text ui-widget-content ui-corner-all"
+                    wicket:id="rowsChooser"/>
+          </form>
+        </span>
+      </div>
+
+      <div wicket:id="createResourceWin">[Show modal window for creating resource]</div>
+      <div wicket:id="editResourceWin">[Show modal window for editing resource]</div>
+
+      <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="createResourceLink">
+        <wicket:message key="create-resource"/>
+      </a>
     </div>
+    <div id="tabs-2">
+      <div id="users-contain" class="ui-widget" style="width:inherit">
+        <span wicket:id="connectorContainer">
+          <table class="ui-widget ui-widget-content table-hover"
+                 wicket:id="connectorDatatable"/>
+        </span>
+
+        <span style="float:right">
+          <form wicket:id="connectorPaginatorForm" style="display:inline">
+            <label><wicket:message key="displayRows"/></label>
+            <select class="text ui-widget-content ui-corner-all"
+                    wicket:id="rowsChooser"/>
+          </form>
+        </span>
+      </div>
+
+      <div wicket:id="createConnectorWin">[Show modal window for creating connector]</div>
+      <div wicket:id="editConnectorWin">[Show modal window for editing connector]</div>
+
+      <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="createConnectorLink">
+        <wicket:message key="create-connector"/>
+      </a>
+    </div>
+  </div>
 
 </wicket:extend>



Mime
View raw message