sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1568335 - 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-metadata/src/test/java/org/apache/sis/met...
Date Fri, 14 Feb 2014 15:17:23 GMT
Author: desruisseaux
Date: Fri Feb 14 15:17:22 2014
New Revision: 1568335

URL: http://svn.apache.org/r1568335
Log:
WKT: switch to camel case for easier reading of keyword made by combination of two words
(e.g. TIMEEXTENT -> TimeExtent, BASEGEODCRS -> BaseGeodCRS). Provide a KeywordCase enum
for letting the user choose his preference.

Added:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java   (with props)
Modified:
    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/FormatterTest.java
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.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/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/DefaultGeocentricCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.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/BursaWolfParameters.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/DefaultVerticalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -170,7 +170,8 @@ public abstract class FormattableObject 
         if (formatter == null) {
             formatter = new Formatter();
         }
-        formatter.configure(convention, null, colorize ? Colors.CONSOLE : null, WKTFormat.DEFAULT_INDENTATION);
+        formatter.configure(convention, null, colorize ? Colors.CONSOLE : null,
+                convention.versionOfWKT() == 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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -140,7 +140,7 @@ public class Formatter implements Locali
      * If non-null, the terminal must be ANSI X3.64 compatible.
      * The default value is {@code null}.
      *
-     * @see #configure(Convention, Citation, Colors, byte)
+     * @see #configure(Convention, Citation, Colors, boolean, byte)
      */
     private Colors colors;
 
@@ -148,14 +148,14 @@ public class Formatter implements Locali
      * The preferred convention for objects or parameter names.
      * This field should never be {@code null}.
      *
-     * @see #configure(Convention, Citation, Colors, byte)
+     * @see #configure(Convention, Citation, Colors, boolean, byte)
      */
     private Convention convention;
 
     /**
      * The preferred authority for objects or parameter names.
      *
-     * @see #configure(Convention, Citation, Colors, byte)
+     * @see #configure(Convention, Citation, Colors, boolean, byte)
      */
     private Citation authority;
 
@@ -215,6 +215,13 @@ public class Formatter implements Locali
     private int elementStart;
 
     /**
+     * {@code true} if keywords shall be converted to upper cases.
+     *
+     * @see #configure(Convention, Citation, Colors, boolean, byte)
+     */
+    private boolean toUpperCase;
+
+    /**
      * Incremented when {@link #setColor(ElementKind)} is invoked, and decremented when {@link #resetColor()}
      * is invoked. Used in order to prevent child elements to overwrite the colors decided by enclosing elements.
      */
@@ -224,7 +231,7 @@ public class Formatter implements Locali
      * The amount of spaces to use in indentation, or {@value org.apache.sis.io.wkt.WKTFormat#SINGLE_LINE}
      * if indentation is disabled.
      *
-     * @see #configure(Convention, Citation, Colors, byte)
+     * @see #configure(Convention, Citation, Colors, boolean, byte)
      */
     private byte indentation;
 
@@ -340,13 +347,17 @@ public class Formatter implements Locali
      * @param convention  The convention, or {@code null} for the default value.
      * @param authority   The authority, or {@code null} for inferring it from the convention.
      * @param colors      The syntax coloring, or {@code null} if none.
+     * @param toUpperCase Whether keywords shall be converted to upper cases.
      * @param indentation The amount of spaces to use in indentation for WKT formatting,
      *                    or {@link WKTFormat#SINGLE_LINE}.
      */
-    final void configure(Convention convention, final Citation authority, final Colors colors, final byte indentation) {
+    final void configure(Convention convention, final Citation authority, final Colors colors,
+            final boolean toUpperCase, final byte indentation)
+    {
         this.convention  = convention;
         this.authority   = (authority != null) ? authority : convention.getNameAuthority();
         this.colors      = colors;
+        this.toUpperCase = toUpperCase;
         this.indentation = indentation;
     }
 
@@ -467,11 +478,14 @@ public class Formatter implements Locali
      * @param newLine {@code true} for invoking {@link #newLine()} first.
      * @param keyword The element keyword (e.g. {@code "DATUM"}, {@code "AXIS"}, <i>etc</i>).
      */
-    private void openElement(final boolean newLine, final String keyword) {
+    private void openElement(final boolean newLine, String keyword) {
         if (newLine) {
             newLine();
         }
         appendSeparator();
+        if (toUpperCase) {
+            keyword = keyword.toUpperCase(symbols.getLocale());
+        }
         elementStart = buffer.append(keyword).appendCodePoint(symbols.getOpeningBracket(0)).length();
     }
 
@@ -552,6 +566,8 @@ public class Formatter implements Locali
                 setInvalidWKT(object.getClass(), null);
                 keyword = invalidElement;
             }
+        } else if (toUpperCase) {
+            keyword = keyword.toUpperCase(symbols.getLocale());
         }
         if (highlightError && colors != null) {
             final String color = colors.getAnsiSequence(ElementKind.ERROR);
@@ -656,7 +672,7 @@ public class Formatter implements Locali
             }
         }
         if (showOthers) {
-            appendOnNewLine("REMARKS", object.getRemarks(), ElementKind.REMARKS);
+            appendOnNewLine("Remarks", object.getRemarks(), ElementKind.REMARKS);
         }
         isComplement = false;
     }
@@ -680,13 +696,13 @@ public class Formatter implements Locali
         } else {
             return;
         }
-        appendOnNewLine("SCOPE", scope, ElementKind.SCOPE);
+        appendOnNewLine("Scope", scope, ElementKind.SCOPE);
         if (area != null) {
-            appendOnNewLine("AREA", area.getDescription(), ElementKind.EXTENT);
+            appendOnNewLine("Area", area.getDescription(), ElementKind.EXTENT);
             append(Extents.getGeographicBoundingBox(area), BBOX_ACCURACY);
             final MeasurementRange<Double> range = Extents.getVerticalRange(area);
             if (range != null) {
-                openElement(true, "VERTICALEXTENT");
+                openElement(true, "VerticalExtent");
                 setColor(ElementKind.EXTENT);
                 numberFormat.setMinimumFractionDigits(0);
                 numberFormat.setMaximumFractionDigits(VERTICAL_ACCURACY);
@@ -703,7 +719,7 @@ public class Formatter implements Locali
             }
             final Range<Date> timeRange = Extents.getTimeRange(area);
             if (timeRange != null) {
-                openElement(true, "TIMEEXTENT");
+                openElement(true, "TimeExtent");
                 setColor(ElementKind.EXTENT);
                 append(timeRange.getMinValue());
                 append(timeRange.getMaxValue());
@@ -746,7 +762,7 @@ public class Formatter implements Locali
      */
     public void append(final GeographicBoundingBox bbox, final int fractionDigits) {
         if (bbox != null) {
-            openElement(isComplement, "BBOX");
+            openElement(isComplement, "BBox");
             setColor(ElementKind.EXTENT);
             numberFormat.setMinimumFractionDigits(fractionDigits);
             numberFormat.setMaximumFractionDigits(fractionDigits);
@@ -773,7 +789,7 @@ public class Formatter implements Locali
             } else {
                 final Matrix matrix = ReferencingServices.getInstance().getMatrix(transform);
                 if (matrix != null) {
-                    openElement(true, "PARAM_MT");
+                    openElement(true, "Param_MT");
                     quote("Affine");
                     indent(+1);
                     append(matrix);
@@ -804,7 +820,7 @@ public class Formatter implements Locali
         final int closeQuote = symbols.getClosingQuote(0);
         boolean columns = false;
         do {
-            openElement(true, "PARAMETER");
+            openElement(true, "Parameter");
             quote(columns ? "num_col" : "num_row");
             append(columns ? numCol : numRow);
             closeElement(false);
@@ -813,7 +829,7 @@ public class Formatter implements Locali
             for (int i=0; i<numCol; i++) {
                 final double element = matrix.getElement(j, i);
                 if (element != (i == j ? 1 : 0)) {
-                    openElement(true, "PARAMETER");
+                    openElement(true, "Parameter");
                     setColor(ElementKind.PARAMETER);
                     buffer.appendCodePoint(openQuote).append("elt_").append(j)
                             .append('_').append(i).appendCodePoint(closeQuote);
@@ -1030,16 +1046,16 @@ public class Formatter implements Locali
      */
     public void append(final Unit<?> unit) {
         if (unit != null) {
-            String keyword = "UNIT";
+            String keyword = "Unit";
             if (!convention.isSimple()) {
                 if (Units.isLinear(unit)) {
-                    keyword = "LENGTHUNIT";
+                    keyword = "LengthUnit";
                 } else if (Units.isAngular(unit)) {
-                    keyword = "ANGLEUNIT";
+                    keyword = "AngleUnit";
                 } else if (Units.isScale(unit)) {
-                    keyword = "SCALEUNIT";
+                    keyword = "ScaleUnit";
                 } else if (Units.isTemporal(unit)) {
-                    keyword = "TIMEUNIT";
+                    keyword = "TimeUnit";
                 }
             }
             openElement(false, keyword);

Added: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java?rev=1568335&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java (added)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.io.wkt;
+
+
+/**
+ * Whether WKT keywords shall be written with upper cases or camel cases.
+ * The most common usage is to write WKT keywords with upper cases.
+ * However with version 2 of Well Known Text, camel cases may be easier to read
+ * because WKT 2 has more keywords made by combination of words. Examples:
+ *
+ * <table class="sis">
+ *   <tr><td>Upper case</td>                 <td>Camel case</td></tr>
+ *   <tr><td>{@code TIMEEXTENT}</td>         <td>{@code TimeExtent}</td></td>
+ *   <tr><td>{@code ANGLEUNIT}</td>          <td>{@code AngleUnit}</td></td>
+ *   <tr><td>{@code BASEGEODCRS}</td>        <td>{@code BaseGeodCRS}</td></td>
+ *   <tr><td>{@code DERIVINGCONVERSION}</td> <td>{@code DerivingConversion}</td></td>
+ *   <tr><td>{@code ENGINEERINGDATUM}</td>   <td>{@code EngineeringDatum}</td></td>
+ * </table>
+ *
+ * {@note Well-Known Text keywords are case insensitive at parsing time. <code>KEYWORD</code> is equivalent
+ *        to <code>keyword</code> is equivalent to <code>KeyWord</code> and to <code>kEYwORd</code>.}
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.4
+ * @version 0.4
+ * @module
+ */
+public enum KeywordCase {
+    /**
+     * Keywords case is determined by the WKT {@linkplain Convention convention}.
+     * The current mapping is:
+     *
+     * <ul>
+     *   <li>Well Known Text version 2 uses camel case.</li>
+     *   <li>Well Known Text version 1 uses upper case.</li>
+     * </ul>
+     */
+    DEFAULT,
+
+    /**
+     * Keywords are written with camel cases. This is more useful in WKT 2 strings, which
+     * use longer keywords than WKT 1 did. Examples: {@code "TimeExtent"}, {@code "AngleUnit"}.
+     */
+    CAMEL_CASE,
+
+    /**
+     * Keywords are written with upper cases. This is the most usual case in WKT 1.
+     */
+    UPPER_CASE
+}

Propchange: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -132,6 +132,11 @@ public class WKTFormat extends CompoundF
     private Citation authority;
 
     /**
+     * Whether WKT keywords shall be formatted in upper case.
+     */
+    private KeywordCase keywordCase;
+
+    /**
      * The amount of spaces to use in indentation, or {@value #SINGLE_LINE} if indentation is disabled.
      * The same value is also stored in the {@linkplain #formatter}.
      * It appears here for serialization purpose.
@@ -156,6 +161,7 @@ public class WKTFormat extends CompoundF
         super(locale, timezone);
         convention  = Convention.DEFAULT;
         symbols     = Symbols.getDefault();
+        keywordCase = KeywordCase.DEFAULT;
         indentation = DEFAULT_INDENTATION;
     }
 
@@ -181,16 +187,6 @@ public class WKTFormat extends CompoundF
     }
 
     /**
-     * Returns the kind of objects formatted by this class.
-     *
-     * @return {@code Object.class}
-     */
-    @Override
-    public Class<?> getValueType() {
-        return Object.class;
-    }
-
-    /**
      * Returns the symbols used for parsing and formatting WKT.
      *
      * @return The current set of symbols used for parsing and formatting WKT.
@@ -213,6 +209,26 @@ public class WKTFormat extends CompoundF
     }
 
     /**
+     * Returns whether WKT keywords should be written with upper cases or camel cases.
+     *
+     * @return The case to use for formatting keywords.
+     */
+    public KeywordCase getKeywordCase() {
+        return keywordCase;
+    }
+
+    /**
+     * Sets whether WKT keywords should be written with upper cases or camel cases.
+     *
+     * @param keywordCase The case to use for formatting keywords.
+     */
+    public void setKeywordCase(final KeywordCase keywordCase) {
+        ArgumentChecks.ensureNonNull("keywordCase", keywordCase);
+        this.keywordCase = keywordCase;
+        updateFormatter(formatter);
+    }
+
+    /**
      * Returns the colors to use for syntax coloring, or {@code null} if none.
      * By default there is no syntax coloring.
      *
@@ -304,7 +320,13 @@ public class WKTFormat extends CompoundF
      */
     private void updateFormatter(final Formatter formatter) {
         if (formatter != null) {
-            formatter.configure(convention, authority, colors, indentation);
+            final boolean toUpperCase;
+            switch (keywordCase) {
+                case UPPER_CASE: toUpperCase = true;  break;
+                case CAMEL_CASE: toUpperCase = false; break;
+                default: toUpperCase = (convention.versionOfWKT() == 1); break;
+            }
+            formatter.configure(convention, authority, colors, toUpperCase, indentation);
         }
     }
 
@@ -331,6 +353,16 @@ public class WKTFormat extends CompoundF
     }
 
     /**
+     * Returns the kind of objects formatted by this class.
+     *
+     * @return {@code Object.class}
+     */
+    @Override
+    public Class<?> getValueType() {
+        return Object.class;
+    }
+
+    /**
      * Not yet supported.
      *
      * @param  text The text to parse.

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -559,11 +559,11 @@ public class ImmutableIdentifier extends
             if (cs != null) {
                 final Convention convention = formatter.getConvention();
                 if (convention.versionOfWKT() == 1) {
-                    keyword = "AUTHORITY";
+                    keyword = "Authority";
                     formatter.append(cs, null);
                     formatter.append(code, null);
                 } else {
-                    keyword = "ID";
+                    keyword = "Id";
                     formatter.append(cs, null);
                     appendCode(formatter, code);
                     if (version != null) {

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -57,7 +57,9 @@ public final strictfp class FormatterTes
      */
     @Test
     public void testAppendGeographicBoundingBox() {
-        assertWktEquals("BBOX[51.43, 2.54, 55.77, 6.40]",
+        assertWktEquals(Convention.WKT2, "BBox[51.43, 2.54, 55.77, 6.40]",
+                new DefaultGeographicBoundingBox(2.54, 6.40, 51.43, 55.77));
+        assertWktEquals(Convention.WKT1, "BBOX[51.43, 2.54, 55.77, 6.40]",
                 new DefaultGeographicBoundingBox(2.54, 6.40, 51.43, 55.77));
     }
 
@@ -72,11 +74,11 @@ public final strictfp class FormatterTes
                 0, 0, 1, 7,
                 0, 0, 0, 1);
         assertWktEquals(
-                "PARAMETER[“num_row”, 4],\n"    +
-                "PARAMETER[“num_col”, 4],\n"    +
-                "PARAMETER[“elt_0_2”, 4.0],\n"  +
-                "PARAMETER[“elt_1_0”, -2.0],\n"  +
-                "PARAMETER[“elt_2_3”, 7.0]", m);
+                "Parameter[“num_row”, 4],\n"    +
+                "Parameter[“num_col”, 4],\n"    +
+                "Parameter[“elt_0_2”, 4.0],\n"  +
+                "Parameter[“elt_1_0”, -2.0],\n"  +
+                "Parameter[“elt_2_3”, 7.0]", m);
     }
 
     /**
@@ -84,9 +86,13 @@ public final strictfp class FormatterTes
      */
     @Test
     public void testAppendUnit() {
-        assertWktEquals("LENGTHUNIT[“metre”, 1]", SI.METRE);
-        assertWktEquals("ANGLEUNIT[“degree”, 0.017453292519943295]", NonSI.DEGREE_ANGLE);
-        assertWktEquals("SCALEUNIT[“parts per million”, 1.0E-6]", Units.PPM);
+        assertWktEquals("LengthUnit[“metre”, 1]", SI.METRE);
+        assertWktEquals("AngleUnit[“degree”, 0.017453292519943295]", NonSI.DEGREE_ANGLE);
+        assertWktEquals("ScaleUnit[“parts per million”, 1.0E-6]", Units.PPM);
+
+        assertWktEquals(Convention.WKT1, "UNIT[“metre”, 1]", SI.METRE);
+        assertWktEquals(Convention.WKT1, "UNIT[“degree”, 0.017453292519943295]", NonSI.DEGREE_ANGLE);
+        assertWktEquals(Convention.WKT1, "UNIT[“parts per million”, 1.0E-6]", Units.PPM);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -176,7 +176,7 @@ public final strictfp class ImmutableIde
     @Test
     public void testWKT() {
         final ImmutableIdentifier id = new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326", "8.2", null);
-        assertWktEquals(Convention.WKT2, "ID[“EPSG”, 4326, “8.2”, “OGP”]", id);
+        assertWktEquals(Convention.WKT2, "Id[“EPSG”, 4326, “8.2”, “OGP”]", id);
         assertWktEquals(Convention.WKT1, "AUTHORITY[“EPSG”, “4326”]", id);
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -711,6 +711,6 @@ public class DefaultParameterValue<T> ex
         } else {
             formatter.appendAny(value);
         }
-        return "PARAMETER";
+        return "Parameter";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -395,6 +395,6 @@ public class DefaultCompoundCRS extends 
             formatter.append(element);
         }
         formatter.newLine(); // For writing the ID[…] element on its own line.
-        return "COMPD_CS";
+        return "Compd_CS";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -259,6 +259,6 @@ public class DefaultEngineeringCRS exten
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        return "LOCAL_CS";
+        return "Local_CS";
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -245,6 +245,6 @@ public class DefaultGeocentricCRS extend
             formatter.setInvalidWKT(this, null);
         }
         formatter.newLine(); // For writing the ID[…] element on its own line.
-        return "GEOCCS";
+        return "GeocCS";
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -246,6 +246,6 @@ public class DefaultGeographicCRS extend
         }
         formatter.setContextualUnit(Angle.class, oldUnit);
         formatter.newLine(); // For writing the ID[…] element on its own line.
-        return "GEOGCS";
+        return "GeogCS";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -237,6 +237,6 @@ public class DefaultVerticalCRS extends 
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        return "VERT_CS";
+        return "Vert_CS";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -781,6 +781,6 @@ public class DefaultCoordinateSystemAxis
         }
         formatter.append(name, ElementKind.AXIS);
         formatter.append(direction);
-        return "AXIS";
+        return "Axis";
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -639,7 +639,7 @@ public class BursaWolfParameters extends
         formatter.append(rZ);
         formatter.append(dS);
         if (isToWGS84()) {
-            return "TOWGS84";
+            return "ToWGS84";
         }
         formatter.setInvalidWKT(BursaWolfParameters.class, null);
         String name = IdentifiedObjects.getUnicodeIdentifier(targetDatum);

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -762,6 +762,6 @@ public class DefaultEllipsoid extends Ab
         super.formatTo(formatter);
         formatter.append(unit.getConverterTo(SI.METRE).convert(semiMajorAxis));
         formatter.append(isInfinite(inverseFlattening) ? 0 : inverseFlattening);
-        return "SPHEROID";
+        return "Spheroid";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -172,6 +172,6 @@ public class DefaultEngineeringDatum ext
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        return "LOCAL_DATUM";
+        return "Local_Datum";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -522,6 +522,6 @@ public class DefaultGeodeticDatum extend
             }
         }
         formatter.newLine(); // For writing the ID[…] element on its own line.
-        return "DATUM";
+        return "Datum";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -241,6 +241,6 @@ public class DefaultImageDatum extends A
         super.formatTo(formatter);
         formatter.append(pixelInCell);
         formatter.setInvalidWKT(this, null);
-        return "GENDATUM"; // Generic datum (WKT 2)
+        return "GenDatum"; // Generic datum (WKT 2)
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -344,6 +344,6 @@ public class DefaultPrimeMeridian extend
             targetUnit = NonSI.DEGREE_ANGLE;
         }
         formatter.append(getGreenwichLongitude(targetUnit));
-        return "PRIMEM";
+        return "PrimeM";
     }
 }

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=1568335&r1=1568334&r2=1568335&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] Fri Feb 14 15:17:22 2014
@@ -324,6 +324,6 @@ public class DefaultVerticalDatum extend
     @Override
     protected String formatTo(final Formatter formatter) {
         super.formatTo(formatter);
-        return "VERT_DATUM";
+        return "Vert_Datum";
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -516,7 +516,7 @@ public final strictfp class DefaultParam
      */
     @Test
     public void testWKT() {
-        assertWktEquals("PARAMETER[“WKT test”, 4]", createOptional("WKT test", 4));
-        assertWktEquals("PARAMETER[“WKT test”, 30.0]", create("WKT test", 30, SI.CENTIMETRE));
+        assertWktEquals("Parameter[“WKT test”, 4]", createOptional("WKT test", 4));
+        assertWktEquals("Parameter[“WKT test”, 30.0]", create("WKT test", 30, SI.CENTIMETRE));
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -116,22 +116,22 @@ public final strictfp class AbstractRefe
 
         assertWktEquals(Convention.WKT2,
                 "ReferenceSystem[“My “object””.”,\n" +
-                "  SCOPE[“Large scale topographic mapping and cadastre.”],\n" +
-                "  AREA[“Netherlands offshore.”],\n" +
-                "  BBOX[51.43, 2.54, 55.77, 6.40],\n" +
-                "  VERTICALEXTENT[-1000, -10, LENGTHUNIT[“metre”, 1]],\n" +
-                "  ID[“EPSG”, 4326, “8.2”, “OGP”, URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
-                "  REMARKS[“注です。”]]",
+                "  Scope[“Large scale topographic mapping and cadastre.”],\n" +
+                "  Area[“Netherlands offshore.”],\n" +
+                "  BBox[51.43, 2.54, 55.77, 6.40],\n" +
+                "  VerticalExtent[-1000, -10, LengthUnit[“metre”, 1]],\n" +
+                "  Id[“EPSG”, 4326, “8.2”, “OGP”, URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
+                "  Remarks[“注です。”]]",
                 object);
 
         assertWktEquals(Convention.WKT2_SIMPLIFIED,
                 "ReferenceSystem[“My “object””.”,\n" +
-                "  SCOPE[“Large scale topographic mapping and cadastre.”],\n" +
-                "  AREA[“Netherlands offshore.”],\n" +
-                "  BBOX[51.43, 2.54, 55.77, 6.40],\n" +
-                "  VERTICALEXTENT[-1000, -10],\n" +
-                "  ID[“EPSG”, 4326, “8.2”, “OGP”, URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
-                "  REMARKS[“注です。”]]",
+                "  Scope[“Large scale topographic mapping and cadastre.”],\n" +
+                "  Area[“Netherlands offshore.”],\n" +
+                "  BBox[51.43, 2.54, 55.77, 6.40],\n" +
+                "  VerticalExtent[-1000, -10],\n" +
+                "  Id[“EPSG”, 4326, “8.2”, “OGP”, URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
+                "  Remarks[“注です。”]]",
                 object);
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -84,40 +84,40 @@ public final strictfp class HardCodedCRS
                 WGS84);
 
         assertWktEquals(Convention.WKT2,
-                "GEOGCS[“WGS 84”,\n" +
-                "  DATUM[“World Geodetic System 1984”,\n" +
-                "    SPHEROID[“WGS84”, 6378137.0, 298.257223563]],\n" +
-                "  PRIMEM[“Greenwich”, 0.0],\n" +
-                "  ANGLEUNIT[“degree”, 0.017453292519943295],\n" +
-                "  AXIS[“Longitude (λ)”, east],\n" +
-                "  AXIS[“Latitude (φ)”, north],\n" +
-                "  AREA[“World”],\n" +
-                "  BBOX[-90.00, -180.00, 90.00, 180.00]]",
+                "GeogCS[“WGS 84”,\n" +
+                "  Datum[“World Geodetic System 1984”,\n" +
+                "    Spheroid[“WGS84”, 6378137.0, 298.257223563]],\n" +
+                "  PrimeM[“Greenwich”, 0.0],\n" +
+                "  AngleUnit[“degree”, 0.017453292519943295],\n" +
+                "  Axis[“Longitude (λ)”, east],\n" +
+                "  Axis[“Latitude (φ)”, north],\n" +
+                "  Area[“World”],\n" +
+                "  BBox[-90.00, -180.00, 90.00, 180.00]]",
                 WGS84);
 
         assertWktEquals(Convention.WKT2_SIMPLIFIED,
-                "GEOGCS[“WGS 84”,\n" +
-                "  DATUM[“World Geodetic System 1984”,\n" +
-                "    SPHEROID[“WGS84”, 6378137.0, 298.257223563]],\n" +
-                "  PRIMEM[“Greenwich”, 0.0],\n" +
-                "  UNIT[“degree”, 0.017453292519943295],\n" +
-                "  AXIS[“Longitude (λ)”, east],\n" +
-                "  AXIS[“Latitude (φ)”, north],\n" +
-                "  AREA[“World”],\n" +
-                "  BBOX[-90.00, -180.00, 90.00, 180.00]]",
+                "GeogCS[“WGS 84”,\n" +
+                "  Datum[“World Geodetic System 1984”,\n" +
+                "    Spheroid[“WGS84”, 6378137.0, 298.257223563]],\n" +
+                "  PrimeM[“Greenwich”, 0.0],\n" +
+                "  Unit[“degree”, 0.017453292519943295],\n" +
+                "  Axis[“Longitude (λ)”, east],\n" +
+                "  Axis[“Latitude (φ)”, north],\n" +
+                "  Area[“World”],\n" +
+                "  BBox[-90.00, -180.00, 90.00, 180.00]]",
                 WGS84);
 
         assertWktEquals(Convention.INTERNAL,
-                "GEOGCS[“WGS 84”,\n" +
-                "  DATUM[“World Geodetic System 1984”,\n" +
-                "    SPHEROID[“WGS84”, 6378137.0, 298.257223563],\n" +
-                "    ID[“EPSG”, 6326]],\n" +
-                "  PRIMEM[“Greenwich”, 0.0, ID[“EPSG”, 8901]],\n" +
-                "  UNIT[“degree”, 0.017453292519943295],\n" +
-                "  AXIS[“Geodetic longitude (λ)”, east],\n" +
-                "  AXIS[“Geodetic latitude (φ)”, north],\n" +
-                "  AREA[“World”],\n" +
-                "  BBOX[-90.00, -180.00, 90.00, 180.00]]",
+                "GeogCS[“WGS 84”,\n" +
+                "  Datum[“World Geodetic System 1984”,\n" +
+                "    Spheroid[“WGS84”, 6378137.0, 298.257223563],\n" +
+                "    Id[“EPSG”, 6326]],\n" +
+                "  PrimeM[“Greenwich”, 0.0, Id[“EPSG”, 8901]],\n" +
+                "  Unit[“degree”, 0.017453292519943295],\n" +
+                "  Axis[“Geodetic longitude (λ)”, east],\n" +
+                "  Axis[“Geodetic latitude (φ)”, north],\n" +
+                "  Area[“World”],\n" +
+                "  BBox[-90.00, -180.00, 90.00, 180.00]]",
                 WGS84);
     }
 

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -84,25 +84,25 @@ public final strictfp class DefaultCoord
      */
     @Test
     public void testWKT() {
-        assertWktEquals("AXIS[“x”, east]",                       X);
-        assertWktEquals("AXIS[“y”, north]",                      Y);
-        assertWktEquals("AXIS[“z”, up]",                         Z);
-        assertWktEquals("AXIS[“Longitude (λ)”, east]",           LONGITUDE_gon);
-        assertWktEquals("AXIS[“Latitude (φ)”, north]",           LATITUDE_gon);
-        assertWktEquals("AXIS[“Altitude (h)”, up]",              ALTITUDE);
-        assertWktEquals("AXIS[“Time (t)”, future]",              TIME);
-        assertWktEquals("AXIS[“Longitude (λ)”, east]",           GEODETIC_LONGITUDE);
-        assertWktEquals("AXIS[“Spherical longitude (Ω)”, east]", SPHERICAL_LONGITUDE);
-        assertWktEquals("AXIS[“Latitude (φ)”, north]",           GEODETIC_LATITUDE);
-        assertWktEquals("AXIS[“Spherical latitude (Θ)”, north]", SPHERICAL_LATITUDE);
+        assertWktEquals("Axis[“x”, east]",                       X);
+        assertWktEquals("Axis[“y”, north]",                      Y);
+        assertWktEquals("Axis[“z”, up]",                         Z);
+        assertWktEquals("Axis[“Longitude (λ)”, east]",           LONGITUDE_gon);
+        assertWktEquals("Axis[“Latitude (φ)”, north]",           LATITUDE_gon);
+        assertWktEquals("Axis[“Altitude (h)”, up]",              ALTITUDE);
+        assertWktEquals("Axis[“Time (t)”, future]",              TIME);
+        assertWktEquals("Axis[“Longitude (λ)”, east]",           GEODETIC_LONGITUDE);
+        assertWktEquals("Axis[“Spherical longitude (Ω)”, east]", SPHERICAL_LONGITUDE);
+        assertWktEquals("Axis[“Latitude (φ)”, north]",           GEODETIC_LATITUDE);
+        assertWktEquals("Axis[“Spherical latitude (Θ)”, north]", SPHERICAL_LATITUDE);
 
         assertWktEquals(Convention.WKT1,     "AXIS[“x”, EAST]",                       X);
         assertWktEquals(Convention.WKT1,     "AXIS[“y”, NORTH]",                      Y);
         assertWktEquals(Convention.WKT1,     "AXIS[“z”, UP]",                         Z);
-        assertWktEquals(Convention.INTERNAL, "AXIS[“Geodetic longitude (λ)”, east]",  GEODETIC_LONGITUDE);
-        assertWktEquals(Convention.INTERNAL, "AXIS[“Spherical longitude (Ω)”, east]", SPHERICAL_LONGITUDE);
-        assertWktEquals(Convention.INTERNAL, "AXIS[“Geodetic latitude (φ)”, north]",  GEODETIC_LATITUDE);
-        assertWktEquals(Convention.INTERNAL, "AXIS[“Spherical latitude (Θ)”, north]", SPHERICAL_LATITUDE);
+        assertWktEquals(Convention.INTERNAL, "Axis[“Geodetic longitude (λ)”, east]",  GEODETIC_LONGITUDE);
+        assertWktEquals(Convention.INTERNAL, "Axis[“Spherical longitude (Ω)”, east]", SPHERICAL_LONGITUDE);
+        assertWktEquals(Convention.INTERNAL, "Axis[“Geodetic latitude (φ)”, north]",  GEODETIC_LATITUDE);
+        assertWktEquals(Convention.INTERNAL, "Axis[“Spherical latitude (Θ)”, north]", SPHERICAL_LATITUDE);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -196,7 +196,7 @@ public final strictfp class BursaWolfPar
     @Test
     public void testToString() {
         final BursaWolfParameters bursaWolf = createED87_to_WGS84();
-        assertEquals("TOWGS84[-82.981, -99.719, -110.709, -0.5076, 0.1503, 0.3898, -0.3143]", bursaWolf.toString());
+        assertEquals("ToWGS84[-82.981, -99.719, -110.709, -0.5076, 0.1503, 0.3898, -0.3143]", bursaWolf.toString());
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -166,7 +166,7 @@ public final strictfp class DefaultEllip
     @Test
     public void testToWKT() {
         final DefaultEllipsoid e = new DefaultEllipsoid(GeodeticDatumMock.WGS84.getEllipsoid());
-        assertWktEquals("SPHEROID[“WGS84”, 6378137.0, 298.257223563]", e);
+        assertWktEquals("Spheroid[“WGS84”, 6378137.0, 298.257223563]", e);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -184,8 +184,8 @@ public final strictfp class DefaultGeode
     public void testToWKT() {
         final DefaultGeodeticDatum datum = new DefaultGeodeticDatum(WGS84);
         assertWktEquals(
-                "DATUM[“WGS84”,\n" +
-                "  SPHEROID[“WGS84”, 6378137.0, 298.257223563]]",
+                "Datum[“WGS84”,\n" +
+                "  Spheroid[“WGS84”, 6378137.0, 298.257223563]]",
                 datum);
     }
 
@@ -265,20 +265,20 @@ public final strictfp class DefaultGeode
                 datum);
 
         assertWktEquals(Convention.WKT2,
-                "DATUM[“World Geodetic System 1984”,\n" +
-                "  SPHEROID[“WGS 84”, 6378137.0, 298.257223563],\n" +
-                "  ID[“EPSG”, 6326, URI[“urn:ogc:def:datum:EPSG::6326”]]]",
+                "Datum[“World Geodetic System 1984”,\n" +
+                "  Spheroid[“WGS 84”, 6378137.0, 298.257223563],\n" +
+                "  Id[“EPSG”, 6326, URI[“urn:ogc:def:datum:EPSG::6326”]]]",
                 datum);
 
         assertWktEquals(Convention.INTERNAL,
-                "DATUM[“World Geodetic System 1984”,\n" +
-                "  SPHEROID[“WGS 84”, 6378137.0, 298.257223563, ID[“EPSG”, 7030],\n" +
-                "    REMARKS[“Defining parameters cited in EPSG database.”]],\n" +
-                "  SCOPE[“Satellite navigation.”],\n" +
-                "  AREA[“World.”],\n" +
-                "  BBOX[-90.00, -180.00, 90.00, 180.00],\n" +
-                "  ID[“EPSG”, 6326],\n" +
-                "  REMARKS[“No distinction between the original and subsequent WGS 84 frames.”]]",
+                "Datum[“World Geodetic System 1984”,\n" +
+                "  Spheroid[“WGS 84”, 6378137.0, 298.257223563, Id[“EPSG”, 7030],\n" +
+                "    Remarks[“Defining parameters cited in EPSG database.”]],\n" +
+                "  Scope[“Satellite navigation.”],\n" +
+                "  Area[“World.”],\n" +
+                "  BBox[-90.00, -180.00, 90.00, 180.00],\n" +
+                "  Id[“EPSG”, 6326],\n" +
+                "  Remarks[“No distinction between the original and subsequent WGS 84 frames.”]]",
                 datum);
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -58,7 +58,7 @@ public final strictfp class DefaultPrime
     public void testToWKT() {
         final DefaultPrimeMeridian pm = new DefaultPrimeMeridian(GREENWICH);
         assertIsGreenwich(pm);
-        assertWktEquals("PRIMEM[“Greenwich”, 0.0]", pm);
+        assertWktEquals("PrimeM[“Greenwich”, 0.0]", pm);
     }
 
     /**
@@ -148,10 +148,10 @@ public final strictfp class DefaultPrime
         assertEquals("Equivalent to 2°20′14.025″.", pm.getRemarks().toString());
         assertNull("name.codeSpace", pm.getName().getCodeSpace());
         assertWktEquals(
-                "PRIMEM[“Paris”, 2.33722917, ID[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
+                "PrimeM[“Paris”, 2.33722917, Id[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
         assertWktEquals(Convention.INTERNAL,
-                "PRIMEM[“Paris”, 2.33722917, ID[“EPSG”, 8903],\n" +
-                "  REMARKS[“Equivalent to 2°20′14.025″.”]]", pm);
+                "PrimeM[“Paris”, 2.33722917, Id[“EPSG”, 8903],\n" +
+                "  Remarks[“Equivalent to 2°20′14.025″.”]]", pm);
         assertXmlEquals(
                 "<gml:PrimeMeridian xmlns:gml=\"" + Namespaces.GML + "\">\n" +
                 "  <gml:identifier codeSpace=\"OGP\">urn:ogc:def:meridian:EPSG::8903</gml:identifier>\n" +

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java?rev=1568335&r1=1568334&r2=1568335&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java [UTF-8] Fri Feb 14 15:17:22 2014
@@ -89,10 +89,10 @@ public final strictfp class DefaultVerti
     public void testToWKT() {
         DefaultVerticalDatum datum;
         datum = new DefaultVerticalDatum(singletonMap(DefaultVerticalDatum.NAME_KEY, "Geoidal"), VerticalDatumType.GEOIDAL);
-        assertWktEquals("VERT_DATUM[“Geoidal”, 2005]", datum);
+        assertWktEquals("Vert_Datum[“Geoidal”, 2005]", datum);
 
         datum = new DefaultVerticalDatum(singletonMap(DefaultVerticalDatum.NAME_KEY, "Ellipsoidal"), VerticalDatumTypes.ELLIPSOIDAL);
-        assertWktEquals("VERT_DATUM[“Ellipsoidal”, 2002]", datum);
+        assertWktEquals("Vert_Datum[“Ellipsoidal”, 2002]", datum);
     }
 
     /**



Mime
View raw message