sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1509760 - in /sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml: TimeInstant.java TimePeriod.java TimePeriodBound.java
Date Fri, 02 Aug 2013 16:15:28 GMT
Author: desruisseaux
Date: Fri Aug  2 16:15:28 2013
New Revision: 1509760

URL: http://svn.apache.org/r1509760
Log:
Exclude the @XmlType(name="...") attribute for now for allowing external projects to define
their own type.
This is a temporary patch to be reverted after we implemented the sis-temporal module.

Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java?rev=1509760&r1=1509759&r2=1509760&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
[UTF-8] Fri Aug  2 16:15:28 2013
@@ -38,7 +38,7 @@ import org.apache.sis.internal.jaxb.XmlU
  * @module
  */
 @XmlRootElement(name="TimeInstant")
-@XmlType(name = "TimeInstantType")
+//@XmlType(name = "TimeInstantType") // TODO: Omitted for now for allowing external modules
to define their own type.
 public final class TimeInstant extends GMLAdapter {
     /**
      * The date, optionally with its time component. The time component is omitted

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java?rev=1509760&r1=1509759&r2=1509760&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
[UTF-8] Fri Aug  2 16:15:28 2013
@@ -37,7 +37,7 @@ import org.apache.sis.internal.jaxb.Cont
  * @module
  */
 @XmlRootElement(name="TimePeriod")
-@XmlType(name = "TimePeriodType", propOrder = {
+@XmlType(/*name = "TimePeriodType",*/ propOrder = { // TODO: Omitted for now for allowing
external modules to define their own type.
     "begin",
     "end"
 })

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java?rev=1509760&r1=1509759&r2=1509760&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
[UTF-8] Fri Aug  2 16:15:28 2013
@@ -28,7 +28,7 @@ import org.opengis.temporal.Instant;
 /**
  * The {@linkplain TimePeriod#begin begin} or {@linkplain TimePeriod#end end} position in
  * a {@link TimePeriod}. This information is encoded in different way depending if we are
- * reading or formatting a GML2 or GML2 file.
+ * reading or formatting a GML2 or GML3 file.
  *
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
@@ -137,7 +137,7 @@ public abstract class TimePeriodBound {
      *   </gml:TimePeriod>
      * }
      */
-    @XmlType(name = "TimeInstantPropertyType")
+    //@XmlType(name = "TimeInstantPropertyType") // TODO: Omitted for now for allowing external
modules to define their own type.
     public static final class GML2 extends TimePeriodBound {
         /**
          * The time.



Mime
View raw message