sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1554596 - in /sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis: internal/jaxb/referencing/ referencing/cs/ referencing/datum/
Date Wed, 01 Jan 2014 02:37:49 GMT
Author: desruisseaux
Date: Wed Jan  1 02:37:49 2014
New Revision: 1554596

URL: http://svn.apache.org/r1554596
Log:
Added package JAXB annotations for coordinate systems.

Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -32,8 +32,6 @@
  */
 @XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GML, xmlns =
{
     @XmlNs(prefix = "gml", namespaceURI = Namespaces.GML),
-    @XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD),
-    @XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
     @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)
 })
 @XmlAccessorType(XmlAccessType.NONE)

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -59,6 +59,14 @@ public class DefaultAffineCS extends Abs
     private static final long serialVersionUID = 7977674229369042440L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    DefaultAffineCS() {
+    }
+
+    /**
      * Constructs a coordinate system of arbitrary dimension. This constructor is
      * not public because {@code AffineCS} are restricted to 2 and 3 dimensions.
      */

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -64,6 +64,14 @@ public class DefaultCartesianCS extends 
     private static final long serialVersionUID = -6182037957705712945L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultCartesianCS() {
+    }
+
+    /**
      * Constructs a one-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -58,6 +58,14 @@ public class DefaultCylindricalCS extend
     private static final long serialVersionUID = -8290402732390917907L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultCylindricalCS() {
+    }
+
+    /**
      * Constructs a three-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -58,6 +58,14 @@ public class DefaultEllipsoidalCS extend
     private static final long serialVersionUID = -1452492488902329211L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultEllipsoidalCS() {
+    }
+
+    /**
      * Constructs a two-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -57,6 +57,14 @@ public class DefaultLinearCS extends Abs
     private static final long serialVersionUID = -6890723478287625763L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultLinearCS() {
+    }
+
+    /**
      * Constructs a coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -56,6 +56,14 @@ public class DefaultPolarCS extends Abst
     private static final long serialVersionUID = 3960197260975470951L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultPolarCS() {
+    }
+
+    /**
      * Constructs a two-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -60,6 +60,14 @@ public class DefaultSphericalCS extends 
     private static final long serialVersionUID = 196295996465774477L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultSphericalCS() {
+    }
+
+    /**
      * Constructs a three-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -56,6 +56,14 @@ public class DefaultTimeCS extends Abstr
     private static final long serialVersionUID = 5222911412381303989L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultTimeCS() {
+    }
+
+    /**
      * Constructs a coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -43,6 +43,14 @@ public class DefaultUserDefinedCS extend
     private static final long serialVersionUID = -4904091898305706316L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultUserDefinedCS() {
+    }
+
+    /**
      * Constructs a two-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -68,6 +68,14 @@ public class DefaultVerticalCS extends A
     private static final long serialVersionUID = 1201155778896630499L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or
empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultVerticalCS() {
+    }
+
+    /**
      * Constructs a coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java?rev=1554596&r1=1554595&r2=1554596&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
[UTF-8] Wed Jan  1 02:37:49 2014
@@ -28,9 +28,12 @@
  * or to platforms (mobile or not)
  * ({@linkplain org.apache.sis.referencing.datum.DefaultEngineeringDatum engineering},
  *  {@linkplain org.apache.sis.referencing.datum.DefaultImageDatum image}).
- * Some worthy methods defined in this package are:</p>
+ * Some of those SIS subclasses provide additional methods that are not part of OGC/ISO specifications:</p>
  * <ul>
+ *   <li>{@link org.apache.sis.referencing.datum.DefaultEllipsoid#getAuthalicRadius()}</li>
+ *   <li>{@link org.apache.sis.referencing.datum.DefaultEllipsoid#getEccentricity()}</li>
  *   <li>{@link org.apache.sis.referencing.datum.DefaultEllipsoid#orthodromicDistance(double,
double, double, double)}</li>
+ *   <li>{@link org.apache.sis.referencing.datum.DefaultGeodeticDatum#getBursaWolfParameters()}</li>
  *   <li>{@link org.apache.sis.referencing.datum.DefaultGeodeticDatum#getPositionVectorTransformation
  *       DefaultGeodeticDatum.getPositionVectorTransformation(GeodeticDatum, Extent)}</li>
  * </ul>
@@ -42,6 +45,7 @@
  * @module
  */
 @XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GML, xmlns =
{
+    @XmlNs(prefix = "gml", namespaceURI = Namespaces.GML),
     @XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD),
     @XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
     @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)



Mime
View raw message