removed IANA properties and parameters

JFXtras · Oct 10, 2016 · 81d2a8c · 81d2a8c
1 parent a202345
commit 81d2a8c
Show file tree

Hide file tree

Showing 31 changed files with 2,511 additions and 613 deletions.
diff --git a/hs_err_pid19585.log b/hs_err_pid19585.log
diff --git a/hs_err_pid19777.log b/hs_err_pid19777.log
diff --git a/src/main/java/jfxtras/labs/icalendarfx/CalendarComponent.java b/src/main/java/jfxtras/labs/icalendarfx/CalendarComponent.java
@@ -31,7 +31,7 @@ public enum CalendarComponent
             PropertyType.CLASSIFICATION, PropertyType.COMMENT, PropertyType.CONTACT, PropertyType.DATE_TIME_CREATED,
             PropertyType.DATE_TIME_END, PropertyType.DATE_TIME_STAMP, PropertyType.DATE_TIME_START,
             PropertyType.DESCRIPTION, PropertyType.DURATION, PropertyType.EXCEPTION_DATE_TIMES,
-            PropertyType.GEOGRAPHIC_POSITION, PropertyType.IANA_PROPERTY, PropertyType.LAST_MODIFIED,
+            PropertyType.GEOGRAPHIC_POSITION, PropertyType.LAST_MODIFIED,
             PropertyType.LOCATION, PropertyType.NON_STANDARD, PropertyType.ORGANIZER, PropertyType.PRIORITY,
             PropertyType.RECURRENCE_DATE_TIMES, PropertyType.RECURRENCE_IDENTIFIER, PropertyType.RELATED_TO,
             PropertyType.RECURRENCE_RULE, PropertyType.REQUEST_STATUS,  PropertyType.RESOURCES, PropertyType.SEQUENCE,
@@ -70,7 +70,7 @@ public void copyChild(VChild child, VCalendar destination)
             PropertyType.CLASSIFICATION, PropertyType.COMMENT, PropertyType.CONTACT, PropertyType.DATE_TIME_COMPLETED,
             PropertyType.DATE_TIME_CREATED, PropertyType.DATE_TIME_DUE, PropertyType.DATE_TIME_STAMP,
             PropertyType.DATE_TIME_START, PropertyType.DESCRIPTION, PropertyType.DURATION,
-            PropertyType.EXCEPTION_DATE_TIMES, PropertyType.GEOGRAPHIC_POSITION, PropertyType.IANA_PROPERTY,
+            PropertyType.EXCEPTION_DATE_TIMES, PropertyType.GEOGRAPHIC_POSITION,
             PropertyType.LAST_MODIFIED, PropertyType.LOCATION,  PropertyType.NON_STANDARD, PropertyType.ORGANIZER,
             PropertyType.PERCENT_COMPLETE, PropertyType.PRIORITY, PropertyType.RECURRENCE_DATE_TIMES,
             PropertyType.RECURRENCE_IDENTIFIER, PropertyType.RELATED_TO, PropertyType.RECURRENCE_RULE,
@@ -99,7 +99,7 @@ public void copyChild(VChild child, VCalendar destination)
             Arrays.asList(PropertyType.ATTACHMENT, PropertyType.ATTENDEE, PropertyType.CATEGORIES,
             PropertyType.CLASSIFICATION, PropertyType.COMMENT, PropertyType.CONTACT, PropertyType.DATE_TIME_CREATED,
             PropertyType.DATE_TIME_STAMP, PropertyType.DATE_TIME_START, PropertyType.DESCRIPTION,
-            PropertyType.EXCEPTION_DATE_TIMES, PropertyType.IANA_PROPERTY, PropertyType.LAST_MODIFIED,
+            PropertyType.EXCEPTION_DATE_TIMES, PropertyType.LAST_MODIFIED,
             PropertyType.NON_STANDARD, PropertyType.ORGANIZER, PropertyType.RECURRENCE_DATE_TIMES,
             PropertyType.RECURRENCE_IDENTIFIER, PropertyType.RELATED_TO, PropertyType.RECURRENCE_RULE, 
             PropertyType.REQUEST_STATUS, PropertyType.SEQUENCE, PropertyType.STATUS, PropertyType.SUMMARY,
@@ -124,7 +124,7 @@ public void copyChild(VChild child, VCalendar destination)
 
     },
     VTIMEZONE ("VTIMEZONE",
-            Arrays.asList(PropertyType.IANA_PROPERTY, PropertyType.LAST_MODIFIED, PropertyType.NON_STANDARD,
+            Arrays.asList(PropertyType.LAST_MODIFIED, PropertyType.NON_STANDARD,
             PropertyType.TIME_ZONE_IDENTIFIER, PropertyType.TIME_ZONE_URL),
 //            true,
             VTimeZone.class)
@@ -148,7 +148,7 @@ public void copyChild(VChild child, VCalendar destination)
     VFREEBUSY ("VFREEBUSY",
             Arrays.asList(PropertyType.ATTENDEE, PropertyType.COMMENT, PropertyType.CONTACT,
             PropertyType.DATE_TIME_END, PropertyType.DATE_TIME_STAMP, PropertyType.DATE_TIME_START,
-            PropertyType.FREE_BUSY_TIME, PropertyType.IANA_PROPERTY, PropertyType.NON_STANDARD, PropertyType.ORGANIZER,
+            PropertyType.FREE_BUSY_TIME, PropertyType.NON_STANDARD, PropertyType.ORGANIZER,
             PropertyType.REQUEST_STATUS, PropertyType.UNIQUE_IDENTIFIER, PropertyType.UNIFORM_RESOURCE_LOCATOR),
 //            true,
             VFreeBusy.class)
@@ -173,7 +173,7 @@ public void copyChild(VChild child, VCalendar destination)
     // NON-MAIN COMPONENTS - MUST BE NESTED IN A MAIN COMPONENT
     DAYLIGHT_SAVING_TIME ("DAYLIGHT",
             Arrays.asList(PropertyType.COMMENT, PropertyType.DATE_TIME_START,
-            PropertyType.IANA_PROPERTY, PropertyType.NON_STANDARD, PropertyType.RECURRENCE_DATE_TIMES,
+            PropertyType.NON_STANDARD, PropertyType.RECURRENCE_DATE_TIMES,
             PropertyType.RECURRENCE_RULE, PropertyType.TIME_ZONE_NAME, PropertyType.TIME_ZONE_OFFSET_FROM,
             PropertyType.TIME_ZONE_OFFSET_TO),
 //            false,
@@ -194,7 +194,7 @@ public void copyChild(VChild child, VCalendar destination)
     },
     STANDARD_TIME ("STANDARD",
             Arrays.asList(PropertyType.COMMENT, PropertyType.DATE_TIME_START,
-            PropertyType.IANA_PROPERTY, PropertyType.NON_STANDARD, PropertyType.RECURRENCE_DATE_TIMES,
+            PropertyType.NON_STANDARD, PropertyType.RECURRENCE_DATE_TIMES,
             PropertyType.RECURRENCE_RULE, PropertyType.TIME_ZONE_NAME, PropertyType.TIME_ZONE_OFFSET_FROM,
             PropertyType.TIME_ZONE_OFFSET_TO),
 //            false,
@@ -216,7 +216,7 @@ public void copyChild(VChild child, VCalendar destination)
     },
     VALARM ("VALARM",
             Arrays.asList(PropertyType.ACTION, PropertyType.ATTACHMENT, PropertyType.ATTENDEE, PropertyType.DESCRIPTION,
-            PropertyType.DURATION, PropertyType.IANA_PROPERTY, PropertyType.NON_STANDARD, PropertyType.REPEAT_COUNT,
+            PropertyType.DURATION, PropertyType.NON_STANDARD, PropertyType.REPEAT_COUNT,
             PropertyType.SUMMARY, PropertyType.TRIGGER),
 //            false,
             VAlarm.class)

diff --git a/src/main/java/jfxtras/labs/icalendarfx/CalendarProperty.java b/src/main/java/jfxtras/labs/icalendarfx/CalendarProperty.java
@@ -18,7 +18,7 @@
 public enum CalendarProperty
 {
     CALENDAR_SCALE ("CALSCALE",
-            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD, ParameterType.IANA_PARAMETER),
+            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD),
              CalendarScale.class)
     {
         @Override
@@ -76,7 +76,7 @@ public void copyChild(VChild child, VCalendar destination)
 //
 //    },
     METHOD ("METHOD",
-            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD, ParameterType.IANA_PARAMETER),
+            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD),
             Method.class)
     {
         @Override
@@ -135,7 +135,7 @@ public void copyChild(VChild child, VCalendar destination)
     },
 
     PRODUCT_IDENTIFIER ("PRODID",
-            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD, ParameterType.IANA_PARAMETER),
+            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD),
             ProductIdentifier.class)
     {
         @Override
@@ -154,7 +154,7 @@ public void copyChild(VChild child, VCalendar destination)
         }
     },
     VERSION ("VERSION",
-            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD, ParameterType.IANA_PARAMETER),
+            Arrays.asList(ParameterType.VALUE_DATA_TYPES, ParameterType.NON_STANDARD),
             Version.class)
     {
         @Override

diff --git a/src/main/java/jfxtras/labs/icalendarfx/VCalendar.java b/src/main/java/jfxtras/labs/icalendarfx/VCalendar.java
@@ -1031,7 +1031,7 @@ public List<String> importVComponent(VComponent newVComponent)
 //    };
 
     @Override
-    protected Callback<VChild, Void> copyChildCallback()
+    protected Callback<VChild, Void> copyIntoCallback()
     {        
         return (child) ->
         {

diff --git a/src/main/java/jfxtras/labs/icalendarfx/VParentBase.java b/src/main/java/jfxtras/labs/icalendarfx/VParentBase.java
@@ -42,7 +42,7 @@ protected void setContentLineGenerator(ContentLineStrategy contentLineGenerator)
 
     /** Strategy to copy subclass's children
      * This method MUST be overridden in subclasses */
-    protected Callback<VChild, Void> copyChildCallback()
+    protected Callback<VChild, Void> copyIntoCallback()
     {
         throw new RuntimeException("Can't copy children.  copyChildCallback isn't overridden in subclass." + this.getClass());
     };
@@ -65,9 +65,15 @@ public List<VChild> childrenUnmodifiable()
     * this component that are not present in source then those will remain unchanged.
     * */
     @Override
+    @Deprecated
     public void copyChildrenFrom(VParent source)
     {
-        source.childrenUnmodifiable().forEach((e) -> copyChildCallback().call(e));
+        source.childrenUnmodifiable().forEach((e) -> copyIntoCallback().call(e));
+    }
+
+    public void copyInto(VParentBase destination)
+    {
+        childrenUnmodifiable().forEach((e) -> destination.copyIntoCallback().call(e));
     }
 
     @Override

diff --git a/src/main/java/jfxtras/labs/icalendarfx/components/DaylightSavingTime.java b/src/main/java/jfxtras/labs/icalendarfx/components/DaylightSavingTime.java
@@ -1,8 +1,7 @@
 package jfxtras.labs.icalendarfx.components;
 
 import jfxtras.labs.icalendarfx.properties.component.descriptive.Comment;
-import jfxtras.labs.icalendarfx.properties.component.misc.IANAProperty;
-import jfxtras.labs.icalendarfx.properties.component.misc.UnknownProperty;
+import jfxtras.labs.icalendarfx.properties.component.misc.NonStandardProperty;
 import jfxtras.labs.icalendarfx.properties.component.recurrence.RecurrenceDates;
 import jfxtras.labs.icalendarfx.properties.component.recurrence.RecurrenceRule;
 import jfxtras.labs.icalendarfx.properties.component.time.DateTimeStart;
@@ -37,13 +36,12 @@
  *<ul>
  *<li>{@link Comment COMMENT}
  *<li>{@link DateTimeStart DTSTART}
- *<li>{@link IANAProperty IANA-PROP}
  *<li>{@link RecurrenceDates RDATE}
  *<li>{@link RecurrenceRule RRULE}
  *<li>{@link TimeZoneName TZNAME}
  *<li>{@link TimeZoneOffsetFrom TZOFFSETFROM}
  *<li>{@link TimeZoneOffsetTo TZOFFSETTO}
- *<li>{@link UnknownProperty X-PROP}
+ *<li>{@link NonStandardProperty X-PROP}
  *</ul>
  *</p>
  * 

diff --git a/src/main/java/jfxtras/labs/icalendarfx/components/StandardTime.java b/src/main/java/jfxtras/labs/icalendarfx/components/StandardTime.java
@@ -1,8 +1,7 @@
 package jfxtras.labs.icalendarfx.components;
 
 import jfxtras.labs.icalendarfx.properties.component.descriptive.Comment;
-import jfxtras.labs.icalendarfx.properties.component.misc.IANAProperty;
-import jfxtras.labs.icalendarfx.properties.component.misc.UnknownProperty;
+import jfxtras.labs.icalendarfx.properties.component.misc.NonStandardProperty;
 import jfxtras.labs.icalendarfx.properties.component.recurrence.RecurrenceDates;
 import jfxtras.labs.icalendarfx.properties.component.recurrence.RecurrenceRule;
 import jfxtras.labs.icalendarfx.properties.component.time.DateTimeStart;
@@ -37,13 +36,12 @@
  *<ul>
  *<li>{@link Comment COMMENT}
  *<li>{@link DateTimeStart DTSTART}
- *<li>{@link IANAProperty IANA-PROP}
  *<li>{@link RecurrenceDates RDATE}
  *<li>{@link RecurrenceRule RRULE}
  *<li>{@link TimeZoneName TZNAME}
  *<li>{@link TimeZoneOffsetFrom TZOFFSETFROM}
  *<li>{@link TimeZoneOffsetTo TZOFFSETTO}
- *<li>{@link UnknownProperty X-PROP}
+ *<li>{@link NonStandardProperty X-PROP}
  *</ul>
  *</p>
  * 

diff --git a/src/main/java/jfxtras/labs/icalendarfx/components/VAlarm.java b/src/main/java/jfxtras/labs/icalendarfx/components/VAlarm.java
@@ -17,7 +17,6 @@
 import jfxtras.labs.icalendarfx.properties.component.descriptive.Attachment;
 import jfxtras.labs.icalendarfx.properties.component.descriptive.Description;
 import jfxtras.labs.icalendarfx.properties.component.descriptive.Summary;
-import jfxtras.labs.icalendarfx.properties.component.misc.IANAProperty;
 import jfxtras.labs.icalendarfx.properties.component.misc.NonStandardProperty;
 import jfxtras.labs.icalendarfx.properties.component.relationship.Attendee;
 import jfxtras.labs.icalendarfx.properties.component.time.DateTimeEnd;
@@ -100,7 +99,6 @@
  *  <li>The following are OPTIONAL, and MAY occur more than once.
  *    <ul>
  *    <li>{@link Attachment ATTACH}
- *    <li>{@link IANAProperty IANA-PROP}
  *    <li>{@link NonStandardProperty X-PROP}
  *    </ul>
  *  </ul>

diff --git a/src/main/java/jfxtras/labs/icalendarfx/components/VCommon.java b/src/main/java/jfxtras/labs/icalendarfx/components/VCommon.java
@@ -9,14 +9,12 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import jfxtras.labs.icalendarfx.properties.PropertyType;
-import jfxtras.labs.icalendarfx.properties.component.misc.IANAProperty;
 import jfxtras.labs.icalendarfx.properties.component.misc.NonStandardProperty;
 
 /**
  * <p>{@link VComponent} with the following properties
  * <ul>
  * <li>{@link NonStandardProperty X-PROP}
- * <li>{@link IANAProperty IANA-PROP}
  * </ul>
  * </p>
  * 
@@ -94,75 +92,75 @@ public T withNonStandard(NonStandardProperty...nonStandardProps)
         return (T) this;
     }
 
-    /**
-     *<p>Allows other properties registered
-     * with IANA to be specified in any calendar components.</p>
-     * 
-     *<p>Example:  The following are examples of properties that might be registered to IANA:
-     *<ul>
-     *<li>DRESSCODE:CASUAL
-     *<li>NON-SMOKING;VALUE=BOOLEAN:TRUE
-     *</ul>
-     *</p>
-     */
-    public ObjectProperty<ObservableList<IANAProperty>> ianaProperty()
-    {
-        if (ianaProps == null)
-        {
-            ianaProps = new SimpleObjectProperty<>(this, PropertyType.IANA_PROPERTY.toString());
-        }
-        return ianaProps;
-    }
-    public ObservableList<IANAProperty> getIana()
-    {
-        return (ianaProps == null) ? null : ianaProps.get();
-    }
-    private ObjectProperty<ObservableList<IANAProperty>> ianaProps;
-    public void setIana(ObservableList<IANAProperty> ianaProps)
-    {
-        if (ianaProps != null)
-        {
-            orderer().registerSortOrderProperty(ianaProps);
-        } else
-        {
-            orderer().unregisterSortOrderProperty(ianaProperty().get());
-        }
-        ianaProperty().set(ianaProps);
-    }
-    /**
-     * Sets the value of the {@link #IANAProperty()} by parsing a vararg of
-     * iCalendar content text representing individual {@link IANAProperty} objects.
-     * 
-     * @return - this class for chaining
-     */
-    public T withIana(String...ianaProps)
-    {
-        List<IANAProperty> a = Arrays.stream(ianaProps)
-                .map(c -> IANAProperty.parse(c))
-                .collect(Collectors.toList());
-        setIana(FXCollections.observableArrayList(a));
-        return (T) this;
-    }
-    /**
-     * Sets the value of the {@link #IANAProperty()}
-     * 
-     * @return - this class for chaining
-     */
-    public T withIana(ObservableList<IANAProperty> ianaProps)
-    {
-        setIana(ianaProps);
-        return (T) this;
-    }
-    /**
-     * Sets the value of the {@link #IANAProperty()} from a vararg of {@link IANAProperty} objects.
-     * 
-     * @return - this class for chaining
-     */    
-    public T withIana(IANAProperty...ianaProps)
-    {
-        setIana(FXCollections.observableArrayList(ianaProps));
-        return (T) this;
-    }
+//    /**
+//     *<p>Allows other properties registered
+//     * with IANA to be specified in any calendar components.</p>
+//     * 
+//     *<p>Example:  The following are examples of properties that might be registered to IANA:
+//     *<ul>
+//     *<li>DRESSCODE:CASUAL
+//     *<li>NON-SMOKING;VALUE=BOOLEAN:TRUE
+//     *</ul>
+//     *</p>
+//     */
+//    public ObjectProperty<ObservableList<IANAProperty>> ianaProperty()
+//    {
+//        if (ianaProps == null)
+//        {
+//            ianaProps = new SimpleObjectProperty<>(this, PropertyType.IANA_PROPERTY.toString());
+//        }
+//        return ianaProps;
+//    }
+//    public ObservableList<IANAProperty> getIana()
+//    {
+//        return (ianaProps == null) ? null : ianaProps.get();
+//    }
+//    private ObjectProperty<ObservableList<IANAProperty>> ianaProps;
+//    public void setIana(ObservableList<IANAProperty> ianaProps)
+//    {
+//        if (ianaProps != null)
+//        {
+//            orderer().registerSortOrderProperty(ianaProps);
+//        } else
+//        {
+//            orderer().unregisterSortOrderProperty(ianaProperty().get());
+//        }
+//        ianaProperty().set(ianaProps);
+//    }
+//    /**
+//     * Sets the value of the {@link #IANAProperty()} by parsing a vararg of
+//     * iCalendar content text representing individual {@link IANAProperty} objects.
+//     * 
+//     * @return - this class for chaining
+//     */
+//    public T withIana(String...ianaProps)
+//    {
+//        List<IANAProperty> a = Arrays.stream(ianaProps)
+//                .map(c -> IANAProperty.parse(c))
+//                .collect(Collectors.toList());
+//        setIana(FXCollections.observableArrayList(a));
+//        return (T) this;
+//    }
+//    /**
+//     * Sets the value of the {@link #IANAProperty()}
+//     * 
+//     * @return - this class for chaining
+//     */
+//    public T withIana(ObservableList<IANAProperty> ianaProps)
+//    {
+//        setIana(ianaProps);
+//        return (T) this;
+//    }
+//    /**
+//     * Sets the value of the {@link #IANAProperty()} from a vararg of {@link IANAProperty} objects.
+//     * 
+//     * @return - this class for chaining
+//     */    
+//    public T withIana(IANAProperty...ianaProps)
+//    {
+//        setIana(FXCollections.observableArrayList(ianaProps));
+//        return (T) this;
+//    }
 
     /*
      * CONSTRUCTORS

diff --git a/src/main/java/jfxtras/labs/icalendarfx/components/VComponent.java b/src/main/java/jfxtras/labs/icalendarfx/components/VComponent.java
@@ -10,7 +10,6 @@
 import jfxtras.labs.icalendarfx.properties.calendar.Method;
 import jfxtras.labs.icalendarfx.properties.calendar.ProductIdentifier;
 import jfxtras.labs.icalendarfx.properties.calendar.Version;
-import jfxtras.labs.icalendarfx.properties.component.misc.IANAProperty;
 import jfxtras.labs.icalendarfx.properties.component.misc.NonStandardProperty;
 import jfxtras.labs.icalendarfx.properties.component.misc.RequestStatus;
 import jfxtras.labs.icalendarfx.utilities.UnfoldingStringIterator;
@@ -50,7 +49,7 @@
  *  <li>The following are OPTIONAL, and MAY occur more than once.
  *    <ul>
  *    <li>{@link NonStandardProperty X-PROP}
- *    <li>{@link IANAProperty IANA-PROP}
+ *    <li>IANA-PROP
  *    </ul>
  *  </ul>
  *<li>component