sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1507233 - in /sis: branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/ tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/
Date Fri, 26 Jul 2013 09:17:34 GMT
Author: desruisseaux
Date: Fri Jul 26 09:17:34 2013
New Revision: 1507233

URL: http://svn.apache.org/r1507233
Log:
Pre-release last minute change: moved the WORLD constant from DefaultExtent to the Extents
static utility class.
This was planned but we forgot to apply that change before the tag. We apply that change before
the release in
order to avoid breaking public API after the release.

Modified:
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
    sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
    sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
    sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java

Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1507233&r1=1507232&r2=1507233&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] Fri Jul 26 09:17:34 2013
@@ -17,7 +17,6 @@
 package org.apache.sis.metadata.iso.extent;
 
 import java.util.Collection;
-import java.util.Collections;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -71,17 +70,6 @@ public class DefaultExtent extends ISOMe
     private static final long serialVersionUID = 2979058128422252800L;
 
     /**
-     * A geographic extent ranging from 180°W to 180°E and 90°S to 90°N.
-     */
-    public static final Extent WORLD;
-    static {
-        final DefaultExtent world = new DefaultExtent();
-        world.setGeographicElements(Collections.singleton(DefaultGeographicBoundingBox.WORLD));
-        world.freeze();
-        WORLD = world;
-    }
-
-    /**
      * Returns the spatial and temporal extent for the referring object.
      */
     private InternationalString description;

Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1507233&r1=1507232&r2=1507233&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
[UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
[UTF-8] Fri Jul 26 09:17:34 2013
@@ -75,16 +75,6 @@ public class DefaultGeographicBoundingBo
     private static final long serialVersionUID = -9200149606040429957L;
 
     /**
-     * A bounding box ranging from 180°W to 180°E and 90°S to 90°N.
-     */
-    public static final GeographicBoundingBox WORLD;
-    static {
-        final DefaultGeographicBoundingBox world = new DefaultGeographicBoundingBox(-180,
180, -90, 90);
-        world.freeze();
-        WORLD = world;
-    }
-
-    /**
      * The western-most coordinate of the limit of the dataset extent.
      * The value is expressed in longitude in decimal degrees (positive east).
      */

Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java?rev=1507233&r1=1507232&r2=1507233&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
[UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
[UTF-8] Fri Jul 26 09:17:34 2013
@@ -43,6 +43,20 @@ public final class Extents extends Stati
     }
 
     /**
+     * A geographic extent ranging from 180°W to 180°E and 90°S to 90°N.
+     * This extent has no vertical and no temporal components.
+     */
+    public static final Extent WORLD;
+    static {
+        final DefaultGeographicBoundingBox box = new DefaultGeographicBoundingBox(-180, 180,
-90, 90);
+        box.freeze();
+        final DefaultExtent world = new DefaultExtent();
+        world.getGeographicElements().add(box);
+        world.freeze();
+        WORLD = world;
+    }
+
+    /**
      * Returns a single geographic bounding box from the specified extent.
      * If no bounding box is found, then this method returns {@code null}.
      * If a single bounding box is found, then that box is returned directly.

Modified: sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
URL: http://svn.apache.org/viewvc/sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1507233&r1=1507232&r2=1507233&view=diff
==============================================================================
--- sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] (original)
+++ sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] Fri Jul 26 09:17:34 2013
@@ -17,7 +17,6 @@
 package org.apache.sis.metadata.iso.extent;
 
 import java.util.Collection;
-import java.util.Collections;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -71,17 +70,6 @@ public class DefaultExtent extends ISOMe
     private static final long serialVersionUID = 2979058128422252800L;
 
     /**
-     * A geographic extent ranging from 180°W to 180°E and 90°S to 90°N.
-     */
-    public static final Extent WORLD;
-    static {
-        final DefaultExtent world = new DefaultExtent();
-        world.setGeographicElements(Collections.singleton(DefaultGeographicBoundingBox.WORLD));
-        world.freeze();
-        WORLD = world;
-    }
-
-    /**
      * Returns the spatial and temporal extent for the referring object.
      */
     private InternationalString description;

Modified: sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1507233&r1=1507232&r2=1507233&view=diff
==============================================================================
--- sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
[UTF-8] (original)
+++ sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
[UTF-8] Fri Jul 26 09:17:34 2013
@@ -75,16 +75,6 @@ public class DefaultGeographicBoundingBo
     private static final long serialVersionUID = -9200149606040429957L;
 
     /**
-     * A bounding box ranging from 180°W to 180°E and 90°S to 90°N.
-     */
-    public static final GeographicBoundingBox WORLD;
-    static {
-        final DefaultGeographicBoundingBox world = new DefaultGeographicBoundingBox(-180,
180, -90, 90);
-        world.freeze();
-        WORLD = world;
-    }
-
-    /**
      * The western-most coordinate of the limit of the dataset extent.
      * The value is expressed in longitude in decimal degrees (positive east).
      */

Modified: sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
URL: http://svn.apache.org/viewvc/sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java?rev=1507233&r1=1507232&r2=1507233&view=diff
==============================================================================
--- sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
[UTF-8] (original)
+++ sis/tags/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
[UTF-8] Fri Jul 26 09:17:34 2013
@@ -43,6 +43,20 @@ public final class Extents extends Stati
     }
 
     /**
+     * A geographic extent ranging from 180°W to 180°E and 90°S to 90°N.
+     * This extent has no vertical and no temporal components.
+     */
+    public static final Extent WORLD;
+    static {
+        final DefaultGeographicBoundingBox box = new DefaultGeographicBoundingBox(-180, 180,
-90, 90);
+        box.freeze();
+        final DefaultExtent world = new DefaultExtent();
+        world.getGeographicElements().add(box);
+        world.freeze();
+        WORLD = world;
+    }
+
+    /**
      * Returns a single geographic bounding box from the specified extent.
      * If no bounding box is found, then this method returns {@code null}.
      * If a single bounding box is found, then that box is returned directly.



Mime
View raw message