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 2012/10/16 13:12:15 UTC
svn commit: r1398733 - in /sis/branches/JDK6: ./
ide-project/NetBeans/nbproject/
sis-utility/src/main/java/org/apache/sis/internal/jaxb/
sis-utility/src/main/java/org/apache/sis/internal/util/
sis-utility/src/main/java/org/apache/sis/util/ sis-utility/...
Author: desruisseaux
Date: Tue Oct 16 11:12:14 2012
New Revision: 1398733
URL: http://svn.apache.org/viewvc?rev=1398733&view=rev
Log:
Merge from the JDK7 branch.
Added:
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
- copied, changed from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
- copied unchanged from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
- copied, changed from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
- copied, changed from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
- copied unchanged from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java
- copied unchanged from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
- copied unchanged from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java
- copied unchanged from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/
- copied from r1398730, sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/internal/jaxb/
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml
sis/branches/JDK6/pom.xml
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/package-info.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Objects.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCasesTest.java
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1398651-1398732
Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties Tue Oct 16 11:12:14 2012
@@ -3,6 +3,6 @@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=47249144
+nbproject/build-impl.xml.data.CRC32=0831326b
nbproject/build-impl.xml.script.CRC32=61cb3eb8
nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml Tue Oct 16 11:12:14 2012
@@ -22,12 +22,15 @@
<word>deserialization</word>
<word>deserialized</word>
<word>initially</word>
+ <word>javadoc</word>
<word>marshallable</word>
<word>marshalled</word>
<word>marshalling</word>
<word>namespace</word>
<word>namespaces</word>
+ <word>timezone</word>
<word>Unicode</word>
+ <word>unmarshalling</word>
</spellchecker-wordlist>
</configuration>
</project>
Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Tue Oct 16 11:12:14 2012
@@ -485,9 +485,10 @@ Apache SIS is a toolkit for describing l
<!-- Custom taglets, some of them implemented in Java. -->
<tags>
- <tag><placement>t</placement> <name>goal</name> <head>Maven goal:</head></tag>
- <tag><placement>t</placement> <name>phase</name> <head>Maven phase:</head></tag>
- <tag><placement>a</placement> <name>todo</name> <head>TODO:</head></tag>
+ <tag><placement>t</placement> <name>goal</name> <head>Maven goal:</head></tag>
+ <tag><placement>t</placement> <name>phase</name> <head>Maven phase:</head></tag>
+ <tag><placement>m</placement> <name>category</name> <head>Category:</head></tag>
+ <tag><placement>a</placement> <name>todo</name> <head>TODO:</head></tag>
</tags>
<taglets>
<taglet><tagletClass>org.apache.sis.internal.taglet.Module</tagletClass></taglet>
Copied: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java (from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java?p2=sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java&p1=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java&r1=1398730&r2=1398733&rev=1398733&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java Tue Oct 16 11:12:14 2012
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.AbstractSet;
import java.util.AbstractMap;
import java.util.NoSuchElementException;
-import java.util.Objects;
import java.io.Serializable;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
@@ -32,6 +31,9 @@ import org.apache.sis.util.ArgumentCheck
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.IdentifierMap;
+// Related to JDK7
+import org.apache.sis.internal.util.Objects;
+
import static org.apache.sis.util.collection.Collections.hashMapCapacity;
@@ -296,7 +298,7 @@ public class IdentifierMapAdapter extend
}
}
if (value != null) {
- identifiers.add(new SpecializedIdentifier<>(authority, value));
+ identifiers.add(new SpecializedIdentifier<T>(authority, value));
}
return old;
}
@@ -365,7 +367,7 @@ public class IdentifierMapAdapter extend
*/
@Override
public int size() {
- final HashMap<Citation,Boolean> done = new HashMap<>(hashMapCapacity(identifiers.size()));
+ final HashMap<Citation,Boolean> done = new HashMap<Citation,Boolean>(hashMapCapacity(identifiers.size()));
for (final Identifier identifier : identifiers) {
if (identifier != null) {
done.put(identifier.getAuthority(), null);
Copied: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java (from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java?p2=sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java&p1=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java&r1=1398730&r2=1398733&rev=1398733&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java Tue Oct 16 11:12:14 2012
@@ -19,14 +19,14 @@ package org.apache.sis.internal.jaxb;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
-import java.util.Objects;
-
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
-
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.XLink;
+// Related to JDK7
+import org.apache.sis.internal.util.Objects;
+
/**
* A map of identifiers which handles some identifiers in a special way.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java Tue Oct 16 11:12:14 2012
@@ -22,9 +22,7 @@ import java.util.Collection;
import java.io.Serializable;
import java.io.ObjectStreamException;
import java.lang.reflect.Field;
-
import org.opengis.metadata.Identifier;
-
import org.apache.sis.internal.simple.SimpleCitation;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.xml.IdentifierSpace;
Copied: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java (from r1398730, sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java?p2=sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java&p1=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java&r1=1398730&r2=1398733&rev=1398733&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java Tue Oct 16 11:12:14 2012
@@ -29,7 +29,7 @@ import org.apache.sis.util.logging.Loggi
import org.apache.sis.internal.util.Citations;
// Related to JDK7
-import java.util.Objects;
+import org.apache.sis.internal.util.Objects;
/**
@@ -97,11 +97,11 @@ public final class SpecializedIdentifier
if (authority instanceof NonMarshalledAuthority) {
switch (((NonMarshalledAuthority) authority).ordinal) {
case NonMarshalledAuthority.ID: {
- return new SpecializedIdentifier<>(IdentifierSpace.ID, code);
+ return new SpecializedIdentifier<String>(IdentifierSpace.ID, code);
}
case NonMarshalledAuthority.UUID: {
try {
- return new SpecializedIdentifier<>(IdentifierSpace.UUID, UUID.fromString(code));
+ return new SpecializedIdentifier<UUID>(IdentifierSpace.UUID, UUID.fromString(code));
} catch (IllegalArgumentException e) {
parseFailure(e);
break;
@@ -115,7 +115,7 @@ public final class SpecializedIdentifier
parseFailure(e);
break;
}
- return new SpecializedIdentifier<>(IdentifierSpace.HREF, href);
+ return new SpecializedIdentifier<URI>(IdentifierSpace.HREF, href);
}
case NonMarshalledAuthority.XLINK: {
final URI href;
@@ -127,7 +127,7 @@ public final class SpecializedIdentifier
}
final XLink xlink = new XLink();
xlink.setHRef(href);
- return new SpecializedIdentifier<>(IdentifierSpace.XLINK, xlink);
+ return new SpecializedIdentifier<XLink>(IdentifierSpace.XLINK, xlink);
}
}
}
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/package-info.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/package-info.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/package-info.java Tue Oct 16 11:12:14 2012
@@ -23,6 +23,15 @@
* This package is for internal use by SIS only. Classes in this package
* may change in incompatible ways in any future version without notice.
*
+ * {@section Main content}
+ * {@link org.apache.sis.internal.jaxb.IdentifierMapAdapter} is our internal implementation of
+ * the public {@link org.apache.sis.xml.IdentifierMap} interface. The actual implementation is
+ * usually the {@code IdentifierMapWithSpecialCases} subclass.
+ *
+ * <p>{@link org.apache.sis.internal.jaxb.SpecializedIdentifier} wraps {@link org.apache.sis.xml.XLink},
+ * {@link java.net.URI} and {@link java.util.UUID} as {@link org.opengis.metadata.Identifier} instances.
+ * This is used for storing the value in a list of identifiers while preserving the original object.</p>
+ *
* @author Cédric Briançon (Geomatys)
* @since 0.3 (derived from geotk-3.00)
* @version 0.3
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Objects.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Objects.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Objects.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/util/Objects.java Tue Oct 16 11:12:14 2012
@@ -167,4 +167,19 @@ public final class Objects {
public static int hash(Object... values) {
return Arrays.hashCode(values);
}
+
+ /**
+ * Returns the hash code of the given object, or 0 if the object is {@code null}.
+ * If non-null, then the given object is not allowed to be an array.
+ *
+ * @param object The object for which to compute the hash code.
+ * @return The hash code of the given object.
+ */
+ public static int hashCode(final Object object) {
+ if (object == null) {
+ return 0;
+ }
+ assert !object.getClass().isArray() : object;
+ return object.hashCode();
+ }
}
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java Tue Oct 16 11:12:14 2012
@@ -31,7 +31,7 @@ import static org.apache.sis.util.Argume
/**
- * A {@linkplain java.util.Collections#checkedList(List) checked} and
+ * A {@linkplain java.util.Collections#checkedList(List, Class) checked} and
* {@linkplain java.util.Collections#synchronizedList(List) synchronized} {@link ArrayList}.
* The type checks are performed at run-time in addition to the compile-time checks.
*
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java Tue Oct 16 11:12:14 2012
@@ -31,7 +31,7 @@ import static org.apache.sis.util.Argume
/**
- * A {@linkplain java.util.Collections#checkedMap(Map) checked} and
+ * A {@linkplain java.util.Collections#checkedMap(Map, Class, Class) checked} and
* {@linkplain java.util.Collections#synchronizedMap(Map) synchronized} {@link LinkedHashMap}.
* The type checks are performed at run-time in addition to the compile-time checks.
*
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java Tue Oct 16 11:12:14 2012
@@ -30,7 +30,7 @@ import static org.apache.sis.util.Argume
/**
- * A {@linkplain java.util.Collections#checkedSet(Set) checked} and
+ * A {@linkplain java.util.Collections#checkedSet(Set, Class) checked} and
* {@linkplain java.util.Collections#synchronizedSet(Set) synchronized} {@link LinkedHashSet}.
* The type checks are performed at run-time in addition to the compile-time checks.
*
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java Tue Oct 16 11:12:14 2012
@@ -167,6 +167,11 @@ public final class Errors extends Indexe
public static final int UnmodifiableObject_1 = 26;
/**
+ * Can not handle instances of â{0}â because arbitrary implementations are not yet supported.
+ */
+ public static final int UnsupportedImplementation_1 = 28;
+
+ /**
* The â{0}â operation is unsupported.
*/
public static final int UnsupportedOperation_1 = 20;
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties Tue Oct 16 11:12:14 2012
@@ -38,6 +38,7 @@ UnmodifiableAffineTransform = This a
UnmodifiableGeometry = This geometry is unmodifiable.
UnmodifiableMetadata = This metadata is unmodifiable.
UnmodifiableObject_1 = Object \u2018{0}\u2019 is unmodifiable.
+UnsupportedImplementation_1 = Can not handle instances of \u2018{0}\u2019 because arbitrary implementations are not yet supported.
UnsupportedOperation_1 = The \u2018{0}\u2019 operation is unsupported.
ValueAlreadyDefined_1 = A value is already defined for \u201c{0}\u201d.
ValueNotGreaterThanZero_2 = Value \u2018{0}\u2019={1} is invalid. Expected a number greater than 0.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties Tue Oct 16 11:12:14 2012
@@ -38,6 +38,7 @@ UnmodifiableAffineTransform = Cette
UnmodifiableGeometry = Cette g\u00e9om\u00e9trie n\u2019est pas modifiable.
UnmodifiableMetadata = Cette m\u00e9ta-donn\u00e9e n\u2019est pas modifiable.
UnmodifiableObject_1 = L\u2019objet \u2018{0}\u2019 n\u2019est pas modifiable.
+UnsupportedImplementation_1 = Les instances de \u2018{0}\u2019 ne peuvent pas \u00eatre g\u00e9r\u00e9es parce que les impl\u00e9mentations arbitraires ne sont pas encore support\u00e9es.
UnsupportedOperation_1 = L\u2019op\u00e9ration \u2018{0}\u2019 n\u2019est pas support\u00e9e.
ValueAlreadyDefined_1 = Une valeur est d\u00e9j\u00e0 d\u00e9finie pour \u201c{0}\u201d.
ValueNotGreaterThanZero_2 = La valeur \u2018{0}\u2019={1} n\u2019est pas valide. On attendait un nombre positif non-nul.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java Tue Oct 16 11:12:14 2012
@@ -87,7 +87,7 @@ public final class Namespaces extends St
*
* @category OGC
*/
- public static final String CSW_202 = "http://www.opengis.net/cat/csw/2.0.2";
+ public static final String CSW = "http://www.opengis.net/cat/csw/2.0.2";
/**
* The <code>{@value}</code> URL.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java Tue Oct 16 11:12:14 2012
@@ -54,34 +54,34 @@ import org.apache.sis.internal.util.Obje
* <th width="14%">{@link XLink.Type#RESOURCE resource}</th>
* <th width="14%">{@link XLink.Type#TITLE title}</th>
* </tr>
- * <tr align="center"><th align="left"> {@link #getType() type}</th>
+ * <tr align="center"><td><b>{@link #getType() type}</b></td>
* <td>R</td><td>R</td><td>R</td><td>R</td><td>R</td><td>R</td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getHRef() href}</th>
+ * <tr align="center"><td><b>{@link #getHRef() href}</b></td>
* <td>O</td><td> </td><td>R</td><td> </td><td> </td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getRole() role}</th>
+ * <tr align="center"><td><b>{@link #getRole() role}</b></td>
* <td>O</td><td>O</td><td>O</td><td> </td><td>O</td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getArcRole() arcrole}</th>
+ * <tr align="center"><td><b>{@link #getArcRole() arcrole}</b></td>
* <td>O</td><td> </td><td> </td><td>O</td><td> </td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getTitle() title}</th>
+ * <tr align="center"><td><b>{@link #getTitle() title}</b></td>
* <td>O</td><td>O</td><td>O</td><td>O</td><td>O</td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getShow() show}</th>
+ * <tr align="center"><td><b>{@link #getShow() show}</b></td>
* <td>O</td><td> </td><td> </td><td>O</td><td> </td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getActuate() actuate}</th>
+ * <tr align="center"><td><b>{@link #getActuate() actuate}</b></td>
* <td>O</td><td> </td><td> </td><td>O</td><td> </td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getLabel() label}</th>
+ * <tr align="center"><td><b>{@link #getLabel() label}</b></td>
* <td> </td><td> </td><td>O</td><td> </td><td>O</td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getFrom() from}</th>
+ * <tr align="center"><td><b>{@link #getFrom() from}</b></td>
* <td> </td><td> </td><td> </td><td>O</td><td> </td><td> </td>
* </tr>
- * <tr align="center"><th align="left"> {@link #getTo() to}</th>
+ * <tr align="center"><td><b>{@link #getTo() to}</b></td>
* <td> </td><td> </td><td> </td><td>O</td><td> </td><td> </td>
* </tr></table></blockquote>
*
@@ -292,6 +292,7 @@ public class XLink implements Serializab
/**
* A bitmask which specified the non-null fields expected for a given type.
* The bit values are:
+ * <p>
* <ul>
* <li>{@code type}: 0x1</li>
* <li>{@code href}: 0x2</li>
@@ -344,7 +345,7 @@ public class XLink implements Serializab
/**
* Returns the type of link. May have one of the following values:
- *
+ * <p>
* <ul>
* <li><b>simple:</b> a simple link</li>
* <li><b>extended:</b> an extended, possibly multi-resource, link</li>
@@ -782,8 +783,6 @@ public class XLink implements Serializab
* method will throw an {@link UnsupportedOperationException}.
* <p>
* After the first call to this method, any subsequent calls have no effect.
- *
- * @todo We have a hole, since the {@link #getTitle() title} attribute could be modifiable...
*/
public synchronized void freeze() {
if (hashCode == 0) {
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java?rev=1398733&r1=1398730&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java Tue Oct 16 11:12:14 2012
@@ -80,7 +80,7 @@ public strictfp class IdentifierMapAdapt
*/
@Test
public void testGetAndPut() {
- final List<Identifier> identifiers = new ArrayList<>();
+ final List<Identifier> identifiers = new ArrayList<Identifier>();
final Map<Citation,String> map = create(identifiers);
assertTrue(map.isEmpty());
assertEquals(0, map.size());
@@ -142,7 +142,7 @@ public strictfp class IdentifierMapAdapt
*/
@Test
public void testPutSpecialized() {
- final List<Identifier> identifiers = new ArrayList<>();
+ final List<Identifier> identifiers = new ArrayList<Identifier>();
final IdentifierMap map = create(identifiers);
final String myID = "myID";
final java.util.UUID myUUID = fromString("a1eb6e53-93db-4942-84a6-d9e7fb9db2c7");
@@ -168,7 +168,7 @@ public strictfp class IdentifierMapAdapt
*/
@Test
public void testGetSpecialized() {
- final List<Identifier> identifiers = new ArrayList<>();
+ final List<Identifier> identifiers = new ArrayList<Identifier>();
final IdentifierMap map = create(identifiers);
map.put(ID, "myID");
@@ -191,7 +191,7 @@ public strictfp class IdentifierMapAdapt
*/
@Test
public void testDuplicatedAuthorities() {
- final List<Identifier> identifiers = new ArrayList<>();
+ final List<Identifier> identifiers = new ArrayList<Identifier>();
identifiers.add(new IdentifierMapEntry(ID, "myID1"));
identifiers.add(new IdentifierMapEntry(UUID, "myUUID"));
identifiers.add(new IdentifierMapEntry(ID, "myID2"));
@@ -223,7 +223,7 @@ public strictfp class IdentifierMapAdapt
assertSame(UUID, assertSerializedEquals(UUID));
assertSame(HREF, assertSerializedEquals(HREF));
- final List<Identifier> identifiers = new ArrayList<>();
+ final List<Identifier> identifiers = new ArrayList<Identifier>();
final Map<Citation,String> map = create(identifiers);
identifiers.add(new IdentifierMapEntry(ID, "myID"));
identifiers.add(new IdentifierMapEntry(UUID, "myUUID"));
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCasesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCasesTest.java?rev=1398733&r1=1398730&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCasesTest.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCasesTest.java Tue Oct 16 11:12:14 2012
@@ -92,7 +92,7 @@ public final strictfp class IdentifierMa
*/
@Test
public void testSpecialCases() {
- final List<Identifier> identifiers = new ArrayList<>();
+ final List<Identifier> identifiers = new ArrayList<Identifier>();
final IdentifierMap map = create(identifiers);
map.put(IdentifierSpace.HREF, "myHREF");
assertEquals("myHREF", map.get(IdentifierSpace.HREF));
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java Tue Oct 16 11:12:14 2012
@@ -19,6 +19,7 @@ package org.apache.sis.test;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import java.util.Iterator;
import java.util.concurrent.Callable;
import java.lang.reflect.UndeclaredThrowableException;
import java.text.DateFormat;
@@ -96,6 +97,23 @@ public final strictfp class TestUtilitie
}
/**
+ * Returns the single element from the given collection. If the given collection is null
+ * or does not contains exactly one element, then an {@link AssertionError} is thrown.
+ *
+ * @param <E> The type of collection elements.
+ * @param collection The collection from which to get the singleton.
+ * @return The singleton element from the collection.
+ */
+ public static <E> E getSingleton(final Iterable<? extends E> collection) {
+ assertNotNull("Null collection.", collection);
+ final Iterator<? extends E> it = collection.iterator();
+ assertTrue("The collection is empty.", it.hasNext());
+ final E element = it.next();
+ assertFalse("The collection has more than one element.", it.hasNext());
+ return element;
+ }
+
+ /**
* If the given failure is not null, re-thrown it as an {@link Error} or
* {@link RuntimeException}. Otherwise do nothing.
*
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1398733&r1=1398732&r2=1398733&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java Tue Oct 16 11:12:14 2012
@@ -49,7 +49,9 @@ import org.junit.runners.Suite;
org.apache.sis.util.collection.WeakHashSetTest.class,
org.apache.sis.util.collection.WeakValueHashMapTest.class,
org.apache.sis.util.collection.CacheTest.class,
- org.apache.sis.xml.XLinkTest.class
+ org.apache.sis.xml.XLinkTest.class,
+ org.apache.sis.internal.jaxb.IdentifierMapAdapterTest.class,
+ org.apache.sis.internal.jaxb.IdentifierMapWithSpecialCasesTest.class
})
public final strictfp class UtilityTestSuite extends TestSuite {
}