From 267c3ff6aff4ef33f26fd7651304e4c12754386b Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Sat, 26 Nov 2016 13:46:10 +1100 Subject: [PATCH] Use superclass validator for simple validation --- .../fortuna/ical4j/model/property/Action.java | 8 ----- .../ical4j/model/property/BusyType.java | 8 ----- .../ical4j/model/property/Categories.java | 32 +++++------------- .../fortuna/ical4j/model/property/Clazz.java | 8 ----- .../ical4j/model/property/Comment.java | 30 ++++------------- .../ical4j/model/property/Contact.java | 30 ++++------------- .../ical4j/model/property/Country.java | 27 ++++----------- .../ical4j/model/property/DateProperty.java | 9 +++++ .../ical4j/model/property/Description.java | 30 ++++------------- .../fortuna/ical4j/model/property/DtEnd.java | 17 ---------- .../ical4j/model/property/DtStart.java | 17 ---------- .../fortuna/ical4j/model/property/Due.java | 17 ---------- .../ical4j/model/property/Duration.java | 8 ----- .../fortuna/ical4j/model/property/ExRule.java | 8 ----- .../model/property/ExtendedAddress.java | 11 ------- .../fortuna/ical4j/model/property/Geo.java | 8 ----- .../ical4j/model/property/Locality.java | 11 ------- .../ical4j/model/property/Location.java | 32 ++++-------------- .../ical4j/model/property/LocationType.java | 32 +++++------------- .../fortuna/ical4j/model/property/Method.java | 8 ----- .../fortuna/ical4j/model/property/Name.java | 11 ------- .../ical4j/model/property/Postalcode.java | 11 ------- .../ical4j/model/property/Priority.java | 8 ----- .../fortuna/ical4j/model/property/ProdId.java | 8 ----- .../fortuna/ical4j/model/property/RRule.java | 8 ----- .../ical4j/model/property/RelatedTo.java | 27 ++++----------- .../fortuna/ical4j/model/property/Repeat.java | 8 ----- .../ical4j/model/property/RequestStatus.java | 29 ++++------------ .../ical4j/model/property/Resources.java | 33 +++++-------------- .../ical4j/model/property/Sequence.java | 8 ----- .../fortuna/ical4j/model/property/Status.java | 8 ----- .../ical4j/model/property/StreetAddress.java | 11 ------- .../ical4j/model/property/Summary.java | 29 ++++------------ .../fortuna/ical4j/model/property/Tel.java | 25 +++----------- .../fortuna/ical4j/model/property/Transp.java | 8 ----- .../fortuna/ical4j/model/property/TzId.java | 8 ----- .../fortuna/ical4j/model/property/TzName.java | 25 +++----------- .../ical4j/model/property/TzOffsetFrom.java | 8 ----- .../ical4j/model/property/TzOffsetTo.java | 8 ----- .../fortuna/ical4j/model/property/TzUrl.java | 8 ----- .../fortuna/ical4j/model/property/Uid.java | 8 ----- .../fortuna/ical4j/model/property/Url.java | 8 ----- 42 files changed, 97 insertions(+), 559 deletions(-) diff --git a/src/main/java/net/fortuna/ical4j/model/property/Action.java b/src/main/java/net/fortuna/ical4j/model/property/Action.java index 3dfb51b65..00519a545 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Action.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Action.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -134,13 +133,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/BusyType.java b/src/main/java/net/fortuna/ical4j/model/property/BusyType.java index 044410750..2bace60ba 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/BusyType.java +++ b/src/main/java/net/fortuna/ical4j/model/property/BusyType.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -143,13 +142,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Categories.java b/src/main/java/net/fortuna/ical4j/model/property/Categories.java index ce4a25218..480281487 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Categories.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Categories.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -100,7 +99,8 @@ public class Categories extends Property { * Default constructor. */ public Categories() { - super(CATEGORIES, PropertyFactoryImpl.getInstance()); + super(CATEGORIES, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); categories = new TextList(); } @@ -108,7 +108,8 @@ public Categories() { * @param aValue a value string for this component */ public Categories(final String aValue) { - super(CATEGORIES, PropertyFactoryImpl.getInstance()); + super(CATEGORIES, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -117,7 +118,7 @@ public Categories(final String aValue) { * @param aValue a value string for this component */ public Categories(final ParameterList aList, final String aValue) { - super(CATEGORIES, aList, PropertyFactoryImpl.getInstance()); + super(CATEGORIES, aList, new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -125,7 +126,8 @@ public Categories(final ParameterList aList, final String aValue) { * @param cList a list of categories */ public Categories(final TextList cList) { - super(CATEGORIES, PropertyFactoryImpl.getInstance()); + super(CATEGORIES, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); categories = cList; } @@ -134,7 +136,7 @@ public Categories(final TextList cList) { * @param cList a list of categories */ public Categories(final ParameterList aList, final TextList cList) { - super(CATEGORIES, aList, PropertyFactoryImpl.getInstance()); + super(CATEGORIES, aList, new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); categories = cList; } @@ -145,22 +147,6 @@ public final void setValue(final String aValue) { categories = new TextList(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; but MUST NOT occur more than once (";" languageparam ) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * @return Returns the categories. */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Clazz.java b/src/main/java/net/fortuna/ical4j/model/property/Clazz.java index ac734fe84..1d4d98944 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Clazz.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Clazz.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -175,13 +174,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Comment.java b/src/main/java/net/fortuna/ical4j/model/property/Comment.java index 45017f555..47eb014e8 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Comment.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Comment.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -58,14 +57,16 @@ public class Comment extends Property implements Escapable { * Default constructor. */ public Comment() { - super(COMMENT, PropertyFactoryImpl.getInstance()); + super(COMMENT, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public Comment(final String aValue) { - super(COMMENT, PropertyFactoryImpl.getInstance()); + super(COMMENT, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -74,28 +75,11 @@ public Comment(final String aValue) { * @param aValue a value string for this component */ public Comment(final ParameterList aList, final String aValue) { - super(COMMENT, aList, PropertyFactoryImpl.getInstance()); + super(COMMENT, aList, new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" altrepparam) / (";" languageparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.ALTREP, - getParameters()); - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Contact.java b/src/main/java/net/fortuna/ical4j/model/property/Contact.java index 314162a28..bb9715721 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Contact.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Contact.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -58,14 +57,16 @@ public class Contact extends Property implements Escapable { * Default constructor. */ public Contact() { - super(CONTACT, PropertyFactoryImpl.getInstance()); + super(CONTACT, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public Contact(final String aValue) { - super(CONTACT, PropertyFactoryImpl.getInstance()); + super(CONTACT, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -74,28 +75,11 @@ public Contact(final String aValue) { * @param aValue a value string for this component */ public Contact(final ParameterList aList, final String aValue) { - super(CONTACT, aList, PropertyFactoryImpl.getInstance()); + super(CONTACT, aList, new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" altrepparam) / (";" languageparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.ALTREP, - getParameters()); - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Country.java b/src/main/java/net/fortuna/ical4j/model/property/Country.java index 935dca96f..0b0650464 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Country.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Country.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -59,14 +58,16 @@ public class Country extends Property implements Escapable { * Default constructor. */ public Country() { - super(COUNTRY, PropertyFactoryImpl.getInstance()); + super(COUNTRY, new ParameterList(), new OneOrLessParameterValidator(Parameter.ABBREV), + PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public Country(final String aValue) { - super(COUNTRY, PropertyFactoryImpl.getInstance()); + super(COUNTRY, new ParameterList(), new OneOrLessParameterValidator(Parameter.ABBREV), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -75,26 +76,10 @@ public Country(final String aValue) { * @param aValue a value string for this component */ public Country(final ParameterList aList, final String aValue) { - super(COUNTRY, aList, PropertyFactoryImpl.getInstance()); + super(COUNTRY, aList, new OneOrLessParameterValidator(Parameter.ABBREV), PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" abbrev - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.ABBREV, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java b/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java index f594e03c8..e459778ce 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java +++ b/src/main/java/net/fortuna/ical4j/model/property/DateProperty.java @@ -223,6 +223,15 @@ public final boolean isUtc() { */ public void validate() throws ValidationException { + /* + * ; the following are optional, ; but MUST NOT occur more than once (";" "VALUE" "=" ("DATE-TIME" / "DATE")) / + * (";" tzidparam) / + */ + + /* + * ; the following is optional, ; and MAY occur more than once (";" xparam) + */ + ParameterValidator.getInstance().assertOneOrLess(Parameter.VALUE, getParameters()); diff --git a/src/main/java/net/fortuna/ical4j/model/property/Description.java b/src/main/java/net/fortuna/ical4j/model/property/Description.java index bf7c647eb..0d6829aba 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Description.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Description.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -58,14 +57,16 @@ public class Description extends Property implements Escapable { * Default constructor. */ public Description() { - super(DESCRIPTION, PropertyFactoryImpl.getInstance()); + super(DESCRIPTION, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public Description(final String aValue) { - super(DESCRIPTION, PropertyFactoryImpl.getInstance()); + super(DESCRIPTION, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -74,28 +75,11 @@ public Description(final String aValue) { * @param aValue a value string for this component */ public Description(final ParameterList aList, final String aValue) { - super(DESCRIPTION, aList, PropertyFactoryImpl.getInstance()); + super(DESCRIPTION, aList, new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" altrepparam) / (";" languageparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.ALTREP, - getParameters()); - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/DtEnd.java b/src/main/java/net/fortuna/ical4j/model/property/DtEnd.java index 32f02dbcb..ade4ee73b 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/DtEnd.java +++ b/src/main/java/net/fortuna/ical4j/model/property/DtEnd.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -195,22 +194,6 @@ public DtEnd(final ParameterList aList, final Date aDate) { setDate(aDate); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - super.validate(); - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" "VALUE" "=" ("DATE-TIME" / "DATE")) / - * (";" tzidparam) / - */ - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/DtStart.java b/src/main/java/net/fortuna/ical4j/model/property/DtStart.java index 379039c1c..b50d9bfae 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/DtStart.java +++ b/src/main/java/net/fortuna/ical4j/model/property/DtStart.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -191,22 +190,6 @@ public DtStart(final ParameterList aList, final Date aDate) { setDate(aDate); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - super.validate(); - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" "VALUE" "=" ("DATE-TIME" / "DATE")) / - * (";" tzidparam) / - */ - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Due.java b/src/main/java/net/fortuna/ical4j/model/property/Due.java index c1277e0aa..60bcc91b8 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Due.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Due.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -169,22 +168,6 @@ public Due(final ParameterList aList, final Date aDate) { setDate(aDate); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - super.validate(); - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" "VALUE" "=" ("DATE-TIME" / "DATE")) / - * (";" tzidparam) / - */ - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Duration.java b/src/main/java/net/fortuna/ical4j/model/property/Duration.java index eb63cf20b..069d7e87c 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Duration.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Duration.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -167,13 +166,6 @@ public final void setDuration(final Dur duration) { this.duration = duration; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/ExRule.java b/src/main/java/net/fortuna/ical4j/model/property/ExRule.java index e1c3ae54b..1f523ae14 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/ExRule.java +++ b/src/main/java/net/fortuna/ical4j/model/property/ExRule.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -118,13 +117,6 @@ public final void setRecur(final Recur recur) { this.recur = recur; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/ExtendedAddress.java b/src/main/java/net/fortuna/ical4j/model/property/ExtendedAddress.java index 43e039f9a..0d223c526 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/ExtendedAddress.java +++ b/src/main/java/net/fortuna/ical4j/model/property/ExtendedAddress.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -78,16 +77,6 @@ public ExtendedAddress(final ParameterList aList, final String aValue) { setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Geo.java b/src/main/java/net/fortuna/ical4j/model/property/Geo.java index 25eb108e8..9b270bbfa 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Geo.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Geo.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import org.apache.commons.lang3.StringUtils; import java.io.IOException; @@ -243,13 +242,6 @@ public final void setLongitude(final BigDecimal longitude) { this.longitude = longitude; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Locality.java b/src/main/java/net/fortuna/ical4j/model/property/Locality.java index dc1bbbe02..ee5ee8472 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Locality.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Locality.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -78,16 +77,6 @@ public Locality(final ParameterList aList, final String aValue) { setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Location.java b/src/main/java/net/fortuna/ical4j/model/property/Location.java index 9f13b2452..5022020ed 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Location.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Location.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -109,14 +108,16 @@ public class Location extends Property implements Escapable { * Default constructor. */ public Location() { - super(LOCATION, PropertyFactoryImpl.getInstance()); + super(LOCATION, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE, Parameter.VVENUE), + PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public Location(final String aValue) { - super(LOCATION, PropertyFactoryImpl.getInstance()); + super(LOCATION, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE, Parameter.VVENUE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -125,30 +126,11 @@ public Location(final String aValue) { * @param aValue a value string for this component */ public Location(final ParameterList aList, final String aValue) { - super(LOCATION, aList, PropertyFactoryImpl.getInstance()); + super(LOCATION, aList, new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE, Parameter.VVENUE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" altrepparam) / (";" languageparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.ALTREP, - getParameters()); - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - ParameterValidator.getInstance().assertOneOrLess(Parameter.VVENUE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/LocationType.java b/src/main/java/net/fortuna/ical4j/model/property/LocationType.java index 3bdca59c7..8d3b4cc09 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/LocationType.java +++ b/src/main/java/net/fortuna/ical4j/model/property/LocationType.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -58,7 +57,8 @@ public class LocationType extends Property { * Default constructor. */ public LocationType() { - super(LOCATION_TYPE, PropertyFactoryImpl.getInstance()); + super(LOCATION_TYPE, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); locationTypes = new LocationTypeList(); } @@ -66,7 +66,8 @@ public LocationType() { * @param aValue a value string for this component */ public LocationType(final String aValue) { - super(LOCATION_TYPE, PropertyFactoryImpl.getInstance()); + super(LOCATION_TYPE, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -75,7 +76,7 @@ public LocationType(final String aValue) { * @param aValue a value string for this component */ public LocationType(final ParameterList aList, final String aValue) { - super(LOCATION_TYPE, aList, PropertyFactoryImpl.getInstance()); + super(LOCATION_TYPE, aList, new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -83,7 +84,8 @@ public LocationType(final ParameterList aList, final String aValue) { * @param cList a list of locationTypes */ public LocationType(final LocationTypeList cList) { - super(LOCATION_TYPE, PropertyFactoryImpl.getInstance()); + super(LOCATION_TYPE, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); locationTypes = cList; } @@ -92,7 +94,7 @@ public LocationType(final LocationTypeList cList) { * @param cList a list of locationTypes */ public LocationType(final ParameterList aList, final LocationTypeList cList) { - super(LOCATION_TYPE, aList, PropertyFactoryImpl.getInstance()); + super(LOCATION_TYPE, aList, new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); locationTypes = cList; } @@ -103,22 +105,6 @@ public final void setValue(final String aValue) { locationTypes = new LocationTypeList(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; but MUST NOT occur more than once (";" languageparam ) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * @return Returns the locationTypes. */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Method.java b/src/main/java/net/fortuna/ical4j/model/property/Method.java index 4feebe972..7743d4e2e 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Method.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Method.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -156,13 +155,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Name.java b/src/main/java/net/fortuna/ical4j/model/property/Name.java index bf055e1f5..1e533e747 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Name.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Name.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -78,16 +77,6 @@ public Name(final ParameterList aList, final String aValue) { setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Postalcode.java b/src/main/java/net/fortuna/ical4j/model/property/Postalcode.java index 1879d52d3..86c12cf21 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Postalcode.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Postalcode.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -78,16 +77,6 @@ public Postalcode(final ParameterList aList, final String aValue) { setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Priority.java b/src/main/java/net/fortuna/ical4j/model/property/Priority.java index ef4785a59..fd13c4ff4 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Priority.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Priority.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -232,13 +231,6 @@ public void setLevel(final int level) { this.level = level; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/ProdId.java b/src/main/java/net/fortuna/ical4j/model/property/ProdId.java index 937032950..6d0f69956 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/ProdId.java +++ b/src/main/java/net/fortuna/ical4j/model/property/ProdId.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -91,13 +90,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/RRule.java b/src/main/java/net/fortuna/ical4j/model/property/RRule.java index d338b78c0..072d4dd05 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/RRule.java +++ b/src/main/java/net/fortuna/ical4j/model/property/RRule.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -120,13 +119,6 @@ public final String getValue() { return getRecur().toString(); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java b/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java index b82bd3575..6eb6edb7d 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java +++ b/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -58,14 +57,16 @@ public class RelatedTo extends Property implements Escapable { * Default constructor. */ public RelatedTo() { - super(RELATED_TO, PropertyFactoryImpl.getInstance()); + super(RELATED_TO, new ParameterList(), new OneOrLessParameterValidator(Parameter.RELTYPE), + PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public RelatedTo(final String aValue) { - super(RELATED_TO, PropertyFactoryImpl.getInstance()); + super(RELATED_TO, new ParameterList(), new OneOrLessParameterValidator(Parameter.RELTYPE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -74,26 +75,10 @@ public RelatedTo(final String aValue) { * @param aValue a value string for this component */ public RelatedTo(final ParameterList aList, final String aValue) { - super(RELATED_TO, aList, PropertyFactoryImpl.getInstance()); + super(RELATED_TO, aList, new OneOrLessParameterValidator(Parameter.RELTYPE), PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; but MUST NOT occur more than once (";" reltypeparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.RELTYPE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparm) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Repeat.java b/src/main/java/net/fortuna/ical4j/model/property/Repeat.java index 702ed660a..59250cca8 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Repeat.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Repeat.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -114,13 +113,6 @@ public final void setCount(final int count) { this.count = count; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java b/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java index b355511e4..9cb510619 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java +++ b/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -83,7 +82,8 @@ public class RequestStatus extends Property { * Default constructor. */ public RequestStatus() { - super(REQUEST_STATUS, PropertyFactoryImpl.getInstance()); + super(REQUEST_STATUS, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); } /** @@ -91,7 +91,7 @@ public RequestStatus() { * @param aValue a value string for this component */ public RequestStatus(final ParameterList aList, final String aValue) { - super(REQUEST_STATUS, aList, PropertyFactoryImpl.getInstance()); + super(REQUEST_STATUS, aList, new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -102,7 +102,8 @@ public RequestStatus(final ParameterList aList, final String aValue) { */ public RequestStatus(final String aStatusCode, final String aDescription, final String data) { - super(REQUEST_STATUS, PropertyFactoryImpl.getInstance()); + super(REQUEST_STATUS, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); statusCode = aStatusCode; description = aDescription; exData = data; @@ -116,28 +117,12 @@ public RequestStatus(final String aStatusCode, final String aDescription, */ public RequestStatus(final ParameterList aList, final String aStatusCode, final String aDescription, final String data) { - super(REQUEST_STATUS, aList, PropertyFactoryImpl.getInstance()); + super(REQUEST_STATUS, aList, new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); statusCode = aStatusCode; description = aDescription; exData = data; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; but MUST NOT occur more than once (";" languageparm) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * @return Returns the description. */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Resources.java b/src/main/java/net/fortuna/ical4j/model/property/Resources.java index 5c6bf5544..ca6f45164 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Resources.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Resources.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -58,7 +57,8 @@ public class Resources extends Property { * Default constructor. */ public Resources() { - super(RESOURCES, PropertyFactoryImpl.getInstance()); + super(RESOURCES, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); resources = new TextList(); } @@ -67,7 +67,8 @@ public Resources() { * @param aValue a value string for this component */ public Resources(final ParameterList aList, final String aValue) { - super(RESOURCES, aList, PropertyFactoryImpl.getInstance()); + super(RESOURCES, aList, new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -75,7 +76,8 @@ public Resources(final ParameterList aList, final String aValue) { * @param rList a list of resources */ public Resources(final TextList rList) { - super(RESOURCES, PropertyFactoryImpl.getInstance()); + super(RESOURCES, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); resources = rList; } @@ -84,28 +86,11 @@ public Resources(final TextList rList) { * @param rList a list of resources */ public Resources(final ParameterList aList, final TextList rList) { - super(RESOURCES, aList, PropertyFactoryImpl.getInstance()); + super(RESOURCES, aList, new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); resources = rList; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" altrepparam) / (";" languageparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.ALTREP, - getParameters()); - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * @return Returns the resources. */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Sequence.java b/src/main/java/net/fortuna/ical4j/model/property/Sequence.java index 72fc65fc4..72de09228 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Sequence.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Sequence.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -197,13 +196,6 @@ public final String getValue() { return String.valueOf(getSequenceNo()); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Status.java b/src/main/java/net/fortuna/ical4j/model/property/Status.java index 18f7211a7..a0f97e803 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Status.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Status.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -236,13 +235,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/StreetAddress.java b/src/main/java/net/fortuna/ical4j/model/property/StreetAddress.java index 6f503fd3c..705908790 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/StreetAddress.java +++ b/src/main/java/net/fortuna/ical4j/model/property/StreetAddress.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -78,16 +77,6 @@ public StreetAddress(final ParameterList aList, final String aValue) { setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Summary.java b/src/main/java/net/fortuna/ical4j/model/property/Summary.java index 864a28a3f..f38de540c 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Summary.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Summary.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -104,14 +103,16 @@ public class Summary extends Property implements Escapable { * Default constructor. */ public Summary() { - super(SUMMARY, PropertyFactoryImpl.getInstance()); + super(SUMMARY, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public Summary(final String aValue) { - super(SUMMARY, PropertyFactoryImpl.getInstance()); + super(SUMMARY, new ParameterList(), new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), + PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -120,28 +121,10 @@ public Summary(final String aValue) { * @param aValue a value string for this component */ public Summary(final ParameterList aList, final String aValue) { - super(SUMMARY, aList, PropertyFactoryImpl.getInstance()); + super(SUMMARY, aList, new OneOrLessParameterValidator(Parameter.ALTREP, Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" altrepparam) / (";" languageparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.ALTREP, - getParameters()); - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Tel.java b/src/main/java/net/fortuna/ical4j/model/property/Tel.java index a8dea525a..deaf36d95 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Tel.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Tel.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -59,14 +58,14 @@ public class Tel extends Property implements Escapable { * Default constructor. */ public Tel() { - super(TEL, PropertyFactoryImpl.getInstance()); + super(TEL, new ParameterList(), new OneOrLessParameterValidator(Parameter.TYPE), PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public Tel(final String aValue) { - super(TEL, PropertyFactoryImpl.getInstance()); + super(TEL, new ParameterList(), new OneOrLessParameterValidator(Parameter.TYPE), PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -75,26 +74,10 @@ public Tel(final String aValue) { * @param aValue a value string for this component */ public Tel(final ParameterList aList, final String aValue) { - super(TEL, aList, PropertyFactoryImpl.getInstance()); + super(TEL, aList, new OneOrLessParameterValidator(Parameter.TYPE), PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following are optional, ; but MUST NOT occur more than once (";" abbrev - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.TYPE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/Transp.java b/src/main/java/net/fortuna/ical4j/model/property/Transp.java index 39c9eb88e..7452a8916 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Transp.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Transp.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -164,13 +163,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/TzId.java b/src/main/java/net/fortuna/ical4j/model/property/TzId.java index 2eb22156a..e012fc9ae 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/TzId.java +++ b/src/main/java/net/fortuna/ical4j/model/property/TzId.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -150,13 +149,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/TzName.java b/src/main/java/net/fortuna/ical4j/model/property/TzName.java index cf01eeb1d..89485db33 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/TzName.java +++ b/src/main/java/net/fortuna/ical4j/model/property/TzName.java @@ -32,8 +32,7 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ParameterValidator; -import net.fortuna.ical4j.validate.ValidationException; +import net.fortuna.ical4j.validate.property.OneOrLessParameterValidator; import java.io.IOException; import java.net.URISyntaxException; @@ -58,14 +57,14 @@ public class TzName extends Property implements Escapable { * Default constructor. */ public TzName() { - super(TZNAME, PropertyFactoryImpl.getInstance()); + super(TZNAME, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); } /** * @param aValue a value string for this component */ public TzName(final String aValue) { - super(TZNAME, PropertyFactoryImpl.getInstance()); + super(TZNAME, new ParameterList(), new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); setValue(aValue); } @@ -74,26 +73,10 @@ public TzName(final String aValue) { * @param aValue a value string for this component */ public TzName(final ParameterList aList, final String aValue) { - super(TZNAME, aList, PropertyFactoryImpl.getInstance()); + super(TZNAME, aList, new OneOrLessParameterValidator(Parameter.LANGUAGE), PropertyFactoryImpl.getInstance()); setValue(aValue); } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - - /* - * ; the following is optional, ; but MUST NOT occur more than once (";" languageparam) / - */ - ParameterValidator.getInstance().assertOneOrLess(Parameter.LANGUAGE, - getParameters()); - - /* - * ; the following is optional, ; and MAY occur more than once (";" xparam) - */ - } - /** * {@inheritDoc} */ diff --git a/src/main/java/net/fortuna/ical4j/model/property/TzOffsetFrom.java b/src/main/java/net/fortuna/ical4j/model/property/TzOffsetFrom.java index 6e47de872..44aabc098 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/TzOffsetFrom.java +++ b/src/main/java/net/fortuna/ical4j/model/property/TzOffsetFrom.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -125,13 +124,6 @@ public final void setOffset(final UtcOffset offset) { this.offset = offset; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/TzOffsetTo.java b/src/main/java/net/fortuna/ical4j/model/property/TzOffsetTo.java index 0ce71951d..be82d6a1a 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/TzOffsetTo.java +++ b/src/main/java/net/fortuna/ical4j/model/property/TzOffsetTo.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -125,13 +124,6 @@ public final void setOffset(final UtcOffset offset) { this.offset = offset; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/TzUrl.java b/src/main/java/net/fortuna/ical4j/model/property/TzUrl.java index 41f1c9c50..05fb4604a 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/TzUrl.java +++ b/src/main/java/net/fortuna/ical4j/model/property/TzUrl.java @@ -34,7 +34,6 @@ import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.Strings; import net.fortuna.ical4j.util.Uris; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URI; @@ -154,13 +153,6 @@ public final void setUri(final URI uri) { this.uri = uri; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Uid.java b/src/main/java/net/fortuna/ical4j/model/property/Uid.java index c60a427a6..6528ccc9b 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Uid.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Uid.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URISyntaxException; @@ -158,13 +157,6 @@ public final String getValue() { return value; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/fortuna/ical4j/model/property/Url.java b/src/main/java/net/fortuna/ical4j/model/property/Url.java index e70af6211..70f29f100 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Url.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Url.java @@ -34,7 +34,6 @@ import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.Strings; import net.fortuna.ical4j.util.Uris; -import net.fortuna.ical4j.validate.ValidationException; import java.io.IOException; import java.net.URI; @@ -154,13 +153,6 @@ public final void setUri(final URI uri) { this.uri = uri; } - /** - * {@inheritDoc} - */ - public final void validate() throws ValidationException { - // TODO: Auto-generated method stub - } - public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L;