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 [7/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/panels/PoliciesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PoliciesPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PoliciesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PoliciesPanel.java Thu Mar 15 10:17:12 2012
@@ -70,8 +70,7 @@ public class PoliciesPanel extends Panel
/**
* Logger.
*/
- protected static final Logger LOG = LoggerFactory.getLogger(
- PoliciesPanel.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(PoliciesPanel.class);
private final static int MODAL_WIN_HEIGHT = 400;
@@ -88,8 +87,7 @@ public class PoliciesPanel extends Panel
@SpringBean
private PreferenceManager prefMan;
- final private int paginatorRows = prefMan.getPaginatorRows(
- getWebRequest(), Constants.PREF_POLICY_PAGINATOR_ROWS);
+ final private int paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_POLICY_PAGINATOR_ROWS);
protected boolean modalResult = false;
@@ -101,8 +99,7 @@ public class PoliciesPanel extends Panel
this.policyType = policyType;
// Modal window for editing user attributes
- final ModalWindow mwindow =
- new ModalWindow("editModalWin");
+ final ModalWindow mwindow = new ModalWindow("editModalWin");
mwindow.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
mwindow.setInitialHeight(MODAL_WIN_HEIGHT);
mwindow.setInitialWidth(MODAL_WIN_WIDTH);
@@ -118,29 +115,23 @@ public class PoliciesPanel extends Panel
final 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("description"), "description", "description"));
+ columns.add(new PropertyColumn(new ResourceModel("description"), "description", "description"));
columns.add(new AbstractColumn<PolicyTO>(new ResourceModel("type")) {
private static final long serialVersionUID = 8263694778917279290L;
@Override
- public void populateItem(
- final Item<ICellPopulator<PolicyTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<PolicyTO>> cellItem, final String componentId,
final IModel<PolicyTO> model) {
- cellItem.add(new Label(componentId,
- getString(model.getObject().getType().name())));
+ cellItem.add(new Label(componentId, getString(model.getObject().getType().name())));
}
});
- columns.add(new AbstractColumn<PolicyTO>(
- new ResourceModel("actions", "")) {
+ columns.add(new AbstractColumn<PolicyTO>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = 2054811145491901166L;
@@ -150,15 +141,12 @@ public class PoliciesPanel extends Panel
}
@Override
- public void populateItem(
- final Item<ICellPopulator<PolicyTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<PolicyTO>> cellItem, final String componentId,
final IModel<PolicyTO> model) {
final PolicyTO accountPolicyTO = model.getObject();
- final ActionLinksPanel panel =
- new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
panel.add(new ActionLink() {
@@ -169,14 +157,11 @@ public class PoliciesPanel extends Panel
mwindow.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
- final PolicyModalPage page =
- new PolicyModalPage(
- mwindow, accountPolicyTO);
+ final PolicyModalPage page = new PolicyModalPage(mwindow, accountPolicyTO);
return page;
}
});
@@ -199,11 +184,8 @@ public class PoliciesPanel extends Panel
} catch (SyncopeClientCompositeErrorException e) {
error(getString("operation_error"));
- LOG.error("While deleting resource {}({})",
- new Object[]{
- accountPolicyTO.getId(),
- accountPolicyTO.getDescription()},
- e);
+ LOG.error("While deleting resource {}({})", new Object[] { accountPolicyTO.getId(),
+ accountPolicyTO.getDescription() }, e);
}
target.add(container);
@@ -215,50 +197,41 @@ public class PoliciesPanel extends Panel
}
});
- final AjaxFallbackDefaultDataTable table =
- new AjaxFallbackDefaultDataTable(
- "datatable", columns, new PolicyDataProvider(), paginatorRows);
+ final AjaxFallbackDefaultDataTable table = new AjaxFallbackDefaultDataTable("datatable", columns,
+ new PolicyDataProvider(), paginatorRows);
container.add(table);
- final IndicatingAjaxLink createButton =
- new IndicatingAjaxLink("createLink") {
+ final IndicatingAjaxLink createButton = new IndicatingAjaxLink("createLink") {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- public void onClick(final AjaxRequestTarget target) {
-
- mwindow.setPageCreator(new ModalWindow.PageCreator() {
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ mwindow.setPageCreator(new ModalWindow.PageCreator() {
- @Override
- public Page createPage() {
- final PolicyModalPage page =
- new PolicyModalPage(
- mwindow,
- getPolicyTOInstance(policyType));
- return page;
- }
- });
+ private static final long serialVersionUID = -7834632442532690940L;
- mwindow.show(target);
+ @Override
+ public Page createPage() {
+ final PolicyModalPage page = new PolicyModalPage(mwindow, getPolicyTOInstance(policyType));
+ return page;
}
- };
+ });
+
+ mwindow.show(target);
+ }
+ };
add(createButton);
- MetaDataRoleAuthorizationStrategy.authorize(
- createButton, ENABLE, xmlRolesReader.getAllAllowedRoles(
- "Policies", "create"));
+ MetaDataRoleAuthorizationStrategy.authorize(createButton, ENABLE, xmlRolesReader.getAllAllowedRoles("Policies",
+ "create"));
final Form paginatorForm = new Form("PaginatorForm");
- final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
- new PropertyModel(this, "paginatorRows"),
+ final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"),
prefMan.getPaginatorChoices());
rowsChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
@@ -267,9 +240,8 @@ public class PoliciesPanel extends Panel
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- prefMan.set(getWebRequest(), (WebResponse) getResponse(),
- Constants.PREF_POLICY_PAGINATOR_ROWS,
- String.valueOf(paginatorRows));
+ prefMan.set(getWebRequest(), (WebResponse) getResponse(), Constants.PREF_POLICY_PAGINATOR_ROWS, String
+ .valueOf(paginatorRows));
table.setItemsPerPage(paginatorRows);
target.add(container);
@@ -280,25 +252,20 @@ public class PoliciesPanel extends Panel
add(paginatorForm);
}
- private void setWindowClosedCallback(
- final ModalWindow window,
- final WebMarkupContainer container) {
+ private void setWindowClosedCallback(final ModalWindow window, final WebMarkupContainer container) {
- window.setWindowClosedCallback(
- new ModalWindow.WindowClosedCallback() {
+ window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
- private static final long serialVersionUID =
- 8804221891699487139L;
+ private static final long serialVersionUID = 8804221891699487139L;
- @Override
- public void onClose(final AjaxRequestTarget target) {
- target.add(container);
- }
- });
+ @Override
+ public void onClose(final AjaxRequestTarget target) {
+ target.add(container);
+ }
+ });
}
- private class PolicyDataProvider
- extends SortableDataProvider<PolicyTO> {
+ private class PolicyDataProvider extends SortableDataProvider<PolicyTO> {
private static final long serialVersionUID = -6976327453925166730L;
@@ -319,11 +286,9 @@ public class PoliciesPanel extends Panel
}
@Override
- public Iterator<PolicyTO> iterator(
- final int first, final int count) {
+ public Iterator<PolicyTO> iterator(final int first, final int count) {
- final List<PolicyTO> policies =
- policyRestClient.getPolicies(policyType);
+ final List<PolicyTO> policies = policyRestClient.getPolicies(policyType);
Collections.sort(policies, comparator);
@@ -355,7 +320,6 @@ public class PoliciesPanel extends Panel
policyTO = new PasswordPolicyTO();
break;
-
case GLOBAL_SYNC:
policyTO = new SyncPolicyTO(true);
break;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java Thu Mar 15 10:17:12 2012
@@ -60,31 +60,27 @@ public class PolicyBeanPanel extends Pan
/**
* Logger.
*/
- protected static final Logger LOG = LoggerFactory.getLogger(
- PolicyBeanPanel.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(PolicyBeanPanel.class);
private static final long serialVersionUID = -3035998190456928143L;
@SpringBean
private SchemaRestClient schemaRestClient;
- final IModel<List<String>> schemas =
- new LoadableDetachableModel<List<String>>() {
+ final IModel<List<String>> schemas = new LoadableDetachableModel<List<String>>() {
- private static final long serialVersionUID =
- -2012833443695917883L;
+ private static final long serialVersionUID = -2012833443695917883L;
- @Override
- protected List<String> load() {
- return schemaRestClient.getSchemaNames(AttributableType.USER);
- }
- };
+ @Override
+ protected List<String> load() {
+ return schemaRestClient.getSchemaNames(AttributableType.USER);
+ }
+ };
@SpringBean
protected XMLRolesReader xmlRolesReader;
- public PolicyBeanPanel(
- final String id, final AbstractPolicySpec policy) {
+ public PolicyBeanPanel(final String id, final AbstractPolicySpec policy) {
super(id);
final List<FieldWrapper> items = new ArrayList<FieldWrapper>();
@@ -103,8 +99,7 @@ public class PolicyBeanPanel extends Pan
}
}
- final ListView<FieldWrapper> policies = new ListView<FieldWrapper>(
- "policies", items) {
+ final ListView<FieldWrapper> policies = new ListView<FieldWrapper>("policies", items) {
private static final long serialVersionUID = 9101744072914090143L;
@@ -113,44 +108,37 @@ public class PolicyBeanPanel extends Pan
final FieldWrapper field = item.getModelObject();
- item.add(new Label(
- "label", new ResourceModel(field.getName())));
+ item.add(new Label("label", new ResourceModel(field.getName())));
final AbstractFieldPanel component;
Method classMethod;
try {
if (field.getType().equals(ConflictResolutionAction.class)) {
- classMethod = policy.getClass().getMethod(
- "get" + StringUtils.capitalize(field.getName()),
- new Class[]{});
+ classMethod = policy.getClass().getMethod("get" + StringUtils.capitalize(field.getName()),
+ new Class[] {});
- component = new AjaxDropDownChoicePanel("field", field.getName(),
- new PropertyModel(policy, field.getName()));
+ component = new AjaxDropDownChoicePanel("field", field.getName(), new PropertyModel(policy,
+ field.getName()));
- ((AjaxDropDownChoicePanel) component).setChoices(
- Arrays.asList(ConflictResolutionAction.values()));
+ ((AjaxDropDownChoicePanel) component).setChoices(Arrays.asList(ConflictResolutionAction
+ .values()));
item.add(component);
- item.add(getActivationControl(
- component,
- (Enum) classMethod.invoke(
- policy, new Object[]{}) != null,
- ConflictResolutionAction.IGNORE,
- ConflictResolutionAction.IGNORE));
-
+ item.add(getActivationControl(component,
+ (Enum) classMethod.invoke(policy, new Object[] {}) != null,
+ ConflictResolutionAction.IGNORE, ConflictResolutionAction.IGNORE));
} else if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) {
- item.add(new AjaxCheckBoxPanel("check", field.getName(),
- new PropertyModel(policy, field.getName())));
+ item.add(new AjaxCheckBoxPanel("check", field.getName(), new PropertyModel(policy, field
+ .getName())));
item.add(new Label("field", new Model(null)));
} else if (field.getType().equals(List.class) || field.getType().equals(Set.class)) {
- classMethod = policy.getClass().getMethod(
- "get" + StringUtils.capitalize(field.getName()),
- new Class[]{});
+ classMethod = policy.getClass().getMethod("get" + StringUtils.capitalize(field.getName()),
+ new Class[] {});
if (field.getSchemaList() != null) {
final List values = schemas.getObject();
@@ -160,62 +148,43 @@ public class PolicyBeanPanel extends Pan
values.add("username");
}
- component = new AjaxPalettePanel(
- "field",
- new PropertyModel(policy,
- field.getName()),
+ component = new AjaxPalettePanel("field", new PropertyModel(policy, field.getName()),
new ListModel<String>(values));
item.add(component);
- item.add(getActivationControl(
- component,
- !((List) classMethod.invoke(
- policy, new Object[]{})).isEmpty(),
- new ArrayList<String>(),
- new ArrayList<String>()));
+ item.add(getActivationControl(component, !((List) classMethod.invoke(policy,
+ new Object[] {})).isEmpty(), new ArrayList<String>(), new ArrayList<String>()));
} else {
final FieldPanel panel = new AjaxTextFieldPanel("panel", field.getName(), new Model(null));
panel.setRequired(true);
- component = new MultiValueSelectorPanel<String>(
- "field",
- new PropertyModel(policy, field.getName()),
- panel);
+ component = new MultiValueSelectorPanel<String>("field", new PropertyModel(policy, field
+ .getName()), panel);
item.add(component);
- final List<String> reinitializedValue =
- new ArrayList<String>();
+ final List<String> reinitializedValue = new ArrayList<String>();
reinitializedValue.add("");
- item.add(getActivationControl(
- component,
- !((List<String>) classMethod.invoke(
- policy, new Object[]{})).isEmpty(),
- (Serializable) new ArrayList<String>(),
+ item.add(getActivationControl(component, !((List<String>) classMethod.invoke(policy,
+ new Object[] {})).isEmpty(), (Serializable) new ArrayList<String>(),
(Serializable) reinitializedValue));
}
- } else if (field.getType().equals(int.class)
- || field.getType().equals(Integer.class)) {
+ } else if (field.getType().equals(int.class) || field.getType().equals(Integer.class)) {
- classMethod = policy.getClass().getMethod(
- "get" + StringUtils.capitalize(field.getName()),
- new Class[]{});
+ classMethod = policy.getClass().getMethod("get" + StringUtils.capitalize(field.getName()),
+ new Class[] {});
- component = new AjaxTextFieldPanel("field", field.getName(),
- new PropertyModel(policy, field.getName()));
+ component = new AjaxTextFieldPanel("field", field.getName(), new PropertyModel(policy, field
+ .getName()));
item.add(component);
- item.add(getActivationControl(
- component,
- (Integer) classMethod.invoke(
- policy, new Object[]{}) > 0,
- 0,
- 0));
+ item.add(getActivationControl(component,
+ (Integer) classMethod.invoke(policy, new Object[] {}) > 0, 0, 0));
} else {
item.add(new AjaxCheckBoxPanel("check", field.getName(), new Model()));
item.add(new Label("field", new Model(null)));
@@ -229,11 +198,8 @@ public class PolicyBeanPanel extends Pan
add(policies);
}
- private <T extends Serializable> AjaxCheckBoxPanel getActivationControl(
- final AbstractFieldPanel panel,
- final Boolean checked,
- final T defaultModelObject,
- final T reinitializedValue) {
+ private <T extends Serializable> AjaxCheckBoxPanel getActivationControl(final AbstractFieldPanel panel,
+ final Boolean checked, final T defaultModelObject, final T reinitializedValue) {
final AjaxCheckBoxPanel check = new AjaxCheckBoxPanel("check", "check", new Model(checked));
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java Thu Mar 15 10:17:12 2012
@@ -85,32 +85,22 @@ public class PropagationTasks extends Pa
add(window = new ModalWindow("taskWin"));
- paginatorRows = prefMan.getPaginatorRows(
- getWebRequest(),
- Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS);
+ paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS);
List<IColumn<TaskTO>> columns = new ArrayList<IColumn<TaskTO>>();
- columns.add(new PropertyColumn(
- new ResourceModel("id"), "id", "id"));
+ columns.add(new PropertyColumn(new ResourceModel("id"), "id", "id"));
- columns.add(new PropertyColumn(
- new ResourceModel("resource"), "resource", "resource"));
+ columns.add(new PropertyColumn(new ResourceModel("resource"), "resource", "resource"));
- columns.add(new PropertyColumn(
- new ResourceModel("accountId"), "accountId", "accountId"));
+ columns.add(new PropertyColumn(new ResourceModel("accountId"), "accountId", "accountId"));
- columns.add(new PropertyColumn(
- new ResourceModel("propagationMode"),
- "propagationMode", "propagationMode"));
-
- columns.add(new PropertyColumn(
- new ResourceModel("propagationOperation"),
- "propagationOperation", "propagationOperation"));
-
- columns.add(new PropertyColumn(
- new ResourceModel("latestExecStatus"),
- "latestExecStatus", "latestExecStatus"));
+ columns.add(new PropertyColumn(new ResourceModel("propagationMode"), "propagationMode", "propagationMode"));
+
+ columns.add(new PropertyColumn(new ResourceModel("propagationOperation"), "propagationOperation",
+ "propagationOperation"));
+
+ columns.add(new PropertyColumn(new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
columns.add(new AbstractColumn<TaskTO>(new ResourceModel("actions", "")) {
@@ -122,15 +112,12 @@ public class PropagationTasks extends Pa
}
@Override
- public void populateItem(
- final Item<ICellPopulator<TaskTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<TaskTO>> cellItem, final String componentId,
final IModel<TaskTO> model) {
final TaskTO taskTO = model.getObject();
- final ActionLinksPanel panel =
- new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
panel.add(new ActionLink() {
@@ -141,8 +128,7 @@ public class PropagationTasks extends Pa
window.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
@@ -193,11 +179,8 @@ public class PropagationTasks extends Pa
}
});
- final AjaxFallbackDefaultDataTable<TaskTO> table =
- new AjaxFallbackDefaultDataTable<TaskTO>(
- "datatable", columns, new TasksProvider(restClient,
- paginatorRows, getId(), PropagationTaskTO.class),
- paginatorRows);
+ final AjaxFallbackDefaultDataTable<TaskTO> table = new AjaxFallbackDefaultDataTable<TaskTO>("datatable",
+ columns, new TasksProvider(restClient, paginatorRows, getId(), PropagationTaskTO.class), paginatorRows);
container = new WebMarkupContainer("container");
container.add(table);
@@ -205,22 +188,20 @@ public class PropagationTasks extends Pa
add(container);
- window.setWindowClosedCallback(
- new ModalWindow.WindowClosedCallback() {
+ window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
- private static final long serialVersionUID =
- 8804221891699487139L;
+ private static final long serialVersionUID = 8804221891699487139L;
- @Override
- public void onClose(final AjaxRequestTarget target) {
- target.add(container);
- if (operationResult) {
- info(getString("operation_succeded"));
- target.add(getPage().get("feedback"));
- operationResult = false;
- }
- }
- });
+ @Override
+ public void onClose(final AjaxRequestTarget target) {
+ target.add(container);
+ if (operationResult) {
+ info(getString("operation_succeded"));
+ target.add(getPage().get("feedback"));
+ operationResult = false;
+ }
+ }
+ });
window.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
window.setInitialHeight(WIN_HEIGHT);
@@ -229,8 +210,7 @@ public class PropagationTasks extends Pa
Form paginatorForm = new Form("PaginatorForm");
- final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
- new PropertyModel(this, "paginatorRows"),
+ final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"),
prefMan.getPaginatorChoices());
rowsChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
@@ -240,8 +220,7 @@ public class PropagationTasks extends Pa
@Override
protected void onUpdate(final AjaxRequestTarget target) {
prefMan.set(getWebRequest(), (WebResponse) getResponse(),
- Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS,
- String.valueOf(paginatorRows));
+ Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS, String.valueOf(paginatorRows));
table.setItemsPerPage(paginatorRows);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java Thu Mar 15 10:17:12 2012
@@ -63,34 +63,23 @@ public class ResourceConnConfPanel exten
/**
* Logger.
*/
- protected static final Logger LOG =
- LoggerFactory.getLogger(ResourceConnConfPanel.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ResourceConnConfPanel.class);
/**
* GuardedString is not in classpath.
*/
- private static final String GUARDED_STRING =
- "org.identityconnectors.common.security.GuardedString";
+ private static final String GUARDED_STRING = "org.identityconnectors.common.security.GuardedString";
/**
* GuardedByteArray is not in classpath.
*/
- private static final String GUARDED_BYTE_ARRAY =
- "org.identityconnectors.common.security.GuardedByteArray";
+ private static final String GUARDED_BYTE_ARRAY = "org.identityconnectors.common.security.GuardedByteArray";
/**
* Number java types.
*/
- private static final List<Class> NUMBER = Arrays.asList(new Class[]{
- Integer.class,
- Double.class,
- Long.class,
- Float.class,
- Number.class,
- Integer.TYPE,
- Long.TYPE,
- Double.TYPE,
- Float.TYPE});
+ private static final List<Class> NUMBER = Arrays.asList(new Class[] { Integer.class, Double.class, Long.class,
+ Float.class, Number.class, Integer.TYPE, Long.TYPE, Double.TYPE, Float.TYPE });
@SpringBean
private ConnectorRestClient connRestClient;
@@ -105,10 +94,7 @@ public class ResourceConnConfPanel exten
private ResourceTO resourceTO;
- public ResourceConnConfPanel(
- final String id,
- final ResourceTO resourceTO,
- final boolean createFlag) {
+ public ResourceConnConfPanel(final String id, final ResourceTO resourceTO, final boolean createFlag) {
super(id);
setOutputMarkupId(true);
@@ -118,31 +104,24 @@ public class ResourceConnConfPanel exten
connConfProperties = getConnConfProperties();
- connConfPropContainer =
- new WebMarkupContainer("connectorPropertiesContainer");
+ connConfPropContainer = new WebMarkupContainer("connectorPropertiesContainer");
connConfPropContainer.setOutputMarkupId(true);
add(connConfPropContainer);
check = new IndicatingAjaxLink("check", new ResourceModel("check")) {
- private static final long serialVersionUID =
- -4199438518229098169L;
+ private static final long serialVersionUID = -4199438518229098169L;
@Override
public void onClick(final AjaxRequestTarget target) {
- ConnInstanceTO connectorTO =
- connRestClient.read(
- resourceTO.getConnectorId());
-
- connectorTO.setConfiguration(
- ConnConfPropUtils.joinConnInstanceProperties(
- connectorTO.getConfigurationMap(),
- ConnConfPropUtils.getConnConfPropertyMap(
- resourceTO.getConnConfProperties())));
+ ConnInstanceTO connectorTO = connRestClient.read(resourceTO.getConnectorId());
- if (connRestClient.check(
- connectorTO).booleanValue()) {
+ connectorTO.setConfiguration(ConnConfPropUtils.joinConnInstanceProperties(connectorTO
+ .getConfigurationMap(), ConnConfPropUtils.getConnConfPropertyMap(resourceTO
+ .getConnConfProperties())));
+
+ if (connRestClient.check(connectorTO).booleanValue()) {
info(getString("success_connection"));
} else {
error(getString("error_connection"));
@@ -158,9 +137,8 @@ public class ResourceConnConfPanel exten
/*
* the list of overridable connector properties
*/
- connConfPropContainer.add(new ListView<ConnConfProperty>(
- "connectorProperties",
- new PropertyModel(this, "connConfProperties")) {
+ connConfPropContainer.add(new ListView<ConnConfProperty>("connectorProperties", new PropertyModel(this,
+ "connConfProperties")) {
private static final long serialVersionUID = 9101744072914090143L;
@@ -168,8 +146,7 @@ public class ResourceConnConfPanel exten
protected void populateItem(final ListItem<ConnConfProperty> item) {
final ConnConfProperty property = item.getModelObject();
- final Label label = new Label("connPropAttrSchema",
- property.getSchema().getDisplayName() == null
+ final Label label = new Label("connPropAttrSchema", property.getSchema().getDisplayName() == null
|| property.getSchema().getDisplayName().isEmpty()
? property.getSchema().getName()
: property.getSchema().getDisplayName());
@@ -182,10 +159,8 @@ public class ResourceConnConfPanel exten
boolean isArray = false;
- if (GUARDED_STRING.equalsIgnoreCase(
- property.getSchema().getType())
- || GUARDED_BYTE_ARRAY.equalsIgnoreCase(
- property.getSchema().getType())) {
+ if (GUARDED_STRING.equalsIgnoreCase(property.getSchema().getType())
+ || GUARDED_BYTE_ARRAY.equalsIgnoreCase(property.getSchema().getType())) {
field = new AjaxPasswordFieldPanel("panel", label.getDefaultModelObjectAsString(), new Model());
((PasswordTextField) field.getField()).setResetPassword(false);
@@ -196,17 +171,16 @@ public class ResourceConnConfPanel exten
Class propertySchemaClass;
try {
- propertySchemaClass = ClassUtils.forName(
- property.getSchema().getType(),
- ClassUtils.getDefaultClassLoader());
+ propertySchemaClass = ClassUtils.forName(property.getSchema().getType(), ClassUtils
+ .getDefaultClassLoader());
} catch (Exception e) {
LOG.error("Error parsing attribute type", e);
propertySchemaClass = String.class;
}
if (NUMBER.contains(propertySchemaClass)) {
- field = new AjaxNumberFieldPanel("panel", label.getDefaultModelObjectAsString(),
- new Model(), ClassUtils.resolvePrimitiveIfNecessary(propertySchemaClass));
+ field = new AjaxNumberFieldPanel("panel", label.getDefaultModelObjectAsString(), new Model(),
+ ClassUtils.resolvePrimitiveIfNecessary(propertySchemaClass));
required = property.getSchema().isRequired();
} else if (Boolean.class.equals(propertySchemaClass) || boolean.class.equals(propertySchemaClass)) {
@@ -231,12 +205,8 @@ public class ResourceConnConfPanel exten
property.getValues().add(null);
}
- final MultiValueSelectorPanel multiFields =
- new MultiValueSelectorPanel<String>(
- "panel",
- new PropertyModel<List<String>>(property, "values"),
- field,
- true);
+ final MultiValueSelectorPanel multiFields = new MultiValueSelectorPanel<String>("panel",
+ new PropertyModel<List<String>>(property, "values"), field, true);
item.add(multiFields);
} else {
@@ -244,20 +214,15 @@ public class ResourceConnConfPanel exten
field.addRequiredLabel();
}
- field.getField().add(
- new AjaxFormComponentUpdatingBehavior("onchange") {
+ field.getField().add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
- @Override
- protected void onUpdate(
- final AjaxRequestTarget target) {
- send(getPage(), Broadcast.BREADTH,
- new ConnConfModEvent(
- target, connConfProperties));
- }
- });
+ @Override
+ protected void onUpdate(final AjaxRequestTarget target) {
+ send(getPage(), Broadcast.BREADTH, new ConnConfModEvent(target, connConfProperties));
+ }
+ });
field.setNewModel(property.getValues());
item.add(field);
@@ -285,8 +250,7 @@ public class ResourceConnConfPanel exten
final Long connectorId = resourceTO.getConnectorId();
if (connectorId != null && connectorId > 0) {
- for (ConnConfProperty property :
- connRestClient.getConnectorProperties(connectorId)) {
+ for (ConnConfProperty property : connRestClient.getConnectorProperties(connectorId)) {
if (property.isOverridable()) {
props.add(property);
@@ -302,8 +266,7 @@ public class ResourceConnConfPanel exten
public void onEvent(final IEvent<?> event) {
if (event.getPayload() instanceof DetailsModEvent) {
// connectro change: update properties and forward event
- final AjaxRequestTarget target =
- ((ResourceEvent) event.getPayload()).getTarget();
+ final AjaxRequestTarget target = ((ResourceEvent) event.getPayload()).getTarget();
connConfProperties = getConnConfProperties();
check.setEnabled(!connConfProperties.isEmpty());
@@ -311,16 +274,13 @@ public class ResourceConnConfPanel exten
target.add(connConfPropContainer);
// get configuration properties and send a new event
- send(getPage(), Broadcast.BREADTH,
- new ConnConfModEvent(target, connConfProperties));
+ send(getPage(), Broadcast.BREADTH, new ConnConfModEvent(target, connConfProperties));
} else if (event.getPayload() instanceof MultiValueSelectorEvent) {
// multi value connector property change: forward event
- final AjaxRequestTarget target =
- ((MultiValueSelectorEvent) event.getPayload()).getTarget();
+ final AjaxRequestTarget target = ((MultiValueSelectorEvent) event.getPayload()).getTarget();
- send(getPage(), Broadcast.BREADTH,
- new ConnConfModEvent(target, connConfProperties));
+ send(getPage(), Broadcast.BREADTH, new ConnConfModEvent(target, connConfProperties));
}
}
@@ -337,9 +297,7 @@ public class ResourceConnConfPanel exten
* @param target request target.
* @param target connector configuration properties.
*/
- public ConnConfModEvent(
- final AjaxRequestTarget target,
- final List<ConnConfProperty> conf) {
+ public ConnConfModEvent(final AjaxRequestTarget target, final List<ConnConfProperty> conf) {
super(target);
this.configuration = conf;
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java Thu Mar 15 10:17:12 2012
@@ -51,39 +51,32 @@ public class ResourceDetailsPanel extend
/**
* Logger.
*/
- protected static final Logger LOG =
- LoggerFactory.getLogger(ResourceDetailsPanel.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ResourceDetailsPanel.class);
@SpringBean
private ConnectorRestClient connRestClient;
private ConnInstanceTO connInstanceTO;
- public ResourceDetailsPanel(
- final String id,
- final ResourceTO resourceTO,
- final boolean createFlag) {
+ public ResourceDetailsPanel(final String id, final ResourceTO resourceTO, final boolean createFlag) {
super(id);
setOutputMarkupId(true);
- final IModel<List<ConnInstanceTO>> connectors =
- new LoadableDetachableModel<List<ConnInstanceTO>>() {
+ final IModel<List<ConnInstanceTO>> connectors = new LoadableDetachableModel<List<ConnInstanceTO>>() {
- private static final long serialVersionUID =
- 5275935387613157437L;
+ private static final long serialVersionUID = 5275935387613157437L;
- @Override
- protected List<ConnInstanceTO> load() {
- return connRestClient.getAllConnectors();
- }
- };
+ @Override
+ protected List<ConnInstanceTO> load() {
+ return connRestClient.getAllConnectors();
+ }
+ };
- connInstanceTO =
- getConectorInstanceTO(connectors.getObject(), resourceTO);
+ connInstanceTO = getConectorInstanceTO(connectors.getObject(), resourceTO);
- final AjaxTextFieldPanel resourceName = new AjaxTextFieldPanel("name",
- new ResourceModel("name", "name").getObject(), new PropertyModel<String>(resourceTO, "name"));
+ final AjaxTextFieldPanel resourceName = new AjaxTextFieldPanel("name", new ResourceModel("name", "name")
+ .getObject(), new PropertyModel<String>(resourceTO, "name"));
resourceName.setEnabled(createFlag);
resourceName.addRequiredLabel();
@@ -94,21 +87,20 @@ public class ResourceDetailsPanel extend
new PropertyModel<Boolean>(resourceTO, "forceMandatoryConstraint"));
add(forceMandatoryConstraint);
- final AjaxCheckBoxPanel propagationPrimary = new AjaxCheckBoxPanel("propagationPrimary",
- new ResourceModel("propagationPrimary", "propagationPrimary").getObject(),
- new PropertyModel<Boolean>(resourceTO, "propagationPrimary"));
+ final AjaxCheckBoxPanel propagationPrimary = new AjaxCheckBoxPanel("propagationPrimary", new ResourceModel(
+ "propagationPrimary", "propagationPrimary").getObject(), new PropertyModel<Boolean>(resourceTO,
+ "propagationPrimary"));
add(propagationPrimary);
final AjaxNumberFieldPanel propagationPriority = new AjaxNumberFieldPanel("propagationPriority",
- new ResourceModel("propagationPriority", "propagationPriority").getObject(),
- new PropertyModel<Number>(resourceTO, "propagationPriority"), Integer.class);
+ new ResourceModel("propagationPriority", "propagationPriority").getObject(), new PropertyModel<Number>(
+ resourceTO, "propagationPriority"), Integer.class);
add(propagationPriority);
final AjaxDropDownChoicePanel<PropagationMode> propagationMode = new AjaxDropDownChoicePanel<PropagationMode>(
"propagationMode", new ResourceModel("propagationMode", "propagationMode").getObject(),
new PropertyModel(resourceTO, "propagationMode"));
- propagationMode.setChoices(
- Arrays.asList(PropagationMode.values()));
+ propagationMode.setChoices(Arrays.asList(PropagationMode.values()));
add(propagationMode);
final AjaxDropDownChoicePanel<TraceLevel> createTraceLevel = new AjaxDropDownChoicePanel<TraceLevel>(
@@ -130,32 +122,29 @@ public class ResourceDetailsPanel extend
add(deleteTraceLevel);
final AjaxDropDownChoicePanel<TraceLevel> syncTraceLevel = new AjaxDropDownChoicePanel<TraceLevel>(
- "syncTraceLevel", new ResourceModel("syncTraceLevel", "syncTraceLevel").getObject(),
- new PropertyModel(resourceTO, "syncTraceLevel"));
+ "syncTraceLevel", new ResourceModel("syncTraceLevel", "syncTraceLevel").getObject(), new PropertyModel(
+ resourceTO, "syncTraceLevel"));
syncTraceLevel.setChoices(Arrays.asList(TraceLevel.values()));
add(syncTraceLevel);
- final AjaxCheckBoxPanel resetToken = new AjaxCheckBoxPanel("resetToken",
- new ResourceModel("resetToken", "resetToken").getObject(), new Model(null));
+ final AjaxCheckBoxPanel resetToken = new AjaxCheckBoxPanel("resetToken", new ResourceModel("resetToken",
+ "resetToken").getObject(), new Model(null));
- resetToken.getField().add(
- new AjaxFormComponentUpdatingBehavior("onchange") {
+ resetToken.getField().add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
- @Override
- protected void onUpdate(final AjaxRequestTarget art) {
- if (resetToken.getModelObject()) {
- resourceTO.setSyncToken(null);
- }
- }
- });
+ @Override
+ protected void onUpdate(final AjaxRequestTarget art) {
+ if (resetToken.getModelObject()) {
+ resourceTO.setSyncToken(null);
+ }
+ }
+ });
add(resetToken);
- final AjaxDropDownChoicePanel<ConnInstanceTO> conn = new AjaxDropDownChoicePanel<ConnInstanceTO>(
- "connector", new ResourceModel("connector", "connector").getObject(),
- new PropertyModel(this, "connInstanceTO"));
+ final AjaxDropDownChoicePanel<ConnInstanceTO> conn = new AjaxDropDownChoicePanel<ConnInstanceTO>("connector",
+ new ResourceModel("connector", "connector").getObject(), new PropertyModel(this, "connInstanceTO"));
conn.setChoices(connectors.getObject());
conn.setChoiceRenderer(new ChoiceRenderer("displayName", "id"));
@@ -184,8 +173,7 @@ public class ResourceDetailsPanel extend
conn.getField().add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onUpdate(final AjaxRequestTarget target) {
@@ -203,9 +191,7 @@ public class ResourceDetailsPanel extend
* @param resourceTO resource.
* @return selected connector instance.
*/
- private ConnInstanceTO getConectorInstanceTO(
- final List<ConnInstanceTO> connectorTOs,
- final ResourceTO resourceTO) {
+ private ConnInstanceTO getConectorInstanceTO(final List<ConnInstanceTO> connectorTOs, final ResourceTO resourceTO) {
for (ConnInstanceTO to : connectorTOs) {
if (Long.valueOf(to.getId()).equals(resourceTO.getConnectorId())) {
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java Thu Mar 15 10:17:12 2012
@@ -71,8 +71,7 @@ public class ResourceMappingPanel extend
/**
* Logger.
*/
- protected static final Logger LOG =
- LoggerFactory.getLogger(ResourceMappingPanel.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ResourceMappingPanel.class);
/**
* Schema rest client.
@@ -158,9 +157,8 @@ public class ResourceMappingPanel extend
initResourceSchemaNames();
- final AjaxTextFieldPanel accountLink = new AjaxTextFieldPanel("accountLink",
- new ResourceModel("accountLink", "accountLink").getObject(),
- new PropertyModel<String>(resourceTO, "accountLink"));
+ final AjaxTextFieldPanel accountLink = new AjaxTextFieldPanel("accountLink", new ResourceModel("accountLink",
+ "accountLink").getObject(), new PropertyModel<String>(resourceTO, "accountLink"));
add(accountLink);
mappingContainer = new WebMarkupContainer("mappingContainer");
@@ -180,7 +178,8 @@ public class ResourceMappingPanel extend
final SchemaMappingTO mappingTO = item.getModelObject();
final AttributableType entity = mappingTO.getIntMappingType() == null
- ? null : mappingTO.getIntMappingType().getAttributableType();
+ ? null
+ : mappingTO.getIntMappingType().getAttributableType();
attrTypes = getAttributeTypes(entity);
@@ -213,10 +212,7 @@ public class ResourceMappingPanel extend
@Override
public CharSequence preDecorateScript(final CharSequence script) {
- return "if (confirm('"
- + getString("confirmDelete")
- + "'))"
- + "{" + script + "} "
+ return "if (confirm('" + getString("confirmDelete") + "'))" + "{" + script + "} "
+ "else {this.checked = false;}";
}
};
@@ -270,14 +266,12 @@ public class ResourceMappingPanel extend
final FieldPanel extAttrName;
if (schemaNames.isEmpty()) {
- extAttrName = new AjaxTextFieldPanel("extAttrName",
- new ResourceModel("extAttrNames", "extAttrNames").getObject(),
- new PropertyModel<String>(mappingTO, "extAttrName"));
+ extAttrName = new AjaxTextFieldPanel("extAttrName", new ResourceModel("extAttrNames",
+ "extAttrNames").getObject(), new PropertyModel<String>(mappingTO, "extAttrName"));
} else {
- extAttrName = new AjaxDropDownChoicePanel<String>("extAttrName",
- new ResourceModel("extAttrNames", "extAttrNames").getObject(),
- new PropertyModel(mappingTO, "extAttrName"));
+ extAttrName = new AjaxDropDownChoicePanel<String>("extAttrName", new ResourceModel("extAttrNames",
+ "extAttrNames").getObject(), new PropertyModel(mappingTO, "extAttrName"));
((AjaxDropDownChoicePanel) extAttrName).setChoices(schemaNames);
}
@@ -289,19 +283,18 @@ public class ResourceMappingPanel extend
extAttrName.setStyleShet(fieldStyle);
item.add(extAttrName);
- final AjaxTextFieldPanel mandatory = new AjaxTextFieldPanel("mandatoryCondition",
- new ResourceModel("mandatoryCondition", "mandatoryCondition").getObject(),
- new PropertyModel(mappingTO, "mandatoryCondition"));
+ final AjaxTextFieldPanel mandatory = new AjaxTextFieldPanel("mandatoryCondition", new ResourceModel(
+ "mandatoryCondition", "mandatoryCondition").getObject(), new PropertyModel(mappingTO,
+ "mandatoryCondition"));
- mandatory.setChoices(Arrays.asList(new String[]{"true", "false"}));
+ mandatory.setChoices(Arrays.asList(new String[] { "true", "false" }));
mandatory.setStyleShet(shortFieldStyle);
item.add(mandatory);
- final AjaxCheckBoxPanel accountId = new AjaxCheckBoxPanel("accountId",
- new ResourceModel("accountId", "accountId").getObject(),
- new PropertyModel(mappingTO, "accountid"));
+ final AjaxCheckBoxPanel accountId = new AjaxCheckBoxPanel("accountId", new ResourceModel("accountId",
+ "accountId").getObject(), new PropertyModel(mappingTO, "accountid"));
accountId.getField().add(new AjaxFormComponentUpdatingBehavior(onchange) {
@@ -318,9 +311,8 @@ public class ResourceMappingPanel extend
item.add(accountId);
- final AjaxCheckBoxPanel password = new AjaxCheckBoxPanel("password",
- new ResourceModel("password", "password").getObject(),
- new PropertyModel(mappingTO, "password"));
+ final AjaxCheckBoxPanel password = new AjaxCheckBoxPanel("password", new ResourceModel("password",
+ "password").getObject(), new PropertyModel(mappingTO, "password"));
password.getField().add(new AjaxFormComponentUpdatingBehavior(onchange) {
@@ -362,8 +354,7 @@ public class ResourceMappingPanel extend
mappings.setReuseItems(true);
mappingContainer.add(mappings);
- addMappingBtn = new IndicatingAjaxButton(
- "addUserSchemaMappingBtn", new ResourceModel("add")) {
+ addMappingBtn = new IndicatingAjaxButton("addUserSchemaMappingBtn", new ResourceModel("add")) {
private static final long serialVersionUID = -4804368561204623354L;
@@ -515,8 +506,8 @@ public class ResourceMappingPanel extend
* @param accountId accountId checkbox.
* @param password password checkbox.
*/
- private void setAccountId(
- final IntMappingType type, final AjaxCheckBoxPanel accountId, final AjaxCheckBoxPanel password) {
+ private void setAccountId(final IntMappingType type, final AjaxCheckBoxPanel accountId,
+ final AjaxCheckBoxPanel password) {
if (type != null && type.getAttributableType() != null) {
switch (type) {
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java Thu Mar 15 10:17:12 2012
@@ -43,8 +43,7 @@ public class ResourceSecurityPanel exten
/**
* Logger.
*/
- protected static final Logger LOG =
- LoggerFactory.getLogger(ResourceSecurityPanel.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ResourceSecurityPanel.class);
private static final long serialVersionUID = -7982691107029848579L;
@@ -70,8 +69,7 @@ public class ResourceSecurityPanel exten
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO :
- policyRestClient.getPolicies(PolicyType.PASSWORD)) {
+ for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PASSWORD)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
@@ -85,8 +83,7 @@ public class ResourceSecurityPanel exten
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO :
- policyRestClient.getPolicies(PolicyType.ACCOUNT)) {
+ for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.ACCOUNT)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
@@ -100,16 +97,14 @@ public class ResourceSecurityPanel exten
@Override
protected Map<Long, String> load() {
Map<Long, String> res = new HashMap<Long, String>();
- for (PolicyTO policyTO :
- policyRestClient.getPolicies(PolicyType.SYNC)) {
+ for (PolicyTO policyTO : policyRestClient.getPolicies(PolicyType.SYNC)) {
res.put(policyTO.getId(), policyTO.getDescription());
}
return res;
}
};
- final WebMarkupContainer securityContainer =
- new WebMarkupContainer("security");
+ final WebMarkupContainer securityContainer = new WebMarkupContainer("security");
securityContainer.setOutputMarkupId(true);
add(securityContainer);
@@ -118,14 +113,12 @@ public class ResourceSecurityPanel exten
// Password policy specification
// -------------------------------
final AjaxDropDownChoicePanel<Long> passwordPolicy = new AjaxDropDownChoicePanel<Long>("passwordPolicy",
- new ResourceModel("passwordPolicy", "passwordPolicy").getObject(),
- new PropertyModel(resourceTO, "passwordPolicy"));
+ new ResourceModel("passwordPolicy", "passwordPolicy").getObject(), new PropertyModel(resourceTO,
+ "passwordPolicy"));
- passwordPolicy.setChoiceRenderer(
- new PolicyRenderer(PolicyType.PASSWORD));
+ passwordPolicy.setChoiceRenderer(new PolicyRenderer(PolicyType.PASSWORD));
- passwordPolicy.setChoices(
- new ArrayList<Long>(passwordPolicies.getObject().keySet()));
+ passwordPolicy.setChoices(new ArrayList<Long>(passwordPolicies.getObject().keySet()));
((DropDownChoice) passwordPolicy.getField()).setNullValid(true);
@@ -136,14 +129,12 @@ public class ResourceSecurityPanel exten
// Account policy specification
// -------------------------------
final AjaxDropDownChoicePanel<Long> accountPolicy = new AjaxDropDownChoicePanel<Long>("accountPolicy",
- new ResourceModel("accountPolicy", "accountPolicy").getObject(),
- new PropertyModel(resourceTO, "accountPolicy"));
+ new ResourceModel("accountPolicy", "accountPolicy").getObject(), new PropertyModel(resourceTO,
+ "accountPolicy"));
- accountPolicy.setChoiceRenderer(
- new PolicyRenderer(PolicyType.ACCOUNT));
+ accountPolicy.setChoiceRenderer(new PolicyRenderer(PolicyType.ACCOUNT));
- accountPolicy.setChoices(
- new ArrayList<Long>(accountPolicies.getObject().keySet()));
+ accountPolicy.setChoices(new ArrayList<Long>(accountPolicies.getObject().keySet()));
((DropDownChoice) accountPolicy.getField()).setNullValid(true);
@@ -156,11 +147,9 @@ public class ResourceSecurityPanel exten
final AjaxDropDownChoicePanel<Long> syncPolicy = new AjaxDropDownChoicePanel<Long>("syncPolicy",
new ResourceModel("syncPolicy", "syncPolicy").getObject(), new PropertyModel(resourceTO, "syncPolicy"));
- syncPolicy.setChoiceRenderer(
- new PolicyRenderer(PolicyType.SYNC));
+ syncPolicy.setChoiceRenderer(new PolicyRenderer(PolicyType.SYNC));
- syncPolicy.setChoices(
- new ArrayList<Long>(syncPolicies.getObject().keySet()));
+ syncPolicy.setChoices(new ArrayList<Long>(syncPolicies.getObject().keySet()));
((DropDownChoice) syncPolicy.getField()).setNullValid(true);
@@ -198,7 +187,9 @@ public class ResourceSecurityPanel exten
@Override
public String getIdValue(Long object, int index) {
- return String.valueOf(object != null ? object : 0L);
+ return String.valueOf(object != null
+ ? object
+ : 0L);
}
};
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java Thu Mar 15 10:17:12 2012
@@ -38,33 +38,26 @@ public class ResourcesPanel extends Pane
@SpringBean
private ResourceRestClient resourceRestClient;
- 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>();
-
- for (ResourceTO resourceTO :
- resourceRestClient.getAllResources()) {
- resourceNames.add(resourceTO.getName());
- }
- return resourceNames;
- }
- };
+ @Override
+ protected List<String> load() {
+ final List<String> resourceNames = new ArrayList<String>();
+
+ for (ResourceTO resourceTO : resourceRestClient.getAllResources()) {
+ resourceNames.add(resourceTO.getName());
+ }
+ return resourceNames;
+ }
+ };
- public <T extends AbstractAttributableTO> ResourcesPanel(
- final String id, final T entityTO) {
+ public <T extends AbstractAttributableTO> ResourcesPanel(final String id, final T entityTO) {
super(id);
- final AjaxPalettePanel resourcesPalette = new AjaxPalettePanel(
- "resourcesPalette",
- new PropertyModel(entityTO, "resources"),
- new ListModel<String>(allResources.getObject()));
+ final AjaxPalettePanel resourcesPalette = new AjaxPalettePanel("resourcesPalette", new PropertyModel(entityTO,
+ "resources"), new ListModel<String>(allResources.getObject()));
add(resourcesPalette);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java Thu Mar 15 10:17:12 2012
@@ -79,8 +79,7 @@ public class ResultSetPanel extends Pane
/**
* Logger.
*/
- private static final Logger LOG =
- LoggerFactory.getLogger(ResultSetPanel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResultSetPanel.class);
/**
* Edit modal window height.
@@ -188,11 +187,8 @@ public class ResultSetPanel extends Pane
*/
private final BasePage page;
- public <T extends AbstractAttributableTO> ResultSetPanel(
- final String id,
- final boolean filtered,
- final NodeCond searchCond,
- final PageReference callerRef) {
+ public <T extends AbstractAttributableTO> ResultSetPanel(final String id, final boolean filtered,
+ final NodeCond searchCond, final PageReference callerRef) {
super(id);
setOutputMarkupId(true);
@@ -243,19 +239,15 @@ public class ResultSetPanel extends Pane
@Override
public void onClick(final AjaxRequestTarget target) {
- displaymodal.setPageCreator(
- new ModalWindow.PageCreator() {
+ displaymodal.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- return new DisplayAttributesModalPage(
- page.getPageReference(),
- displaymodal);
- }
- });
+ @Override
+ public Page createPage() {
+ return new DisplayAttributesModalPage(page.getPageReference(), displaymodal);
+ }
+ });
displaymodal.show(target);
}
@@ -268,8 +260,7 @@ public class ResultSetPanel extends Pane
private static final long serialVersionUID = 1469628524240283489L;
@Override
- public void onComponentTag(
- final Component component, final ComponentTag tag) {
+ public void onComponentTag(final Component component, final ComponentTag tag) {
if (resultTable.getRowCount() > rows) {
tag.remove("class");
@@ -281,8 +272,8 @@ public class ResultSetPanel extends Pane
}
});
- MetaDataRoleAuthorizationStrategy.authorize(displayAttrsLink, ENABLE,
- xmlRolesReader.getAllAllowedRoles("Users", "changeView"));
+ MetaDataRoleAuthorizationStrategy.authorize(displayAttrsLink, ENABLE, xmlRolesReader.getAllAllowedRoles(
+ "Users", "changeView"));
container.add(displayAttrsLink);
// ---------------------------
@@ -293,10 +284,8 @@ public class ResultSetPanel extends Pane
final Form paginatorForm = new Form("paginator");
container.add(paginatorForm);
- final DropDownChoice<Integer> rowsChooser =
- new DropDownChoice<Integer>("rowsChooser",
- new PropertyModel(this, "rows"),
- preferences.getPaginatorChoices());
+ final DropDownChoice<Integer> rowsChooser = new DropDownChoice<Integer>("rowsChooser", new PropertyModel(this,
+ "rows"), preferences.getPaginatorChoices());
rowsChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
@@ -304,9 +293,7 @@ public class ResultSetPanel extends Pane
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- preferences.set(getRequest(), getResponse(),
- Constants.PREF_USERS_PAGINATOR_ROWS,
- String.valueOf(rows));
+ preferences.set(getRequest(), getResponse(), Constants.PREF_USERS_PAGINATOR_ROWS, String.valueOf(rows));
final EventDataWrapper data = new EventDataWrapper();
data.setTarget(target);
@@ -322,8 +309,7 @@ public class ResultSetPanel extends Pane
setWindowClosedReloadCallback(displaymodal);
}
- public void search(
- final NodeCond searchCond, final AjaxRequestTarget target) {
+ public void search(final NodeCond searchCond, final AjaxRequestTarget target) {
this.filter = searchCond;
dataProvider.setSearchCond(filter);
@@ -332,20 +318,18 @@ public class ResultSetPanel extends Pane
private void updateResultTable(final boolean create) {
// Requires preferences/container attributes not null ...
- rows = preferences.getPaginatorRows(
- getRequest(), Constants.PREF_USERS_PAGINATOR_ROWS);
+ rows = preferences.getPaginatorRows(getRequest(), Constants.PREF_USERS_PAGINATOR_ROWS);
dataProvider = new UserDataProvider(userRestClient, rows, filtered);
dataProvider.setSearchCond(filter);
final int currentPage = resultTable != null
? (create
- ? resultTable.getPageCount() - 1
- : resultTable.getCurrentPage())
+ ? resultTable.getPageCount() - 1
+ : resultTable.getCurrentPage())
: 0;
- resultTable = new AjaxFallbackDefaultDataTable<UserTO>(
- "resultTable", getColumns(), dataProvider, rows);
+ resultTable = new AjaxFallbackDefaultDataTable<UserTO>("resultTable", getColumns(), dataProvider, rows);
resultTable.setCurrentPage(currentPage);
@@ -357,8 +341,7 @@ public class ResultSetPanel extends Pane
private List<IColumn<UserTO>> getColumns() {
final List<IColumn<UserTO>> columns = new ArrayList<IColumn<UserTO>>();
- for (String name : preferences.getList(getRequest(),
- Constants.PREF_USERS_DETAILS_VIEW)) {
+ for (String name : preferences.getList(getRequest(), Constants.PREF_USERS_DETAILS_VIEW)) {
Field field = null;
@@ -369,49 +352,36 @@ public class ResultSetPanel extends Pane
try {
field = AbstractAttributableTO.class.getDeclaredField(name);
} catch (Exception aae) {
- LOG.error("Error retrieving AbstractAttributableTO field {}",
- name, aae);
+ LOG.error("Error retrieving AbstractAttributableTO field {}", name, aae);
}
}
if ("token".equalsIgnoreCase(name)) {
columns.add(new TokenColumn("token"));
} else if (field != null && field.getType().equals(Date.class)) {
- columns.add(new DatePropertyColumn<UserTO>(
- new ResourceModel(name, name), name, name));
+ columns.add(new DatePropertyColumn<UserTO>(new ResourceModel(name, name), name, name));
} else {
- columns.add(new PropertyColumn(
- new ResourceModel(name, name), name, name));
+ columns.add(new PropertyColumn(new ResourceModel(name, name), name, name));
}
}
- for (String name : preferences.getList(getRequest(),
- Constants.PREF_USERS_ATTRIBUTES_VIEW)) {
- columns.add(new UserAttrColumn(
- name, UserAttrColumn.SchemaType.schema));
+ for (String name : preferences.getList(getRequest(), Constants.PREF_USERS_ATTRIBUTES_VIEW)) {
+ columns.add(new UserAttrColumn(name, UserAttrColumn.SchemaType.schema));
}
- for (String name : preferences.getList(getRequest(),
- Constants.PREF_USERS_DERIVED_ATTRIBUTES_VIEW)) {
- columns.add(new UserAttrColumn(
- name, UserAttrColumn.SchemaType.derivedSchema));
+ for (String name : preferences.getList(getRequest(), Constants.PREF_USERS_DERIVED_ATTRIBUTES_VIEW)) {
+ columns.add(new UserAttrColumn(name, UserAttrColumn.SchemaType.derivedSchema));
}
- for (String name : preferences.getList(getRequest(),
- Constants.PREF_USERS_VIRTUAL_ATTRIBUTES_VIEW)) {
- columns.add(new UserAttrColumn(
- name, UserAttrColumn.SchemaType.virtualSchema));
+ for (String name : preferences.getList(getRequest(), Constants.PREF_USERS_VIRTUAL_ATTRIBUTES_VIEW)) {
+ columns.add(new UserAttrColumn(name, UserAttrColumn.SchemaType.virtualSchema));
}
// Add defaults in case of empty selections
if (columns.isEmpty()) {
- columns.add(new PropertyColumn(
- new ResourceModel("id", "id"), "id", "id"));
- columns.add(new PropertyColumn(
- new ResourceModel("username", "username"),
- "username", "username"));
- columns.add(new PropertyColumn(
- new ResourceModel("status", "status"), "status", "status"));
+ columns.add(new PropertyColumn(new ResourceModel("id", "id"), "id", "id"));
+ columns.add(new PropertyColumn(new ResourceModel("username", "username"), "username", "username"));
+ columns.add(new PropertyColumn(new ResourceModel("status", "status"), "status", "status"));
}
columns.add(new AbstractColumn<UserTO>(new ResourceModel("actions", "")) {
@@ -424,35 +394,26 @@ public class ResultSetPanel extends Pane
}
@Override
- public void populateItem(
- final Item<ICellPopulator<UserTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<UserTO>> cellItem, final String componentId,
final IModel<UserTO> model) {
- final ActionLinksPanel panel =
- new ActionLinksPanel(componentId, model);
+ final ActionLinksPanel panel = new ActionLinksPanel(componentId, model);
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
@Override
public void onClick(final AjaxRequestTarget target) {
- statusmodal.setPageCreator(
- new ModalWindow.PageCreator() {
+ statusmodal.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- return new StatusModalPage(
- page.getPageReference(),
- statusmodal,
- model.getObject());
- }
- });
+ @Override
+ public Page createPage() {
+ return new StatusModalPage(page.getPageReference(), statusmodal, model.getObject());
+ }
+ });
statusmodal.show(target);
}
@@ -460,25 +421,19 @@ public class ResultSetPanel extends Pane
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
@Override
public void onClick(final AjaxRequestTarget target) {
- editmodal.setPageCreator(
- new ModalWindow.PageCreator() {
+ editmodal.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- return new EditUserModalPage(
- page.getPageReference(),
- editmodal,
- model.getObject());
- }
- });
+ @Override
+ public Page createPage() {
+ return new EditUserModalPage(page.getPageReference(), editmodal, model.getObject());
+ }
+ });
editmodal.show(target);
}
@@ -486,29 +441,24 @@ public class ResultSetPanel extends Pane
panel.add(new ActionLink() {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
@Override
public void onClick(final AjaxRequestTarget target) {
try {
- final UserTO userTO = userRestClient.delete(
- model.getObject().getId());
+ final UserTO userTO = userRestClient.delete(model.getObject().getId());
page.setModalResult(true);
- editmodal.setPageCreator(
- new ModalWindow.PageCreator() {
+ editmodal.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID =
- -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- return new EditUserModalPage(
- editmodal, userTO);
- }
- });
+ @Override
+ public Page createPage() {
+ return new EditUserModalPage(editmodal, userTO);
+ }
+ });
editmodal.show(target);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java Thu Mar 15 10:17:12 2012
@@ -39,8 +39,7 @@ public class RoleAttributesPanel extends
final Palette<String> entitlementsPalette;
- public RoleAttributesPanel(final String id,
- final Form form, final RoleTO roleTO) {
+ public RoleAttributesPanel(final String id, final Form form, final RoleTO roleTO) {
super(id);
@@ -73,8 +72,7 @@ public class RoleAttributesPanel extends
//--------------------------------
// Virtual attributes container
//--------------------------------
- this.add(new VirtualAttributesPanel("virtualAttributes", roleTO,
- false));
+ this.add(new VirtualAttributesPanel("virtualAttributes", roleTO, false));
final AjaxCheckBoxPanel inhVirtualAttributes = new AjaxCheckBoxPanel("inheritVirtualAttributes",
"inheritVirtualAttributes", new PropertyModel<Boolean>(roleTO, "inheritVirtualAttributes"));
@@ -96,16 +94,12 @@ public class RoleAttributesPanel extends
this.add(new ResourcesPanel("resources", roleTO));
//--------------------------------
- ListModel<String> selectedEntitlements =
- new ListModel<String>(roleTO.getEntitlements());
+ ListModel<String> selectedEntitlements = new ListModel<String>(roleTO.getEntitlements());
- ListModel<String> availableEntitlements =
- new ListModel<String>(
- entitlementRestClient.getAllEntitlements());
-
- entitlementsPalette = new Palette(
- "entitlementsPalette", selectedEntitlements,
- availableEntitlements, new SelectChoiceRenderer(), 20, false);
+ ListModel<String> availableEntitlements = new ListModel<String>(entitlementRestClient.getAllEntitlements());
+
+ entitlementsPalette = new Palette("entitlementsPalette", selectedEntitlements, availableEntitlements,
+ new SelectChoiceRenderer(), 20, false);
this.add(entitlementsPalette);
}