You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/12/13 21:42:41 UTC
[1/3] wicket git commit: Update DateTimeField.java
Repository: wicket
Updated Branches:
refs/heads/master 1bcb02e95 -> 214e178c0
Update DateTimeField.java
Factory method for the hours TextField.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/70376e59
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/70376e59
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/70376e59
Branch: refs/heads/master
Commit: 70376e590a558ba0e12ec6e69466b0f3f69f59b1
Parents: 25f7d43
Author: astrapi69 <as...@gmx.net>
Authored: Sat Dec 13 15:07:38 2014 +0100
Committer: astrapi69 <as...@gmx.net>
Committed: Sat Dec 13 15:07:38 2014 +0100
----------------------------------------------------------------------
.../extensions/yui/calendar/DateTimeField.java | 24 ++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/70376e59/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
index 57d8d88..20ddf1f 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
@@ -163,11 +163,8 @@ public class DateTimeField extends FormComponentPanel<Date>
dateField.add(newDatePicker());
// Create and add the "hours" TextField
- add(hoursField = new TextField<Integer>(HOURS, new PropertyModel<Integer>(this, HOURS),
+ add(hoursField = newHoursTextField(HOURS, new PropertyModel<Integer>(this, HOURS),
Integer.class));
- hoursField.add(getMaximumHours() == 24 ? RangeValidator.range(0, 23) : RangeValidator
- .range(1, 12));
- hoursField.setLabel(new Model<>(HOURS));
// Create and add the "minutes" TextField
add(minutesField = new TextField<Integer>(MINUTES,
@@ -209,6 +206,25 @@ public class DateTimeField extends FormComponentPanel<Date>
}
/**
+ * create a new {@link TextField} instance for hours to be added to this panel.
+ *
+ * @param id
+ * the component id
+ * @param model
+ * model that should be used by the {@link TextField}
+ * @param type
+ * the type of the text field
+ * @return a new text field instance
+ */
+ protected TextField<Integer> newHoursTextField(final String id, IModel<Integer> model, Class<Integer> type) {
+ TextField<Integer> hoursTextField = new TextField<Integer>(id, model, type);
+ hoursTextField.add(getMaximumHours() == 24 ? RangeValidator.range(0, 23) : RangeValidator
+ .range(1, 12));
+ hoursTextField.setLabel(new Model<>(HOURS));
+ return hoursTextField;
+ }
+
+ /**
*
* @return The date TextField
*/
[2/3] wicket git commit: changed to diamond operator
Posted by mg...@apache.org.
changed to diamond operator
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bd526fc4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bd526fc4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bd526fc4
Branch: refs/heads/master
Commit: bd526fc4571c6a2b99aff655cc2a0f11adfa2d1b
Parents: 70376e5
Author: astrapi69 <as...@gmx.net>
Authored: Sat Dec 13 17:31:21 2014 +0100
Committer: astrapi69 <as...@gmx.net>
Committed: Sat Dec 13 17:31:21 2014 +0100
----------------------------------------------------------------------
.../org/apache/wicket/extensions/yui/calendar/DateTimeField.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd526fc4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
index 20ddf1f..aecf57a 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
@@ -217,7 +217,7 @@ public class DateTimeField extends FormComponentPanel<Date>
* @return a new text field instance
*/
protected TextField<Integer> newHoursTextField(final String id, IModel<Integer> model, Class<Integer> type) {
- TextField<Integer> hoursTextField = new TextField<Integer>(id, model, type);
+ TextField<Integer> hoursTextField = new TextField<>(id, model, type);
hoursTextField.add(getMaximumHours() == 24 ? RangeValidator.range(0, 23) : RangeValidator
.range(1, 12));
hoursTextField.setLabel(new Model<>(HOURS));
[3/3] wicket git commit: Merge branch 'master' of
https://github.com/astrapi69/wicket into pr-80-master
Posted by mg...@apache.org.
Merge branch 'master' of https://github.com/astrapi69/wicket into pr-80-master
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/214e178c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/214e178c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/214e178c
Branch: refs/heads/master
Commit: 214e178c05b0689fb336c35ef905936cbd14181e
Parents: 1bcb02e bd526fc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Dec 13 22:37:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Dec 13 22:37:51 2014 +0200
----------------------------------------------------------------------
.../extensions/yui/calendar/DateTimeField.java | 24 ++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------