You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/08/26 09:17:14 UTC
svn commit: r569773 - in
/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar:
DateField.java DateTimeField.java
Author: ehillenius
Date: Sun Aug 26 00:17:13 2007
New Revision: 569773
URL: http://svn.apache.org/viewvc?rev=569773&view=rev
Log:
removed init methods that didn't add much to the party
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java?rev=569773&r1=569772&r2=569773&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java Sun Aug 26 00:17:13 2007
@@ -36,7 +36,7 @@
private MutableDateTime date;
- private DateTextField dateField;
+ private final DateTextField dateField;
/**
* Construct.
@@ -45,8 +45,7 @@
*/
public DateField(String id)
{
- super(id);
- init();
+ this(id, null);
}
/**
@@ -58,7 +57,10 @@
public DateField(String id, IModel model)
{
super(id, model);
- init();
+ setType(Date.class);
+ PropertyModel dateFieldModel = new PropertyModel(this, "date");
+ add(dateField = newDateTextField("date", dateFieldModel));
+ dateField.add(new DatePicker());
}
/**
@@ -91,17 +93,6 @@
{
this.date = (date != null) ? new MutableDateTime(date) : null;
setModelObject(date);
- }
-
- /**
- * Initialize.
- */
- private void init()
- {
- setType(Date.class);
- PropertyModel dateFieldModel = new PropertyModel(this, "date");
- add(dateField = newDateTextField("date", dateFieldModel));
- dateField.add(new DatePicker());
}
/**
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=569773&r1=569772&r2=569773&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java Sun Aug 26 00:17:13 2007
@@ -101,8 +101,7 @@
*/
public DateTimeField(String id)
{
- super(id);
- init();
+ this(id, null);
}
/**
@@ -114,7 +113,27 @@
public DateTimeField(String id, IModel model)
{
super(id, model);
- init();
+ setType(Date.class);
+ PropertyModel dateFieldModel = new PropertyModel(this, "date");
+ add(dateField = newDateTextField("date", dateFieldModel));
+ dateField.add(new DatePicker());
+ add(hoursField = new TextField("hours", new PropertyModel(this, "hours"), Integer.class));
+ hoursField.add(NumberValidator.range(0, 12));
+ hoursField.setLabel(new Model("hours"));
+ add(minutesField = new TextField("minutes", new PropertyModel(this, "minutes"),
+ Integer.class)
+ {
+ private static final long serialVersionUID = 1L;
+
+ public IConverter getConverter(Class type)
+ {
+ return MINUTES_CONVERTER;
+ }
+ });
+ minutesField.add(NumberValidator.range(0, 59));
+ minutesField.setLabel(new Model("minutes"));
+ add(amOrPmChoice = new DropDownChoice("amOrPmChoice", new PropertyModel(this, "amOrPm"),
+ Arrays.asList(AM_PM.values())));
}
/**
@@ -225,31 +244,6 @@
return ((WebClientInfo)info).getProperties().getTimeZone();
}
return null;
- }
-
- private void init()
- {
- setType(Date.class);
- PropertyModel dateFieldModel = new PropertyModel(this, "date");
- add(dateField = newDateTextField("date", dateFieldModel));
- dateField.add(new DatePicker());
- add(hoursField = new TextField("hours", new PropertyModel(this, "hours"), Integer.class));
- hoursField.add(NumberValidator.range(0, 12));
- hoursField.setLabel(new Model("hours"));
- add(minutesField = new TextField("minutes", new PropertyModel(this, "minutes"),
- Integer.class)
- {
- private static final long serialVersionUID = 1L;
-
- public IConverter getConverter(Class type)
- {
- return MINUTES_CONVERTER;
- }
- });
- minutesField.add(NumberValidator.range(0, 59));
- minutesField.setLabel(new Model("minutes"));
- add(amOrPmChoice = new DropDownChoice("amOrPmChoice", new PropertyModel(this, "amOrPm"),
- Arrays.asList(AM_PM.values())));
}
/**