You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/03/15 11:17:24 UTC
svn commit: r1300882 [5/22] - in /incubator/syncope/trunk:
build-tools/src/main/java/org/syncope/buildtools/
client/src/main/java/org/syncope/annotation/
client/src/main/java/org/syncope/client/
client/src/main/java/org/syncope/client/http/ client/src/...
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Resources.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Resources.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Resources.java Thu Mar 15 10:17:12 2012
@@ -103,11 +103,8 @@ public class Resources extends BasePage
add(feedbackPanel);
- resourcePaginatorRows = prefMan.getPaginatorRows(getRequest(),
- Constants.PREF_RESOURCES_PAGINATOR_ROWS);
- connectorPaginatorRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_CONNECTORS_PAGINATOR_ROWS);
+ resourcePaginatorRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_RESOURCES_PAGINATOR_ROWS);
+ connectorPaginatorRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_CONNECTORS_PAGINATOR_ROWS);
setupResources();
setupConnectors();
@@ -116,17 +113,13 @@ public class Resources extends BasePage
private void setupResources() {
List<IColumn> columns = new ArrayList<IColumn>();
- columns.add(new PropertyColumn(
- new ResourceModel("name"), "name", "name"));
- columns.add(new PropertyColumn(
- new ResourceModel("propagationPrimary"),
- "propagationPrimary", "propagationPrimary"));
- columns.add(new PropertyColumn(
- new ResourceModel("propagationPriority"),
- "propagationPriority", "propagationPriority"));
+ columns.add(new PropertyColumn(new ResourceModel("name"), "name", "name"));
+ columns.add(new PropertyColumn(new ResourceModel("propagationPrimary"), "propagationPrimary",
+ "propagationPrimary"));
+ columns.add(new PropertyColumn(new ResourceModel("propagationPriority"), "propagationPriority",
+ "propagationPriority"));
- columns.add(new AbstractColumn<ResourceTO>(new ResourceModel("actions",
- "")) {
+ columns.add(new AbstractColumn<ResourceTO>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = 2054811145491901166L;
@@ -136,39 +129,30 @@ public class Resources extends BasePage
}
@Override
- public void populateItem(
- final Item<ICellPopulator<ResourceTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<ResourceTO>> cellItem, final String componentId,
final IModel<ResourceTO> model) {
final ResourceTO resourceTO = model.getObject();
- final ActionLinksPanel panel =
- new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -3722207913631435501L;
+ private static final long serialVersionUID = -3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget target) {
- editResourceWin.setPageCreator(
- new ModalWindow.PageCreator() {
+ editResourceWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- ResourceModalPage form =
- new ResourceModalPage(
- Resources.this.getPageReference(),
- editResourceWin, resourceTO,
- false);
- return form;
- }
- });
+ @Override
+ public Page createPage() {
+ ResourceModalPage form = new ResourceModalPage(Resources.this.getPageReference(),
+ editResourceWin, resourceTO, false);
+ return form;
+ }
+ });
editResourceWin.show(target);
}
@@ -176,8 +160,7 @@ public class Resources extends BasePage
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -3722207913631435501L;
+ private static final long serialVersionUID = -3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget target) {
@@ -189,8 +172,7 @@ public class Resources extends BasePage
} catch (SyncopeClientCompositeErrorException e) {
error(getString("operation_error"));
- LOG.error("While deleting resource "
- + resourceTO.getName(), e);
+ LOG.error("While deleting resource " + resourceTO.getName(), e);
}
target.add(feedbackPanel);
@@ -202,8 +184,7 @@ public class Resources extends BasePage
}
});
- final AjaxFallbackDefaultDataTable table =
- new AjaxFallbackDefaultDataTable("resourceDatatable", columns,
+ final AjaxFallbackDefaultDataTable table = new AjaxFallbackDefaultDataTable("resourceDatatable", columns,
new ResourcesProvider(), resourcePaginatorRows);
resourceContainer = new WebMarkupContainer("resourceContainer");
@@ -225,50 +206,41 @@ public class Resources extends BasePage
editResourceWin.setInitialWidth(WIN_WIDTH);
editResourceWin.setCookieName("edit-res-modal");
- AjaxLink createResourceLink =
- new IndicatingAjaxLink("createResourceLink") {
-
- private static final long serialVersionUID =
- -7978723352517770644L;
+ AjaxLink createResourceLink = new IndicatingAjaxLink("createResourceLink") {
- @Override
- public void onClick(final AjaxRequestTarget target) {
+ private static final long serialVersionUID = -7978723352517770644L;
- createResourceWin.setPageCreator(
- new ModalWindow.PageCreator() {
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ createResourceWin.setPageCreator(new ModalWindow.PageCreator() {
- @Override
- public Page createPage() {
- final ResourceModalPage windows =
- new ResourceModalPage(
- Resources.this.getPageReference(),
- editResourceWin,
- new ResourceTO(), true);
- return windows;
- }
- });
+ private static final long serialVersionUID = -7834632442532690940L;
- createResourceWin.show(target);
+ @Override
+ public Page createPage() {
+ final ResourceModalPage windows = new ResourceModalPage(Resources.this.getPageReference(),
+ editResourceWin, new ResourceTO(), true);
+ return windows;
}
- };
+ });
+
+ createResourceWin.show(target);
+ }
+ };
- MetaDataRoleAuthorizationStrategy.authorize(createResourceLink, ENABLE,
- xmlRolesReader.getAllAllowedRoles("Resources", "create"));
+ MetaDataRoleAuthorizationStrategy.authorize(createResourceLink, ENABLE, xmlRolesReader.getAllAllowedRoles(
+ "Resources", "create"));
add(createResourceLink);
final Form paginatorForm = new Form("resourcePaginatorForm");
- MetaDataRoleAuthorizationStrategy.authorize(
- paginatorForm, RENDER,
- xmlRolesReader.getAllAllowedRoles("Resources", "list"));
-
- final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
- new PropertyModel(this, "resourcePaginatorRows"),
- prefMan.getPaginatorChoices());
+ MetaDataRoleAuthorizationStrategy.authorize(paginatorForm, RENDER, xmlRolesReader.getAllAllowedRoles(
+ "Resources", "list"));
+
+ final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
+ "resourcePaginatorRows"), prefMan.getPaginatorChoices());
rowsChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
@@ -276,9 +248,8 @@ public class Resources extends BasePage
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- prefMan.set(getRequest(), getResponse(),
- Constants.PREF_RESOURCES_PAGINATOR_ROWS,
- String.valueOf(resourcePaginatorRows));
+ prefMan.set(getRequest(), getResponse(), Constants.PREF_RESOURCES_PAGINATOR_ROWS, String
+ .valueOf(resourcePaginatorRows));
table.setItemsPerPage(resourcePaginatorRows);
target.add(resourceContainer);
@@ -292,23 +263,17 @@ public class Resources extends BasePage
private void setupConnectors() {
List<IColumn> columns = new ArrayList<IColumn>();
- columns.add(new PropertyColumn(new ResourceModel("id"),
- "id", "id"));
+ columns.add(new PropertyColumn(new ResourceModel("id"), "id", "id"));
- columns.add(new PropertyColumn(new ResourceModel("name"),
- "connectorName", "connectorName"));
+ columns.add(new PropertyColumn(new ResourceModel("name"), "connectorName", "connectorName"));
- columns.add(new PropertyColumn(new ResourceModel("displayName"),
- "displayName", "displayName"));
+ columns.add(new PropertyColumn(new ResourceModel("displayName"), "displayName", "displayName"));
- columns.add(new PropertyColumn(new ResourceModel("version"),
- "version", "version"));
+ columns.add(new PropertyColumn(new ResourceModel("version"), "version", "version"));
- columns.add(new PropertyColumn(new ResourceModel("bundleName"),
- "bundleName", "bundleName"));
+ columns.add(new PropertyColumn(new ResourceModel("bundleName"), "bundleName", "bundleName"));
- columns.add(new AbstractColumn<ConnInstanceTO>(
- new ResourceModel("actions", "")) {
+ columns.add(new AbstractColumn<ConnInstanceTO>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = 2054811145491901166L;
@@ -318,37 +283,30 @@ public class Resources extends BasePage
}
@Override
- public void populateItem(
- final Item<ICellPopulator<ConnInstanceTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<ConnInstanceTO>> cellItem, final String componentId,
final IModel<ConnInstanceTO> model) {
final ConnInstanceTO connectorTO = model.getObject();
- final ActionLinksPanel panel =
- new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -3722207913631435501L;
+ private static final long serialVersionUID = -3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget target) {
- editConnectorWin.setPageCreator(
- new ModalWindow.PageCreator() {
+ editConnectorWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- return new ConnectorModalPage(
- Resources.this.getPageReference(),
- editConnectorWin, connectorTO);
- }
- });
+ @Override
+ public Page createPage() {
+ return new ConnectorModalPage(Resources.this.getPageReference(), editConnectorWin,
+ connectorTO);
+ }
+ });
editConnectorWin.show(target);
}
@@ -356,8 +314,7 @@ public class Resources extends BasePage
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -3722207913631435501L;
+ private static final long serialVersionUID = -3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget target) {
@@ -367,8 +324,7 @@ public class Resources extends BasePage
} catch (SyncopeClientCompositeErrorException e) {
error(getString("operation_error"));
- LOG.error("While deleting connector "
- + connectorTO.getId(), e);
+ LOG.error("While deleting connector " + connectorTO.getId(), e);
}
target.add(connectorContainer);
@@ -380,17 +336,15 @@ public class Resources extends BasePage
}
});
- final AjaxFallbackDefaultDataTable table =
- new AjaxFallbackDefaultDataTable("connectorDatatable", columns,
+ final AjaxFallbackDefaultDataTable table = new AjaxFallbackDefaultDataTable("connectorDatatable", columns,
new ConnectorsProvider(), connectorPaginatorRows);
connectorContainer = new WebMarkupContainer("connectorContainer");
connectorContainer.add(table);
connectorContainer.setOutputMarkupId(true);
- MetaDataRoleAuthorizationStrategy.authorize(
- connectorContainer, RENDER,
- xmlRolesReader.getAllAllowedRoles("Connectors", "list"));
+ MetaDataRoleAuthorizationStrategy.authorize(connectorContainer, RENDER, xmlRolesReader.getAllAllowedRoles(
+ "Connectors", "list"));
add(connectorContainer);
@@ -407,48 +361,41 @@ public class Resources extends BasePage
editConnectorWin.setInitialWidth(WIN_WIDTH);
editConnectorWin.setCookieName("edit-conn-modal");
- AjaxLink createConnectorLink = new IndicatingAjaxLink(
- "createConnectorLink") {
+ AjaxLink createConnectorLink = new IndicatingAjaxLink("createConnectorLink") {
private static final long serialVersionUID = -7978723352517770644L;
@Override
public void onClick(final AjaxRequestTarget target) {
- createConnectorWin.setPageCreator(
- new ModalWindow.PageCreator() {
+ createConnectorWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- ConnectorModalPage form =
- new ConnectorModalPage(
- Resources.this.getPageReference(),
- editConnectorWin, new ConnInstanceTO());
- return form;
- }
- });
+ @Override
+ public Page createPage() {
+ ConnectorModalPage form = new ConnectorModalPage(Resources.this.getPageReference(),
+ editConnectorWin, new ConnInstanceTO());
+ return form;
+ }
+ });
createConnectorWin.show(target);
}
};
- MetaDataRoleAuthorizationStrategy.authorize(createConnectorLink, ENABLE,
- xmlRolesReader.getAllAllowedRoles("Connectors", "create"));
+ MetaDataRoleAuthorizationStrategy.authorize(createConnectorLink, ENABLE, xmlRolesReader.getAllAllowedRoles(
+ "Connectors", "create"));
add(createConnectorLink);
Form paginatorForm = new Form("connectorPaginatorForm");
- MetaDataRoleAuthorizationStrategy.authorize(
- paginatorForm, RENDER,
- xmlRolesReader.getAllAllowedRoles("Connectors", "list"));
-
- final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
- new PropertyModel(this, "connectorPaginatorRows"),
- prefMan.getPaginatorChoices());
+ MetaDataRoleAuthorizationStrategy.authorize(paginatorForm, RENDER, xmlRolesReader.getAllAllowedRoles(
+ "Connectors", "list"));
+
+ final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
+ "connectorPaginatorRows"), prefMan.getPaginatorChoices());
rowsChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
@@ -456,10 +403,8 @@ public class Resources extends BasePage
@Override
protected void onUpdate(AjaxRequestTarget target) {
- prefMan.set(getRequest(),
- getResponse(),
- Constants.PREF_CONNECTORS_PAGINATOR_ROWS,
- String.valueOf(connectorPaginatorRows));
+ prefMan.set(getRequest(), getResponse(), Constants.PREF_CONNECTORS_PAGINATOR_ROWS, String
+ .valueOf(connectorPaginatorRows));
table.setItemsPerPage(connectorPaginatorRows);
target.add(connectorContainer);
@@ -479,8 +424,7 @@ public class Resources extends BasePage
public ResourcesProvider() {
//Default sorting
setSort("name", SortOrder.ASCENDING);
- comparator =
- new SortableDataProviderComparator<ResourceTO>(this);
+ comparator = new SortableDataProviderComparator<ResourceTO>(this);
}
@Override
@@ -501,8 +445,7 @@ public class Resources extends BasePage
public IModel<ResourceTO> model(final ResourceTO resource) {
return new AbstractReadOnlyModel<ResourceTO>() {
- private static final long serialVersionUID =
- 8952474152465381634L;
+ private static final long serialVersionUID = 8952474152465381634L;
@Override
public ResourceTO getObject() {
@@ -525,9 +468,7 @@ public class Resources extends BasePage
public ConnectorsProvider() {
//Default sorting
setSort("id", SortOrder.ASCENDING);
- comparator =
- new SortableDataProviderComparator<ConnInstanceTO>(
- this);
+ comparator = new SortableDataProviderComparator<ConnInstanceTO>(this);
}
@Override
@@ -545,13 +486,11 @@ public class Resources extends BasePage
}
@Override
- public IModel<ConnInstanceTO> model(
- final ConnInstanceTO connector) {
+ public IModel<ConnInstanceTO> model(final ConnInstanceTO connector) {
return new AbstractReadOnlyModel<ConnInstanceTO>() {
- private static final long serialVersionUID =
- -6033068018293569398L;
+ private static final long serialVersionUID = -6033068018293569398L;
@Override
public ConnInstanceTO getObject() {
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/RoleModalPage.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/RoleModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/RoleModalPage.java Thu Mar 15 10:17:12 2012
@@ -49,10 +49,7 @@ public class RoleModalPage extends BaseM
private RoleTO originalRoleTO;
- public RoleModalPage(
- final PageReference callerPageRef,
- final ModalWindow window,
- final RoleTO roleTO) {
+ public RoleModalPage(final PageReference callerPageRef, final ModalWindow window, final RoleTO roleTO) {
super();
@@ -63,38 +60,33 @@ public class RoleModalPage extends BaseM
final Form form = new Form("RoleForm");
- add(new Label("displayName",
- roleTO.getId() != 0 ? roleTO.getDisplayName() : ""));
+ add(new Label("displayName", roleTO.getId() != 0
+ ? roleTO.getDisplayName()
+ : ""));
form.setModel(new CompoundPropertyModel(roleTO));
- final RoleAttributesPanel attributesPanel =
- new RoleAttributesPanel("attributesPanel", form, roleTO);
+ final RoleAttributesPanel attributesPanel = new RoleAttributesPanel("attributesPanel", form, roleTO);
form.add(attributesPanel);
- final AjaxButton submit = new IndicatingAjaxButton(
- "submit", new ResourceModel("submit")) {
+ final AjaxButton submit = new IndicatingAjaxButton("submit", new ResourceModel("submit")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target,
- final Form form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
final RoleTO roleTO = (RoleTO) form.getDefaultModelObject();
try {
- final List<String> entitlementList =
- new ArrayList<String>(
- attributesPanel.getEntitlementsPalette().
- getModelCollection());
+ final List<String> entitlementList = new ArrayList<String>(attributesPanel.getEntitlementsPalette()
+ .getModelCollection());
roleTO.setEntitlements(entitlementList);
if (createFlag) {
roleRestClient.createRole(roleTO);
} else {
- RoleMod roleMod = AttributableOperations.diff(
- roleTO, originalRoleTO);
+ RoleMod roleMod = AttributableOperations.diff(roleTO, originalRoleTO);
// update role just if it is changed
if (!roleMod.isEmpty()) {
@@ -111,16 +103,16 @@ public class RoleModalPage extends BaseM
}
@Override
- protected void onError(final AjaxRequestTarget target,
- final Form form) {
+ protected void onError(final AjaxRequestTarget target, final Form form) {
target.add(feedbackPanel);
}
};
- MetaDataRoleAuthorizationStrategy.authorize(
- submit, ENABLE, xmlRolesReader.getAllAllowedRoles(
- "Roles", createFlag ? "create" : "update"));
+ MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, xmlRolesReader.getAllAllowedRoles("Roles",
+ createFlag
+ ? "create"
+ : "update"));
form.add(submit);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Roles.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Roles.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Roles.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Roles.java Thu Mar 15 10:17:12 2012
@@ -63,37 +63,33 @@ public class Roles extends BasePage {
treePanel.setOutputMarkupId(true);
container.add(treePanel);
- final RoleSummaryPanel nodePanel =
- new RoleSummaryPanel("summaryPanel",
- createRoleWin, Roles.this.getPageReference());
+ final RoleSummaryPanel nodePanel = new RoleSummaryPanel("summaryPanel", createRoleWin, Roles.this
+ .getPageReference());
nodePanel.setOutputMarkupId(true);
container.add(nodePanel);
- createRoleWin.setWindowClosedCallback(
- new ModalWindow.WindowClosedCallback() {
+ createRoleWin.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
- private static final long serialVersionUID =
- 8804221891699487139L;
+ private static final long serialVersionUID = 8804221891699487139L;
- @Override
- public void onClose(final AjaxRequestTarget target) {
+ @Override
+ public void onClose(final AjaxRequestTarget target) {
- final TreeNodeClickUpdate data =
- new TreeNodeClickUpdate(target,
- nodePanel.getSelectedNode() == null
- ? 0 : nodePanel.getSelectedNode().getId());
-
- send(getPage(), Broadcast.BREADTH, data);
- target.add(container);
- if (modalResult) {
- getSession().info(getString("operation_succeded"));
- target.add(feedbackPanel);
- modalResult = false;
- }
- }
- });
+ final TreeNodeClickUpdate data = new TreeNodeClickUpdate(target, nodePanel.getSelectedNode() == null
+ ? 0
+ : nodePanel.getSelectedNode().getId());
+
+ send(getPage(), Broadcast.BREADTH, data);
+ target.add(container);
+ if (modalResult) {
+ getSession().info(getString("operation_succeded"));
+ target.add(feedbackPanel);
+ modalResult = false;
+ }
+ }
+ });
container.add(createRoleWin);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchedTaskModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchedTaskModalPage.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchedTaskModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchedTaskModalPage.java Thu Mar 15 10:17:12 2012
@@ -35,10 +35,7 @@ public class SchedTaskModalPage extends
private static final long serialVersionUID = -2501860242590060867L;
- public SchedTaskModalPage(
- final ModalWindow window,
- final SchedTaskTO taskTO,
- final PageReference callerPageRef) {
+ public SchedTaskModalPage(final ModalWindow window, final SchedTaskTO taskTO, final PageReference callerPageRef) {
super(window, taskTO, callerPageRef);
@@ -57,8 +54,7 @@ public class SchedTaskModalPage extends
className.setChoices(classNames.getObject());
className.addRequiredLabel();
className.setEnabled(taskTO.getId() == 0);
- className.setStyleShet(
- "ui-widget-content ui-corner-all long_dynamicsize");
+ className.setStyleShet("ui-widget-content ui-corner-all long_dynamicsize");
profile.add(className);
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Schema.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Schema.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Schema.java Thu Mar 15 10:17:12 2012
@@ -179,315 +179,172 @@ public class Schema extends BasePage {
public Schema(PageParameters parameters) {
super(parameters);
- userSchemasContainer =
- new WebMarkupContainer("userSchemasContainer");
+ userSchemasContainer = new WebMarkupContainer("userSchemasContainer");
- userDerivedSchemasContainer =
- new WebMarkupContainer("userDerivedSchemasContainer");
+ userDerivedSchemasContainer = new WebMarkupContainer("userDerivedSchemasContainer");
- userVirtualSchemasContainer =
- new WebMarkupContainer("userVirtualSchemasContainer");
+ userVirtualSchemasContainer = new WebMarkupContainer("userVirtualSchemasContainer");
- roleSchemasContainer =
- new WebMarkupContainer("roleSchemasContainer");
+ roleSchemasContainer = new WebMarkupContainer("roleSchemasContainer");
- roleDerivedSchemasContainer =
- new WebMarkupContainer("roleDerivedSchemasContainer");
+ roleDerivedSchemasContainer = new WebMarkupContainer("roleDerivedSchemasContainer");
- roleVirtualSchemasContainer =
- new WebMarkupContainer("roleVirtualSchemasContainer");
+ roleVirtualSchemasContainer = new WebMarkupContainer("roleVirtualSchemasContainer");
- membershipSchemaContainer =
- new WebMarkupContainer("membershipSchemaContainer");
+ membershipSchemaContainer = new WebMarkupContainer("membershipSchemaContainer");
- membershipDerivedSchemaContainer =
- new WebMarkupContainer("membershipDerivedSchemaContainer");
+ membershipDerivedSchemaContainer = new WebMarkupContainer("membershipDerivedSchemaContainer");
- membershipVirtualSchemaContainer =
- new WebMarkupContainer("membershipVirtualSchemaContainer");
+ membershipVirtualSchemaContainer = new WebMarkupContainer("membershipVirtualSchemaContainer");
add(createRoleSchemaWin = new ModalWindow("createRoleSchemaWin"));
add(editRoleSchemaWin = new ModalWindow("editRoleSchemaWin"));
- add(createRoleDerivedSchemaWin =
- new ModalWindow("createRoleDerivedSchemaWin"));
+ add(createRoleDerivedSchemaWin = new ModalWindow("createRoleDerivedSchemaWin"));
- add(createRoleVirtualSchemaWin =
- new ModalWindow("createRoleVirtualSchemaWin"));
+ add(createRoleVirtualSchemaWin = new ModalWindow("createRoleVirtualSchemaWin"));
- add(editRoleDerivedSchemaWin =
- new ModalWindow("editRoleDerivedSchemaWin"));
+ add(editRoleDerivedSchemaWin = new ModalWindow("editRoleDerivedSchemaWin"));
- add(editRoleVirtualSchemaWin =
- new ModalWindow("editRoleVirtualSchemaWin"));
+ add(editRoleVirtualSchemaWin = new ModalWindow("editRoleVirtualSchemaWin"));
add(createUserSchemaWin = new ModalWindow("createUserSchemaWin"));
add(editUserSchemaWin = new ModalWindow("editUserSchemaWin"));
- add(createUserDerivedSchemaWin = new ModalWindow(
- "createUserDerSchemaWin"));
- add(createUserVirtualSchemaWin = new ModalWindow(
- "createUserVirSchemaWin"));
-
- add(editUserDerivedSchemaWin = new ModalWindow(
- "editUserDerSchemaWin"));
- add(editUserVirtualSchemaWin = new ModalWindow(
- "editUserVirSchemaWin"));
-
- add(createMembershipSchemaWin = new ModalWindow(
- "createMembershipSchemaWin"));
- add(editMembershipSchemaWin = new ModalWindow(
- "editMembershipSchemaWin"));
-
- add(createMembershipDerivedSchemaWin = new ModalWindow(
- "createMembershipDerSchemaWin"));
- add(createMembershipVirtualSchemaWin = new ModalWindow(
- "createMembershipVirSchemaWin"));
-
- add(editMembershipDerivedSchemaWin = new ModalWindow(
- "editMembershipDerSchemaWin"));
- add(editMembershipVirtualSchemaWin = new ModalWindow(
- "editMembershipVirSchemaWin"));
-
- rolePageRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_ROLE_SCHEMA_PAGINATOR_ROWS);
-
- roleDerPageRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_ROLE_DER_SCHEMA_PAGINATOR_ROWS);
-
- roleVirPageRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_ROLE_VIR_SCHEMA_PAGINATOR_ROWS);
-
- userSchemaPageRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS);
-
- userDerSchemaPageRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS);
-
- userVirSchemaPageRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS);
-
- membershipPageRows = prefMan.getPaginatorRows(
- getRequest(),
- Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS);
+ add(createUserDerivedSchemaWin = new ModalWindow("createUserDerSchemaWin"));
+ add(createUserVirtualSchemaWin = new ModalWindow("createUserVirSchemaWin"));
- membershipDerPageRows = prefMan.getPaginatorRows(
- getRequest(),
+ add(editUserDerivedSchemaWin = new ModalWindow("editUserDerSchemaWin"));
+ add(editUserVirtualSchemaWin = new ModalWindow("editUserVirSchemaWin"));
+
+ add(createMembershipSchemaWin = new ModalWindow("createMembershipSchemaWin"));
+ add(editMembershipSchemaWin = new ModalWindow("editMembershipSchemaWin"));
+
+ add(createMembershipDerivedSchemaWin = new ModalWindow("createMembershipDerSchemaWin"));
+ add(createMembershipVirtualSchemaWin = new ModalWindow("createMembershipVirSchemaWin"));
+
+ add(editMembershipDerivedSchemaWin = new ModalWindow("editMembershipDerSchemaWin"));
+ add(editMembershipVirtualSchemaWin = new ModalWindow("editMembershipVirSchemaWin"));
+
+ rolePageRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_ROLE_SCHEMA_PAGINATOR_ROWS);
+
+ roleDerPageRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_ROLE_DER_SCHEMA_PAGINATOR_ROWS);
+
+ roleVirPageRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_ROLE_VIR_SCHEMA_PAGINATOR_ROWS);
+
+ userSchemaPageRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS);
+
+ userDerSchemaPageRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS);
+
+ userVirSchemaPageRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS);
+
+ membershipPageRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS);
+
+ membershipDerPageRows = prefMan.getPaginatorRows(getRequest(),
Constants.PREF_MEMBERSHIP_DER_SCHEMA_PAGINATOR_ROWS);
- membershipVirPageRows = prefMan.getPaginatorRows(
- getRequest(),
+ membershipVirPageRows = prefMan.getPaginatorRows(getRequest(),
Constants.PREF_MEMBERSHIP_VIR_SCHEMA_PAGINATOR_ROWS);
- final String allowedCreateRoles = xmlRolesReader.getAllAllowedRoles(
- "Schema", "create");
+ final String allowedCreateRoles = xmlRolesReader.getAllAllowedRoles("Schema", "create");
- final String allowedReadRoles = xmlRolesReader.getAllAllowedRoles(
- "Schema", "read");
+ final String allowedReadRoles = xmlRolesReader.getAllAllowedRoles("Schema", "read");
- final String allowedDeleteRoles = xmlRolesReader.getAllAllowedRoles(
- "Schema", "delete");
+ final String allowedDeleteRoles = xmlRolesReader.getAllAllowedRoles("Schema", "delete");
- List<IColumn> rolesColumns = getColumnsForSchema(
- roleSchemasContainer,
- editRoleSchemaWin,
- AttributableType.ROLE,
- SchemaModalPageFactory.SchemaType.NORMAL,
- Constants.SCHEMA_FIELDS,
- allowedReadRoles,
- allowedCreateRoles);
+ List<IColumn> rolesColumns = getColumnsForSchema(roleSchemasContainer, editRoleSchemaWin,
+ AttributableType.ROLE, SchemaModalPageFactory.SchemaType.NORMAL, Constants.SCHEMA_FIELDS,
+ allowedReadRoles, allowedCreateRoles);
- final AjaxFallbackDefaultDataTable tableRoles =
- new AjaxFallbackDefaultDataTable("datatable", rolesColumns,
+ final AjaxFallbackDefaultDataTable tableRoles = new AjaxFallbackDefaultDataTable("datatable", rolesColumns,
new SchemaProvider(SchemaType.RoleSchema), rolePageRows);
- add(getPaginatorForm(
- roleSchemasContainer,
- tableRoles,
- "RolesPaginatorForm",
- "rolePageRows",
+ add(getPaginatorForm(roleSchemasContainer, tableRoles, "RolesPaginatorForm", "rolePageRows",
Constants.PREF_ROLE_SCHEMA_PAGINATOR_ROWS));
- List<IColumn> columnsRolesDer = getColumnsForSchema(
- roleDerivedSchemasContainer,
- editRoleDerivedSchemaWin,
- AttributableType.ROLE,
- SchemaModalPageFactory.SchemaType.DERIVED,
- Constants.DERIVED_SCHEMA_FIELDS,
- allowedReadRoles,
- allowedDeleteRoles);
-
- final AjaxFallbackDefaultDataTable tableRolesDer =
- new AjaxFallbackDefaultDataTable("datatable", columnsRolesDer,
- new DerivedSchemaProvider(SchemaDerivedType.RoleDerivedSchema),
- roleDerPageRows);
-
- add(getPaginatorForm(
- roleDerivedSchemasContainer,
- tableRolesDer,
- "RolesDerPaginatorForm",
- "roleDerPageRows",
+ List<IColumn> columnsRolesDer = getColumnsForSchema(roleDerivedSchemasContainer, editRoleDerivedSchemaWin,
+ AttributableType.ROLE, SchemaModalPageFactory.SchemaType.DERIVED, Constants.DERIVED_SCHEMA_FIELDS,
+ allowedReadRoles, allowedDeleteRoles);
+
+ final AjaxFallbackDefaultDataTable tableRolesDer = new AjaxFallbackDefaultDataTable("datatable",
+ columnsRolesDer, new DerivedSchemaProvider(SchemaDerivedType.RoleDerivedSchema), roleDerPageRows);
+
+ add(getPaginatorForm(roleDerivedSchemasContainer, tableRolesDer, "RolesDerPaginatorForm", "roleDerPageRows",
Constants.PREF_ROLE_DER_SCHEMA_PAGINATOR_ROWS));
- List<IColumn> columnsRolesVir = getColumnsForSchema(
- roleVirtualSchemasContainer,
- editRoleVirtualSchemaWin,
- AttributableType.ROLE,
- SchemaModalPageFactory.SchemaType.VIRTUAL,
- Constants.VIRTUAL_SCHEMA_FIELDS,
- allowedReadRoles,
- allowedDeleteRoles);
-
- final AjaxFallbackDefaultDataTable tableRolesVir =
- new AjaxFallbackDefaultDataTable("datatable", columnsRolesVir,
- new VirtualSchemaProvider(SchemaVirtualType.RoleVirtualSchema),
- roleVirPageRows);
-
- add(getPaginatorForm(
- roleVirtualSchemasContainer,
- tableRolesVir,
- "RolesVirPaginatorForm",
- "roleVirPageRows",
+ List<IColumn> columnsRolesVir = getColumnsForSchema(roleVirtualSchemasContainer, editRoleVirtualSchemaWin,
+ AttributableType.ROLE, SchemaModalPageFactory.SchemaType.VIRTUAL, Constants.VIRTUAL_SCHEMA_FIELDS,
+ allowedReadRoles, allowedDeleteRoles);
+
+ final AjaxFallbackDefaultDataTable tableRolesVir = new AjaxFallbackDefaultDataTable("datatable",
+ columnsRolesVir, new VirtualSchemaProvider(SchemaVirtualType.RoleVirtualSchema), roleVirPageRows);
+
+ add(getPaginatorForm(roleVirtualSchemasContainer, tableRolesVir, "RolesVirPaginatorForm", "roleVirPageRows",
Constants.PREF_ROLE_VIR_SCHEMA_PAGINATOR_ROWS));
- List<IColumn> userColumns = getColumnsForSchema(
- userSchemasContainer,
- editUserSchemaWin,
- AttributableType.USER,
- SchemaModalPageFactory.SchemaType.NORMAL,
- Constants.SCHEMA_FIELDS,
- allowedReadRoles,
- allowedCreateRoles);
+ List<IColumn> userColumns = getColumnsForSchema(userSchemasContainer, editUserSchemaWin, AttributableType.USER,
+ SchemaModalPageFactory.SchemaType.NORMAL, Constants.SCHEMA_FIELDS, allowedReadRoles, allowedCreateRoles);
- final AjaxFallbackDefaultDataTable tableUsers =
- new AjaxFallbackDefaultDataTable("datatable", userColumns,
+ final AjaxFallbackDefaultDataTable tableUsers = new AjaxFallbackDefaultDataTable("datatable", userColumns,
new SchemaProvider(SchemaType.UserSchema), userSchemaPageRows);
tableUsers.setMarkupId("tableUsers");
- add(getPaginatorForm(
- userSchemasContainer,
- tableUsers,
- "UsersPaginatorForm",
- "userSchemaPageRows",
+ add(getPaginatorForm(userSchemasContainer, tableUsers, "UsersPaginatorForm", "userSchemaPageRows",
Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS));
- List<IColumn> columnsUsersDer = getColumnsForSchema(
- userDerivedSchemasContainer,
- editUserDerivedSchemaWin,
- AttributableType.USER,
- SchemaModalPageFactory.SchemaType.DERIVED,
- Constants.DERIVED_SCHEMA_FIELDS,
- allowedReadRoles,
- allowedDeleteRoles);
-
- final AjaxFallbackDefaultDataTable tableUsersDer =
- new AjaxFallbackDefaultDataTable("datatable", columnsUsersDer,
- new DerivedSchemaProvider(SchemaDerivedType.UserDerivedSchema),
- userDerSchemaPageRows);
-
- add(getPaginatorForm(
- userDerivedSchemasContainer,
- tableUsersDer,
- "UsersDerPaginatorForm",
- "userDerSchemaPageRows",
- Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS));
-
- List<IColumn> columnsUsersVir = getColumnsForSchema(
- userVirtualSchemasContainer,
- editUserVirtualSchemaWin,
- AttributableType.USER,
- SchemaModalPageFactory.SchemaType.VIRTUAL,
- Constants.VIRTUAL_SCHEMA_FIELDS,
- allowedReadRoles,
- allowedDeleteRoles);
-
- final AjaxFallbackDefaultDataTable tableUsersVir =
- new AjaxFallbackDefaultDataTable("datatable", columnsUsersVir,
- new VirtualSchemaProvider(SchemaVirtualType.UserVirtualSchema),
- userVirSchemaPageRows);
-
- add(getPaginatorForm(
- userVirtualSchemasContainer,
- tableUsersVir,
- "UsersVirPaginatorForm",
- "userVirSchemaPageRows",
- Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS));
-
- List<IColumn> membershipsColumns = getColumnsForSchema(
- membershipSchemaContainer,
- editMembershipSchemaWin,
- AttributableType.MEMBERSHIP,
- SchemaModalPageFactory.SchemaType.NORMAL,
- Constants.SCHEMA_FIELDS,
- allowedReadRoles,
- allowedCreateRoles);
-
- final AjaxFallbackDefaultDataTable tableMemberships =
- new AjaxFallbackDefaultDataTable(
- "datatable", membershipsColumns,
- new SchemaProvider(SchemaType.MembershipSchema),
- membershipPageRows);
-
- add(getPaginatorForm(
- membershipSchemaContainer,
- tableMemberships,
- "MembershipPaginatorForm",
- "membershipPageRows",
- Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS));
-
- List<IColumn> columnsMembershipsDer = getColumnsForSchema(
- membershipDerivedSchemaContainer,
- editMembershipDerivedSchemaWin,
- AttributableType.MEMBERSHIP,
- SchemaModalPageFactory.SchemaType.DERIVED,
- Constants.DERIVED_SCHEMA_FIELDS,
- allowedReadRoles,
- allowedDeleteRoles);
-
- final AjaxFallbackDefaultDataTable tableMembershipsDer =
- new AjaxFallbackDefaultDataTable("datatable",
- columnsMembershipsDer,
- new DerivedSchemaProvider(
- SchemaDerivedType.MembershipDerivedSchema),
+ List<IColumn> columnsUsersDer = getColumnsForSchema(userDerivedSchemasContainer, editUserDerivedSchemaWin,
+ AttributableType.USER, SchemaModalPageFactory.SchemaType.DERIVED, Constants.DERIVED_SCHEMA_FIELDS,
+ allowedReadRoles, allowedDeleteRoles);
+
+ final AjaxFallbackDefaultDataTable tableUsersDer = new AjaxFallbackDefaultDataTable("datatable",
+ columnsUsersDer, new DerivedSchemaProvider(SchemaDerivedType.UserDerivedSchema), userDerSchemaPageRows);
+
+ add(getPaginatorForm(userDerivedSchemasContainer, tableUsersDer, "UsersDerPaginatorForm",
+ "userDerSchemaPageRows", Constants.PREF_USER_DER_SCHEMA_PAGINATOR_ROWS));
+
+ List<IColumn> columnsUsersVir = getColumnsForSchema(userVirtualSchemasContainer, editUserVirtualSchemaWin,
+ AttributableType.USER, SchemaModalPageFactory.SchemaType.VIRTUAL, Constants.VIRTUAL_SCHEMA_FIELDS,
+ allowedReadRoles, allowedDeleteRoles);
+
+ final AjaxFallbackDefaultDataTable tableUsersVir = new AjaxFallbackDefaultDataTable("datatable",
+ columnsUsersVir, new VirtualSchemaProvider(SchemaVirtualType.UserVirtualSchema), userVirSchemaPageRows);
+
+ add(getPaginatorForm(userVirtualSchemasContainer, tableUsersVir, "UsersVirPaginatorForm",
+ "userVirSchemaPageRows", Constants.PREF_USER_VIR_SCHEMA_PAGINATOR_ROWS));
+
+ List<IColumn> membershipsColumns = getColumnsForSchema(membershipSchemaContainer, editMembershipSchemaWin,
+ AttributableType.MEMBERSHIP, SchemaModalPageFactory.SchemaType.NORMAL, Constants.SCHEMA_FIELDS,
+ allowedReadRoles, allowedCreateRoles);
+
+ final AjaxFallbackDefaultDataTable tableMemberships = new AjaxFallbackDefaultDataTable("datatable",
+ membershipsColumns, new SchemaProvider(SchemaType.MembershipSchema), membershipPageRows);
+
+ add(getPaginatorForm(membershipSchemaContainer, tableMemberships, "MembershipPaginatorForm",
+ "membershipPageRows", Constants.PREF_MEMBERSHIP_SCHEMA_PAGINATOR_ROWS));
+
+ List<IColumn> columnsMembershipsDer = getColumnsForSchema(membershipDerivedSchemaContainer,
+ editMembershipDerivedSchemaWin, AttributableType.MEMBERSHIP, SchemaModalPageFactory.SchemaType.DERIVED,
+ Constants.DERIVED_SCHEMA_FIELDS, allowedReadRoles, allowedDeleteRoles);
+
+ final AjaxFallbackDefaultDataTable tableMembershipsDer = new AjaxFallbackDefaultDataTable("datatable",
+ columnsMembershipsDer, new DerivedSchemaProvider(SchemaDerivedType.MembershipDerivedSchema),
membershipDerPageRows);
- add(getPaginatorForm(
- membershipDerivedSchemaContainer,
- tableMembershipsDer,
- "MembershipDerPaginatorForm",
- "membershipDerPageRows",
- Constants.PREF_MEMBERSHIP_DER_SCHEMA_PAGINATOR_ROWS));
-
- List<IColumn> columnsMembershipsVir = getColumnsForSchema(
- membershipVirtualSchemaContainer,
- editMembershipVirtualSchemaWin,
- AttributableType.MEMBERSHIP,
- SchemaModalPageFactory.SchemaType.VIRTUAL,
- Constants.VIRTUAL_SCHEMA_FIELDS,
- allowedReadRoles,
- allowedDeleteRoles);
-
- final AjaxFallbackDefaultDataTable tableMembershipsVir =
- new AjaxFallbackDefaultDataTable("datatable",
- columnsMembershipsVir,
- new VirtualSchemaProvider(
- SchemaVirtualType.MembershipVirtualSchema),
+ add(getPaginatorForm(membershipDerivedSchemaContainer, tableMembershipsDer, "MembershipDerPaginatorForm",
+ "membershipDerPageRows", Constants.PREF_MEMBERSHIP_DER_SCHEMA_PAGINATOR_ROWS));
+
+ List<IColumn> columnsMembershipsVir = getColumnsForSchema(membershipVirtualSchemaContainer,
+ editMembershipVirtualSchemaWin, AttributableType.MEMBERSHIP, SchemaModalPageFactory.SchemaType.VIRTUAL,
+ Constants.VIRTUAL_SCHEMA_FIELDS, allowedReadRoles, allowedDeleteRoles);
+
+ final AjaxFallbackDefaultDataTable tableMembershipsVir = new AjaxFallbackDefaultDataTable("datatable",
+ columnsMembershipsVir, new VirtualSchemaProvider(SchemaVirtualType.MembershipVirtualSchema),
membershipVirPageRows);
- add(getPaginatorForm(
- membershipVirtualSchemaContainer,
- tableMembershipsVir,
- "MembershipVirPaginatorForm",
- "membershipVirPageRows",
- Constants.PREF_MEMBERSHIP_VIR_SCHEMA_PAGINATOR_ROWS));
+ add(getPaginatorForm(membershipVirtualSchemaContainer, tableMembershipsVir, "MembershipVirPaginatorForm",
+ "membershipVirPageRows", Constants.PREF_MEMBERSHIP_VIR_SCHEMA_PAGINATOR_ROWS));
roleSchemasContainer.add(tableRoles);
roleSchemasContainer.setOutputMarkupId(true);
@@ -594,8 +451,7 @@ public class Schema extends BasePage {
editMembershipSchemaWin.setInitialWidth(WIN_WIDTH);
editMembershipSchemaWin.setCookieName("modal-14");
- createMembershipDerivedSchemaWin.setCssClassName(
- ModalWindow.CSS_CLASS_GRAY);
+ createMembershipDerivedSchemaWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
createMembershipDerivedSchemaWin.setInitialWidth(WIN_WIDTH);
createMembershipDerivedSchemaWin.setInitialHeight(WIN_HEIGHT);
createMembershipDerivedSchemaWin.setCookieName("modal-15");
@@ -604,14 +460,12 @@ public class Schema extends BasePage {
editMembershipSchemaWin.setInitialWidth(WIN_WIDTH);
editMembershipSchemaWin.setCookieName("modal-16");
- createMembershipVirtualSchemaWin.setCssClassName(
- ModalWindow.CSS_CLASS_GRAY);
+ createMembershipVirtualSchemaWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
createMembershipVirtualSchemaWin.setInitialWidth(WIN_WIDTH);
createMembershipVirtualSchemaWin.setInitialHeight(WIN_HEIGHT);
createMembershipVirtualSchemaWin.setCookieName("modal-17");
- editMembershipVirtualSchemaWin.setCssClassName(
- ModalWindow.CSS_CLASS_GRAY);
+ editMembershipVirtualSchemaWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
editMembershipVirtualSchemaWin.setInitialWidth(WIN_WIDTH);
editMembershipVirtualSchemaWin.setInitialHeight(WIN_HEIGHT);
editMembershipVirtualSchemaWin.setCookieName("modal-18");
@@ -620,123 +474,71 @@ public class Schema extends BasePage {
setWindowClosedCallback(editUserSchemaWin, userSchemasContainer);
- setWindowClosedCallback(createUserDerivedSchemaWin,
- userDerivedSchemasContainer);
+ setWindowClosedCallback(createUserDerivedSchemaWin, userDerivedSchemasContainer);
- setWindowClosedCallback(createUserVirtualSchemaWin,
- userVirtualSchemasContainer);
+ setWindowClosedCallback(createUserVirtualSchemaWin, userVirtualSchemasContainer);
- setWindowClosedCallback(editUserDerivedSchemaWin,
- userDerivedSchemasContainer);
+ setWindowClosedCallback(editUserDerivedSchemaWin, userDerivedSchemasContainer);
- setWindowClosedCallback(editUserVirtualSchemaWin,
- userVirtualSchemasContainer);
+ setWindowClosedCallback(editUserVirtualSchemaWin, userVirtualSchemasContainer);
setWindowClosedCallback(createRoleSchemaWin, roleSchemasContainer);
setWindowClosedCallback(editRoleSchemaWin, roleSchemasContainer);
- setWindowClosedCallback(createRoleDerivedSchemaWin,
- roleDerivedSchemasContainer);
+ setWindowClosedCallback(createRoleDerivedSchemaWin, roleDerivedSchemasContainer);
- setWindowClosedCallback(createRoleVirtualSchemaWin,
- roleVirtualSchemasContainer);
+ setWindowClosedCallback(createRoleVirtualSchemaWin, roleVirtualSchemasContainer);
- setWindowClosedCallback(editRoleDerivedSchemaWin,
- roleDerivedSchemasContainer);
+ setWindowClosedCallback(editRoleDerivedSchemaWin, roleDerivedSchemasContainer);
- setWindowClosedCallback(editRoleVirtualSchemaWin,
- roleVirtualSchemasContainer);
+ setWindowClosedCallback(editRoleVirtualSchemaWin, roleVirtualSchemasContainer);
- setWindowClosedCallback(createMembershipSchemaWin,
- membershipSchemaContainer);
+ setWindowClosedCallback(createMembershipSchemaWin, membershipSchemaContainer);
- setWindowClosedCallback(editMembershipSchemaWin,
- membershipSchemaContainer);
+ setWindowClosedCallback(editMembershipSchemaWin, membershipSchemaContainer);
- setWindowClosedCallback(createMembershipDerivedSchemaWin,
- membershipDerivedSchemaContainer);
+ setWindowClosedCallback(createMembershipDerivedSchemaWin, membershipDerivedSchemaContainer);
- setWindowClosedCallback(createMembershipVirtualSchemaWin,
- membershipVirtualSchemaContainer);
+ setWindowClosedCallback(createMembershipVirtualSchemaWin, membershipVirtualSchemaContainer);
- setWindowClosedCallback(editMembershipDerivedSchemaWin,
- membershipDerivedSchemaContainer);
+ setWindowClosedCallback(editMembershipDerivedSchemaWin, membershipDerivedSchemaContainer);
- setWindowClosedCallback(editMembershipVirtualSchemaWin,
- membershipVirtualSchemaContainer);
+ setWindowClosedCallback(editMembershipVirtualSchemaWin, membershipVirtualSchemaContainer);
- add(getCreateSchemaWindow(
- createRoleSchemaWin,
- AttributableType.ROLE,
- SchemaModalPageFactory.SchemaType.NORMAL,
- "createRoleSchemaWinLink",
- "createRoleSchemaWin",
- allowedCreateRoles));
+ add(getCreateSchemaWindow(createRoleSchemaWin, AttributableType.ROLE, SchemaModalPageFactory.SchemaType.NORMAL,
+ "createRoleSchemaWinLink", "createRoleSchemaWin", allowedCreateRoles));
- add(getCreateSchemaWindow(
- createRoleDerivedSchemaWin,
- AttributableType.ROLE,
- SchemaModalPageFactory.SchemaType.DERIVED,
- "createRoleDerivedSchemaWinLink",
- "createRoleDerivedSchemaWin",
- allowedCreateRoles));
+ add(getCreateSchemaWindow(createRoleDerivedSchemaWin, AttributableType.ROLE,
+ SchemaModalPageFactory.SchemaType.DERIVED, "createRoleDerivedSchemaWinLink",
+ "createRoleDerivedSchemaWin", allowedCreateRoles));
- add(getCreateSchemaWindow(
- createRoleVirtualSchemaWin,
- AttributableType.ROLE,
- SchemaModalPageFactory.SchemaType.VIRTUAL,
- "createRoleVirtualSchemaWinLink",
- "createRoleVirtualSchemaWin",
- allowedCreateRoles));
+ add(getCreateSchemaWindow(createRoleVirtualSchemaWin, AttributableType.ROLE,
+ SchemaModalPageFactory.SchemaType.VIRTUAL, "createRoleVirtualSchemaWinLink",
+ "createRoleVirtualSchemaWin", allowedCreateRoles));
- add(getCreateSchemaWindow(
- createUserSchemaWin,
- AttributableType.USER,
- SchemaModalPageFactory.SchemaType.NORMAL,
- "createUserSchemaWinLink",
- "createUserSchemaModalWin",
- allowedCreateRoles));
+ add(getCreateSchemaWindow(createUserSchemaWin, AttributableType.USER, SchemaModalPageFactory.SchemaType.NORMAL,
+ "createUserSchemaWinLink", "createUserSchemaModalWin", allowedCreateRoles));
- add(getCreateSchemaWindow(
- createUserDerivedSchemaWin,
- AttributableType.USER,
- SchemaModalPageFactory.SchemaType.DERIVED,
- "createUserDerSchemaWinLink",
- "createUserDerSchemaModalWin",
+ add(getCreateSchemaWindow(createUserDerivedSchemaWin, AttributableType.USER,
+ SchemaModalPageFactory.SchemaType.DERIVED, "createUserDerSchemaWinLink", "createUserDerSchemaModalWin",
allowedCreateRoles));
- add(getCreateSchemaWindow(
- createUserVirtualSchemaWin,
- AttributableType.USER,
- SchemaModalPageFactory.SchemaType.VIRTUAL,
- "createUserVirSchemaWinLink",
- "createUserVirSchemaModalWin",
+ add(getCreateSchemaWindow(createUserVirtualSchemaWin, AttributableType.USER,
+ SchemaModalPageFactory.SchemaType.VIRTUAL, "createUserVirSchemaWinLink", "createUserVirSchemaModalWin",
allowedCreateRoles));
- add(getCreateSchemaWindow(
- createMembershipSchemaWin,
- AttributableType.MEMBERSHIP,
- SchemaModalPageFactory.SchemaType.NORMAL,
- "createMembershipSchemaWinLink",
- "createMembershipSchemaModalWin",
- allowedCreateRoles));
-
- add(getCreateSchemaWindow(
- createMembershipDerivedSchemaWin,
- AttributableType.MEMBERSHIP,
- SchemaModalPageFactory.SchemaType.DERIVED,
- "createMembershipDerSchemaWinLink",
- "createMembershipDerivedSchemaWin",
- allowedCreateRoles));
-
- add(getCreateSchemaWindow(
- createMembershipVirtualSchemaWin,
- AttributableType.MEMBERSHIP,
- SchemaModalPageFactory.SchemaType.VIRTUAL,
- "createMembershipVirSchemaWinLink",
- "createMembershipVirtualSchemaWin",
- allowedCreateRoles));
+ add(getCreateSchemaWindow(createMembershipSchemaWin, AttributableType.MEMBERSHIP,
+ SchemaModalPageFactory.SchemaType.NORMAL, "createMembershipSchemaWinLink",
+ "createMembershipSchemaModalWin", allowedCreateRoles));
+
+ add(getCreateSchemaWindow(createMembershipDerivedSchemaWin, AttributableType.MEMBERSHIP,
+ SchemaModalPageFactory.SchemaType.DERIVED, "createMembershipDerSchemaWinLink",
+ "createMembershipDerivedSchemaWin", allowedCreateRoles));
+
+ add(getCreateSchemaWindow(createMembershipVirtualSchemaWin, AttributableType.MEMBERSHIP,
+ SchemaModalPageFactory.SchemaType.VIRTUAL, "createMembershipVirSchemaWinLink",
+ "createMembershipVirtualSchemaWin", allowedCreateRoles));
}
private class SchemaProvider extends SortableDataProvider<SchemaTO> {
@@ -799,8 +601,7 @@ public class Schema extends BasePage {
}
}
- private class DerivedSchemaProvider
- extends SortableDataProvider<DerivedSchemaTO> {
+ private class DerivedSchemaProvider extends SortableDataProvider<DerivedSchemaTO> {
private static final long serialVersionUID = -8518694430295937917L;
@@ -814,8 +615,7 @@ public class Schema extends BasePage {
//Default sorting
setSort("name", SortOrder.ASCENDING);
- comparator =
- new SortableDataProviderComparator<DerivedSchemaTO>(this);
+ comparator = new SortableDataProviderComparator<DerivedSchemaTO>(this);
}
@Override
@@ -853,8 +653,7 @@ public class Schema extends BasePage {
}
}
- private class VirtualSchemaProvider
- extends SortableDataProvider<VirtualSchemaTO> {
+ private class VirtualSchemaProvider extends SortableDataProvider<VirtualSchemaTO> {
private static final long serialVersionUID = -5431560608852987760L;
@@ -868,8 +667,7 @@ public class Schema extends BasePage {
//Default sorting
setSort("name", SortOrder.ASCENDING);
- comparator =
- new SortableDataProviderComparator<VirtualSchemaTO>(this);
+ comparator = new SortableDataProviderComparator<VirtualSchemaTO>(this);
}
@Override
@@ -908,13 +706,9 @@ public class Schema extends BasePage {
}
private <T extends AbstractSchemaModalPage> List<IColumn> getColumnsForSchema(
- final WebMarkupContainer webContainer,
- final ModalWindow modalWindow,
- final AttributableType attributableType,
- final SchemaModalPageFactory.SchemaType schemaType,
- final String[] fields,
- final String readPermissions,
- final String deletePermissions) {
+ final WebMarkupContainer webContainer, final ModalWindow modalWindow,
+ final AttributableType attributableType, final SchemaModalPageFactory.SchemaType schemaType,
+ final String[] fields, final String readPermissions, final String deletePermissions) {
List<IColumn> columns = new ArrayList<IColumn>();
@@ -922,7 +716,6 @@ public class Schema extends BasePage {
columns.add(new PropertyColumn(new ResourceModel(field), field, field));
}
-
columns.add(new AbstractColumn<AbstractBaseBean>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = 2054811145491901166L;
@@ -933,9 +726,7 @@ public class Schema extends BasePage {
}
@Override
- public void populateItem(
- final Item<ICellPopulator<AbstractBaseBean>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<AbstractBaseBean>> cellItem, final String componentId,
final IModel<AbstractBaseBean> model) {
final AbstractBaseBean schemaTO = model.getObject();
@@ -954,11 +745,10 @@ public class Schema extends BasePage {
@Override
public Page createPage() {
- AbstractSchemaModalPage page =
- SchemaModalPageFactory.getSchemaModalPage(attributableType, schemaType);
+ AbstractSchemaModalPage page = SchemaModalPageFactory.getSchemaModalPage(
+ attributableType, schemaType);
- page.setSchemaModalPage(Schema.this.getPageReference(), modalWindow,
- schemaTO, false);
+ page.setSchemaModalPage(Schema.this.getPageReference(), modalWindow, schemaTO, false);
return page;
}
@@ -970,18 +760,19 @@ public class Schema extends BasePage {
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -3722207913631435501L;
+ private static final long serialVersionUID = -3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget target) {
switch (schemaType) {
case DERIVED:
- restClient.deleteDerivedSchema(attributableType, ((DerivedSchemaTO) schemaTO).getName());
+ restClient
+ .deleteDerivedSchema(attributableType, ((DerivedSchemaTO) schemaTO).getName());
break;
case VIRTUAL:
- restClient.deleteVirtualSchema(attributableType, ((VirtualSchemaTO) schemaTO).getName());
+ restClient
+ .deleteVirtualSchema(attributableType, ((VirtualSchemaTO) schemaTO).getName());
break;
default:
restClient.deleteSchema(attributableType, ((SchemaTO) schemaTO).getName());
@@ -1002,20 +793,13 @@ public class Schema extends BasePage {
return columns;
}
- private Form getPaginatorForm(
- final WebMarkupContainer webContainer,
- final AjaxFallbackDefaultDataTable dataTable,
- final String formname,
- final String rowname,
- final String rowsPerPagePrefName) {
+ private Form getPaginatorForm(final WebMarkupContainer webContainer, final AjaxFallbackDefaultDataTable dataTable,
+ final String formname, final String rowname, final String rowsPerPagePrefName) {
Form usersPaginatorForm = new Form(formname);
- final DropDownChoice rowChooser = new DropDownChoice(
- "rowsChooser",
- new PropertyModel(this, rowname),
- prefMan.getPaginatorChoices(),
- new SelectChoiceRenderer());
+ final DropDownChoice rowChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, rowname), prefMan
+ .getPaginatorChoices(), new SelectChoiceRenderer());
rowChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
@@ -1035,13 +819,9 @@ public class Schema extends BasePage {
return usersPaginatorForm;
}
- private <T extends AbstractSchemaModalPage> AjaxLink getCreateSchemaWindow(
- final ModalWindow createSchemaWin,
- final AttributableType attributableType,
- final SchemaModalPageFactory.SchemaType schemaType,
- final String winLinkName,
- final String winName,
- final String createPermissions) {
+ private <T extends AbstractSchemaModalPage> AjaxLink getCreateSchemaWindow(final ModalWindow createSchemaWin,
+ final AttributableType attributableType, final SchemaModalPageFactory.SchemaType schemaType,
+ final String winLinkName, final String winName, final String createPermissions) {
AjaxLink createSchemaWinLink = new IndicatingAjaxLink(winLinkName) {
@@ -1056,8 +836,8 @@ public class Schema extends BasePage {
@Override
public Page createPage() {
- AbstractSchemaModalPage page = SchemaModalPageFactory.getSchemaModalPage(
- attributableType, schemaType);
+ AbstractSchemaModalPage page = SchemaModalPageFactory.getSchemaModalPage(attributableType,
+ schemaType);
page.setSchemaModalPage(Schema.this.getPageReference(), new ModalWindow(winName), null, true);
@@ -1069,8 +849,7 @@ public class Schema extends BasePage {
}
};
- MetaDataRoleAuthorizationStrategy.authorize(
- createSchemaWinLink, ENABLE, createPermissions);
+ MetaDataRoleAuthorizationStrategy.authorize(createSchemaWinLink, ENABLE, createPermissions);
return createSchemaWinLink;
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchemaModalPage.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchemaModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SchemaModalPage.java Thu Mar 15 10:17:12 2012
@@ -60,39 +60,35 @@ public class SchemaModalPage extends Abs
}
@Override
- public void setSchemaModalPage(
- final PageReference callerPageRef,
- final ModalWindow window,
- AbstractBaseBean schemaTO,
- final boolean createFlag) {
+ public void setSchemaModalPage(final PageReference callerPageRef, final ModalWindow window,
+ AbstractBaseBean schemaTO, final boolean createFlag) {
- final SchemaTO schema =
- schemaTO == null ? new SchemaTO() : (SchemaTO) schemaTO;
+ final SchemaTO schema = schemaTO == null
+ ? new SchemaTO()
+ : (SchemaTO) schemaTO;
final Form schemaForm = new Form("form");
schemaForm.setModel(new CompoundPropertyModel(schema));
schemaForm.setOutputMarkupId(Boolean.TRUE);
- final AjaxTextFieldPanel name = new AjaxTextFieldPanel("name", getString("name"),
- new PropertyModel<String>(schema, "name"));
+ final AjaxTextFieldPanel name = new AjaxTextFieldPanel("name", getString("name"), new PropertyModel<String>(
+ schema, "name"));
name.addRequiredLabel();
name.setEnabled(createFlag);
final AjaxTextFieldPanel conversionPattern = new AjaxTextFieldPanel("conversionPattern",
getString("conversionPattern"), new PropertyModel<String>(schema, "conversionPattern"));
- final IModel<List<String>> validatorsList =
- new LoadableDetachableModel<List<String>>() {
+ final IModel<List<String>> validatorsList = new LoadableDetachableModel<List<String>>() {
- private static final long serialVersionUID =
- 5275935387613157437L;
+ private static final long serialVersionUID = 5275935387613157437L;
- @Override
- protected List<String> load() {
- return restClient.getAllValidatorClasses();
- }
- };
+ @Override
+ protected List<String> load() {
+ return restClient.getAllValidatorClasses();
+ }
+ };
final AjaxDropDownChoicePanel<String> validatorClass = new AjaxDropDownChoicePanel<String>("validatorClass",
getString("validatorClass"), new PropertyModel(schema, "validatorClass"));
@@ -122,12 +118,10 @@ public class SchemaModalPage extends Abs
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- if (SchemaType.Enum.ordinal()
- == Integer.parseInt(type.getField().getValue())) {
+ if (SchemaType.Enum.ordinal() == Integer.parseInt(type.getField().getValue())) {
enumerationValues.addRequiredLabel();
enumerationValues.setEnabled(Boolean.TRUE);
- enumerationValues.setModelObject(
- ((SchemaTO) schema).getEnumerationValues());
+ enumerationValues.setModelObject(((SchemaTO) schema).getEnumerationValues());
} else {
enumerationValues.removeRequiredLabel();
enumerationValues.setEnabled(Boolean.FALSE);
@@ -138,42 +132,37 @@ public class SchemaModalPage extends Abs
}
});
- final AutoCompleteTextField mandatoryCondition =
- new AutoCompleteTextField("mandatoryCondition") {
+ final AutoCompleteTextField mandatoryCondition = new AutoCompleteTextField("mandatoryCondition") {
- private static final long serialVersionUID =
- -2428903969518079100L;
+ private static final long serialVersionUID = -2428903969518079100L;
- @Override
- protected Iterator getChoices(String input) {
- List<String> choices = new ArrayList<String>();
-
- if (Strings.isEmpty(input)) {
- choices = Collections.emptyList();
- return choices.iterator();
- }
+ @Override
+ protected Iterator getChoices(String input) {
+ List<String> choices = new ArrayList<String>();
- if ("true".startsWith(input.toLowerCase())) {
- choices.add("true");
- } else if ("false".startsWith(input.toLowerCase())) {
- choices.add("false");
- }
+ if (Strings.isEmpty(input)) {
+ choices = Collections.emptyList();
+ return choices.iterator();
+ }
+ if ("true".startsWith(input.toLowerCase())) {
+ choices.add("true");
+ } else if ("false".startsWith(input.toLowerCase())) {
+ choices.add("false");
+ }
- return choices.iterator();
- }
- };
+ return choices.iterator();
+ }
+ };
- mandatoryCondition.add(
- new AjaxFormComponentUpdatingBehavior("onchange") {
+ mandatoryCondition.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
- @Override
- protected void onUpdate(AjaxRequestTarget art) {
- }
- });
+ @Override
+ protected void onUpdate(AjaxRequestTarget art) {
+ }
+ });
final AjaxCheckBoxPanel multivalue = new AjaxCheckBoxPanel("multivalue", getString("multivalue"),
new PropertyModel<Boolean>(schema, "multivalue"));
@@ -184,14 +173,12 @@ public class SchemaModalPage extends Abs
final AjaxCheckBoxPanel uniqueConstraint = new AjaxCheckBoxPanel("uniqueConstraint",
getString("uniqueConstraint"), new PropertyModel<Boolean>(schema, "uniqueConstraint"));
- final AjaxButton submit = new IndicatingAjaxButton(
- "apply", new ResourceModel("submit")) {
+ final AjaxButton submit = new IndicatingAjaxButton("apply", new ResourceModel("submit")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(final AjaxRequestTarget target,
- final Form form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
SchemaTO schemaTO = (SchemaTO) form.getDefaultModelObject();
@@ -208,8 +195,7 @@ public class SchemaModalPage extends Abs
restClient.updateSchema(kind, schemaTO);
}
if (callerPageRef.getPage() instanceof BasePage) {
- ((BasePage) callerPageRef.getPage()).setModalResult(
- true);
+ ((BasePage) callerPageRef.getPage()).setModalResult(true);
}
window.close(target);
@@ -220,8 +206,7 @@ public class SchemaModalPage extends Abs
}
@Override
- protected void onError(final AjaxRequestTarget target,
- final Form form) {
+ protected void onError(final AjaxRequestTarget target, final Form form) {
target.add(feedbackPanel);
}
@@ -230,15 +215,12 @@ public class SchemaModalPage extends Abs
String allowedRoles;
if (createFlag) {
- allowedRoles = xmlRolesReader.getAllAllowedRoles("Schema",
- "create");
+ allowedRoles = xmlRolesReader.getAllAllowedRoles("Schema", "create");
} else {
- allowedRoles = xmlRolesReader.getAllAllowedRoles("Schema",
- "update");
+ allowedRoles = xmlRolesReader.getAllAllowedRoles("Schema", "update");
}
- MetaDataRoleAuthorizationStrategy.authorize(
- submit, ENABLE, allowedRoles);
+ MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, allowedRoles);
schemaForm.add(name);
schemaForm.add(conversionPattern);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/StatusModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/StatusModalPage.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/StatusModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/StatusModalPage.java Thu Mar 15 10:17:12 2012
@@ -40,10 +40,7 @@ public class StatusModalPage extends Bas
@SpringBean
private UserRestClient userRestClient;
- public StatusModalPage(
- final PageReference callerPageRef,
- final ModalWindow window,
- final UserTO userTO) {
+ public StatusModalPage(final PageReference callerPageRef, final ModalWindow window, final UserTO userTO) {
super();
@@ -52,19 +49,15 @@ public class StatusModalPage extends Bas
final List<StatusBean> statuses = new ArrayList<StatusBean>();
- final StatusPanel statusPanel =
- new StatusPanel("statuspanel", userTO, statuses);
+ final StatusPanel statusPanel = new StatusPanel("statuspanel", userTO, statuses);
form.add(statusPanel);
- final AjaxButton disable = new IndicatingAjaxButton(
- "disable", new ResourceModel("disable", "Disable")) {
+ final AjaxButton disable = new IndicatingAjaxButton("disable", new ResourceModel("disable", "Disable")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(
- final AjaxRequestTarget target,
- final Form form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
try {
userRestClient.suspend(userTO.getId(), statuses);
@@ -82,22 +75,18 @@ public class StatusModalPage extends Bas
}
@Override
- protected void onError(final AjaxRequestTarget target,
- final Form form) {
+ protected void onError(final AjaxRequestTarget target, final Form form) {
target.add(feedbackPanel);
}
};
- final AjaxButton enable = new IndicatingAjaxButton(
- "enable", new ResourceModel("enable", "Enable")) {
+ final AjaxButton enable = new IndicatingAjaxButton("enable", new ResourceModel("enable", "Enable")) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmit(
- final AjaxRequestTarget target,
- final Form form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form form) {
try {
userRestClient.reactivate(userTO.getId(), statuses);
@@ -113,8 +102,7 @@ public class StatusModalPage extends Bas
}
@Override
- protected void onError(final AjaxRequestTarget target,
- final Form form) {
+ protected void onError(final AjaxRequestTarget target, final Form form) {
target.add(feedbackPanel);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SyncTaskModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SyncTaskModalPage.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SyncTaskModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/SyncTaskModalPage.java Thu Mar 15 10:17:12 2012
@@ -43,32 +43,25 @@ public class SyncTaskModalPage extends A
@SpringBean
private ResourceRestClient resourceRestClient;
- public SyncTaskModalPage(
- final ModalWindow window,
- final SyncTaskTO taskTO,
- final PageReference callerPageRef) {
+ public SyncTaskModalPage(final ModalWindow window, final SyncTaskTO taskTO, final PageReference callerPageRef) {
super(window, taskTO, callerPageRef);
- final IModel<List<String>> allResources =
- new LoadableDetachableModel<List<String>>() {
+ final IModel<List<String>> allResources = new LoadableDetachableModel<List<String>>() {
- private static final long serialVersionUID =
- 5275935387613157437L;
+ private static final long serialVersionUID = 5275935387613157437L;
+
+ @Override
+ protected List<String> load() {
+ final List<String> resourceNames = new ArrayList<String>();
- @Override
- protected List<String> load() {
- final List<String> resourceNames =
- new ArrayList<String>();
-
- for (ResourceTO resourceTO :
- resourceRestClient.getAllResources()) {
-
- resourceNames.add(resourceTO.getName());
- }
- return resourceNames;
- }
- };
+ for (ResourceTO resourceTO : resourceRestClient.getAllResources()) {
+
+ resourceNames.add(resourceTO.getName());
+ }
+ return resourceNames;
+ }
+ };
final AjaxDropDownChoicePanel<String> resource = new AjaxDropDownChoicePanel<String>("resource",
getString("resourceName"), new PropertyModel(taskTO, "resource"));
@@ -93,8 +86,7 @@ public class SyncTaskModalPage extends A
final AjaxDropDownChoicePanel<String> actionsClassName = new AjaxDropDownChoicePanel<String>(
"jobActionsClassName", getString("actionsClass"), new PropertyModel(taskTO, "jobActionsClassName"));
actionsClassName.setChoices(classNames.getObject());
- actionsClassName.setStyleShet(
- "ui-widget-content ui-corner-all long_dynamicsize");
+ actionsClassName.setStyleShet("ui-widget-content ui-corner-all long_dynamicsize");
profile.add(actionsClassName);
final AjaxCheckBoxPanel creates = new AjaxCheckBoxPanel("performCreate", getString("creates"),