diff --git a/build.gradle b/build.gradle index f84328e..fa92545 100644 --- a/build.gradle +++ b/build.gradle @@ -19,10 +19,14 @@ apply plugin: 'release' repositories { mavenCentral() + // sonatype snapshots + maven { + url 'https://oss.sonatype.org/content/repositories/snapshots/' + } } dependencies { - compile 'org.mnode.ical4j:ical4j:1.0.5.2', + compile 'org.mnode.ical4j:ical4j:factory-service-locator-SNAPSHOT', 'org.codehaus.groovy:groovy-all:2.3.6' testCompile 'org.spockframework:spock-core:0.7-groovy-2.0' diff --git a/src/main/groovy/net/fortuna/ical4j/extensions/property/CalStartFactory.groovy b/src/main/groovy/net/fortuna/ical4j/extensions/property/CalStartFactory.groovy index da99819..926ff6e 100644 --- a/src/main/groovy/net/fortuna/ical4j/extensions/property/CalStartFactory.groovy +++ b/src/main/groovy/net/fortuna/ical4j/extensions/property/CalStartFactory.groovy @@ -1,40 +1,39 @@ -/** - * Copyright (c) 2012, Ben Fortuna - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * o Neither the name of Ben Fortuna nor the names of any other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/** + * Copyright (c) 2012, Ben Fortuna + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * o Neither the name of Ben Fortuna nor the names of any other contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package net.fortuna.ical4j.extensions.property -import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.ParameterList import net.fortuna.ical4j.model.property.AbstractPropertyFactory - + /** * $Id$ * @@ -49,21 +48,19 @@ public class CalStartFactory extends AbstractPropertyFactory { CalStart instance if (FactoryBuilderSupport.checkValueIsTypeNotString(value, name, CalStart.class)) { instance = (CalStart) value - } - else { + } else { String instanceValue = attributes.remove('value') if (instanceValue != null) { attributes.put('value', instanceValue) instance = super.newInstance(builder, name, value, attributes) - } - else { + } else { instance = super.newInstance(builder, name, value, attributes) } } return instance } - + protected Object newInstance(ParameterList parameters, String value) { - return new CalStart(parameters, null, value) + return new CalStart(parameters, value) } } diff --git a/src/main/groovy/net/fortuna/ical4j/extensions/property/LicLocationFactory.groovy b/src/main/groovy/net/fortuna/ical4j/extensions/property/LicLocationFactory.groovy index e0baa76..fa1f1ea 100644 --- a/src/main/groovy/net/fortuna/ical4j/extensions/property/LicLocationFactory.groovy +++ b/src/main/groovy/net/fortuna/ical4j/extensions/property/LicLocationFactory.groovy @@ -1,40 +1,39 @@ -/** - * Copyright (c) 2012, Ben Fortuna - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * o Neither the name of Ben Fortuna nor the names of any other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/** + * Copyright (c) 2012, Ben Fortuna + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * o Neither the name of Ben Fortuna nor the names of any other contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package net.fortuna.ical4j.extensions.property -import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.ParameterList import net.fortuna.ical4j.model.property.AbstractPropertyFactory - + /** * $Id$ * @@ -49,21 +48,19 @@ public class LicLocationFactory extends AbstractPropertyFactory { LicLocation instance if (FactoryBuilderSupport.checkValueIsTypeNotString(value, name, LicLocation.class)) { instance = (LicLocation) value - } - else { + } else { String instanceValue = attributes.remove('value') if (instanceValue != null) { attributes.put('value', instanceValue) instance = super.newInstance(builder, name, value, attributes) - } - else { + } else { instance = super.newInstance(builder, name, value, attributes) } } return instance } - + protected Object newInstance(ParameterList parameters, String value) { - return new LicLocation(parameters, null, value) + return new LicLocation(parameters, value) } } diff --git a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrAlarmIdFactory.groovy b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrAlarmIdFactory.groovy index ac503b0..726dd02 100644 --- a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrAlarmIdFactory.groovy +++ b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrAlarmIdFactory.groovy @@ -1,40 +1,39 @@ -/** - * Copyright (c) 2012, Ben Fortuna - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * o Neither the name of Ben Fortuna nor the names of any other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/** + * Copyright (c) 2012, Ben Fortuna + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * o Neither the name of Ben Fortuna nor the names of any other contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package net.fortuna.ical4j.extensions.property -import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.ParameterList import net.fortuna.ical4j.model.property.AbstractPropertyFactory - + /** * $Id$ * @@ -49,21 +48,19 @@ public class WrAlarmIdFactory extends AbstractPropertyFactory { WrAlarmId instance if (FactoryBuilderSupport.checkValueIsTypeNotString(value, name, WrAlarmId.class)) { instance = (WrAlarmId) value - } - else { + } else { String instanceValue = attributes.remove('value') if (instanceValue != null) { attributes.put('value', instanceValue) instance = super.newInstance(builder, name, value, attributes) - } - else { + } else { instance = super.newInstance(builder, name, value, attributes) } } return instance } - + protected Object newInstance(ParameterList parameters, String value) { - return new WrAlarmId(parameters, null, value) + return new WrAlarmId(parameters, value) } } diff --git a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalDescFactory.groovy b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalDescFactory.groovy index 0492520..5eb64e4 100644 --- a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalDescFactory.groovy +++ b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalDescFactory.groovy @@ -1,40 +1,39 @@ -/** - * Copyright (c) 2012, Ben Fortuna - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * o Neither the name of Ben Fortuna nor the names of any other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/** + * Copyright (c) 2012, Ben Fortuna + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * o Neither the name of Ben Fortuna nor the names of any other contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package net.fortuna.ical4j.extensions.property -import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.ParameterList import net.fortuna.ical4j.model.property.AbstractPropertyFactory - + /** * $Id$ * @@ -49,21 +48,19 @@ public class WrCalDescFactory extends AbstractPropertyFactory { WrCalDesc instance if (FactoryBuilderSupport.checkValueIsTypeNotString(value, name, WrCalDesc.class)) { instance = (WrCalDesc) value - } - else { + } else { String instanceValue = attributes.remove('value') if (instanceValue != null) { attributes.put('value', instanceValue) instance = super.newInstance(builder, name, value, attributes) - } - else { + } else { instance = super.newInstance(builder, name, value, attributes) } } return instance } - + protected Object newInstance(ParameterList parameters, String value) { - return new WrCalDesc(parameters, null, value) + return new WrCalDesc(parameters, value) } } diff --git a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalNameFactory.groovy b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalNameFactory.groovy index 6b92df8..cf8b0f9 100755 --- a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalNameFactory.groovy +++ b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrCalNameFactory.groovy @@ -1,40 +1,39 @@ -/** - * Copyright (c) 2012, Ben Fortuna - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * o Neither the name of Ben Fortuna nor the names of any other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/** + * Copyright (c) 2012, Ben Fortuna + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * o Neither the name of Ben Fortuna nor the names of any other contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package net.fortuna.ical4j.extensions.property -import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.ParameterList import net.fortuna.ical4j.model.property.AbstractPropertyFactory - + /** * $Id$ * @@ -49,21 +48,19 @@ public class WrCalNameFactory extends AbstractPropertyFactory { WrCalName instance if (FactoryBuilderSupport.checkValueIsTypeNotString(value, name, WrCalName.class)) { instance = (WrCalName) value - } - else { + } else { String instanceValue = attributes.remove('value') if (instanceValue != null) { attributes.put('value', instanceValue) instance = super.newInstance(builder, name, value, attributes) - } - else { + } else { instance = super.newInstance(builder, name, value, attributes) } } return instance } - + protected Object newInstance(ParameterList parameters, String value) { - return new WrCalName(parameters, null, value) + return new WrCalName(parameters, value) } } diff --git a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrTimezoneFactory.groovy b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrTimezoneFactory.groovy index b826bc5..d62bbc5 100644 --- a/src/main/groovy/net/fortuna/ical4j/extensions/property/WrTimezoneFactory.groovy +++ b/src/main/groovy/net/fortuna/ical4j/extensions/property/WrTimezoneFactory.groovy @@ -1,40 +1,39 @@ -/** - * Copyright (c) 2012, Ben Fortuna - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * o Neither the name of Ben Fortuna nor the names of any other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/** + * Copyright (c) 2012, Ben Fortuna + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * o Neither the name of Ben Fortuna nor the names of any other contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package net.fortuna.ical4j.extensions.property -import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.ParameterList import net.fortuna.ical4j.model.property.AbstractPropertyFactory - + /** * $Id$ * @@ -49,21 +48,19 @@ public class WrTimezoneFactory extends AbstractPropertyFactory { WrTimezone instance if (FactoryBuilderSupport.checkValueIsTypeNotString(value, name, WrTimezone.class)) { instance = (WrTimezone) value - } - else { + } else { String instanceValue = attributes.remove('value') if (instanceValue != null) { attributes.put('value', instanceValue) instance = super.newInstance(builder, name, value, attributes) - } - else { + } else { instance = super.newInstance(builder, name, value, attributes) } } return instance } - + protected Object newInstance(ParameterList parameters, String value) { - return new WrTimezone(parameters, null, value) + return new WrTimezone(parameters, value) } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/CalendarBuilder.java b/src/main/java/net/fortuna/ical4j/extensions/CalendarBuilder.java deleted file mode 100644 index 2d99df1..0000000 --- a/src/main/java/net/fortuna/ical4j/extensions/CalendarBuilder.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Copyright (c) 2012, Ben Fortuna - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * o Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * o Neither the name of Ben Fortuna nor the names of any other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.fortuna.ical4j.extensions; - -import net.fortuna.ical4j.data.CalendarParser; -import net.fortuna.ical4j.data.CalendarParserFactory; -import net.fortuna.ical4j.extensions.outlook.OriginalEnd; -import net.fortuna.ical4j.extensions.outlook.OriginalStart; -import net.fortuna.ical4j.extensions.property.CalStart; -import net.fortuna.ical4j.model.ParameterFactoryRegistry; -import net.fortuna.ical4j.model.PropertyFactoryRegistry; -import net.fortuna.ical4j.model.TimeZoneRegistry; -import net.fortuna.ical4j.model.TimeZoneRegistryFactory; - -public class CalendarBuilder extends net.fortuna.ical4j.data.CalendarBuilder { - - private static final PropertyFactoryRegistry PROPERTY_FACTORY_REGISTRY = new PropertyFactoryRegistry(); - - private static final ParameterFactoryRegistry PARAMETER_FACTORY_REGISTRY = new ParameterFactoryRegistry(); - - static { - PROPERTY_FACTORY_REGISTRY.register(CalStart.PROPERTY_NAME, CalStart.FACTORY); - PROPERTY_FACTORY_REGISTRY.register(OriginalStart.PROPERTY_NAME, OriginalStart.FACTORY); - PROPERTY_FACTORY_REGISTRY.register(OriginalEnd.PROPERTY_NAME, OriginalEnd.FACTORY); - } - - public CalendarBuilder() { - this(CalendarParserFactory.getInstance().createParser()); - } - - public CalendarBuilder(CalendarParser parser) { - this(parser, TimeZoneRegistryFactory.getInstance().createRegistry()); - } - - public CalendarBuilder(TimeZoneRegistry tzRegistry) { - this(CalendarParserFactory.getInstance().createParser(), tzRegistry); - } - - public CalendarBuilder(CalendarParser parser, TimeZoneRegistry tzRegistry) { - super(parser, PROPERTY_FACTORY_REGISTRY, PARAMETER_FACTORY_REGISTRY, tzRegistry); - } - -} diff --git a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/AlarmAgent.java b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/AlarmAgent.java index 300d900..9d8b298 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/AlarmAgent.java +++ b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/AlarmAgent.java @@ -32,108 +32,89 @@ package net.fortuna.ical4j.extensions.caldav.property; import net.fortuna.ical4j.extensions.caldav.parameter.AgentId; -import net.fortuna.ical4j.extensions.caldav.parameter.CalendarServerDtStamp; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.PropertyFactoryImpl; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** - * ALARM-AGENT is a proposed (RFC draft) property for iCalendar - * - * @see draft-daboo-valarm-extensions-04 - * - * @author probert + * ALARM-AGENT is a proposed (RFC draft) property for iCalendar * + * @author probert + * @see draft-daboo-valarm-extensions-04 */ public class AlarmAgent extends Property { - private static final long serialVersionUID = 2182103734645261668L; - - public static final String PROPERTY_NAME = "ALARM-AGENT"; - - private String value; - - public static final PropertyFactory FACTORY = new Factory(); - - public static final AlarmAgent SERVER = new ImmutableAlarmAgent("SERVER", null); - - public static final AlarmAgent CLIENT = new ImmutableAlarmAgent("CLIENT", null); - - public static final AlarmAgent BOTH = new ImmutableAlarmAgent("BOTH", null); - - public static final AlarmAgent NONE = new ImmutableAlarmAgent("NONE", null); - - public AlarmAgent(PropertyFactory factory) { - super(PROPERTY_NAME, factory); - } - - public AlarmAgent(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); - setValue(value); - } - - public AlarmAgent(ParameterList aList, String aValue) { - super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); - value = aValue; - } - - @Override - public void setValue(String aValue) { - this.value = aValue; - } - - @Override - public void validate() throws ValidationException { + private static final long serialVersionUID = 2182103734645261668L; + + public static final String PROPERTY_NAME = "ALARM-AGENT"; + + private String value; + + public static final AlarmAgent SERVER = new ImmutableAlarmAgent("SERVER"); + + public static final AlarmAgent CLIENT = new ImmutableAlarmAgent("CLIENT"); + + public static final AlarmAgent BOTH = new ImmutableAlarmAgent("BOTH"); + + public static final AlarmAgent NONE = new ImmutableAlarmAgent("NONE"); + + public AlarmAgent() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); + } + + public AlarmAgent(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); + setValue(value); + } + + @Override + public void setValue(String aValue) { + this.value = aValue; + } + + @Override + public void validate() throws ValidationException { /* * ; the following is OPTIONAL, * ; but MUST NOT occur more than once */ - ParameterValidator.getInstance().assertOneOrLess(AgentId.PARAMETER_NAME, - getParameters()); - } - - @Override - public String getValue() { - return value; - } - - private static final class ImmutableAlarmAgent extends AlarmAgent { - private static final long serialVersionUID = -2054338254L; - - private ImmutableAlarmAgent(String value) { - super(new ParameterList(true), value); + ParameterValidator.getInstance().assertOneOrLess(AgentId.PARAMETER_NAME, + getParameters()); } - - public void setValue(String aValue) { - throw new UnsupportedOperationException("Cannot modify constant instances"); - } - - ImmutableAlarmAgent(String s, ImmutableAlarmAgent immutableclazz) { - this(s); + + @Override + public String getValue() { + return value; } - } - private static class Factory implements PropertyFactory { + private static final class ImmutableAlarmAgent extends AlarmAgent { + private static final long serialVersionUID = -2054338254L; - private static final long serialVersionUID = 2099427445505899578L; + private ImmutableAlarmAgent(String value) { + super(new ParameterList(true), value); + } - public Property createProperty(String name) { - return new AlarmAgent(this); + public void setValue(String aValue) { + throw new UnsupportedOperationException("Cannot modify constant instances"); + } } - public Property createProperty(String name, ParameterList parameters, String value) { - AlarmAgent property = null; - if (CLIENT.getValue().equals(value)) { - property = CLIENT; - } - else { - property = new AlarmAgent(parameters, this, value); - } - return property; + public static class Factory extends Content.Factory implements PropertyFactory { + + private static final long serialVersionUID = 2099427445505899578L; + + public AlarmAgent createProperty() { + return new AlarmAgent(); + } + + public AlarmAgent createProperty(ParameterList parameters, String value) { + AlarmAgent property = null; + if (CLIENT.getValue().equals(value)) { + property = CLIENT; + } else { + property = new AlarmAgent(parameters, value); + } + return property; + } } - } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAccess.java b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAccess.java index 1c195b5..ecfaf4f 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAccess.java +++ b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAccess.java @@ -31,100 +31,82 @@ */ package net.fortuna.ical4j.extensions.caldav.property; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.PropertyFactoryImpl; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * This property is a non-standard property for iCal Server/Calendar Server - * - * @see caldav-privateevents.txt - * - * @author probert * + * @author probert + * @see caldav-privateevents.txt */ public class CalendarServerAccess extends Property { - private static final long serialVersionUID = 2182103734645261668L; - - public static final String PROPERTY_NAME = "X-CALENDARSERVER-ACCESS"; - - private String value; - - public static final PropertyFactory FACTORY = new Factory(); - - public static final CalendarServerAccess PUBLIC = new ImmutableCalendarServerAccess("PUBLIC", null); - - public static final CalendarServerAccess PRIVATE = new ImmutableCalendarServerAccess("PRIVATE", null); - - public static final CalendarServerAccess CONFIDENTIAL = new ImmutableCalendarServerAccess("CONFIDENTIAL", null); - - public static final CalendarServerAccess RESTRICTED = new ImmutableCalendarServerAccess("RESTRICTED", null); - - public CalendarServerAccess(PropertyFactory factory) { - super(PROPERTY_NAME, factory); - } - - public CalendarServerAccess(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); - setValue(value); - } - - public CalendarServerAccess(ParameterList aList, String aValue) { - super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); - value = aValue; - } - - @Override - public void setValue(String aValue) { - this.value = aValue; - } - - @Override - public void validate() throws ValidationException { - } - - @Override - public String getValue() { - return value; - } - - private static final class ImmutableCalendarServerAccess extends CalendarServerAccess { - private static final long serialVersionUID = -2054338254L; - - private ImmutableCalendarServerAccess(String value) { - super(new ParameterList(true), value); + private static final long serialVersionUID = 2182103734645261668L; + + public static final String PROPERTY_NAME = "X-CALENDARSERVER-ACCESS"; + + private String value; + + public static final CalendarServerAccess PUBLIC = new ImmutableCalendarServerAccess("PUBLIC"); + + public static final CalendarServerAccess PRIVATE = new ImmutableCalendarServerAccess("PRIVATE"); + + public static final CalendarServerAccess CONFIDENTIAL = new ImmutableCalendarServerAccess("CONFIDENTIAL"); + + public static final CalendarServerAccess RESTRICTED = new ImmutableCalendarServerAccess("RESTRICTED"); + + public CalendarServerAccess() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); + } + + public CalendarServerAccess(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); + setValue(value); } - + + @Override public void setValue(String aValue) { - throw new UnsupportedOperationException("Cannot modify constant instances"); + this.value = aValue; + } + + @Override + public void validate() throws ValidationException { } - - ImmutableCalendarServerAccess(String s, ImmutableCalendarServerAccess immutableclazz) { - this(s); + + @Override + public String getValue() { + return value; } - } - private static class Factory implements PropertyFactory { + private static final class ImmutableCalendarServerAccess extends CalendarServerAccess { + private static final long serialVersionUID = -2054338254L; - private static final long serialVersionUID = 2099427445505899578L; + private ImmutableCalendarServerAccess(String value) { + super(new ParameterList(true), value); + } - public Property createProperty(String name) { - return new CalendarServerAccess(this); + public void setValue(String aValue) { + throw new UnsupportedOperationException("Cannot modify constant instances"); + } } - public Property createProperty(String name, ParameterList parameters, String value) { - CalendarServerAccess property = null; - if (PUBLIC.getValue().equals(value)) { - property = PUBLIC; - } - else { - property = new CalendarServerAccess(parameters, this, value); - } - return property; + public static class Factory extends Content.Factory implements PropertyFactory { + + private static final long serialVersionUID = 2099427445505899578L; + + public CalendarServerAccess createProperty() { + return new CalendarServerAccess(); + } + + public CalendarServerAccess createProperty(ParameterList parameters, String value) { + CalendarServerAccess property = null; + if (PUBLIC.getValue().equals(value)) { + property = PUBLIC; + } else { + property = new CalendarServerAccess(parameters, value); + } + return property; + } } - } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAttendeeComment.java b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAttendeeComment.java index ebdedc4..d0182c2 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAttendeeComment.java +++ b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerAttendeeComment.java @@ -33,86 +33,72 @@ import net.fortuna.ical4j.extensions.caldav.parameter.CalendarServerAttendeeRef; import net.fortuna.ical4j.extensions.caldav.parameter.CalendarServerDtStamp; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.PropertyFactoryImpl; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * This property is a non-standard property for iCal Server/Calendar Server - * - * @see caldav-privatecomments.txt - * - * @author probert * + * @author probert + * @see caldav-privatecomments.txt */ public class CalendarServerAttendeeComment extends Property { - private static final long serialVersionUID = 2182103734645261668L; - - public static final String PROPERTY_NAME = "X-CALENDARSERVER-ATTENDEE-COMMENT"; - - private String value; - - public static final PropertyFactory FACTORY = new Factory(); - - public CalendarServerAttendeeComment(PropertyFactory factory) { - super(PROPERTY_NAME, factory); - } - - public CalendarServerAttendeeComment(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); - setValue(value); - } - - public CalendarServerAttendeeComment(ParameterList aList, String aValue) { - super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); - value = aValue; - } - - @Override - public void setValue(String aValue) { - this.value = aValue; - } - - @Override - public void validate() throws ValidationException { + private static final long serialVersionUID = 2182103734645261668L; + + public static final String PROPERTY_NAME = "X-CALENDARSERVER-ATTENDEE-COMMENT"; + + private String value; + + public CalendarServerAttendeeComment() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); + } + + public CalendarServerAttendeeComment(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); + setValue(value); + } + + @Override + public void setValue(String aValue) { + this.value = aValue; + } + + @Override + public void validate() throws ValidationException { /* * ; the following are REQUIRED, * ; but MUST occur only once */ - ParameterValidator.getInstance().assertOne(CalendarServerDtStamp.PARAMETER_NAME, - getParameters()); + ParameterValidator.getInstance().assertOne(CalendarServerDtStamp.PARAMETER_NAME, + getParameters()); /* * ; the following are REQUIRED, * ; but MUST occur only once */ - ParameterValidator.getInstance().assertOne(CalendarServerAttendeeRef.PARAMETER_NAME, - getParameters()); - } + ParameterValidator.getInstance().assertOne(CalendarServerAttendeeRef.PARAMETER_NAME, + getParameters()); + } - @Override - public String getValue() { - return value; - } + @Override + public String getValue() { + return value; + } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { - private static final long serialVersionUID = 2099427445505899578L; + private static final long serialVersionUID = 2099427445505899578L; - public Property createProperty(String name) { - return new CalendarServerAttendeeComment(this); - } + public CalendarServerAttendeeComment createProperty() { + return new CalendarServerAttendeeComment(); + } - public Property createProperty(String name, ParameterList parameters, String value) { - CalendarServerAttendeeComment property = null; - property = new CalendarServerAttendeeComment(parameters, this, value); - return property; + public CalendarServerAttendeeComment createProperty(ParameterList parameters, String value) { + CalendarServerAttendeeComment property = null; + property = new CalendarServerAttendeeComment(parameters, value); + return property; + } } - } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerPrivateComment.java b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerPrivateComment.java index 70e7723..37bd3f6 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerPrivateComment.java +++ b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/CalendarServerPrivateComment.java @@ -31,71 +31,58 @@ */ package net.fortuna.ical4j.extensions.caldav.property; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.PropertyFactoryImpl; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * This property is a non-standard property for iCal Server/Calendar Server - * - * @see caldav-privatecomments.txt - * - * @author probert * + * @author probert + * @see caldav-privatecomments.txt */ public class CalendarServerPrivateComment extends Property { - private static final long serialVersionUID = 2182103734645261668L; - - public static final String PROPERTY_NAME = "X-CALENDARSERVER-PRIVATE-COMMENT"; - - private String value; + private static final long serialVersionUID = 2182103734645261668L; - public static final PropertyFactory FACTORY = new Factory(); - - public CalendarServerPrivateComment(PropertyFactory factory) { - super(PROPERTY_NAME, factory); - } + public static final String PROPERTY_NAME = "X-CALENDARSERVER-PRIVATE-COMMENT"; - public CalendarServerPrivateComment(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); - setValue(value); - } + private String value; - public CalendarServerPrivateComment(ParameterList aList, String aValue) { - super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); - value = aValue; - } + public CalendarServerPrivateComment() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); + } - @Override - public void setValue(String aValue) { - this.value = aValue; - } + public CalendarServerPrivateComment(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); + setValue(value); + } - @Override - public void validate() throws ValidationException { - } + @Override + public void setValue(String aValue) { + this.value = aValue; + } - @Override - public String getValue() { - return value; - } + @Override + public void validate() throws ValidationException { + } - private static class Factory implements PropertyFactory { + @Override + public String getValue() { + return value; + } - private static final long serialVersionUID = 2099427445505899578L; + public static class Factory extends Content.Factory implements PropertyFactory { - public Property createProperty(String name) { - return new CalendarServerPrivateComment(this); - } + private static final long serialVersionUID = 2099427445505899578L; + + public CalendarServerPrivateComment createProperty() { + return new CalendarServerPrivateComment(); + } - public Property createProperty(String name, ParameterList parameters, String value) { - CalendarServerPrivateComment property = null; - property = new CalendarServerPrivateComment(parameters, this, value); - return property; + public CalendarServerPrivateComment createProperty(ParameterList parameters, String value) { + CalendarServerPrivateComment property = null; + property = new CalendarServerPrivateComment(parameters, value); + return property; + } } - } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/DefaultAlarm.java b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/DefaultAlarm.java index 44075ca..4200478 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/DefaultAlarm.java +++ b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/DefaultAlarm.java @@ -31,96 +31,78 @@ */ package net.fortuna.ical4j.extensions.caldav.property; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.PropertyFactoryImpl; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * New property as defined in a RFC draft - * - * @see draft-daboo-valarm-extensions-04 - * - * @author probert * + * @author probert + * @see draft-daboo-valarm-extensions-04 */ public class DefaultAlarm extends Property { - private static final long serialVersionUID = 2182103734645261668L; - - public static final String PROPERTY_NAME = "DEFAULT-ALARM"; - - private String value; - - public static final PropertyFactory FACTORY = new Factory(); - - public static final DefaultAlarm TRUE = new ImmutableDefaultAlarm("TRUE", null); - - public static final DefaultAlarm FALSE = new ImmutableDefaultAlarm("FALSE", null); - - public DefaultAlarm(PropertyFactory factory) { - super(PROPERTY_NAME, factory); - } - - public DefaultAlarm(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); - setValue(value); - } - - public DefaultAlarm(ParameterList aList, String aValue) { - super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); - value = aValue; - } - - @Override - public void setValue(String aValue) { - this.value = aValue; - } - - @Override - public void validate() throws ValidationException { - } - - @Override - public String getValue() { - return value; - } - - private static final class ImmutableDefaultAlarm extends DefaultAlarm { - private static final long serialVersionUID = -2054338254L; - - private ImmutableDefaultAlarm(String value) { - super(new ParameterList(true), value); + private static final long serialVersionUID = 2182103734645261668L; + + public static final String PROPERTY_NAME = "DEFAULT-ALARM"; + + private String value; + + public static final DefaultAlarm TRUE = new ImmutableDefaultAlarm("TRUE"); + + public static final DefaultAlarm FALSE = new ImmutableDefaultAlarm("FALSE"); + + public DefaultAlarm() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } - + + public DefaultAlarm(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); + setValue(value); + } + + @Override public void setValue(String aValue) { - throw new UnsupportedOperationException("Cannot modify constant instances"); + this.value = aValue; } - - ImmutableDefaultAlarm(String s, ImmutableDefaultAlarm immutableclazz) { - this(s); + + @Override + public void validate() throws ValidationException { } - } - private static class Factory implements PropertyFactory { + @Override + public String getValue() { + return value; + } - private static final long serialVersionUID = 2099427445505899578L; + private static final class ImmutableDefaultAlarm extends DefaultAlarm { + private static final long serialVersionUID = -2054338254L; - public Property createProperty(String name) { - return new DefaultAlarm(this); + private ImmutableDefaultAlarm(String value) { + super(new ParameterList(true), value); + } + + public void setValue(String aValue) { + throw new UnsupportedOperationException("Cannot modify constant instances"); + } } - public Property createProperty(String name, ParameterList parameters, String value) { - DefaultAlarm property = null; - if (FALSE.getValue().equals(value)) { - property = FALSE; - } - else { - property = new DefaultAlarm(parameters, this, value); - } - return property; + public static class Factory extends Content.Factory implements PropertyFactory { + + private static final long serialVersionUID = 2099427445505899578L; + + public DefaultAlarm createProperty() { + return new DefaultAlarm(); + } + + public DefaultAlarm createProperty(ParameterList parameters, String value) { + DefaultAlarm property = null; + if (FALSE.getValue().equals(value)) { + property = FALSE; + } else { + property = new DefaultAlarm(parameters, value); + } + return property; + } } - } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/Proximity.java b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/Proximity.java index ccd2ac8..a57ebbb 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/caldav/property/Proximity.java +++ b/src/main/java/net/fortuna/ical4j/extensions/caldav/property/Proximity.java @@ -31,11 +31,7 @@ */ package net.fortuna.ical4j.extensions.caldav.property; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.PropertyFactoryImpl; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * New property as defined in a RFC draft @@ -53,24 +49,17 @@ public class Proximity extends Property { private String value; - public static final PropertyFactory FACTORY = new Factory(); - - public static final Proximity ARRIVE = new ImmutableProximity("ARRIVE", null); - - public static final Proximity DEPART = new ImmutableProximity("DEPART", null); - - public Proximity(PropertyFactory factory) { - super(PROPERTY_NAME, factory); - } + public static final Proximity ARRIVE = new ImmutableProximity("ARRIVE"); - public Proximity(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); - setValue(value); + public static final Proximity DEPART = new ImmutableProximity("DEPART"); + + public Proximity() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } - public Proximity(ParameterList aList, String aValue) { - super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); - value = aValue; + public Proximity(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); + setValue(value); } @Override @@ -97,27 +86,23 @@ private ImmutableProximity(String value) { public void setValue(String aValue) { throw new UnsupportedOperationException("Cannot modify constant instances"); } - - ImmutableProximity(String s, ImmutableProximity immutableclazz) { - this(s); - } } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 2099427445505899578L; - public Property createProperty(String name) { - return new Proximity(this); + public Proximity createProperty() { + return new Proximity(); } - public Property createProperty(String name, ParameterList parameters, String value) { + public Proximity createProperty(ParameterList parameters, String value) { Proximity property = null; if (DEPART.getValue().equals(value)) { property = DEPART; } else { - property = new Proximity(parameters, this, value); + property = new Proximity(parameters, value); } return property; } diff --git a/src/main/java/net/fortuna/ical4j/extensions/groupwise/AutodateKey.java b/src/main/java/net/fortuna/ical4j/extensions/groupwise/AutodateKey.java index 82ca113..3b9be46 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/groupwise/AutodateKey.java +++ b/src/main/java/net/fortuna/ical4j/extensions/groupwise/AutodateKey.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.groupwise; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class AutodateKey extends Property { private static final long serialVersionUID = -4722251591472186896L; public static final String PROPERTY_NAME = "X-GWAUTODATE-KEY"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public AutodateKey(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public AutodateKey() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public AutodateKey(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public AutodateKey(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,16 +84,16 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; - public Property createProperty(String name) { - return new AutodateKey(this); + public AutodateKey createProperty() { + return new AutodateKey(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - AutodateKey property = new AutodateKey(parameters, this, value); + + public AutodateKey createProperty(ParameterList parameters, String value) { + AutodateKey property = new AutodateKey(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/groupwise/ItemType.java b/src/main/java/net/fortuna/ical4j/extensions/groupwise/ItemType.java index 5a75cfb..26160d2 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/groupwise/ItemType.java +++ b/src/main/java/net/fortuna/ical4j/extensions/groupwise/ItemType.java @@ -31,40 +31,32 @@ */ package net.fortuna.ical4j.extensions.groupwise; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * @author fortuna - * */ public class ItemType extends Property { private static final long serialVersionUID = 359692381730081304L; public static final String PROPERTY_NAME = "X-GWITEM-TYPE"; - - public static final PropertyFactory FACTORY = new Factory(); - - public static final ItemType APPOINTMENT = new ItemType(new ParameterList(true), FACTORY, "APPOINTMENT"); - + + public static final ItemType APPOINTMENT = new ItemType(new ParameterList(true), "APPOINTMENT"); + private String value; - + /** - * @param factory */ - public ItemType(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public ItemType() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public ItemType(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public ItemType(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,21 +85,20 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; - public Property createProperty(String name) { - return new ItemType(this); + public ItemType createProperty() { + return new ItemType(); } - - public Property createProperty(String name, ParameterList parameters, String value) { + + public ItemType createProperty(ParameterList parameters, String value) { ItemType property = null; if (APPOINTMENT.getValue().equals(value)) { property = APPOINTMENT; - } - else { - property = new ItemType(parameters, this, value); + } else { + property = new ItemType(parameters, value); } return property; } diff --git a/src/main/java/net/fortuna/ical4j/extensions/groupwise/MessageId.java b/src/main/java/net/fortuna/ical4j/extensions/groupwise/MessageId.java index 879ffe8..3a68019 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/groupwise/MessageId.java +++ b/src/main/java/net/fortuna/ical4j/extensions/groupwise/MessageId.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.groupwise; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class MessageId extends Property { private static final long serialVersionUID = -7910360817210293089L; public static final String PROPERTY_NAME = "X-GWMESSAGEID"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public MessageId(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public MessageId() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public MessageId(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public MessageId(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,16 +84,16 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; - public Property createProperty(String name) { - return new MessageId(this); + public MessageId createProperty() { + return new MessageId(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - MessageId property = new MessageId(parameters, this, value); + + public MessageId createProperty(ParameterList parameters, String value) { + MessageId property = new MessageId(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/groupwise/RecordId.java b/src/main/java/net/fortuna/ical4j/extensions/groupwise/RecordId.java index e260502..fe31623 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/groupwise/RecordId.java +++ b/src/main/java/net/fortuna/ical4j/extensions/groupwise/RecordId.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.groupwise; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class RecordId extends Property { private static final long serialVersionUID = -3377034395408250616L; public static final String PROPERTY_NAME = "X-RECORDID"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public RecordId(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public RecordId() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public RecordId(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public RecordId(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,16 +84,16 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; - public Property createProperty(String name) { - return new RecordId(this); + public RecordId createProperty() { + return new RecordId(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - RecordId property = new RecordId(parameters, this, value); + + public RecordId createProperty(ParameterList parameters, String value) { + RecordId property = new RecordId(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/groupwise/ShowAs.java b/src/main/java/net/fortuna/ical4j/extensions/groupwise/ShowAs.java index 0f8ae48..e23cb2a 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/groupwise/ShowAs.java +++ b/src/main/java/net/fortuna/ical4j/extensions/groupwise/ShowAs.java @@ -31,40 +31,32 @@ */ package net.fortuna.ical4j.extensions.groupwise; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * @author fortuna - * */ public class ShowAs extends Property { private static final long serialVersionUID = 1777126874405580074L; public static final String PROPERTY_NAME = "X-GWSHOW-AS"; - - public static final PropertyFactory FACTORY = new Factory(); - - public static final ShowAs BUSY = new ShowAs(new ParameterList(true), FACTORY, "BUSY"); - + + public static final ShowAs BUSY = new ShowAs(new ParameterList(true), "BUSY"); + private String value; - + /** - * @param factory */ - public ShowAs(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public ShowAs() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public ShowAs(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public ShowAs(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,21 +85,20 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; - public Property createProperty(String name) { - return new ShowAs(this); + public ShowAs createProperty() { + return new ShowAs(); } - - public Property createProperty(String name, ParameterList parameters, String value) { + + public ShowAs createProperty(ParameterList parameters, String value) { ShowAs property = null; if (BUSY.getValue().equals(value)) { property = BUSY; - } - else { - property = new ShowAs(parameters, this, value); + } else { + property = new ShowAs(parameters, value); } return property; } diff --git a/src/main/java/net/fortuna/ical4j/extensions/lotus/Charset.java b/src/main/java/net/fortuna/ical4j/extensions/lotus/Charset.java index 2d43906..4093c43 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/lotus/Charset.java +++ b/src/main/java/net/fortuna/ical4j/extensions/lotus/Charset.java @@ -31,40 +31,32 @@ */ package net.fortuna.ical4j.extensions.lotus; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * @author fortuna - * */ public class Charset extends Property { private static final long serialVersionUID = -3514682572599864426L; public static final String PROPERTY_NAME = "X-LOTUS-CHARSET"; - - public static final PropertyFactory FACTORY = new Factory(); - - public static final Charset UTF8 = new Charset(new ParameterList(true), FACTORY, "UTF-8"); - + + public static final Charset UTF8 = new Charset(new ParameterList(true), "UTF-8"); + private String value; - + /** - * @param factory */ - public Charset(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public Charset() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public Charset(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public Charset(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,21 +85,20 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { - + public static class Factory extends Content.Factory implements PropertyFactory { + private static final long serialVersionUID = 596282786680252116L; - public Property createProperty(String name) { - return new Charset(this); + public Charset createProperty() { + return new Charset(); } - - public Property createProperty(String name, ParameterList parameters, String value) { + + public Charset createProperty(ParameterList parameters, String value) { Charset property = null; if (UTF8.getValue().equals(value)) { property = UTF8; - } - else { - property = new Charset(parameters, this, value); + } else { + property = new Charset(parameters, value); } return property; } diff --git a/src/main/java/net/fortuna/ical4j/extensions/lotus/UpdateSubject.java b/src/main/java/net/fortuna/ical4j/extensions/lotus/UpdateSubject.java index db84722..510b40d 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/lotus/UpdateSubject.java +++ b/src/main/java/net/fortuna/ical4j/extensions/lotus/UpdateSubject.java @@ -31,38 +31,30 @@ */ package net.fortuna.ical4j.extensions.lotus; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * @author fortuna - * */ public class UpdateSubject extends Property { private static final long serialVersionUID = -615091328274504900L; public static final String PROPERTY_NAME = "X-LOTUS-UPDATE-SUBJECT"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public UpdateSubject(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public UpdateSubject() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public UpdateSubject(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public UpdateSubject(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -89,16 +81,16 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 2326651749315407915L; - public Property createProperty(String name) { - return new UpdateSubject(this); + public UpdateSubject createProperty() { + return new UpdateSubject(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - UpdateSubject property = new UpdateSubject(parameters, this, value); + + public UpdateSubject createProperty(ParameterList parameters, String value) { + UpdateSubject property = new UpdateSubject(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/outlook/AllDayEvent.java b/src/main/java/net/fortuna/ical4j/extensions/outlook/AllDayEvent.java index d10f750..cf44432 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/outlook/AllDayEvent.java +++ b/src/main/java/net/fortuna/ical4j/extensions/outlook/AllDayEvent.java @@ -31,40 +31,32 @@ */ package net.fortuna.ical4j.extensions.outlook; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * @author fortuna - * */ public class AllDayEvent extends Property { private static final long serialVersionUID = -3514682572599864426L; public static final String PROPERTY_NAME = "X-MICROSOFT-CDO-ALLDAYEVENT"; - - public static final PropertyFactory FACTORY = new Factory(); - - public static final AllDayEvent FALSE = new AllDayEvent(new ParameterList(true), FACTORY, "FALSE"); - + + public static final AllDayEvent FALSE = new AllDayEvent(new ParameterList(true), "FALSE"); + private String value; - + /** - * @param factory */ - public AllDayEvent(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public AllDayEvent() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public AllDayEvent(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public AllDayEvent(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,21 +85,20 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { - + public static class Factory extends Content.Factory implements PropertyFactory { + private static final long serialVersionUID = 596282786680252116L; - public Property createProperty(String name) { - return new AllDayEvent(this); + public AllDayEvent createProperty() { + return new AllDayEvent(); } - - public Property createProperty(String name, ParameterList parameters, String value) { + + public AllDayEvent createProperty(ParameterList parameters, String value) { AllDayEvent property = null; if (FALSE.getValue().equals(value)) { property = FALSE; - } - else { - property = new AllDayEvent(parameters, this, value); + } else { + property = new AllDayEvent(parameters, value); } return property; } diff --git a/src/main/java/net/fortuna/ical4j/extensions/outlook/BusyStatus.java b/src/main/java/net/fortuna/ical4j/extensions/outlook/BusyStatus.java index b8b5a54..77fe4e5 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/outlook/BusyStatus.java +++ b/src/main/java/net/fortuna/ical4j/extensions/outlook/BusyStatus.java @@ -31,10 +31,7 @@ */ package net.fortuna.ical4j.extensions.outlook; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * @author fortuna @@ -47,24 +44,22 @@ public class BusyStatus extends Property { public static final String PROPERTY_NAME = "X-MICROSOFT-CDO-BUSYSTATUS"; public static final PropertyFactory FACTORY = new Factory(); - - public static final BusyStatus BUSY = new BusyStatus(new ParameterList(true), FACTORY, "BUSY"); + + public static final BusyStatus BUSY = new BusyStatus(new ParameterList(true), "BUSY"); private String value; /** - * @param factory */ - public BusyStatus(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public BusyStatus() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public BusyStatus(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public BusyStatus(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,21 +88,21 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 596282786680252116L; - public Property createProperty(String name) { - return new BusyStatus(this); + public BusyStatus createProperty() { + return new BusyStatus(); } - - public Property createProperty(String name, ParameterList parameters, String value) { + + public BusyStatus createProperty(ParameterList parameters, String value) { BusyStatus property = null; if (BUSY.getValue().equals(value)) { property = BUSY; } else { - property = new BusyStatus(parameters, this, value); + property = new BusyStatus(parameters, value); } return property; } diff --git a/src/main/java/net/fortuna/ical4j/extensions/outlook/Importance.java b/src/main/java/net/fortuna/ical4j/extensions/outlook/Importance.java index c3523e1..25d62b0 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/outlook/Importance.java +++ b/src/main/java/net/fortuna/ical4j/extensions/outlook/Importance.java @@ -31,11 +31,7 @@ */ package net.fortuna.ical4j.extensions.outlook; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** @@ -47,24 +43,20 @@ public class Importance extends Property { private static final long serialVersionUID = 3044453382694356302L; public static final String PROPERTY_NAME = "X-MICROSOFT-CDO-IMPORTANCE"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; /** - * @param factory */ - public Importance(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public Importance() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public Importance(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public Importance(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,14 +85,14 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { - public Property createProperty(String name) { - return new Importance(this); + public Importance createProperty() { + return new Importance(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - Importance property = new Importance(parameters, this, value); + + public Importance createProperty(ParameterList parameters, String value) { + Importance property = new Importance(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/outlook/InstType.java b/src/main/java/net/fortuna/ical4j/extensions/outlook/InstType.java index 49caafc..2cf07cf 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/outlook/InstType.java +++ b/src/main/java/net/fortuna/ical4j/extensions/outlook/InstType.java @@ -31,11 +31,7 @@ */ package net.fortuna.ical4j.extensions.outlook; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** @@ -47,24 +43,20 @@ public class InstType extends Property { private static final long serialVersionUID = -3495027929173808410L; public static final String PROPERTY_NAME = "X-MICROSOFT-CDO-INSTTYPE"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; /** - * @param factory */ - public InstType(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public InstType() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public InstType(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public InstType(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,16 +85,16 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 1L; - public Property createProperty(String name) { - return new InstType(this); + public InstType createProperty() { + return new InstType(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - InstType property = new InstType(parameters, this, value); + + public InstType createProperty(ParameterList parameters, String value) { + InstType property = new InstType(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalEnd.java b/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalEnd.java index 4ae0866..a489ac7 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalEnd.java +++ b/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalEnd.java @@ -31,14 +31,11 @@ */ package net.fortuna.ical4j.extensions.outlook; -import java.text.ParseException; - -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.model.property.DateProperty; +import java.text.ParseException; + /** * @author fortuna * @@ -48,23 +45,19 @@ public class OriginalEnd extends DateProperty { private static final long serialVersionUID = -4581216613476177094L; public static final String PROPERTY_NAME = "X-MS-OLK-ORIGINALEND"; - - public static final PropertyFactory FACTORY = new Factory(); - + /** - * @param factory */ - public OriginalEnd(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public OriginalEnd() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory - * @throws ParseException + * @throws ParseException */ - public OriginalEnd(ParameterList aList, PropertyFactory factory, String value) throws ParseException { - super(PROPERTY_NAME, aList, factory); + public OriginalEnd(ParameterList aList, String value) throws ParseException { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -77,16 +70,16 @@ public void validate() throws ValidationException { } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 596282786680252116L; - public Property createProperty(String name) { - return new OriginalEnd(this); + public OriginalEnd createProperty() { + return new OriginalEnd(); } - - public Property createProperty(String name, ParameterList parameters, String value) throws ParseException { - OriginalEnd property = new OriginalEnd(parameters, this, value); + + public OriginalEnd createProperty(ParameterList parameters, String value) throws ParseException { + OriginalEnd property = new OriginalEnd(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalStart.java b/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalStart.java index a9eb9ea..6ecf0f5 100644 --- a/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalStart.java +++ b/src/main/java/net/fortuna/ical4j/extensions/outlook/OriginalStart.java @@ -31,14 +31,11 @@ */ package net.fortuna.ical4j.extensions.outlook; -import java.text.ParseException; - -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.model.property.DateProperty; +import java.text.ParseException; + /** * @author fortuna * @@ -48,23 +45,19 @@ public class OriginalStart extends DateProperty { private static final long serialVersionUID = -2369374600955575062L; public static final String PROPERTY_NAME = "X-MS-OLK-ORIGINALSTART"; - - public static final PropertyFactory FACTORY = new Factory(); - + /** - * @param factory */ - public OriginalStart(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public OriginalStart() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory - * @throws ParseException + * @throws ParseException */ - public OriginalStart(ParameterList aList, PropertyFactory factory, String value) throws ParseException { - super(PROPERTY_NAME, aList, factory); + public OriginalStart(ParameterList aList, String value) throws ParseException { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -77,16 +70,16 @@ public void validate() throws ValidationException { } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 596282786680252116L; - public Property createProperty(String name) { - return new OriginalStart(this); + public OriginalStart createProperty() { + return new OriginalStart(); } - - public Property createProperty(String name, ParameterList parameters, String value) throws ParseException { - OriginalStart property = new OriginalStart(parameters, this, value); + + public OriginalStart createProperty(ParameterList parameters, String value) throws ParseException { + OriginalStart property = new OriginalStart(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/property/CalStart.java b/src/main/java/net/fortuna/ical4j/extensions/property/CalStart.java index dac85c8..c746f29 100755 --- a/src/main/java/net/fortuna/ical4j/extensions/property/CalStart.java +++ b/src/main/java/net/fortuna/ical4j/extensions/property/CalStart.java @@ -31,40 +31,32 @@ */ package net.fortuna.ical4j.extensions.property; -import java.text.ParseException; - -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.model.property.UtcProperty; +import java.text.ParseException; + /** * @author fortuna - * */ public class CalStart extends UtcProperty { private static final long serialVersionUID = -1823078836099613956L; public static final String PROPERTY_NAME = "X-CALSTART"; - - public static final PropertyFactory FACTORY = new Factory(); - + /** - * @param factory */ - public CalStart(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public CalStart() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory - * @throws ParseException + * @throws ParseException */ - public CalStart(ParameterList aList, PropertyFactory factory, String value) throws ParseException { - super(PROPERTY_NAME, aList, factory); + public CalStart(ParameterList aList, String value) throws ParseException { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -85,16 +77,16 @@ public boolean isCalendarProperty() { return true; } - private static class Factory implements PropertyFactory { - + public static class Factory extends Content.Factory implements PropertyFactory { + private static final long serialVersionUID = 596282786680252116L; - public Property createProperty(String name) { - return new CalStart(this); + public CalStart createProperty() { + return new CalStart(); } - - public Property createProperty(String name, ParameterList parameters, String value) throws ParseException { - CalStart property = new CalStart(parameters, this, value); + + public CalStart createProperty(ParameterList parameters, String value) throws ParseException { + CalStart property = new CalStart(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/property/LicLocation.java b/src/main/java/net/fortuna/ical4j/extensions/property/LicLocation.java index 73abfde..15c4ab9 100755 --- a/src/main/java/net/fortuna/ical4j/extensions/property/LicLocation.java +++ b/src/main/java/net/fortuna/ical4j/extensions/property/LicLocation.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.property; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class LicLocation extends Property { private static final long serialVersionUID = -9063118211308272499L; public static final String PROPERTY_NAME = "X-LIC-LOCATION"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public LicLocation(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public LicLocation() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public LicLocation(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public LicLocation(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -93,14 +84,14 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { - public Property createProperty(String name) { - return new LicLocation(this); + public LicLocation createProperty() { + return new LicLocation(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - LicLocation property = new LicLocation(parameters, this, value); + + public LicLocation createProperty(ParameterList parameters, String value) { + LicLocation property = new LicLocation(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/property/WrAlarmId.java b/src/main/java/net/fortuna/ical4j/extensions/property/WrAlarmId.java index 557d4c5..a688564 100755 --- a/src/main/java/net/fortuna/ical4j/extensions/property/WrAlarmId.java +++ b/src/main/java/net/fortuna/ical4j/extensions/property/WrAlarmId.java @@ -31,38 +31,30 @@ */ package net.fortuna.ical4j.extensions.property; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; /** * @author fortuna - * */ public class WrAlarmId extends Property { private static final long serialVersionUID = 2182103734645261668L; public static final String PROPERTY_NAME = "X-WR-ALARMID"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public WrAlarmId(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public WrAlarmId() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public WrAlarmId(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public WrAlarmId(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -89,16 +81,16 @@ public String getValue() { return value; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 2099427445505899578L; - public Property createProperty(String name) { - return new WrAlarmId(this); + public WrAlarmId createProperty() { + return new WrAlarmId(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - WrAlarmId property = new WrAlarmId(parameters, this, value); + + public WrAlarmId createProperty(ParameterList parameters, String value) { + WrAlarmId property = new WrAlarmId(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/property/WrCalDesc.java b/src/main/java/net/fortuna/ical4j/extensions/property/WrCalDesc.java index ce29423..70d42b5 100755 --- a/src/main/java/net/fortuna/ical4j/extensions/property/WrCalDesc.java +++ b/src/main/java/net/fortuna/ical4j/extensions/property/WrCalDesc.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.property; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class WrCalDesc extends Property { private static final long serialVersionUID = 4925485073475375164L; public static final String PROPERTY_NAME = "X-WR-CALDESC"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public WrCalDesc(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public WrCalDesc() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public WrCalDesc(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public WrCalDesc(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -101,16 +92,16 @@ public boolean isCalendarProperty() { return true; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = -7990613145503686965L; - public Property createProperty(String name) { - return new WrCalDesc(this); + public WrCalDesc createProperty() { + return new WrCalDesc(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - WrCalDesc property = new WrCalDesc(parameters, this, value); + + public WrCalDesc createProperty(ParameterList parameters, String value) { + WrCalDesc property = new WrCalDesc(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/property/WrCalName.java b/src/main/java/net/fortuna/ical4j/extensions/property/WrCalName.java index 721403c..0b0c411 100755 --- a/src/main/java/net/fortuna/ical4j/extensions/property/WrCalName.java +++ b/src/main/java/net/fortuna/ical4j/extensions/property/WrCalName.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.property; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class WrCalName extends Property { private static final long serialVersionUID = 3529181417508181637L; public static final String PROPERTY_NAME = "X-WR-CALNAME"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public WrCalName(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public WrCalName() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public WrCalName(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public WrCalName(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -100,17 +91,17 @@ public String getValue() { public boolean isCalendarProperty() { return true; } - - private static class Factory implements PropertyFactory { + + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = -202687610325706085L; - public Property createProperty(String name) { - return new WrCalName(this); + public WrCalName createProperty() { + return new WrCalName(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - WrCalName property = new WrCalName(parameters, this, value); + + public WrCalName createProperty(ParameterList parameters, String value) { + WrCalName property = new WrCalName(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/property/WrRelCalId.java b/src/main/java/net/fortuna/ical4j/extensions/property/WrRelCalId.java index 680321c..a67d4e6 100755 --- a/src/main/java/net/fortuna/ical4j/extensions/property/WrRelCalId.java +++ b/src/main/java/net/fortuna/ical4j/extensions/property/WrRelCalId.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.property; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class WrRelCalId extends Property { private static final long serialVersionUID = 1102593718257055628L; public static final String PROPERTY_NAME = "X-WR-RELCALID"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public WrRelCalId(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public WrRelCalId() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public WrRelCalId(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public WrRelCalId(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -101,16 +92,16 @@ public boolean isCalendarProperty() { return true; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = -6362745894043821710L; - public Property createProperty(String name) { - return new WrRelCalId(this); + public WrRelCalId createProperty() { + return new WrRelCalId(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - WrRelCalId property = new WrRelCalId(parameters, this, value); + + public WrRelCalId createProperty(ParameterList parameters, String value) { + WrRelCalId property = new WrRelCalId(parameters, value); return property; } } diff --git a/src/main/java/net/fortuna/ical4j/extensions/property/WrTimezone.java b/src/main/java/net/fortuna/ical4j/extensions/property/WrTimezone.java index aa130ff..4d3af98 100755 --- a/src/main/java/net/fortuna/ical4j/extensions/property/WrTimezone.java +++ b/src/main/java/net/fortuna/ical4j/extensions/property/WrTimezone.java @@ -31,40 +31,31 @@ */ package net.fortuna.ical4j.extensions.property; -import net.fortuna.ical4j.model.Parameter; -import net.fortuna.ical4j.model.ParameterList; -import net.fortuna.ical4j.model.Property; -import net.fortuna.ical4j.model.PropertyFactory; -import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.util.ParameterValidator; /** * @author fortuna - * */ public class WrTimezone extends Property { private static final long serialVersionUID = 7248705823074186148L; public static final String PROPERTY_NAME = "X-WR-TIMEZONE"; - - public static final PropertyFactory FACTORY = new Factory(); - + private String value; - + /** - * @param factory */ - public WrTimezone(PropertyFactory factory) { - super(PROPERTY_NAME, factory); + public WrTimezone() { + super(PROPERTY_NAME, PropertyFactoryImpl.getInstance()); } /** * @param aList - * @param factory */ - public WrTimezone(ParameterList aList, PropertyFactory factory, String value) { - super(PROPERTY_NAME, aList, factory); + public WrTimezone(ParameterList aList, String value) { + super(PROPERTY_NAME, aList, PropertyFactoryImpl.getInstance()); setValue(value); } @@ -101,16 +92,16 @@ public boolean isCalendarProperty() { return true; } - private static class Factory implements PropertyFactory { + public static class Factory extends Content.Factory implements PropertyFactory { private static final long serialVersionUID = 3538377735326578201L; - public Property createProperty(String name) { - return new WrTimezone(this); + public WrTimezone createProperty() { + return new WrTimezone(); } - - public Property createProperty(String name, ParameterList parameters, String value) { - WrTimezone property = new WrTimezone(parameters, this, value); + + public WrTimezone createProperty(ParameterList parameters, String value) { + WrTimezone property = new WrTimezone(parameters, value); return property; } } diff --git a/src/main/resources/META-INF/services/net.fortuna.ical4j.model.ParameterFactory b/src/main/resources/META-INF/services/net.fortuna.ical4j.model.ParameterFactory new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/META-INF/services/net.fortuna.ical4j.model.PropertyFactory b/src/main/resources/META-INF/services/net.fortuna.ical4j.model.PropertyFactory new file mode 100644 index 0000000..467a7a6 --- /dev/null +++ b/src/main/resources/META-INF/services/net.fortuna.ical4j.model.PropertyFactory @@ -0,0 +1,34 @@ +net.fortuna.ical4j.extensions.property.CalStart$Factory +net.fortuna.ical4j.extensions.property.LicLocation$Factory +net.fortuna.ical4j.extensions.property.WrAlarmId$Factory +net.fortuna.ical4j.extensions.property.WrCalDesc$Factory +net.fortuna.ical4j.extensions.property.WrCalName$Factory +net.fortuna.ical4j.extensions.property.WrRelCalId$Factory +net.fortuna.ical4j.extensions.property.WrTimezone$Factory + +# CalDAV +net.fortuna.ical4j.extensions.caldav.property.AlarmAgent$Factory +net.fortuna.ical4j.extensions.caldav.property.CalendarServerAccess$Factory +net.fortuna.ical4j.extensions.caldav.property.CalendarServerAttendeeComment$Factory +net.fortuna.ical4j.extensions.caldav.property.CalendarServerPrivateComment$Factory +net.fortuna.ical4j.extensions.caldav.property.DefaultAlarm$Factory +net.fortuna.ical4j.extensions.caldav.property.Proximity$Factory + +# Groupwise +net.fortuna.ical4j.extensions.groupwise.AutodateKey$Factory +net.fortuna.ical4j.extensions.groupwise.ItemType$Factory +net.fortuna.ical4j.extensions.groupwise.MessageId$Factory +net.fortuna.ical4j.extensions.groupwise.RecordId$Factory +net.fortuna.ical4j.extensions.groupwise.ShowAs$Factory + +# Lotus Notes +net.fortuna.ical4j.extensions.lotus.Charset$Factory +net.fortuna.ical4j.extensions.lotus.UpdateSubject$Factory + +# MS Outlook +net.fortuna.ical4j.extensions.outlook.AllDayEvent$Factory +net.fortuna.ical4j.extensions.outlook.BusyStatus$Factory +net.fortuna.ical4j.extensions.outlook.Importance$Factory +net.fortuna.ical4j.extensions.outlook.InstType$Factory +net.fortuna.ical4j.extensions.outlook.OriginalEnd$Factory +net.fortuna.ical4j.extensions.outlook.OriginalStart$Factory diff --git a/src/test/groovy/net/fortuna/ical4j/extensions/property/CalStartSpec.groovy b/src/test/groovy/net/fortuna/ical4j/extensions/property/CalStartSpec.groovy index 4cf974c..e4e5048 100644 --- a/src/test/groovy/net/fortuna/ical4j/extensions/property/CalStartSpec.groovy +++ b/src/test/groovy/net/fortuna/ical4j/extensions/property/CalStartSpec.groovy @@ -31,17 +31,17 @@ */ package net.fortuna.ical4j.extensions.property -import net.fortuna.ical4j.model.ParameterList; -import spock.lang.Specification; +import net.fortuna.ical4j.model.ParameterList +import spock.lang.Specification class CalStartSpec extends Specification { - def 'verify value'() { - expect: - new CalStart(new ParameterList(), null, value).value == expectedValue - - where: - value | expectedValue - '20110101T120000' | '20110101T120000' - } + def 'verify value'() { + expect: + new CalStart(new ParameterList(), value).value == expectedValue + + where: + value | expectedValue + '20110101T120000' | '20110101T120000' + } } diff --git a/src/test/java/net/fortuna/ical4j/extensions/CalendarBuilderTest.java b/src/test/java/net/fortuna/ical4j/extensions/CalendarBuilderTest.java index 8c0f28a..24218e8 100644 --- a/src/test/java/net/fortuna/ical4j/extensions/CalendarBuilderTest.java +++ b/src/test/java/net/fortuna/ical4j/extensions/CalendarBuilderTest.java @@ -31,16 +31,10 @@ */ package net.fortuna.ical4j.extensions; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - +import net.fortuna.ical4j.data.CalendarBuilder; import net.fortuna.ical4j.data.ParserException; import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.model.ValidationException; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -48,6 +42,12 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * @author Ben diff --git a/src/test/java/net/fortuna/ical4j/extensions/lotus/CharsetTest.java b/src/test/java/net/fortuna/ical4j/extensions/lotus/CharsetTest.java index 9a38638..172a71a 100644 --- a/src/test/java/net/fortuna/ical4j/extensions/lotus/CharsetTest.java +++ b/src/test/java/net/fortuna/ical4j/extensions/lotus/CharsetTest.java @@ -31,14 +31,13 @@ */ package net.fortuna.ical4j.extensions.lotus; +import junit.framework.Assert; +import org.junit.Test; + import java.io.IOException; import java.net.URISyntaxException; import java.text.ParseException; -import junit.framework.Assert; - -import org.junit.Test; - /** * @author fortuna @@ -48,7 +47,7 @@ public class CharsetTest { @Test public void testFactoryUTF8() throws IOException, URISyntaxException, ParseException { - Charset property = (Charset) Charset.FACTORY.createProperty(null, null, "UTF-8"); + Charset property = (Charset) new Charset.Factory().createProperty(null, "UTF-8"); Assert.assertEquals(Charset.UTF8, property); } } diff --git a/src/test/java/net/fortuna/ical4j/extensions/property/CalStartTest.java b/src/test/java/net/fortuna/ical4j/extensions/property/CalStartTest.java index 91f6de0..9982e89 100755 --- a/src/test/java/net/fortuna/ical4j/extensions/property/CalStartTest.java +++ b/src/test/java/net/fortuna/ical4j/extensions/property/CalStartTest.java @@ -31,15 +31,13 @@ */ package net.fortuna.ical4j.extensions.property; -import java.io.IOException; -import java.net.URISyntaxException; -import java.text.ParseException; - +import junit.framework.Assert; import net.fortuna.ical4j.model.ParameterList; - import org.junit.Test; -import junit.framework.Assert; +import java.io.IOException; +import java.net.URISyntaxException; +import java.text.ParseException; /** @@ -50,7 +48,7 @@ public class CalStartTest { @Test public void testFactoryCreate() throws IOException, URISyntaxException, ParseException { - CalStart property = (CalStart) CalStart.FACTORY.createProperty(null, new ParameterList(), + CalStart property = (CalStart) new CalStart.Factory().createProperty(new ParameterList(), "20081030T193000Z"); Assert.assertNotNull(property); }