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/06/01 10:14:34 UTC
[2/6] syncope git commit: [SYNCOPE-156] Minor fixes
[SYNCOPE-156] Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c1fd63c0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c1fd63c0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c1fd63c0
Branch: refs/heads/SYNCOPE-862
Commit: c1fd63c0e2199afc81b9b3571c60232bdd98023d
Parents: 514cbf4
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Wed Jun 1 08:52:55 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Wed Jun 1 08:52:55 2016 +0200
----------------------------------------------------------------------
.../client/console/panels/ConnObjects.java | 28 +++++++++++++-------
.../policies/AccountPolicyDirectoryPanel.java | 2 --
.../policies/PasswordPolicyDirectoryPanel.java | 2 --
.../policies/PolicyRuleWizardBuilder.java | 24 ++++++++++-------
.../policies/PullPolicyDirectoryPanel.java | 2 --
5 files changed, 33 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/c1fd63c0/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
index f261ddc..5d08ebe 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
@@ -19,6 +19,7 @@
package org.apache.syncope.client.console.panels;
import java.util.ArrayList;
+import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Transformer;
import org.apache.syncope.client.console.commons.Constants;
@@ -49,18 +50,27 @@ public class ConnObjects extends Panel implements ModalPanel {
super(BaseModal.CONTENT_ID);
- anyTypes = new AjaxDropDownChoicePanel<>("anyTypes", "anyTypes", new Model<String>(), true);
- anyTypes.setChoices(CollectionUtils.collect(new ResourceRestClient().read(resource).getProvisions(),
- new Transformer<ProvisionTO, String>() {
+ List<String> availableAnyTypes =
+ CollectionUtils.collect(new ResourceRestClient().read(resource).getProvisions(),
+ new Transformer<ProvisionTO, String>() {
- @Override
- public String transform(final ProvisionTO provision) {
- return provision.getAnyType();
- }
- }, new ArrayList<String>()));
+ @Override
+ public String transform(final ProvisionTO provision) {
+ return provision.getAnyType();
+ }
+ }, new ArrayList<String>());
+
+ anyTypes = new AjaxDropDownChoicePanel<>("anyTypes", "anyTypes", new Model<String>(), true);
+ anyTypes.setChoices(availableAnyTypes);
anyTypes.hideLabel();
anyTypes.setNullValid(false);
- anyTypes.setDefaultModelObject(AnyTypeKind.USER.name());
+ if (availableAnyTypes.contains(AnyTypeKind.USER.name())) {
+ anyTypes.setDefaultModelObject(AnyTypeKind.USER.name());
+ } else if (availableAnyTypes.contains(AnyTypeKind.GROUP.name())) {
+ anyTypes.setDefaultModelObject(AnyTypeKind.GROUP.name());
+ } else if (!availableAnyTypes.isEmpty()) {
+ anyTypes.setDefaultModelObject(availableAnyTypes.get(0));
+ }
add(anyTypes);
connObjects = new MultilevelPanel("connObjects") {
http://git-wip-us.apache.org/repos/asf/syncope/blob/c1fd63c0/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
index 5671bdd..eceb67f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.policies;
-import static org.apache.wicket.Component.ENABLE;
-
import java.util.List;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.BooleanPropertyColumn;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.CollectionPropertyColumn;
http://git-wip-us.apache.org/repos/asf/syncope/blob/c1fd63c0/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
index c05f983..50666f8 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.policies;
-import static org.apache.wicket.Component.ENABLE;
-
import java.util.List;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.BooleanPropertyColumn;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
http://git-wip-us.apache.org/repos/asf/syncope/blob/c1fd63c0/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
index 6d3950f..168195f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
@@ -138,19 +138,23 @@ public class PolicyRuleWizardBuilder
}
});
- final List<String> choices;
-
- if (type == PolicyType.ACCOUNT) {
- choices = new ArrayList<>(SyncopeConsoleSession.get().getPlatformInfo().getAccountRules());
- } else if (type == PolicyType.PASSWORD) {
- choices = new ArrayList<>(SyncopeConsoleSession.get().getPlatformInfo().getPasswordRules());
- } else {
- choices = new ArrayList<>();
+ List<String> choices;
+ switch (type) {
+ case ACCOUNT:
+ choices = new ArrayList<>(SyncopeConsoleSession.get().getPlatformInfo().getAccountRules());
+ break;
+
+ case PASSWORD:
+ choices = new ArrayList<>(SyncopeConsoleSession.get().getPlatformInfo().getPasswordRules());
+ break;
+
+ default:
+ choices = new ArrayList<>();
}
Collections.<String>sort(choices);
conf.setChoices(choices);
-
+
conf.addRequiredLabel();
add(conf);
}
@@ -173,7 +177,7 @@ public class PolicyRuleWizardBuilder
}
};
- add(new BeanPanel("bean", bean).setRenderBodyOnly(true));
+ add(new BeanPanel<>("bean", bean).setRenderBodyOnly(true));
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/c1fd63c0/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
index 99bd048..a313d05 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.policies;
-import static org.apache.wicket.Component.ENABLE;
-
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPanel;
import org.apache.syncope.common.lib.policy.PullPolicySpec;