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 07:20:00 UTC
svn commit: r1398647 - in /sis/branches/JDK7: ide-project/NetBeans/nbproject/
sis-utility/src/main/java/org/apache/sis/util/type/
sis-utility/src/main/java/org/apache/sis/xml/
sis-utility/src/test/java/org/apache/sis/test/
Author: desruisseaux
Date: Tue Oct 16 05:19:59 2012
New Revision: 1398647
URL: http://svn.apache.org/viewvc?rev=1398647&view=rev
Log:
Minor documentation update: "name space" --> "namespace".
Added that word to the NetBeans project dictionary.
Modified:
sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1398647&r1=1398646&r2=1398647&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties Tue Oct 16 05:19:59 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=faf8c177
+nbproject/build-impl.xml.data.CRC32=47249144
nbproject/build-impl.xml.script.CRC32=61cb3eb8
nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1398647&r1=1398646&r2=1398647&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Tue Oct 16 05:19:59 2012
@@ -20,6 +20,14 @@
</data>
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
<word>bitmask</word>
+ <word>deserialization</word>
+ <word>deserialized</word>
+ <word>initially</word>
+ <word>marshallable</word>
+ <word>marshalled</word>
+ <word>marshalling</word>
+ <word>namespace</word>
+ <word>namespaces</word>
<word>Unicode</word>
</spellchecker-wordlist>
</configuration>
Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java?rev=1398647&r1=1398646&r2=1398647&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java Tue Oct 16 05:19:59 2012
@@ -30,7 +30,7 @@
* </li>
* <li>Implementations of {@link org.opengis.util.GenericName}:
* <ul>
- * <li>{@link org.apache.sis.util.type.DefaultLocalName} for identifier within a name space.</li>
+ * <li>{@link org.apache.sis.util.type.DefaultLocalName} for identifier within a namespace.</li>
* <li>{@link org.apache.sis.util.type.DefaultScopedName} for a composite of a <cite>head</cite>
* name and a <cite>tail</cite> name.</li>
* </ul>
Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java?rev=1398647&r1=1398646&r2=1398647&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java Tue Oct 16 05:19:59 2012
@@ -23,7 +23,7 @@ import org.apache.sis.internal.jaxb.NonM
/**
- * Some identifier name spaces that are handled in a special way. The identifier name spaces are
+ * Some identifier namespaces that are handled in a special way. The identifier namespaces are
* usually defined as authorities in the {@link org.apache.sis.metadata.iso.citation.Citations}
* class. However a few identifiers defined in the {@code gco:ObjectIdentification} XML attribute
* group are handled in a special way. For example identifiers associated to the {@link #HREF}
@@ -107,7 +107,7 @@ public interface IdentifierSpace<T> exte
* {@code "gco:uuid"} or {@code "xlink:href"}.</p></li>
*
* <li><p>For the constants defined in the {@link org.apache.sis.metadata.iso.citation.Citations}
- * class, this is the identifier name space. They are usually not XML attribute name because those
+ * class, this is the identifier namespace. They are usually not XML attribute name because those
* identifiers are marshalled as {@code <MD_Identifier>} XML elements rather than attributes.</p></li>
* </ul>
*
Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java?rev=1398647&r1=1398646&r2=1398647&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java Tue Oct 16 05:19:59 2012
@@ -25,7 +25,7 @@ import org.apache.sis.util.ArgumentCheck
/**
- * List some name spaces URLs used by JAXB when (un)marshalling.
+ * List some namespaces URLs used by JAXB when (un)marshalling.
*
* @author Cédric Briançon (Geomatys)
* @author Quentin Boileau (Geomatys)
@@ -161,13 +161,13 @@ public final class Namespaces extends St
}
/**
- * Returns the preferred prefix for the given name space URI.
+ * Returns the preferred prefix for the given namespace URI.
*
- * @param namespace The name space URI for which the prefix needs to be found.
+ * @param namespace The namespace URI for which the prefix needs to be found.
* Can not be {@code null}.
* @param defaultValue The default prefix to returned if the given {@code namespace}
* is not recognized, or {@code null}.
- * @return The prefix inferred from the name space URI, or {@code null} if the given name space
+ * @return The prefix inferred from the namespace URI, or {@code null} if the given namespace
* is unrecognized and the {@code defaultValue} is null.
*/
public static String getPreferredPrefix(String namespace, final String defaultValue) {
Modified: sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java?rev=1398647&r1=1398646&r2=1398647&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java (original)
+++ sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java Tue Oct 16 05:19:59 2012
@@ -87,10 +87,10 @@ public strictfp class XMLComparator {
/**
* The fully-qualified name of attributes to ignore in comparisons. The name shall be in
- * the form {@code "namespace:name"}, or only {@code "name"} if there is no name space.
- * In order to ignore everything in a name space, use {@code "namespace:*"}.
+ * the form {@code "namespace:name"}, or only {@code "name"} if there is no namespace.
+ * In order to ignore everything in a namespace, use {@code "namespace:*"}.
* <p>
- * For example in order to ignore the name space, type and schema location declaration,
+ * For example in order to ignore the namespace, type and schema location declaration,
* the following strings can be added in this set:
*
* {@preformat text
@@ -105,8 +105,8 @@ public strictfp class XMLComparator {
/**
* The fully-qualified name of nodes to ignore in comparisons. The name shall be in the form
- * {@code "namespace:name"}, or only {@code "name"} if there is no name space. In order to
- * ignore everything in a name space, use {@code "namespace:*"}.
+ * {@code "namespace:name"}, or only {@code "name"} if there is no namespace. In order to
+ * ignore everything in a namespace, use {@code "namespace:*"}.
* <p>
* This set provides a way to ignore a node of the given name <em>and all its children</em>.
* In order to ignore a node but still compare its children, override the
@@ -361,10 +361,10 @@ public strictfp class XMLComparator {
}
/**
- * Compares the names and name spaces of the given node.
+ * Compares the names and namespaces of the given node.
* Subclasses can override this method if they need a different comparison.
*
- * @param expected The node having the expected name and name space.
+ * @param expected The node having the expected name and namespace.
* @param actual The node to compare.
*/
protected void compareNames(final Node expected, final Node actual) {
@@ -413,7 +413,7 @@ public strictfp class XMLComparator {
* Returns {@code true} if the given node or attribute shall be ignored.
*
* @param ignored The set of node or attribute fully qualified names to ignore.
- * @param ns The node or attribute name space, or {@code null}.
+ * @param ns The node or attribute namespace, or {@code null}.
* @param name The node or attribute name.
* @return {@coce true} if the node or attribute shall be ignored.
*/
@@ -490,7 +490,7 @@ public strictfp class XMLComparator {
* Verifies that the given property (text or number) are equal, ignoring spaces. If they are
* not equal, then an error message is formatted using the given property name and nodes.
*
- * @param propertyName The name of the property being compared (typically "name", "name space", etc.).
+ * @param propertyName The name of the property being compared (typically "name", "namespace", etc.).
* @param expected The property value from the expected node to compare.
* @param actual The property value to compare to the expected one.
* @param expectedNode The node from which the expected property has been fetched.