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 2016/04/04 14:46:10 UTC
syncope git commit: [SYNCOPE-793] Fixed by overriding
ResourceMappingPanel#onBeforeRender
Repository: syncope
Updated Branches:
refs/heads/master 45bfdf7de -> 74e57f1f7
[SYNCOPE-793] Fixed by overriding ResourceMappingPanel#onBeforeRender
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/74e57f1f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/74e57f1f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/74e57f1f
Branch: refs/heads/master
Commit: 74e57f1f732728ab0ca622239960207b948fe879
Parents: 45bfdf7
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Apr 4 14:46:02 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Apr 4 14:46:02 2016 +0200
----------------------------------------------------------------------
.../console/panels/ResourceMappingPanel.java | 14 ++++++----
.../provision/ProvisionWizardBuilder.java | 28 +++++++-------------
2 files changed, 18 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/74e57f1f/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
index e05b3d5..09d99d0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java
@@ -101,6 +101,8 @@ public class ResourceMappingPanel extends Panel {
*/
private final List<String> schemaNames;
+ private final Label passwordLabel;
+
/**
* Add mapping button.
*/
@@ -161,13 +163,9 @@ public class ResourceMappingPanel extends Panel {
mappingContainer.add(Constants.getJEXLPopover(this, TooltipConfig.Placement.bottom));
- final Label passwordLabel = new Label("passwordLabel", new ResourceModel("password"));
+ passwordLabel = new Label("passwordLabel", new ResourceModel("password"));
mappingContainer.add(passwordLabel);
- if (!AnyTypeKind.USER.name().equals(this.provisionTO.getAnyType())) {
- passwordLabel.setVisible(false);
- }
-
Collections.sort(getMapping().getItems(), new Comparator<MappingItemTO>() {
@Override
@@ -477,6 +475,12 @@ public class ResourceMappingPanel extends Panel {
mappingContainer.add(addMappingBtn);
}
+ @Override
+ protected void onBeforeRender() {
+ super.onBeforeRender();
+ passwordLabel.setVisible(AnyTypeKind.USER.name().equals(this.provisionTO.getAnyType()));
+ }
+
private List<String> getSchemaNames(final Long connectorId, final Set<ConnConfProperty> conf) {
final ConnInstanceTO connInstanceTO = new ConnInstanceTO();
connInstanceTO.setKey(connectorId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/74e57f1f/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
index 85a9640..99eb7c5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
@@ -54,13 +54,13 @@ import org.apache.wicket.model.StringResourceModel;
public class ProvisionWizardBuilder extends AjaxWizardBuilder<ProvisionTO> implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 3739399543837732640L;
private final ResourceTO resourceTO;
private final LoadableDetachableModel<List<String>> anyTypes = new LoadableDetachableModel<List<String>>() {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 5275935387613157437L;
@Override
protected List<String> load() {
@@ -95,33 +95,29 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ProvisionTO> imple
*/
private final class ObjectType extends WizardStep {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -1657800545799468278L;
private static final String ACCOUNT = "__ACCOUNT__";
private static final String GROUP = "__GROUP__";
- /**
- * Construct.
- */
ObjectType(final ProvisionTO item) {
super(new ResourceModel("type.title", StringUtils.EMPTY),
- new ResourceModel("type.summary", StringUtils.EMPTY), new Model<ProvisionTO>(item));
+ new ResourceModel("type.summary", StringUtils.EMPTY), new Model<>(item));
final WebMarkupContainer container = new WebMarkupContainer("container");
container.setOutputMarkupId(true);
add(container);
- final FieldPanel<String> type = new AjaxDropDownChoicePanel<String>(
+ final FieldPanel<String> type = new AjaxDropDownChoicePanel<>(
"type", "type", new PropertyModel<String>(item, "anyType"), false).
setChoices(anyTypes).
setStyleSheet("form-control").
setRequired(true);
container.add(type);
- final FormComponent<String> clazz = new TextField<String>(
+ final FormComponent<String> clazz = new TextField<>(
"class", new PropertyModel<String>(item, "objectClass")).setRequired(true);
-
container.add(clazz);
type.getField().add(new IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
@@ -147,14 +143,11 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ProvisionTO> imple
*/
private final class Mapping extends WizardStep {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 3454904947720856253L;
- /**
- * Construct.
- */
Mapping(final ProvisionTO item) {
setTitleModel(new ResourceModel("mapping.title", "Mapping"));
- setSummaryModel(new StringResourceModel("mapping.summary", this, new Model<ProvisionTO>(item)));
+ setSummaryModel(new StringResourceModel("mapping.summary", this, new Model<>(item)));
add(new ResourceMappingPanel("mapping", resourceTO, item));
}
@@ -165,11 +158,8 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ProvisionTO> imple
*/
private final class ConnObjectLink extends WizardStep {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2359955465172450478L;
- /**
- * Construct.
- */
ConnObjectLink(final ProvisionTO item) {
super(new ResourceModel("link.title", StringUtils.EMPTY),
new ResourceModel("link.summary", StringUtils.EMPTY));