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 2015/05/28 18:51:06 UTC
svn commit: r1682276 [3/3] - in /sis/branches/JDK8:
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/
core/si...
Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java?rev=1682276&r1=1682275&r2=1682276&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] Thu May 28 16:51:05 2015
@@ -1594,7 +1594,7 @@ cmp: while (ia < lga) {
* @param s2 The second characters sequence to compare, or {@code null}.
* @param filter The subset of characters to compare, or {@code null} for comparing all characters.
* @param ignoreCase {@code true} for comparing cases, or {@code false} for requiring exact match.
- * @return {@code true} if or if both arguments are {@code null} or if the two given texts are equal,
+ * @return {@code true} if both arguments are {@code null} or if the two given texts are equal,
* optionally ignoring case and filtered-out characters.
*/
public static boolean equalsFiltered(final CharSequence s1, final CharSequence s2,
Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1682276&r1=1682275&r2=1682276&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] Thu May 28 16:51:05 2015
@@ -706,7 +706,7 @@ public final class Types extends Static
/**
* Returns the given characters sequence as an international string. If the given sequence is
- * null or an instance of {@link InternationalString}, this this method returns it unchanged.
+ * null or an instance of {@link InternationalString}, then this method returns it unchanged.
* Otherwise, this method copies the {@link InternationalString#toString()} value in a new
* {@link SimpleInternationalString} instance and returns it.
*
Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java?rev=1682276&r1=1682275&r2=1682276&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/simple/SimpleIdentifierTest.java [UTF-8] Thu May 28 16:51:05 2015
@@ -39,10 +39,10 @@ public final strictfp class SimpleIdenti
@Test
public void testToString() {
final SimpleCitation authority = new SimpleCitation("EPSG");
- assertEquals("SimpleIdentifier[“EPSG:4326”]", new SimpleIdentifier(authority, "4326").toString());
- assertEquals("SimpleIdentifier[“EPSG”]", new SimpleIdentifier(authority, null ).toString());
- assertEquals("SimpleIdentifier[“4326”]", new SimpleIdentifier(null, "4326").toString());
- assertEquals("SimpleIdentifier[]", new SimpleIdentifier(null, null ).toString());
+ assertEquals("SimpleIdentifier[“EPSG:4326”]", new SimpleIdentifier(authority, "4326", false).toString());
+ assertEquals("SimpleIdentifier[“EPSG”]", new SimpleIdentifier(authority, null, false).toString());
+ assertEquals("SimpleIdentifier[“4326”]", new SimpleIdentifier(null, "4326", false).toString());
+ assertEquals("SimpleIdentifier[]", new SimpleIdentifier(null, null, false).toString());
}
/**
@@ -51,9 +51,9 @@ public final strictfp class SimpleIdenti
@Test
public void testToWKT() {
final SimpleCitation authority = new SimpleCitation("EPSG");
- assertEquals("Id[\"EPSG\", \"4326\"]", new SimpleIdentifier(authority, "4326").toWKT());
- assertEquals("Id[\"EPSG\", null]", new SimpleIdentifier(authority, null ).toWKT());
- assertEquals("Id[null, \"4326\"]", new SimpleIdentifier(null, "4326").toWKT());
- assertEquals("Id[null, null]", new SimpleIdentifier(null, null ).toWKT());
+ assertEquals("Id[\"EPSG\", \"4326\"]", new SimpleIdentifier(authority, "4326", false).toWKT());
+ assertEquals("Id[\"EPSG\", null]", new SimpleIdentifier(authority, null, false).toWKT());
+ assertEquals("Id[null, \"4326\"]", new SimpleIdentifier(null, "4326", false).toWKT());
+ assertEquals("Id[null, null]", new SimpleIdentifier(null, null, false).toWKT());
}
}
Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java?rev=1682276&r1=1682275&r2=1682276&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] Thu May 28 16:51:05 2015
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
/**
- * Tests the {@link Citations} class.
+ * Tests the internal {@link Citations} class.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.6
@@ -44,7 +44,7 @@ public final strictfp class CitationsTes
*/
@SuppressWarnings("serial")
private static Identifier identifier(final String codeSpace, final String code) {
- return new SimpleIdentifier(null, code) {
+ return new SimpleIdentifier(null, code, false) {
@Override public String getCodeSpace() {
return codeSpace;
}
@@ -117,7 +117,7 @@ public final strictfp class CitationsTes
}
/**
- * A citation which is also an {@link IdentifierSpace}, for {@link #testGetUnicodeIdentifier()} purpose.
+ * A citation which is also an {@link IdentifierSpace}, for {@link #testGetCodeSpace()} purpose.
*/
@SuppressWarnings("serial")
private static final class Proj4 extends SimpleCitation implements IdentifierSpace<Integer> {
Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java?rev=1682276&r1=1682275&r2=1682276&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] Thu May 28 16:51:05 2015
@@ -151,7 +151,7 @@ public final strictfp class DefinitionUR
*/
@Test
public void testToURN() {
- final Identifier identifier = new SimpleIdentifier(new SimpleCitation("EPSG"), "4326");
+ final Identifier identifier = new SimpleIdentifier(new SimpleCitation("EPSG"), "4326", false);
assertEquals("urn:ogc:def:crs:EPSG::4326", DefinitionURI.format("crs", identifier));
}
}
Modified: sis/branches/JDK8/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java?rev=1682276&r1=1682275&r2=1682276&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java [UTF-8] (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java [UTF-8] Thu May 28 16:51:05 2015
@@ -57,7 +57,7 @@ public final strictfp class DirectRefere
@SuppressWarnings("deprecation")
private static DefaultMetadata createMetadata(final boolean legacy) {
final DefaultMetadata metadata = new DefaultMetadata();
- final DefaultCitation citation = new DefaultCitation("European Petroleum Survey Group");
+ final DefaultCitation citation = new DefaultCitation("EPSG Geodetic Parameter Dataset");
Collection<Responsibility> r = HardCodedCitations.EPSG.getCitedResponsibleParties();
if (legacy) {
r = singleton(new DefaultResponsibleParty(TestUtilities.getSingleton(r)));
Modified: sis/branches/JDK8/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml?rev=1682276&r1=1682275&r2=1682276&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/src/test/resources/org/apache/sis/internal/profile/fra/DirectReferenceSystem.xml Thu May 28 16:51:05 2015
@@ -39,7 +39,7 @@
<gmd:authority>
<gmd:CI_Citation>
<gmd:title>
- <gco:CharacterString>European Petroleum Survey Group</gco:CharacterString>
+ <gco:CharacterString>EPSG Geodetic Parameter Dataset</gco:CharacterString>
</gmd:title>
<gmd:citedResponsibleParty>
<gmd:CI_ResponsibleParty>