You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2016/01/26 01:12:36 UTC
svn commit: r1726717 [4/4] - in /sis/branches/JDK7: ./
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...
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] Tue Jan 26 00:12:35 2016
@@ -18,12 +18,12 @@ package org.apache.sis.util.collection;
import java.util.Set;
import java.util.Iterator;
-import java.util.AbstractSet;
import java.io.Serializable;
-import org.apache.sis.util.ObjectConverter;
import org.apache.sis.math.FunctionProperty;
+import org.apache.sis.util.ObjectConverter;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.util.SetOfUnknownSize;
/**
@@ -61,7 +61,7 @@ import org.apache.sis.util.resources.Err
* @version 0.3
* @module
*/
-class DerivedSet<S,E> extends AbstractSet<E> implements CheckedContainer<E>, Serializable {
+class DerivedSet<S,E> extends SetOfUnknownSize<E> implements CheckedContainer<E>, Serializable {
/**
* Serial number for inter-operability with different versions.
*/
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] Tue Jan 26 00:12:35 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/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] Tue Jan 26 00:12:35 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/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Tue Jan 26 00:12:35 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/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] Tue Jan 26 00:12:35 2016
@@ -176,6 +176,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;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties [ISO-8859-1] Tue Jan 26 00:12:35 2016
@@ -38,6 +38,7 @@ DeprecatedCode_3 = Code
DiscardedExclusiveProperty_2 = Property \u201c{0}\u201d has been discarded in favor of \u201c{1}\u201d, because those two properties are mutually exclusive.
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.
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties [ISO-8859-1] Tue Jan 26 00:12:35 2016
@@ -45,6 +45,7 @@ DeprecatedCode_3 = Le co
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.
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.
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] Tue Jan 26 00:12:35 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/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] Tue Jan 26 00:12:35 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;
@@ -35,11 +36,23 @@ import static org.junit.Assert.*;
*
* @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")
@@ -93,6 +106,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/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] Tue Jan 26 00:12:35 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,14 +101,33 @@ 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);
@@ -137,7 +175,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/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java [UTF-8] Tue Jan 26 00:12:35 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/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java [UTF-8] Tue Jan 26 00:12:35 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/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java [UTF-8] Tue Jan 26 00:12:35 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/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java [UTF-8] Tue Jan 26 00:12:35 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/JDK7/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/build.xml?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/build.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/build.xml Tue Jan 26 00:12:35 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/JDK7/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/src/main/javadoc/stylesheet.css?rev=1726717&r1=1726716&r2=1726717&view=diff
==============================================================================
--- sis/branches/JDK7/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/JDK7/src/main/javadoc/stylesheet.css Tue Jan 26 00:12:35 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,