sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1569816 - in /sis/branches/JDK7/core: sis-metadata/src/main/java/org/apache/sis/io/wkt/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/test/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache/sis/...
Date Wed, 19 Feb 2014 16:38:53 GMT
Author: desruisseaux
Date: Wed Feb 19 16:38:53 2014
New Revision: 1569816

URL: http://svn.apache.org/r1569816
Log:
Renamed Convention.versionOfWKT() as majorVersion().
Removed Convention.getNameAuthority() from public API.

Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -185,12 +185,12 @@ public enum Convention {
     }
 
     /**
-     * Returns the version of the Well Known Text represented by this convention.
+     * Returns the major version of the Well Known Text represented by this convention.
      * In current Apache SIS implementation, this method can return only 1 or 2.
      *
      * @return 1 if this convention is one of the WKT 1 variants, or 2 otherwise.
      */
-    public int versionOfWKT() {
+    public int majorVersion() {
         return isWKT1 ? 1 : 2;
     }
 
@@ -249,7 +249,7 @@ public enum Convention {
      * @see Citations#EPSG
      * @see Citations#OGC
      */
-    public Citation getNameAuthority() {
+    final Citation getNameAuthority() {
         return isWKT1 ? Citations.OGC : Citations.EPSG;
     }
 }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -171,7 +171,7 @@ public abstract class FormattableObject 
             formatter = new Formatter();
         }
         formatter.configure(convention, null, colorize ? Colors.CONSOLE : null,
-                convention.versionOfWKT() == 1, WKTFormat.DEFAULT_INDENTATION);
+                convention.majorVersion() == 1, WKTFormat.DEFAULT_INDENTATION);
         final String wkt;
         try {
             formatter.append(this);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -651,7 +651,7 @@ public class Formatter implements Locali
             } else {
                 showIDs = isRoot || (object instanceof OperationMethod) || (object instanceof
GeneralParameterDescriptor);
             }
-            if (convention.versionOfWKT() == 1) {
+            if (convention.majorVersion() == 1) {
                 filterID   = true;
                 showOthers = false;
             } else {
@@ -933,7 +933,7 @@ public class Formatter implements Locali
         final String quote = symbols.getQuote();
         while ((fromIndex = buffer.indexOf(quote, fromIndex)) >= 0) {
             final int n = quote.length();
-            if (convention.versionOfWKT() == 1) {
+            if (convention.majorVersion() == 1) {
                 buffer.delete(fromIndex, fromIndex + n);
             } else {
                 buffer.insert(fromIndex += n, quote);
@@ -953,7 +953,7 @@ public class Formatter implements Locali
         if (code != null) {
             appendSeparator();
             setColor(ElementKind.CODE_LIST);
-            buffer.append(convention.versionOfWKT() == 1 ? code.name() : Types.getCodeName(code));
+            buffer.append(convention.majorVersion() == 1 ? code.name() : Types.getCodeName(code));
             resetColor();
         }
     }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -281,12 +281,21 @@ public class WKTFormat extends CompoundF
     /**
      * Returns the preferred authority to look for when fetching identified object names
and identifiers.
      * The difference between various authorities are most easily seen in projection and
parameter names.
+     *
+     * {@example The following table shows the names given by various organizations or projects
for the same projection:
+     *
+     * <table class="sis">
+     *   <tr><th>Authority</th> <th>Projection name</th></tr>
+     *   <tr><td>EPSG</td>      <td>Mercator (variant A)</td></tr>
+     *   <tr><td>OGC</td>       <td>Mercator_1SP</td></tr>
+     *   <tr><td>GEOTIFF</td>   <td>CT_Mercator</td></tr>
+     * </table>}
+     *
      * If no authority has been {@link #setNameAuthority(Citation) explicitly set}, then
this
-     * method returns the authority associated to the {@linkplain #getConvention() convention}.
+     * method returns the default authority for the current {@linkplain #getConvention()
convention}.
      *
-     * @return The authority for projection and parameter names.
+     * @return The organization, standard or project to look for when fetching projection
and parameter names.
      *
-     * @see Convention#getNameAuthority()
      * @see Formatter#getNameAuthority()
      */
     public Citation getNameAuthority() {
@@ -324,7 +333,7 @@ public class WKTFormat extends CompoundF
             switch (keywordCase) {
                 case UPPER_CASE: toUpperCase = true;  break;
                 case CAMEL_CASE: toUpperCase = false; break;
-                default: toUpperCase = (convention.versionOfWKT() == 1); break;
+                default: toUpperCase = (convention.majorVersion() == 1); break;
             }
             formatter.configure(convention, authority, colors, toUpperCase, indentation);
         }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -559,7 +559,7 @@ public class ImmutableIdentifier extends
             }
             if (cs != null) {
                 final Convention convention = formatter.getConvention();
-                if (convention.versionOfWKT() == 1) {
+                if (convention.majorVersion() == 1) {
                     keyword = "Authority";
                     formatter.append(cs, null);
                     formatter.append(code, null);

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ConventionTest.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -45,15 +45,15 @@ public final strictfp class ConventionTe
     }
 
     /**
-     * Tests {@link Convention#versionOfWKT()}.
+     * Tests {@link Convention#majorVersion()}.
      */
     @Test
     public void testVersion() {
-        assertEquals(2, Convention.WKT2.versionOfWKT());
-        assertEquals(2, Convention.WKT2_SIMPLIFIED.versionOfWKT());
-        assertEquals(1, Convention.WKT1.versionOfWKT());
-        assertEquals(1, Convention.WKT1_COMMON_UNITS.versionOfWKT());
-        assertEquals(2, Convention.INTERNAL.versionOfWKT());
+        assertEquals(2, Convention.WKT2.majorVersion());
+        assertEquals(2, Convention.WKT2_SIMPLIFIED.majorVersion());
+        assertEquals(1, Convention.WKT1.majorVersion());
+        assertEquals(1, Convention.WKT1_COMMON_UNITS.majorVersion());
+        assertEquals(2, Convention.INTERNAL.majorVersion());
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -708,7 +708,7 @@ public class DefaultParameterValue<T> ex
         WKTUtilities.appendName(descriptor, formatter, ElementKind.PARAMETER);
         final Unit<?> targetUnit = formatter.toContextualUnit(descriptor.getUnit());
         final Convention convention = formatter.getConvention();
-        final boolean isWKT1 = convention.versionOfWKT() == 1;
+        final boolean isWKT1 = convention.majorVersion() == 1;
         if (isWKT1 && targetUnit != null) {
             double convertedValue;
             try {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -420,7 +420,7 @@ public class AbstractCRS extends Abstrac
     protected String formatTo(final Formatter formatter) {
         final String  keyword = super.formatTo(formatter);
         final CoordinateSystem cs = coordinateSystem;
-        final boolean isWKT1  = formatter.getConvention().versionOfWKT() == 1;
+        final boolean isWKT1  = formatter.getConvention().majorVersion() == 1;
         final Unit<?> unit    = ReferencingUtilities.getUnit(cs);
         final Unit<?> oldUnit = formatter.addContextualUnit(unit);
         formatter.newLine();

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -403,7 +403,7 @@ public class DefaultCompoundCRS extends 
     protected String formatTo(final Formatter formatter) {
         WKTUtilities.appendName(this, formatter, null);
         final Convention convention = formatter.getConvention();
-        final boolean isWKT1 = convention.versionOfWKT() == 1;
+        final boolean isWKT1 = convention.majorVersion() == 1;
         for (final CoordinateReferenceSystem element :
                 (isWKT1 || convention == Convention.INTERNAL) ? components : singles)
         {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -258,6 +258,6 @@ public class DefaultEngineeringCRS exten
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        return (formatter.getConvention().versionOfWKT() == 1) ? "Local_CS" : "EngineeringCRS";
+        return (formatter.getConvention().majorVersion() == 1) ? "Local_CS" : "EngineeringCRS";
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -167,7 +167,7 @@ class DefaultGeodeticCRS extends Abstrac
     @Override
     protected String formatTo(final Formatter formatter) {
         WKTUtilities.appendName(this, formatter, null);
-        final boolean isWKT1  = formatter.getConvention().versionOfWKT() == 1;
+        final boolean isWKT1  = formatter.getConvention().majorVersion() == 1;
         final Unit<?> unit    = getUnit();
         final Unit<?> oldUnit = formatter.addContextualUnit(unit);
         formatter.newLine();

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -236,6 +236,6 @@ public class DefaultVerticalCRS extends 
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        return (formatter.getConvention().versionOfWKT() == 1) ? "Vert_CS" : "VerticalCRS";
+        return (formatter.getConvention().majorVersion() == 1) ? "Vert_CS" : "VerticalCRS";
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -746,7 +746,7 @@ public class DefaultCoordinateSystemAxis
     @Override
     protected String formatTo(final Formatter formatter) {
         final Convention convention = formatter.getConvention();
-        final boolean isWKT1 = convention.versionOfWKT() == 1;
+        final boolean isWKT1 = convention.majorVersion() == 1;
         final boolean isInternal = (convention == Convention.INTERNAL);
         String name = null;
         if (isWKT1 || isInternal || !omitName(formatter)) {

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=1569816&r1=1569815&r2=1569816&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 Feb 19 16:38:53 2014
@@ -761,7 +761,7 @@ public class DefaultEllipsoid extends Ab
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
         final Convention convention = formatter.getConvention();
-        final boolean isWKT1 = convention.versionOfWKT() == 1;
+        final boolean isWKT1 = convention.majorVersion() == 1;
         double length = semiMajorAxis;
         if (isWKT1) {
             length = unit.getConverterTo(SI.METRE).convert(length);

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -170,7 +170,7 @@ public class DefaultEngineeringDatum ext
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        if (formatter.getConvention().versionOfWKT() == 1) {
+        if (formatter.getConvention().majorVersion() == 1) {
             /*
              * Datum type was provided for all kind of datum in the legacy OGC 01-009 specification.
              * Datum types became provided only for vertical datum in the ISO 19111:2003
specification,

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -524,7 +524,7 @@ public class DefaultGeodeticDatum extend
         formatter.newLine();
         formatter.append(ellipsoid instanceof FormattableObject ? (FormattableObject) ellipsoid
:
                          DefaultEllipsoid.castOrCopy(ellipsoid));
-        if (formatter.getConvention().versionOfWKT() == 1) {
+        if (formatter.getConvention().majorVersion() == 1) {
             /*
              * Note that at the different of other datum (in particular vertical datum),
              * WKT of geodetic datum do not have a numerical code for the datum type.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -243,7 +243,7 @@ public class DefaultImageDatum extends A
         final Convention convention = formatter.getConvention();
         if (convention == Convention.INTERNAL) {
             formatter.append(pixelInCell); // This is an extension compared to ISO 19162.
-        } else if (convention.versionOfWKT() == 1) {
+        } else if (convention.majorVersion() == 1) {
             formatter.setInvalidWKT(this, null);
         }
         return "ImageDatum";

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -340,7 +340,7 @@ public class DefaultPrimeMeridian extend
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
         final Convention convention = formatter.getConvention();
-        final boolean isWKT1 = convention.versionOfWKT() == 1;
+        final boolean isWKT1 = convention.majorVersion() == 1;
         final Unit<Angle> targetUnit = formatter.toContextualUnit(NonSI.DEGREE_ANGLE);
         formatter.append(isWKT1 ? getGreenwichLongitude(targetUnit) : greenwichLongitude);
         if (isWKT1) {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Wed Feb 19 16:38:53 2014
@@ -287,7 +287,7 @@ public class DefaultTemporalDatum extend
         final Convention convention = formatter.getConvention();
         if (convention == Convention.INTERNAL) {
             formatter.append(MetadataUtilities.toDate(origin)); // This is an extension compared
to ISO 19162.
-        } else if (convention.versionOfWKT() == 1) {
+        } else if (convention.majorVersion() == 1) {
             formatter.setInvalidWKT(this, null);
         }
         return "TimeDatum";

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1569816&r1=1569815&r2=1569816&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] Wed Feb 19 16:38:53 2014
@@ -318,7 +318,7 @@ public class DefaultVerticalDatum extend
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        if (formatter.getConvention().versionOfWKT() == 1) {
+        if (formatter.getConvention().majorVersion() == 1) {
             formatter.append(VerticalDatumTypes.toLegacy(type().ordinal()));
             return "Vert_Datum";
         }



Mime
View raw message