sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1831857 - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/internal/jaxb/ sis-metadata/src/main/java/org/apache/sis/internal/metadata/ sis-metadata/src/main/java/org/apache/sis/internal/simple/ sis-metadata/src/main/ja...
Date Fri, 18 May 2018 12:28:04 GMT
Author: desruisseaux
Date: Fri May 18 12:28:04 2018
New Revision: 1831857

URL: http://svn.apache.org/viewvc?rev=1831857&view=rev
Log:
Rename Citations.getCodeSpace(Citation) as toCodeSpace(…).
The getCodeList name was confusing since it suggests that the method was returning a citation
code space, while actually it returns the citation *as* a code space.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -73,7 +73,7 @@ final class IdentifierMapEntry extends A
      */
     @Override
     public String getCodeSpace() {
-        return Citations.getCodeSpace(getAuthority());
+        return Citations.toCodeSpace(getAuthority());
     }
 
     /**
@@ -110,7 +110,7 @@ final class IdentifierMapEntry extends A
         Immutable(Citation authority, String code) {super(authority, code);}
         @Override public Citation            getAuthority()   {return getKey();}
         @Override public String              getCode()        {return getValue();}
-        @Override public String              getCodeSpace()   {return Citations.getCodeSpace(getAuthority());}
+        @Override public String              getCodeSpace()   {return Citations.toCodeSpace(getAuthority());}
         @Override public String              getVersion()     {return null;}
         @Override public InternationalString getDescription() {return null;}
     }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -197,7 +197,7 @@ public final class SpecializedIdentifier
      */
     @Override
     public String getCodeSpace() {
-        return Citations.getCodeSpace(authority);
+        return Citations.toCodeSpace(authority);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -170,7 +170,7 @@ public final class NameMeaning extends S
              * new name for that organization).
              */
             final Citation c = Citations.fromName(key);
-            codeSpace = Citations.getCodeSpace(c);
+            codeSpace = Citations.toCodeSpace(c);
             if (AUTHORITIES.get(codeSpace) == null) {
                 return null;            // Not an authority that we recognize for the OGC
namespace.
             }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -105,7 +105,7 @@ public class SimpleIdentifier implements
      */
     @Override
     public String getCodeSpace() {
-        return org.apache.sis.metadata.iso.citation.Citations.getCodeSpace(authority);
+        return org.apache.sis.metadata.iso.citation.Citations.toCodeSpace(authority);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -185,7 +185,7 @@ public class DefaultIdentifier extends I
     public DefaultIdentifier(final Citation authority, final String code) {
         this.authority = authority;
         this.code = code;
-        codeSpace = Citations.getCodeSpace(authority);
+        codeSpace = Citations.toCodeSpace(authority);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -315,7 +315,7 @@ public class ImmutableIdentifier extends
          */
         value = properties.get(CODESPACE_KEY);
         if (value == null) {
-            codeSpace = Citations.getCodeSpace(authority);
+            codeSpace = Citations.toCodeSpace(authority);
         } else if (value instanceof String) {
             codeSpace = trimWhitespaces((String) value);
         } else {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -69,7 +69,7 @@ import static org.apache.sis.internal.ut
  * </ul>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @version 0.7
+ * @version 1.0
  * @since   0.3
  * @module
  */
@@ -705,13 +705,24 @@ public final class Citations extends Sta
      * @return a non-empty code space for the given citation without leading or trailing
whitespaces,
      *         or {@code null} if the given citation is null or does not have any Unicode
identifier or title.
      *
-     * @since 0.8
+     * @since 1.0
      */
-    public static String getCodeSpace(final Citation citation) {
+    public static String toCodeSpace(final Citation citation) {
         if (citation instanceof IdentifierSpace<?>) {
             return ((IdentifierSpace<?>) citation).getName();
         } else {
             return getUnicodeIdentifier(citation);
         }
     }
+
+    /**
+     * @deprecated Renamed as {@link #toCodeSpace(Citation)}. The previous name was confusing
because this
+     * method does not return the namespace of the given citation, but instead represents
it as a namespace.
+     *
+     * @since 0.8
+     */
+    @Deprecated
+    public static String getCodeSpace(final Citation citation) {
+        return toCodeSpace(citation);
+    }
 }

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -133,7 +133,7 @@ public final strictfp class CitationsTes
     }
 
     /**
-     * Tests {@link Citations#getCodeSpace(Citation)} with some ignorable characters.
+     * Tests {@link Citations#toCodeSpace(Citation)} with some ignorable characters.
      * Ignorable character used in this test are:
      *
      * <ul>
@@ -145,12 +145,12 @@ public final strictfp class CitationsTes
     @DependsOnMethod("testGetIdentifier")
     public void testGetCodeSpace() {
         final SimpleCitation citation = new SimpleCitation(" Valid\u2060Id\u200Bentifier
");
-        assertEquals("ValidIdentifier", Citations.getCodeSpace(citation));
+        assertEquals("ValidIdentifier", Citations.toCodeSpace(citation));
 
         assertNull("Shall not be taken as a valid identifier.",
-                Citations.getCodeSpace(new SimpleCitation("Proj.4")));
+                Citations.toCodeSpace(new SimpleCitation("Proj.4")));
         assertEquals("Shall fallback on the the identifier space name.",
-                "TheProj4Space", Citations.getCodeSpace(new Proj4()));
+                "TheProj4Space", Citations.toCodeSpace(new Proj4()));
     }
 
     /**
@@ -169,27 +169,27 @@ public final strictfp class CitationsTes
     }
 
     /**
-     * Tests {@link Citations#getCodeSpace(Citation)} on the constants
+     * Tests {@link Citations#toCodeSpace(Citation)} on the constants
      * declared in the {@link Citations} class.
      */
     @Test
     @DependsOnMethod({"testGetUnicodeIdentifier", "testGetIdentifier"})
     public void testGetConstantCodeSpace() {
-        assertEquals("SIS",         Citations.getCodeSpace(SIS));
-        assertEquals("OGC",         Citations.getCodeSpace(WMS));
-        assertEquals("OGC",         Citations.getCodeSpace(OGC));
-        assertEquals("IOGP",        Citations.getCodeSpace(IOGP));
-        assertEquals("EPSG",        Citations.getCodeSpace(EPSG));
-        assertEquals("ESRI",        Citations.getCodeSpace(ESRI));
-        assertEquals("NetCDF",      Citations.getCodeSpace(NETCDF));
-        assertEquals("GeoTIFF",     Citations.getCodeSpace(GEOTIFF));
-        assertEquals("MapInfo",     Citations.getCodeSpace(MAP_INFO));
-        assertEquals("ISBN",        Citations.getCodeSpace(ISBN));
-        assertEquals("ISSN",        Citations.getCodeSpace(ISSN));
-        assertEquals("Proj4",       Citations.getCodeSpace(PROJ4));
-        assertEquals("S57",         Citations.getCodeSpace(S57));
-        assertNull  ("ISO_19115-1", Citations.getCodeSpace(ISO_19115.get(0)));
-        assertNull  ("ISO_19115-2", Citations.getCodeSpace(ISO_19115.get(1)));
+        assertEquals("SIS",         Citations.toCodeSpace(SIS));
+        assertEquals("OGC",         Citations.toCodeSpace(WMS));
+        assertEquals("OGC",         Citations.toCodeSpace(OGC));
+        assertEquals("IOGP",        Citations.toCodeSpace(IOGP));
+        assertEquals("EPSG",        Citations.toCodeSpace(EPSG));
+        assertEquals("ESRI",        Citations.toCodeSpace(ESRI));
+        assertEquals("NetCDF",      Citations.toCodeSpace(NETCDF));
+        assertEquals("GeoTIFF",     Citations.toCodeSpace(GEOTIFF));
+        assertEquals("MapInfo",     Citations.toCodeSpace(MAP_INFO));
+        assertEquals("ISBN",        Citations.toCodeSpace(ISBN));
+        assertEquals("ISSN",        Citations.toCodeSpace(ISSN));
+        assertEquals("Proj4",       Citations.toCodeSpace(PROJ4));
+        assertEquals("S57",         Citations.toCodeSpace(S57));
+        assertNull  ("ISO_19115-1", Citations.toCodeSpace(ISO_19115.get(0)));
+        assertNull  ("ISO_19115-2", Citations.toCodeSpace(ISO_19115.get(1)));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -27,7 +27,7 @@ import org.apache.sis.internal.metadata.
 import org.apache.sis.referencing.NamedIdentifier;
 import org.apache.sis.metadata.iso.citation.Citations;
 
-import static org.apache.sis.metadata.iso.citation.Citations.getCodeSpace;
+import static org.apache.sis.metadata.iso.citation.Citations.toCodeSpace;
 
 
 /**
@@ -239,7 +239,7 @@ public final class Code {
                                 }
                             }
                         } else {
-                            code.codeSpace = getCodeSpace(authority);
+                            code.codeSpace = toCodeSpace(authority);
                         }
                         code.code = urn;
                         return code;

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -328,7 +328,7 @@ public abstract class Builder<B extends
             version    = getVersion();
         } else {
             // Do not use the version information since it applies to the default authority
rather than the given one.
-            codeSpace = Citations.getCodeSpace(authority);
+            codeSpace = Citations.toCodeSpace(authority);
             version   = null;
         }
         return createIdentifier(authority, codeSpace, identifier, version);
@@ -552,7 +552,7 @@ public abstract class Builder<B extends
                 version    = getVersion();
             } else {
                 // Do not use the version information since it applies to the default authority
rather than the given one.
-                codeSpace = Citations.getCodeSpace(authority);
+                codeSpace = Citations.toCodeSpace(authority);
                 version   = null;
             }
             if (isDeprecated) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -426,7 +426,7 @@ public final class IdentifiedObjects ext
         }
         IdentifiedObjectFinder finder;
         try {
-            finder = newFinder(Citations.getCodeSpace(authority));
+            finder = newFinder(Citations.toCodeSpace(authority));
         } catch (NoSuchAuthorityFactoryException e) {
             warning("lookupURN", e);
             finder = newFinder(null);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -225,7 +225,7 @@ public class NamedIdentifier extends Imm
      *          The code can not be null.
      */
     public NamedIdentifier(final Citation authority, final CharSequence code) {
-        super(authority, Citations.getCodeSpace(authority), toString(code));
+        super(authority, Citations.toCodeSpace(authority), toString(code));
         if (code instanceof InternationalString) {
             name = createName(authority, super.getCodeSpace(), code);
             isNameSupplied = true;                              // Because 'code' is an international
string.
@@ -317,7 +317,7 @@ public class NamedIdentifier extends Imm
      */
     private static GenericName createName(final Citation authority, String codeSpace, final
CharSequence code) {
         if (codeSpace == null) {
-            codeSpace = Citations.getCodeSpace(authority);          // Whitespaces trimed
by Citations.
+            codeSpace = Citations.toCodeSpace(authority);           // Whitespaces trimed
by Citations.
         }
         final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         if (codeSpace != null) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -466,7 +466,7 @@ public class AbstractDatum extends Abstr
             if (name == null) { // Should never happen, but be safe.
                 return super.formatTo(formatter);
             }
-            if ("ESRI".equalsIgnoreCase(Citations.getCodeSpace(authority)) && !name.startsWith(ESRI_PREFIX))
{
+            if ("ESRI".equalsIgnoreCase(Citations.toCodeSpace(authority)) && !name.startsWith(ESRI_PREFIX))
{
                 name = ESRI_PREFIX + name;
             }
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -138,7 +138,7 @@ public abstract class GeodeticAuthorityF
      * @return the namespaces recognized by this factory, or an empty set if none.
      */
     public Set<String> getCodeSpaces() {
-        final String authority = org.apache.sis.metadata.iso.citation.Citations.getCodeSpace(getAuthority());
+        final String authority = org.apache.sis.metadata.iso.citation.Citations.toCodeSpace(getAuthority());
         return (authority != null) ? Collections.singleton(authority) : Collections.emptySet();
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -519,7 +519,7 @@ public class MultiAuthoritiesFactory ext
         if (factory instanceof GeodeticAuthorityFactory) {
             return ((GeodeticAuthorityFactory) factory).getCodeSpaces();
         } else {
-            final String authority = Citations.getCodeSpace(factory.getAuthority());
+            final String authority = Citations.toCodeSpace(factory.getAuthority());
             return (authority != null) ? Collections.singleton(authority) : Collections.emptySet();
         }
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -979,7 +979,7 @@ check:      for (int isTarget=0; ; isTar
                  * on MathTransform WKT neither for more reliable debugging.
                  */
                 final boolean filter = WKTUtilities.isEPSG(parameters.getDescriptor(), false)
&&   // NOT method.getName()
-                        Constants.EPSG.equalsIgnoreCase(Citations.getCodeSpace(formatter.getNameAuthority()));
+                        Constants.EPSG.equalsIgnoreCase(Citations.toCodeSpace(formatter.getNameAuthority()));
                 formatter.newLine();
                 formatter.indent(+1);
                 for (final GeneralParameterValue param : parameters.values()) {

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java?rev=1831857&r1=1831856&r2=1831857&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
[UTF-8] Fri May 18 12:28:04 2018
@@ -125,7 +125,7 @@ public final strictfp class CommonAuthor
         assertTrue (Citations.identifierMatches(authority, "WMS"));
         assertFalse(Citations.identifierMatches(authority, "OGP"));
         assertFalse(Citations.identifierMatches(authority, "EPSG"));
-        assertEquals(Constants.OGC, Citations.getCodeSpace(authority));
+        assertEquals(Constants.OGC, Citations.toCodeSpace(authority));
     }
 
     /**



Mime
View raw message