sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1518549 - in /sis/branches/JDK7: application/sis-console/src/test/java/org/apache/sis/console/ core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-...
Date Thu, 29 Aug 2013 09:24:47 GMT
Author: desruisseaux
Date: Thu Aug 29 09:24:46 2013
New Revision: 1518549

URL: http://svn.apache.org/r1518549
Log:
Documentation fixes.

Modified:
    sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties

Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -54,7 +54,7 @@ public final strictfp class HelpSCTest e
 
     /**
      * Tests the sub-command with the {@code --help} option.
-     * Shall contains only a subset of {@link #testDefault()}.
+     * Shall contain only a subset of {@link #testDefault()}.
      *
      * @throws InvalidOptionException Should never happen.
      */

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -46,7 +46,7 @@ final class Packer implements FilenameFi
 
     /**
      * The Maven target directory. Shall contain the {@code "binaries"} sub-directory,
-     * which shall contains all JAR files collected by {@code sis-build-helper} plugin.
+     * which shall contain all JAR files collected by {@code sis-build-helper} plugin.
      */
     private final File targetDirectory;
 

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -24,7 +24,7 @@ import com.sun.tools.doclets.formats.htm
 
 /**
  * The <code>@scmUrl</code> tag for inserting a URL to a file in the source code
repository.
- * This tag shall contains a keyword, for example <code>{@scmUrl gmd-data}</code>.
+ * This tag shall contain a keyword, for example <code>{@scmUrl gmd-data}</code>.
  * Valid keywords are:
  *
  * <table class="sis>

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -201,9 +201,9 @@ public class ImmutableIdentifier impleme
 
     /**
      * Constructs an identifier from a set of properties. Keys are strings from the table
below.
-     * Keys are case-insensitive, and leading and trailing spaces are ignored. The map given
in
-     * argument shall contains at least a {@code "code"} property. Other properties listed
in
-     * the table below are optional.
+     * The map given in argument shall contain an entry at least for the
+     * {@value org.opengis.metadata.Identifier#CODE_KEY} key.
+     * Other properties listed in the table below are optional.
      *
      * <table class="sis">
      *   <tr>

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -425,7 +425,7 @@ public final strictfp class PropertyAcce
         assertInstanceOf("alternateTitles", Collection.class, oldValue);
         assertTrue("alternateTitles", ((Collection<?>) oldValue).isEmpty());
 
-        // Insert the second value. Old collection shall contains the first value.
+        // Insert the second value. Old collection shall contain the first value.
         oldValue = accessor.set(index, instance, conversion ? text2 : title2, RETURN_PREVIOUS);
         assertInstanceOf("alternateTitles", Collection.class, oldValue);
         oldValue = getSingleton((Collection<?>) oldValue);

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -137,7 +137,7 @@ public class AbstractIdentifiedObject ex
 
     /**
      * Constructs an object from a set of properties. Keys are strings from the table below.
-     * The map given in argument shall contains an entry at least for the
+     * The map given in argument shall contain an entry at least for the
      * {@value org.opengis.referencing.IdentifiedObject#NAME_KEY} key.
      * Other properties listed in the table below are optional.
      *

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -18,7 +18,7 @@ package org.apache.sis.referencing;
 
 import java.util.Map;
 import java.util.List;
-import java.util.Objects;
+import java.util.Locale;
 import org.opengis.util.NameSpace;
 import org.opengis.util.LocalName;
 import org.opengis.util.ScopedName;
@@ -35,6 +35,9 @@ import org.apache.sis.metadata.iso.Immut
 import org.apache.sis.util.collection.WeakValueHashMap;
 import org.apache.sis.util.Immutable;
 
+// Related to JDK7
+import java.util.Objects;
+
 
 /**
  * An identification of a CRS object which is both an {@link Identifier} and a {@link GenericName}.
@@ -112,17 +115,14 @@ public class NamedIdentifier extends Imm
      * If more control are wanted (for example adding remarks), use the
      * {@linkplain #NamedIdentifier(Map) constructor with a properties map}.
      *
-     * @param authority
-     *          The authority (e.g. {@link Citations#OGC} or {@link Citations#EPSG}),
-     *          or {@code null} if not available.
-     * @param code
-     *          The code. The {@link InternationalString#toString(Locale) code.toString(null)}
return
-     *          value will be used for the {@link #getCode() code} property, and the complete
international
-     *          string will be used for the {@link #getName() name} property.
+     * @param authority The authority (e.g. {@link Citations#OGC} or {@link Citations#EPSG}),
+     *                  or {@code null} if not available.
+     * @param code      The code. The {@code code.toString(Locale.ROOT)} return value will
be used for the
+     *                  {@link #getCode() code} property, and the complete international
string will be used
+     *                  for the {@link #getName() name} property.
      */
     public NamedIdentifier(final Citation authority, final InternationalString code) {
-        // The "null" locale argument is required for getting the unlocalized version.
-        this(authority, code.toString(null));
+        this(authority, code.toString(Locale.ROOT));
         name = createName(authority, code);
     }
 
@@ -206,7 +206,7 @@ public class NamedIdentifier extends Imm
 
     /**
      * The last element in the sequence of {@linkplain #getParsedNames() parsed names}.
-     * By default, this is the same value than {@link #getCode()} provided as a local name.
+     * By default, this is the same value than the {@linkplain #getCode() code} provided
as a local name.
      *
      * @return The last element in the list of {@linkplain #getParsedNames() parsed names}.
      *
@@ -219,7 +219,7 @@ public class NamedIdentifier extends Imm
 
     /**
      * Returns the first element in the sequence of {@linkplain #getParsedNames() parsed
names}.
-     * By default, this is the same value than {@link #getCodeSpace()} provided as a local
name.
+     * By default, this is the same value than the {@linkplain #getCodeSpace() code space}
provided as a local name.
      *
      * @return The first element in the list of {@linkplain #getParsedNames() parsed names}.
      *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -140,7 +140,7 @@ public enum FunctionProperty {
     ORDER_REVERSING;
 
     /**
-     * Bijective functions shall contains all the value in this set.
+     * Bijective functions shall contain all the value in this set.
      *
      * @see #isBijective(Set)
      */

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java?rev=1518549&r1=1518548&r2=1518549&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
[UTF-8] Thu Aug 29 09:24:46 2013
@@ -222,10 +222,10 @@ public class DefaultNameFactory extends 
      * array is 1, or an instance of {@link DefaultScopedName} if the length of the array
is 2
      * or more.
      *
-     * @param  scope The {@linkplain AbstractName#scope() scope} of the generic name to
-     *         be created, or {@code null} for a global namespace.
-     * @param  parsedNames The local names as an array of {@link String} or {@link InternationalString}
-     *         instances. This array shall contains at least one element.
+     * @param  scope The {@linkplain AbstractName#scope() scope} of the generic name to be
created,
+     *         or {@code null} for a global namespace.
+     * @param  parsedNames The local names as an array of {@link String} or {@link InternationalString}
instances.
+     *         This array shall contain at least one element.
      * @return The generic name for the given parsed names.
      * @throws NullArgumentException If the given array is empty.
      */

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=1518549&r1=1518548&r2=1518549&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] Thu Aug 29 09:24:46 2013
@@ -154,7 +154,7 @@ public final class Errors extends Indexe
         public static final int EmptyArgument_1 = 1;
 
         /**
-         * The dictionary shall contains at least one entry.
+         * The dictionary shall contain at least one entry.
          */
         public static final int EmptyDictionary = 54;
 

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=1518549&r1=1518548&r2=1518549&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] Thu Aug 29 09:24:46 2013
@@ -42,7 +42,7 @@ DuplicatedOption_1              = Option
 DuplicatedIdentifier_1          = Identifier \u201c{0}\u201d is duplicated.
 ElementAlreadyPresent_1         = Element \u201c{0}\u201d is already present.
 EmptyArgument_1                 = Argument \u2018{0}\u2019 shall not be empty.
-EmptyDictionary                 = The dictionary shall contains at least one entry.
+EmptyDictionary                 = The dictionary shall contain at least one entry.
 EmptyEnvelope2D                 = Envelope must be at least two-dimensional and non-empty.
 EmptyProperty_1                 = Property named \u201c{0}\u201d shall not be empty.
 ExcessiveArgumentSize_3         = Argument \u2018{0}\u2019 shall not contain more than {1}
elements. A number of {2} is excessive.



Mime
View raw message