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 13:51:27 UTC
syncope git commit: [SYNCOPE-811] Fixed
Repository: syncope
Updated Branches:
refs/heads/master 7857936e6 -> 45bfdf7de
[SYNCOPE-811] Fixed
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/45bfdf7d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/45bfdf7d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/45bfdf7d
Branch: refs/heads/master
Commit: 45bfdf7de9e7d0a17d2d59ce43be05ca3c94b968
Parents: 7857936
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Apr 4 13:51:09 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Apr 4 13:51:09 2016 +0200
----------------------------------------------------------------------
.../console/panels/ConnectorDetailsPanel.java | 12 +++---
.../markup/html/form/AjaxSpinnerFieldPanel.java | 42 ++++++--------------
.../markup/html/form/AjaxTextFieldPanel.java | 1 -
.../client/console/wizards/any/PlainAttrs.java | 2 +-
4 files changed, 19 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/45bfdf7d/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.java
index 02381da..7bccd18 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.java
@@ -121,37 +121,37 @@ public class ConnectorDetailsPanel extends Panel {
model.getObject().setPoolConf(new ConnPoolConfTO());
}
- add(new AjaxSpinnerFieldPanel.Builder<Integer>().setMin(0).setMax(Integer.MAX_VALUE).build(
+ add(new AjaxSpinnerFieldPanel.Builder<Integer>().min(0).max(Integer.MAX_VALUE).build(
"connRequestTimeout",
"connRequestTimeout",
Integer.class,
new PropertyModel<Integer>(model, "connRequestTimeout")));
- add(new AjaxSpinnerFieldPanel.Builder<Integer>().setMin(0).setMax(Integer.MAX_VALUE).build(
+ add(new AjaxSpinnerFieldPanel.Builder<Integer>().min(0).max(Integer.MAX_VALUE).build(
"poolMaxObjects",
"poolMaxObjects",
Integer.class,
new PropertyModel<Integer>(model.getObject().getPoolConf(), "maxObjects")));
- add(new AjaxSpinnerFieldPanel.Builder<Integer>().setMin(0).setMax(Integer.MAX_VALUE).build(
+ add(new AjaxSpinnerFieldPanel.Builder<Integer>().min(0).max(Integer.MAX_VALUE).build(
"poolMinIdle",
"poolMinIdle",
Integer.class,
new PropertyModel<Integer>(model.getObject().getPoolConf(), "minIdle")));
- add(new AjaxSpinnerFieldPanel.Builder<Integer>().setMin(0).setMax(Integer.MAX_VALUE).build(
+ add(new AjaxSpinnerFieldPanel.Builder<Integer>().min(0).max(Integer.MAX_VALUE).build(
"poolMaxIdle",
"poolMaxIdle",
Integer.class,
new PropertyModel<Integer>(model.getObject().getPoolConf(), "maxIdle")));
- add(new AjaxSpinnerFieldPanel.Builder<Long>().setMin(0L).setMax(Long.MAX_VALUE).build(
+ add(new AjaxSpinnerFieldPanel.Builder<Long>().min(0L).max(Long.MAX_VALUE).build(
"poolMaxWait",
"poolMaxWait",
Long.class,
new PropertyModel<Long>(model.getObject().getPoolConf(), "maxWait")));
- add(new AjaxSpinnerFieldPanel.Builder<Long>().setMin(0L).setMax(Long.MAX_VALUE).build(
+ add(new AjaxSpinnerFieldPanel.Builder<Long>().min(0L).max(Long.MAX_VALUE).build(
"poolMinEvictableIdleTime",
"poolMinEvictableIdleTime",
Long.class,
http://git-wip-us.apache.org/repos/asf/syncope/blob/45bfdf7d/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxSpinnerFieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxSpinnerFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxSpinnerFieldPanel.java
index 32ae007..d697674 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxSpinnerFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxSpinnerFieldPanel.java
@@ -29,17 +29,18 @@ import org.apache.commons.lang3.math.NumberUtils;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.springframework.util.StringUtils;
public final class AjaxSpinnerFieldPanel<T extends Number> extends FieldPanel<T> {
private static final long serialVersionUID = 6413819574530703577L;
- private Class<T> reference;
+ private final Class<T> reference;
- private IModel<T> model;
+ private final IModel<T> model;
- private Options options;
+ private final Options options;
private AjaxSpinnerFieldPanel(
final String id,
@@ -49,12 +50,6 @@ public final class AjaxSpinnerFieldPanel<T extends Number> extends FieldPanel<T>
final Options options) {
super(id, name, model);
- init(name, reference, model, options);
- }
-
- private void init(
- final String name, final Class<T> reference,
- final IModel<T> model, final Options options) {
field = new AjaxSpinner<T>("spinner", model, options, reference) {
@@ -67,8 +62,7 @@ public final class AjaxSpinnerFieldPanel<T extends Number> extends FieldPanel<T>
return behavior;
}
};
-
- add(field);
+ add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
this.name = name;
this.model = model;
@@ -177,27 +171,20 @@ public final class AjaxSpinnerFieldPanel<T extends Number> extends FieldPanel<T>
public static class Builder<T extends Number> {
- protected T step;
-
- protected T min;
-
- protected T max;
-
- public Builder() {
- }
+ private final Options options = new Options();
- public Builder<T> setMin(final T min) {
- this.min = min;
+ public Builder<T> min(final T min) {
+ options.set("min", min);
return this;
}
- public Builder<T> setMax(final T max) {
- this.max = max;
+ public Builder<T> max(final T max) {
+ options.set("max", max);
return this;
}
- public Builder<T> setStep(final T step) {
- this.step = step;
+ public Builder<T> step(final T step) {
+ options.set("step", step);
return this;
}
@@ -207,11 +194,6 @@ public final class AjaxSpinnerFieldPanel<T extends Number> extends FieldPanel<T>
final Class<T> reference,
final IModel<T> model) {
- final Options options = new Options();
- options.set("min", min);
- options.set("max", max);
- options.set("step", step);
-
return new AjaxSpinnerFieldPanel<>(id, name, reference, model, options);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/45bfdf7d/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.java
index 1edfaa6..eb85677 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.java
@@ -69,7 +69,6 @@ public class AjaxTextFieldPanel extends FieldPanel<String> implements Cloneable
return result.iterator();
}
};
-
add(field.setLabel(new ResourceModel(name, name)).setOutputMarkupId(true));
if (enableOnChange && !isReadOnly()) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/45bfdf7d/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index 17e107f..8613d35 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -261,7 +261,7 @@ public class PlainAttrs extends AbstractAttrs {
break;
case Double:
- panel = new AjaxSpinnerFieldPanel.Builder<Double>().setStep(0.1)
+ panel = new AjaxSpinnerFieldPanel.Builder<Double>().step(0.1)
.build("panel", schemaTO.getKey(), Double.class, new Model<Double>());
if (required) {