sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1747214 - in /sis/branches/JDK8: application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/
Date Tue, 07 Jun 2016 12:59:07 GMT
Author: desruisseaux
Date: Tue Jun  7 12:59:06 2016
New Revision: 1747214

URL: http://svn.apache.org/viewvc?rev=1747214&view=rev
Log:
Rename methods for making clearer that the domain of validity is returned as a geographic
coordinates
and that the transform method operates on points (not on envelopes or geometries).

Modified:
    sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Referencing.java
    sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
    sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
    sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java

Modified: sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Referencing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Referencing.java?rev=1747214&r1=1747213&r2=1747214&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Referencing.java
[UTF-8] (original)
+++ sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Referencing.java
[UTF-8] Tue Jun  7 12:59:06 2016
@@ -66,7 +66,7 @@ final class Referencing extends CalcAddi
                 "xOptions",   "Provided by OpenOffice.",
                 "code",       "The code allocated by authority."
         }));
-        methods.put("getDomainOfValidity", new MethodInfo("Referencing", "CRS.VALID.AREA",
+        methods.put("getGeographicArea", new MethodInfo("Referencing", "GEOGRAPHIC.AREA",
             "Returns the valid area as a geographic bounding box for an identified object.",
             new String[] {
                 "xOptions",   "Provided by OpenOffice.",
@@ -87,7 +87,7 @@ final class Referencing extends CalcAddi
                 "target CRS",  "The target coordinate reference system.",
                 "coordinates", "The coordinate values to transform."
         }));
-        methods.put("transform", new MethodInfo("Referencing", "TRANSFORM.COORD",
+        methods.put("transform", new MethodInfo("Referencing", "TRANSFORM.POINTS",
             "Transform coordinates from the given source CRS to the given target CRS.",
             new String[] {
                 "xOptions",    "Provided by OpenOffice.",
@@ -245,7 +245,7 @@ final class Referencing extends CalcAddi
      * @return the object bounding box.
      */
     @Override
-    public double[][] getDomainOfValidity(final XPropertySet xOptions, final String codeOrPath)
{
+    public double[][] getGeographicArea(final XPropertySet xOptions, final String codeOrPath)
{
         final CacheKey<GeographicBoundingBox> key = new CacheKey<>(GeographicBoundingBox.class,
codeOrPath, null, null);
         GeographicBoundingBox area = key.peek();
         if (area == null) {
@@ -259,7 +259,7 @@ final class Referencing extends CalcAddi
                         area = Extents.getGeographicBoundingBox((Extent) domain);
                     }
                 } catch (FactoryException exception) {
-                    reportException("getDomainOfValidity", exception, THROW_EXCEPTION);
+                    reportException("getGeographicArea", exception, THROW_EXCEPTION);
                 }
             } finally {
                 handler.putAndUnlock(area);

Modified: sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl?rev=1747214&r1=1747213&r2=1747214&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
[UTF-8] (original)
+++ sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.idl
[UTF-8] Tue Jun  7 12:59:06 2016
@@ -46,7 +46,7 @@ module org {
           );
 
           /// Returns the domain of validity as a geographic bounding box for an identified
object.
-          sequence< sequence< double > > getDomainOfValidity(
+          sequence< sequence< double > > getGeographicArea(
             [in] com::sun::star::beans::XPropertySet xOptions,
             /// The authority code (e.g. "EPSG:4326").
             [in] string authorityCode

Modified: sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java?rev=1747214&r1=1747213&r2=1747214&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
[UTF-8] (original)
+++ sis/branches/JDK8/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
[UTF-8] Tue Jun  7 12:59:06 2016
@@ -69,7 +69,7 @@ public interface XReferencing extends XI
      * @param  codeOrPath  the code allocated by an authority, or the path to a file.
      * @return the object bounding box.
      */
-    double[][] getDomainOfValidity(XPropertySet xOptions, String codeOrPath);
+    double[][] getGeographicArea(XPropertySet xOptions, String codeOrPath);
 
     /**
      * Returns the accuracy of a transformation between two coordinate reference systems.

Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java?rev=1747214&r1=1747213&r2=1747214&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
[UTF-8] Tue Jun  7 12:59:06 2016
@@ -119,7 +119,7 @@ public final class UnoPkg extends Abstra
      */
     @Override
     public boolean accept(final File directory, final String name) {
-        if (name.endsWith("-sources.jar") || name.endsWith("-javadoc.jar")) {
+        if (name.endsWith("-sources.jar") || name.endsWith("-tests.jar") || name.endsWith("-javadoc.jar"))
{
             return false;
         }
         return name.endsWith(".jar") || name.endsWith(".JAR") ||



Mime
View raw message