LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DateTimeWidget 

Erlaube auch DateTimeParameter als möglichen Parameter für Date und Time

git-svn-id: https://svn.libreccm.org/ccm/trunk@1479 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2012-01-30 12:13:59 +00:00
parent caba8b7540
commit b1aa546295
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ccm-core/src/com/arsdigita/bebop/form/Date.java
View File

@ -31,8 +31,7 @@ import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.Form; import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.parameters.IncompleteDateParameter; import com.arsdigita.bebop.parameters.*;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
// This interface contains the XML element name of this class // This interface contains the XML element name of this class
// in a constant which is used when generating XML // in a constant which is used when generating XML
import com.arsdigita.bebop.util.BebopConstants; import com.arsdigita.bebop.util.BebopConstants;
@ -169,7 +168,7 @@ public class Date extends Widget implements BebopConstants {
public Date(ParameterModel model) { public Date(ParameterModel model) {
super(model); super(model);
if (!(model instanceof DateParameter)) { if (!(model instanceof DateParameter || model instanceof DateTimeParameter)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"The Date widget " + model.getName() "The Date widget " + model.getName()
+ " must be backed by a DateParameter parmeter model"); + " must be backed by a DateParameter parmeter model");

8
ccm-core/src/com/arsdigita/bebop/form/Time.java
View File

@ -21,11 +21,7 @@ package com.arsdigita.bebop.form;
import com.arsdigita.bebop.Form; import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.*;
import com.arsdigita.bebop.parameters.TimeParameter;
import com.arsdigita.bebop.parameters.NumberInRangeValidationListener;
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.util.BebopConstants; import com.arsdigita.bebop.util.BebopConstants;
import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.util.Assert; import com.arsdigita.util.Assert;
@ -186,7 +182,7 @@ public class Time extends Widget implements BebopConstants {
public Time(ParameterModel model, boolean showSeconds) { public Time(ParameterModel model, boolean showSeconds) {
super(model); super(model);
if (!(model instanceof TimeParameter)) { if (!(model instanceof TimeParameter || model instanceof DateTimeParameter)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"The Time widget " + model.getName() "The Time widget " + model.getName()
+ " must be backed by a TimeParameter parameter model"); + " must be backed by a TimeParameter parameter model");