sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1727561 [5/5] - in /sis/branches/JDK6: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ core/s...
Date Fri, 29 Jan 2016 12:23:11 GMT
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -121,6 +121,11 @@ public final class Errors extends Indexe
         public static final short CanNotConvertValue_2 = 4;
 
         /**
+         * Can not create an object of type “{1}” as an instance of ‘{0}’.
+         */
+        public static final short CanNotCreateObjectOfType_2 = 215;
+
+        /**
          * Can not instantiate an object of type ‘{0}’.
          */
         public static final short CanNotInstantiate_1 = 5;

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] Fri Jan 29 12:23:09 2016
@@ -35,6 +35,7 @@ CanNotConvertFromType_2           = Can
 CanNotConvertValue_2              = Can not convert value \u201c{0}\u201d to type \u2018{1}\u2019.
 CanNotCompute_1                   = Can not compute \u201c{0}\u201d.
 CanNotComputeDerivative           = Can not compute the derivative.
+CanNotCreateObjectOfType_2        = Can not create an object of type \u201c{1}\u201d as an
instance of \u2018{0}\u2019.
 CanNotInstantiate_1               = Can not instantiate an object of type \u2018{0}\u2019.
 CanNotMapAxisToDirection_2        = Can not map an axis from \u201c{0}\u201d to direction
\u201c{1}\u201d.
 CanNotOpen_1                      = Can not open \u201c{0}\u201d.

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] Fri Jan 29 12:23:09 2016
@@ -32,6 +32,7 @@ CanNotConvertFromType_2           = Ne p
 CanNotConvertValue_2              = La valeur \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre
convertie vers le type \u2018{1}\u2019.
 CanNotCompute_1                   = Ne peut pas calculer \u00ab\u202f{0}\u202f\u00bb.
 CanNotComputeDerivative           = La d\u00e9riv\u00e9 ne peut pas \u00eatre calcul\u00e9e.
+CanNotCreateObjectOfType_2        = Ne peut pas cr\u00e9er un objet de type \u00ab\u202f{1}\u202f\u00bb
comme une instance de \u2018{0}\u2019.
 CanNotInstantiate_1               = Ne peut pas cr\u00e9er un objet de type \u2018{0}\u2019.
 CanNotMapAxisToDirection_2        = Aucun axe de \u00ab\u202f{0}\u202f\u00bb n\u2019a pu
\u00eatre associ\u00e9 \u00e0 la direction \u00ab\u202f{1}\u202f\u00bb.
 CanNotOpen_1                      = Ne peut pas ouvrir \u00ab\u202f{0}\u202f\u00bb.

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -166,6 +166,12 @@ public final class Messages extends Inde
         public static final short DiscardedExclusiveProperty_2 = 2;
 
         /**
+         * There is no factory for version {1} of “{0}” authority. Fallback on default
version for
+         * objects creation.
+         */
+        public static final short FallbackDefaultFactoryVersion_2 = 38;
+
+        /**
          * Ignored properties after the first occurrence of ‘{0}’.
          */
         public static final short IgnoredPropertiesAfterFirst_1 = 6;
@@ -176,6 +182,12 @@ public final class Messages extends Inde
         public static final short IgnoredPropertyAssociatedTo_1 = 7;
 
         /**
+         * More than one service provider of type ‘{0}’ are declared for “{1}”. Only
the first provider
+         * (an instance of ‘{2}’) will be used.
+         */
+        public static final short IgnoredServiceProvider_3 = 36;
+
+        /**
          * Parsing of “{0}” done, but some elements were ignored.
          */
         public static final short IncompleteParsing_1 = 14;
@@ -202,6 +214,11 @@ public final class Messages extends Inde
         public static final short MismatchedEllipsoidAxisLength_3 = 9;
 
         /**
+         * No coordinate operation from “{0}” to “{1}” because of mismatched factories.
+         */
+        public static final short MismatchedOperationFactories_2 = 37;
+
+        /**
          * Despite its name, this parameter is effectively “{0}”.
          */
         public static final short MisnamedParameter_1 = 18;

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
[ISO-8859-1] Fri Jan 29 12:23:09 2016
@@ -36,14 +36,17 @@ DataDirectoryNotSpecified_1      = The \
 DataDirectoryNotWritable_2       = Apache SIS can not write in the \u201c{1}\u201d directory
given by the {0} environment variable.
 DeprecatedCode_3                 = Code \u201c{0}\u201d is deprecated and replaced by code
{1}. Reason is: {2}
 DiscardedExclusiveProperty_2     = Property \u201c{0}\u201d has been discarded in favor of
\u201c{1}\u201d, because those two properties are mutually exclusive.
+FallbackDefaultFactoryVersion_2  = There is no factory for version {1} of \u201c{0}\u201d
authority. Fallback on default version for objects creation.
 IgnoredPropertiesAfterFirst_1    = Ignored properties after the first occurrence of \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1    = Ignored property associated to \u2018{0}\u2019.
+IgnoredServiceProvider_3         = More than one service provider of type \u2018{0}\u2019
are declared for \u201c{1}\u201d. Only the first provider (an instance of \u2018{2}\u2019)
will be used.
 IncompleteParsing_1              = Parsing of \u201c{0}\u201d done, but some elements were
ignored.
 JNDINotSpecified_1               = No object associated to the \u201c{0}\u201d JNDI name.
 LoadingDatumShiftFile_1          = Loading datum shift file \u201c{0}\u201d.
 LocalesDiscarded                 = Text were discarded for some locales.
 OptionalModuleNotFound_1         = Optional module \u201c{0}\u201d requested but not found.
 PropertyHiddenBy_2               = Property \u201c{0}\u201d is hidden by \u201c{1}\u201d.
+MismatchedOperationFactories_2   = No coordinate operation from \u201c{0}\u201d to \u201c{1}\u201d
because of mismatched factories.
 MismatchedEllipsoidAxisLength_3  = The \u201c{1}\u201d parameter could have been omitted.
But it has been given a value of {2} which does not match the definition of the \u201c{0}\u201d
ellipsoid.
 MisnamedParameter_1              = Despite its name, this parameter is effectively \u201c{0}\u201d.
 NonConformFormatting_1           = Formatting of \u201c{0}\u201d is not conform to the format
standard.

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
[ISO-8859-1] Fri Jan 29 12:23:09 2016
@@ -43,14 +43,17 @@ DataDirectoryNotSpecified_1      = La va
 DataDirectoryNotWritable_2       = Apache SIS ne peut pas \u00e9crire dans le r\u00e9pertoire
\u00ab\u202f{1}\u202f\u00bb sp\u00e9cifi\u00e9e par la variable environnementale {0}.
 DeprecatedCode_3                 = Le code \u00ab\u202f{0}\u202f\u00bb est d\u00e9pr\u00e9ci\u00e9
et remplac\u00e9 par le code {1}. La raison est\u00a0: {2}
 DiscardedExclusiveProperty_2     = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9
\u00e9cart\u00e9e en faveur de \u00ab\u202f{1}\u202f\u00bb, parce que ces deux propri\u00e9t\u00e9s
sont mutuellement exclusives.
+FallbackDefaultFactoryVersion_2  = Il n\u2019y a pas de fabrique pour la version {1} de l\u2019autorit\u00e9
\u00ab\u202f{0}\u202f\u00bb. Les objets seront cr\u00e9\u00e9s avec la version par d\u00e9faut.
 IgnoredPropertiesAfterFirst_1    = Des propri\u00e9t\u00e9s ont \u00e9t\u00e9 ignor\u00e9es
apr\u00e8s la premi\u00e8re occurrence de \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1    = Une propri\u00e9t\u00e9 associ\u00e9e \u00e0 \u2018{0}\u2019
a \u00e9t\u00e9 ignor\u00e9e.
+IgnoredServiceProvider_3         = Plusieurs fournisseurs de service de type \u2018{0}\u2019
sont d\u00e9clar\u00e9s pour \u00ab\u202f{1}\u202f\u00bb. Seul le premier fournisseur (une
instance de \u2018{2}\u2019) sera utilis\u00e9.
 IncompleteParsing_1              = La lecture de \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9
faite, mais en ignorant certains \u00e9l\u00e9ments.
 JNDINotSpecified_1               = Aucun objet n\u2019est associ\u00e9 au nom JNDI \u00ab\u202f{0}\u202f\u00bb.
 LoadingDatumShiftFile_1          = Chargement du fichier de changement de r\u00e9f\u00e9rentiel
\u00ab\u202f{0}\u202f\u00bb.
 LocalesDiscarded                 = Des textes ont \u00e9t\u00e9 ignor\u00e9s pour certaines
langues.
 OptionalModuleNotFound_1         = Le module optionnel \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9
demand\u00e9 mais n\u2019a pas \u00e9t\u00e9 trouv\u00e9.
 PropertyHiddenBy_2               = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb est
masqu\u00e9e par \u00ab\u202f{1}\u202f\u00bb.
+MismatchedOperationFactories_2   = Il n\u2019y a pas d\u2019op\u00e9rations allant de \u00ab\u202f{0}\u202f\u00bb
vers \u00ab\u202f{1}\u202f\u00bb parce que ces derniers sont associ\u00e9s \u00e0 deux fabriques
diff\u00e9rentes.
 MismatchedEllipsoidAxisLength_3  = Le param\u00e8tre \u00ab\u202f{1}\u202f\u00bb aurait pu
\u00eatre omis. Mais il lui a \u00e9t\u00e9 donn\u00e9 la valeur {2} qui ne correspond pas
\u00e0 la d\u00e9finition de l\u2019ellipso\u00efde \u00ab\u202f{0}\u202f\u00bb.
 MisnamedParameter_1              = Malgr\u00e9 son nom, ce param\u00e8tre produit en r\u00e9alit\u00e9
l\u2019effet d\u2019un \u00ab\u202f{0}\u202f\u00bb.
 NonConformFormatting_1           = L\u2019\u00e9criture de \u00ab\u202f{0}\u202f\u00bb n\u2019est
pas conforme au format standard.

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -20,7 +20,7 @@ import java.util.UUID;
 import org.apache.sis.util.iso.SimpleInternationalString;
 import org.apache.sis.xml.XLink;
 import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.test.mock.ReferenceResolverMock;
+import org.apache.sis.xml.ReferenceResolverMock;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.XMLTestCase;

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -18,6 +18,7 @@ package org.apache.sis.internal.util;
 
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.apache.sis.internal.simple.SimpleCitation;
@@ -36,11 +37,23 @@ import static org.junit.Assume.assumeTru
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.6
+ * @version 0.7
  * @module
  */
 public final strictfp class CitationsTest extends TestCase {
     /**
+     * Creates a citation with the given title and the given identifiers.
+     */
+     @SuppressWarnings("serial")
+     private static SimpleCitation citation(final String title, final Identifier... identifiers)
{
+        return new SimpleCitation(title) {
+            @Override public List<Identifier> getIdentifiers() {
+                return Arrays.asList(identifiers);
+            }
+        };
+    }
+
+    /**
      * Creates an identifier with a code space.
      */
      @SuppressWarnings("serial")
@@ -94,6 +107,13 @@ public final strictfp class CitationsTes
         citation = new SimpleCitation(" ValidIdentifier ");
         assertEquals("ValidIdentifier", Citations.getIdentifier(citation, false));
         assertEquals("ValidIdentifier", Citations.getIdentifier(citation, true));
+        /*
+         * Following test uses '-' in the first identifier, which is an invalid Unicode identifier
part.
+         * Consequently the identifier that we get depends on whether we ask for strict Unicode
or not.
+         */
+        citation = citation("Web Map Server", identifier("OGC", "06-042"), identifier("ISO",
"19128"));
+        assertEquals("OGC:06-042", Citations.getIdentifier(citation, false));
+        assertEquals("ISO_19128",  Citations.getIdentifier(citation, true));
     }
 
     /**

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -29,31 +29,49 @@ import static org.junit.Assert.*;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.4
+ * @version 0.7
  * @module
  */
 public final strictfp class DefinitionURITest extends TestCase {
     /**
-     * Tests {@link DefinitionURI#parse(String)} on {@code "urn:ogc:def:crs:EPSG:8.2:4326"}.
-     * This is a URN without parameters defined by EPSG.
+     * Tests {@link DefinitionURI#parse(String)} on strings that should not be recognized
as URN.
      */
     @Test
-    public void testParse() {
+    public void testParseInvalid() {
         assertNull(DefinitionURI.parse("EPSG:4326"));
+        assertNull(DefinitionURI.parse("EPSG::4326"));
+        assertNull(DefinitionURI.parse("urn:ogcx:def:CRS:EPSG:8.2:4326"));
+    }
 
-        DefinitionURI parsed = DefinitionURI.parse(" urn:ogc:def: crs : EPSG: 8.2 :4326 ");
+    /**
+     * Tests {@link DefinitionURI#parse(String)} on {@code "urn:ogc:def:crs:EPSG:8.2:4326"}.
+     * This is a URN without parameters defined by EPSG. This test also puts some spaces
for
+     * testing the parser capability to ignore them.
+     */
+    @Test
+    public void testParse() {
+        final DefinitionURI parsed = DefinitionURI.parse(" urn:ogc:def: crs : EPSG: 8.2 :4326
");
         assertNotNull("DefinitionURI", parsed);
         assertEquals ("isHTTP",    false,   parsed.isHTTP);
+        assertEquals ("isGML",     false,   parsed.isGML);
         assertEquals ("type",      "crs",   parsed.type);
         assertEquals ("authority", "EPSG",  parsed.authority);
         assertEquals ("version",   "8.2",   parsed.version);
         assertEquals ("code",      "4326",  parsed.code);
         assertNull   ("parameters",         parsed.parameters);
         assertEquals ("toString()", "urn:ogc:def:crs:EPSG:8.2:4326", parsed.toString());
+    }
 
-        parsed = DefinitionURI.parse("URN :X-OGC: Def:crs:EPSG::4326");
+    /**
+     * Tests {@link DefinitionURI#parse(String)} on {@code "urn:ogc:def:crs:EPSG::4326"}.
+     * This is a URN without version. This test also mixes lower and upper cases.
+     */
+    @Test
+    public void testParseWithoutVersion() {
+        final DefinitionURI parsed = DefinitionURI.parse("URN :X-OGC: Def:crs:EPSG::4326");
         assertNotNull("DefinitionURI", parsed);
         assertEquals ("isHTTP",    false,   parsed.isHTTP);
+        assertEquals ("isGML",     false,   parsed.isGML);
         assertEquals ("type",      "crs",   parsed.type);
         assertEquals ("authority", "EPSG",  parsed.authority);
         assertNull   ("version",            parsed.version);
@@ -72,6 +90,7 @@ public final strictfp class DefinitionUR
         final DefinitionURI parsed = DefinitionURI.parse("urn:ogc:def:crs:OGC:1.3:AUTO42003:1:-100:45");
         assertNotNull("DefinitionURI", parsed);
         assertEquals ("isHTTP",    false,       parsed.isHTTP);
+        assertEquals ("isGML",     false,       parsed.isGML);
         assertEquals ("type",      "crs",       parsed.type);
         assertEquals ("authority", "OGC",       parsed.authority);
         assertEquals ("version",   "1.3",       parsed.version);
@@ -82,20 +101,46 @@ public final strictfp class DefinitionUR
     }
 
     /**
-     * Tests {@link DefinitionURI#parse(String)} on {@code "http://www.opengis.net/gml/srs/epsg.xml#4326"}.
+     * Tests {@link DefinitionURI#parse(String)} on {@code "http://www.opengis.net/def/crs/epsg/0/4326"}.
      */
     @Test
     @DependsOnMethod("testParse")
     public void testParseHTTP() {
+        final DefinitionURI parsed = DefinitionURI.parse("http://www.opengis.net/def/crs/epsg/0/4326");
+        assertNotNull("DefinitionURI", parsed);
+        assertEquals ("isHTTP",    true,   parsed.isHTTP);
+        assertEquals ("isGML",     false,  parsed.isGML);
+        assertEquals ("type",      "crs",  parsed.type);
+        assertEquals ("authority", "epsg", parsed.authority);
+        assertNull   ("version",           parsed.version);
+        assertEquals ("code",      "4326", parsed.code);
+        assertNull   ("parameters",        parsed.parameters);
+        assertEquals ("toString()", "http://www.opengis.net/def/crs/epsg/0/4326", parsed.toString());
+    }
+
+    /**
+     * Tests {@link DefinitionURI#parse(String)} on {@code "http://www.opengis.net/gml/srs/epsg.xml#4326"}.
+     */
+    @Test
+    @DependsOnMethod("testParse")
+    public void testParseGML() {
         final DefinitionURI parsed = DefinitionURI.parse("http://www.opengis.net/gml/srs/epsg.xml#4326");
         assertNotNull("DefinitionURI", parsed);
         assertEquals ("isHTTP",    true,   parsed.isHTTP);
+        assertEquals ("isGML",     true,   parsed.isGML);
         assertEquals ("type",      "crs",  parsed.type);
         assertEquals ("authority", "epsg", parsed.authority);
         assertNull   ("version",           parsed.version);
         assertEquals ("code",      "4326", parsed.code);
         assertNull   ("parameters",        parsed.parameters);
         assertEquals ("toString()", "http://www.opengis.net/gml/srs/epsg.xml#4326", parsed.toString());
+
+        final DefinitionURI withoutExtension = DefinitionURI.parse("http://www.opengis.net/gml/srs/epsg#4326");
+        assertNotNull("Should parse even if the .xml extension is missig.", withoutExtension);
+        assertEquals(parsed.toString(), withoutExtension.toString());
+
+        assertNull("Should not parse if no '#' character.",
+                DefinitionURI.parse("http://www.opengis.net/gml/srs/epsg?4326"));
     }
 
     /**
@@ -137,7 +182,7 @@ public final strictfp class DefinitionUR
      * {@code "http://www.opengis.net/gml/srs/epsg.xml#4326"}.
      */
     @Test
-    public void testCodeOfHTTP() {
+    public void testCodeOfGML() {
         assertEquals("4326", DefinitionURI.codeOf("crs", "EPSG", "http://www.opengis.net/gml/srs/epsg.xml#4326"));
         assertNull  (        DefinitionURI.codeOf("crs", "OGC",  "http://www.opengis.net/gml/srs/epsg.xml#4326"));
         assertNull  (        DefinitionURI.codeOf("uom", "EPSG", "http://www.opengis.net/gml/srs/epsg.xml#4326"));

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -56,7 +56,7 @@ public strictfp class CoordinateSystemAx
      * {@inheritDoc}
      */
     @Override
-    Object[] properties() {
+    protected Object[] properties() {
         return new Object[] {getCode(), alias, abbreviation};
     }
 

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -39,7 +39,7 @@ import org.apache.sis.internal.jaxb.gco.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
- * @version 0.5
+ * @version 0.7
  * @module
  */
 @SuppressWarnings("serial")
@@ -60,8 +60,10 @@ public strictfp class IdentifiedObjectMo
     /**
      * Returns all properties defined in this object,
      * for the convenience of {@link #equals(Object)} and {@link #hashCode()}.
+     *
+     * @return The properties to use in hash code computations and in comparisons.
      */
-    Object[] properties() {
+    protected Object[] properties() {
         return new Object[] {code, alias};
     }
 
@@ -125,9 +127,9 @@ public strictfp class IdentifiedObjectMo
     }
 
     /**
-     * Returns the identifier version ({@code null} for now).
+     * Returns the namespace version ({@code null} for now).
      *
-     * @return The identifier version.
+     * @return The namespace version.
      */
     @Override
     public final String getVersion() {

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -117,7 +117,7 @@ public final strictfp class VerticalCRSM
      * {@inheritDoc}
      */
     @Override
-    Object[] properties() {
+    protected Object[] properties() {
         return new Object[] {getCode(), alias, minimumValue, maximumValue, unit, up};
     }
 

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
[UTF-8] Fri Jan 29 12:23:09 2016
@@ -19,6 +19,10 @@
  * Provides objects that simulate the behavior of complex or unavailable real objects.
  * Mocks are often used as a replacement for objects to be defined only in dependant modules.
  *
+ * <p>This package does not provide all mocks defined by SIS, but only the mocks that
could not be put in
+ * the right package for the interface that they implement. To get a list of all mocks used
in SIS tests,
+ * we need to search for classes ending in {@code *Mock}.</p>
+ *
  * <p>Objects defined in this package are only for SIS testing purpose any many change
  * in any future version without notice.</p>
  *

Modified: sis/branches/JDK6/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/build.xml?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/build.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/build.xml Fri Jan 29 12:23:09 2016
@@ -77,6 +77,13 @@
       </fileset>
     </concat>
 
+    <!-- CRSAuthorityFactory implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory"
encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory"/>
+      </fileset>
+    </concat>
+
     <!-- CRSFactory implementations to be loaded by ServiceLoader. -->
     <concat destfile="${build.classes.dir}/META-INF/services/org.opengis.referencing.crs.CRSFactory"
encoding="UTF-8" fixlastline="yes">
       <fileset dir="${project.root}">

Modified: sis/branches/JDK6/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/javadoc/stylesheet.css?rev=1727561&r1=1727560&r2=1727561&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/JDK6/src/main/javadoc/stylesheet.css Fri Jan 29 12:23:09 2016
@@ -180,7 +180,7 @@ div.block ol {
 div.block ul > li,
 div.block ol > li {
   margin-top:    0;
-  margin-bottom: 3px;
+  margin-bottom: 0;
 }
 
 div.block ul.verbose > li,



Mime
View raw message