sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1463921 - in /sis/branches/JDK7: sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/ sis-utility/src/main/java/org/apache/sis/util/
Date Wed, 03 Apr 2013 11:21:26 GMT
Author: desruisseaux
Date: Wed Apr  3 11:21:26 2013
New Revision: 1463921

URL: http://svn.apache.org/r1463921
Log:
Moved back MetadataObjects to Extents.

Added:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
      - copied, changed from r1463918, sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataObjects.java
Removed:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataObjects.java
Modified:
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
    sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1463921&r1=1463920&r2=1463921&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
[UTF-8] Wed Apr  3 11:21:26 2013
@@ -45,8 +45,7 @@ import org.apache.sis.internal.metadata.
  * <p>In addition to the standard properties, SIS provides the following methods:</p>
  * <ul>
  *   <li>{@link #addElements(Envelope)} for adding extents inferred from the given
envelope.</li>
- *   <li>{@link org.apache.sis.metadata.iso.MetadataObjects#getGeographicBoundingBox(Extent)}
- *       for extracting a global geographic bounding box.</li>
+ *   <li>{@link Extents#getGeographicBoundingBox(Extent)} for extracting a global geographic
bounding box.</li>
  * </ul>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
@@ -56,7 +55,7 @@ import org.apache.sis.internal.metadata.
  * @version 0.3
  * @module
  *
- * @see org.apache.sis.metadata.iso.MetadataObjects#getGeographicBoundingBox(Extent)
+ * @see Extents#getGeographicBoundingBox(Extent)
  */
 @XmlType(name = "EX_Extent_Type", propOrder = {
     "description",

Copied: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
(from r1463918, sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataObjects.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java?p2=sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java&p1=sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataObjects.java&r1=1463918&r2=1463921&rev=1463921&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataObjects.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
[UTF-8] Wed Apr  3 11:21:26 2013
@@ -14,31 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.metadata.iso;
+package org.apache.sis.metadata.iso.extent;
 
 import org.opengis.metadata.extent.Extent;
 import org.opengis.metadata.extent.BoundingPolygon;
 import org.opengis.metadata.extent.GeographicExtent;
 import org.opengis.metadata.extent.GeographicBoundingBox;
-import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.util.Static;
 
 import static org.apache.sis.internal.metadata.MetadataUtilities.getInclusion;
 
 
 /**
- * Convenience static methods for extracting information from {@link org.opengis.metadata}
objects.
+ * Convenience static methods for extracting information from {@link Extent} objects.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3 (derived from geotk-2.2)
  * @version 0.3
  * @module
  */
-public final class MetadataObjects extends Static {
+public final class Extents extends Static {
     /**
      * Do no allow instantiation of this class.
      */
-    private MetadataObjects() {
+    private Extents() {
     }
 
     /**

Modified: sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java?rev=1463921&r1=1463920&r2=1463921&view=diff
==============================================================================
--- sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
[UTF-8] Wed Apr  3 11:21:26 2013
@@ -51,8 +51,8 @@
  *
  * <p>In addition to the standard properties, SIS provides the following methods:</p>
  * <ul>
- *   <li>{@link org.apache.sis.metadata.iso.MetadataObjects#getGeographicBoundingBox
- *       MetadataObjects.getGeographicBoundingBox(Extent)}
+ *   <li>{@link org.apache.sis.metadata.iso.extent.Extents#getGeographicBoundingBox
+ *       Extents.getGeographicBoundingBox(Extent)}
  *       for extracting a global geographic bounding box.</li>
  *
  *   <li>{@link org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox#setBounds(double,
double, double, double)

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java?rev=1463921&r1=1463920&r2=1463921&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8] (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8] Wed
Apr  3 11:21:26 2013
@@ -48,8 +48,8 @@ package org.apache.sis.util;
  *     <td>Insert or remove elements in the middle of arrays.</td></tr>
  *
  * <tr><th colspan="2" class="hsep">OGC/ISO objects (metadata, referencing, geometries)</th></tr>
- * <tr><td>{@link org.apache.sis.metadata.iso.MetadataObjects}</td>
- *     <td>Extract information from {@link org.opengis.metadata} objects.</td></tr>
+ * <tr><td>{@link org.apache.sis.metadata.iso.extent.Extents}</td>
+ *     <td>Extract information from {@link org.opengis.metadata.extent.Extent} objects.</td></tr>
  *
  * <tr><th colspan="2" class="hsep">Input / Output (including CRS, XML, images)</th></tr>
  * <tr><td>{@link org.apache.sis.io.IO}</td>



Mime
View raw message