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/09/07 15:08:48 UTC
[2/2] syncope git commit: Some console cleanup
Some console cleanup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8c90e12d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8c90e12d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8c90e12d
Branch: refs/heads/master
Commit: 8c90e12db83b1cf59f3e0099a73a670767b085f7
Parents: a29cc80
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Wed Sep 7 16:44:21 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Wed Sep 7 17:08:39 2016 +0200
----------------------------------------------------------------------
.../console/notifications/NotificationWizardBuilder.java | 2 +-
.../client/console/panels/search/SearchClausePanel.java | 9 ++++-----
.../client/console/policies/PolicySpecModalPanel.java | 2 +-
.../console/wicket/markup/html/form/AbstractMultiPanel.java | 7 +------
.../client/console/wicket/markup/html/form/FieldPanel.java | 2 +-
.../console/wicket/markup/html/form/MultiFieldPanel.java | 7 +++----
.../client/console/wicket/markup/html/form/MultiPanel.java | 5 ++---
7 files changed, 13 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8c90e12d/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
index 5d5dd3d..41fa708 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java
@@ -294,7 +294,7 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra
final IModel<List<Pair<String, List<SearchClause>>>> model =
new PropertyModel<>(modelObject, "aboutClauses");
- aboutContainer.add(new MultiPanel<Pair<String, List<SearchClause>>>("abouts", "abouts", model, false) {
+ aboutContainer.add(new MultiPanel<Pair<String, List<SearchClause>>>("abouts", "abouts", model) {
private static final long serialVersionUID = -2481579077338205547L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/8c90e12d/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
index 0db39f4..d72c8ba 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java
@@ -98,8 +98,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
final IModel<List<String>> dnames,
final IModel<Map<String, String>> groupNames,
final IModel<List<String>> roleNames,
- final IModel<List<String>> resourceNames
- ) {
+ final IModel<List<String>> resourceNames) {
super(id, name, clause);
@@ -130,7 +129,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
field = new FormComponent<SearchClause>("container", this.clause) {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -8204140666393922700L;
};
@@ -138,7 +137,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
comparators = new LoadableDetachableModel<List<Comparator>>() {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 5275935387613157437L;
@Override
protected List<Comparator> load() {
@@ -172,7 +171,7 @@ public class SearchClausePanel extends FieldPanel<SearchClause> {
properties = new LoadableDetachableModel<List<String>>() {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 5275935387613157437L;
@Override
protected List<String> load() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/8c90e12d/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
index 4a4d3a2..e5fdc7f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
@@ -110,7 +110,7 @@ public class PolicySpecModalPanel extends AbstractModalPanel<PullPolicyTO> {
};
- add(new MultiPanel<CorrelationRule>("correlationRules", "correlationRules", model, false) {
+ add(new MultiPanel<CorrelationRule>("correlationRules", "correlationRules", model) {
private static final long serialVersionUID = -2481579077338205547L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/8c90e12d/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
index ecac451..34c9c8c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
@@ -40,8 +40,6 @@ public abstract class AbstractMultiPanel<INNER> extends AbstractFieldPanel<List<
private final ListView<INNER> view;
- private final boolean eventTemplate;
-
private final WebMarkupContainer container;
private final Form<?> form;
@@ -49,13 +47,10 @@ public abstract class AbstractMultiPanel<INNER> extends AbstractFieldPanel<List<
public AbstractMultiPanel(
final String id,
final String name,
- final IModel<List<INNER>> model,
- final boolean eventTemplate) {
+ final IModel<List<INNER>> model) {
super(id, name, model);
- this.eventTemplate = eventTemplate;
-
// -----------------------
// Object container definition
// -----------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8c90e12d/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
index aba8aa0..c12437a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.java
@@ -188,7 +188,7 @@ public abstract class FieldPanel<T extends Serializable> extends AbstractFieldPa
}
/**
- * To be overridded to add settings depending components.
+ * Override to add settings depending components.
* It has to be used by default to add components depending by index model.
*
* @return the current field panel.
http://git-wip-us.apache.org/repos/asf/syncope/blob/8c90e12d/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
index effe436..735e6bc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java
@@ -34,10 +34,9 @@ public abstract class MultiFieldPanel<E extends Serializable> extends AbstractMu
private MultiFieldPanel(
final String id,
final String name,
- final IModel<List<E>> model,
- final boolean eventTemplate) {
+ final IModel<List<E>> model) {
- super(id, name, model, eventTemplate);
+ super(id, name, model);
}
public static class Builder<E extends Serializable> implements Serializable {
@@ -74,7 +73,7 @@ public abstract class MultiFieldPanel<E extends Serializable> extends AbstractMu
}
public MultiFieldPanel<E> build(final String id, final String name, final FieldPanel<E> panelTemplate) {
- return new MultiFieldPanel<E>(id, name, model, eventTemplate) {
+ return new MultiFieldPanel<E>(id, name, model) {
private static final long serialVersionUID = 6600411297376841521L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/8c90e12d/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiPanel.java
index e8a2e97..893c9e8 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiPanel.java
@@ -29,9 +29,8 @@ public abstract class MultiPanel<INNER extends Serializable> extends AbstractMul
public MultiPanel(
final String id,
final String name,
- final IModel<List<INNER>> model,
- final boolean eventTemplate) {
+ final IModel<List<INNER>> model) {
- super(id, name, model, eventTemplate);
+ super(id, name, model);
}
}