sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1520151 - in /sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum: DefaultEllipsoid.java Sphere.java Spheroid.java
Date Wed, 04 Sep 2013 21:50:15 GMT
Author: desruisseaux
Date: Wed Sep  4 21:50:15 2013
New Revision: 1520151

URL: http://svn.apache.org/r1520151
Log:
Renamed Spheroid as Sphere, which match better what the object is.

Added:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
      - copied, changed from r1520149, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Spheroid.java
Removed:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Spheroid.java
Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1520151&r1=1520150&r2=1520151&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] Wed Sep  4 21:50:15 2013
@@ -310,7 +310,7 @@ public class DefaultEllipsoid extends Ab
                                                    final Unit<Length> unit)
     {
         if (semiMajorAxis == semiMinorAxis) {
-            return new Spheroid(properties, semiMajorAxis, false, unit);
+            return new Sphere(properties, semiMajorAxis, false, unit);
         } else {
             return new DefaultEllipsoid(properties, semiMajorAxis, semiMinorAxis,
                        semiMajorAxis / (semiMajorAxis - semiMinorAxis), false, unit);
@@ -351,7 +351,7 @@ public class DefaultEllipsoid extends Ab
                                                          final Unit<Length> unit)
     {
         if (isInfinite(inverseFlattening)) {
-            return new Spheroid(properties, semiMajorAxis, true, unit);
+            return new Sphere(properties, semiMajorAxis, true, unit);
         } else {
             return new DefaultEllipsoid(properties, semiMajorAxis,
                     semiMajorAxis * (1 - 1/inverseFlattening), inverseFlattening, true, unit);

Copied: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
(from r1520149, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Spheroid.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java?p2=sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java&p1=sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Spheroid.java&r1=1520149&r2=1520151&rev=1520151&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Spheroid.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
[UTF-8] Wed Sep  4 21:50:15 2013
@@ -36,7 +36,7 @@ import static java.lang.Math.*;
  */
 @Immutable
 @XmlTransient
-final class Spheroid extends DefaultEllipsoid {
+final class Sphere extends DefaultEllipsoid {
     /**
      * Serial number for inter-operability with different versions.
      */
@@ -50,7 +50,7 @@ final class Spheroid extends DefaultElli
      * @param ivfDefinitive {@code true} if the inverse flattening is definitive.
      * @param unit          The units of the radius value.
      */
-    protected Spheroid(Map<String,?> properties, double radius, boolean ivfDefinitive,
Unit<Length> unit) {
+    protected Sphere(Map<String,?> properties, double radius, boolean ivfDefinitive,
Unit<Length> unit) {
         super(properties, radius, radius, Double.POSITIVE_INFINITY, ivfDefinitive, unit);
     }
 



Mime
View raw message