sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1464085 [2/2] - in /sis/trunk: ./ sis-metadata/src/main/java/org/apache/sis/internal/geoapi/ sis-metadata/src/main/java/org/apache/sis/internal/geoapi/temporal/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/ sis-metadata...
Date Wed, 03 Apr 2013 16:00:30 GMT
Modified: sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] Wed Apr  3 16:00:28 2013
@@ -47,7 +47,6 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static java.util.Collections.singleton;
@@ -141,26 +140,27 @@ public final strictfp class PropertyAcce
     }
 
     /**
-     * Tests the constructor. This test may need to be updated if a future GeoAPI release
-     * modifies the {@link Citation} interface.
+     * Tests the constructor with the {@link DefaultCitation} implementation.
+     * The order of properties shall be the order declared in the {@code XmlType.propOrder}
annotation.
+     * This test may need to be updated if a future GeoAPI release modifies the {@link Citation}
interface.
      */
     @Test
     public void testConstructor() {
         assertMappingEquals(createPropertyAccessor(),
         //……Declaring type………Method………………………………………………………………JavaBeans………………………………………………UML
identifier……………………………Sentence………………………………………………………Type………………………………………………………………
-/*Required*/Citation.class, "getDates",                   "dates",                   "date",
                 "Dates",                      CitationDate[].class,
             Citation.class, "getTitle",                   "title",                   "title",
                "Title",                      InternationalString.class,
-/*Optional*/Citation.class, "getAlternateTitles",         "alternateTitles",         "alternateTitle",
       "Alternate titles",           InternationalString[].class,
-            Citation.class, "getCitedResponsibleParties", "citedResponsibleParties", "citedResponsibleParty",
"Cited responsible parties",  ResponsibleParty[].class,
-            Citation.class, "getCollectiveTitle",         "collectiveTitle",         "collectiveTitle",
      "Collective title",           InternationalString.class,
+            Citation.class, "getAlternateTitles",         "alternateTitles",         "alternateTitle",
       "Alternate titles",           InternationalString[].class,
+            Citation.class, "getDates",                   "dates",                   "date",
                 "Dates",                      CitationDate[].class,
             Citation.class, "getEdition",                 "edition",                 "edition",
              "Edition",                    InternationalString.class,
             Citation.class, "getEditionDate",             "editionDate",             "editionDate",
          "Edition date",               Date.class,
             Citation.class, "getIdentifiers",             "identifiers",             "identifier",
           "Identifiers",                Identifier[].class,
-            Citation.class, "getISBN",                    "ISBN",                    "ISBN",
                 "ISBN",                       String.class,
-            Citation.class, "getISSN",                    "ISSN",                    "ISSN",
                 "ISSN",                       String.class,
-            Citation.class, "getOtherCitationDetails",    "otherCitationDetails",    "otherCitationDetails",
 "Other citation details",     InternationalString.class,
+            Citation.class, "getCitedResponsibleParties", "citedResponsibleParties", "citedResponsibleParty",
"Cited responsible parties",  ResponsibleParty[].class,
             Citation.class, "getPresentationForms",       "presentationForms",       "presentationForm",
     "Presentation forms",         PresentationForm[].class,
-            Citation.class, "getSeries",                  "series",                  "series",
               "Series",                     Series.class);
+            Citation.class, "getSeries",                  "series",                  "series",
               "Series",                     Series.class,
+            Citation.class, "getOtherCitationDetails",    "otherCitationDetails",    "otherCitationDetails",
 "Other citation details",     InternationalString.class,
+            Citation.class, "getCollectiveTitle",         "collectiveTitle",         "collectiveTitle",
      "Collective title",           InternationalString.class,
+            Citation.class, "getISBN",                    "ISBN",                    "ISBN",
                 "ISBN",                       String.class,
+            Citation.class, "getISSN",                    "ISSN",                    "ISSN",
                 "ISSN",                       String.class);
     }
 
     /**

Modified: sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] Wed Apr  3 16:00:28 2013
@@ -29,6 +29,7 @@ import org.junit.runners.Suite;
  * @module
  */
 @Suite.SuiteClasses({
+    org.apache.sis.internal.metadata.MetadataUtilitiesTest.class,
     org.apache.sis.metadata.PropertyDescriptorTest.class,
     org.apache.sis.metadata.PropertyAccessorTest.class
 })

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
[UTF-8] Wed Apr  3 16:00:28 2013
@@ -305,7 +305,7 @@ public class ConverterRegistry {
                      */
                     continue;
                 }
-                if (sourceClass == String.class && Iterable.class.isAssignableFrom(targetClass))
{
+                if (sourceClass == String.class && Iterable.class.isAssignableFrom(i))
{
                     /*
                      * Exclude the case of String to Iterables (including collections), because
                      * there is too many ways to perform such conversion. For example we
do not

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/MarshalContext.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/MarshalContext.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/MarshalContext.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/MarshalContext.java [UTF-8]
Wed Apr  3 16:00:28 2013
@@ -219,6 +219,23 @@ public final class MarshalContext extend
     }
 
     /**
+     * Returns {@code true} if XML marshalling is under progress.
+     * This convenience method is implemented by:
+     *
+     * {@preformat java
+     *     return isFlagSet(current(), MARSHALING);
+     * }
+     *
+     * Callers should use the {@link #isFlagSet(MarshalContext, int)} method instead if the
+     * {@code MarshalContext} instance is known, for avoiding a call to {@link #current()}.
+     * 
+     * @return {@code true} if XML marshalling is under progress.
+     */
+    public static boolean isMarshaling() {
+        return isFlagSet(current(), MARSHALING);
+    }
+
+    /**
      * Returns {@code true} if the given flag is set.
      *
      * @param  context The current context, or {@code null} if none.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
[UTF-8] Wed Apr  3 16:00:28 2013
@@ -37,8 +37,8 @@ import org.apache.sis.xml.IdentifierSpac
  *
  * <ul>
  *   <li>The XML attributes declared by ISO 19139 specification in the {@code gco:PropertyType}
- *       element: {@code gml:id}, {@code gco:uuid} and {@code xlink:href}. Those attributes
are not
- *       part of the ISO 19115 specification. Those authorities are declared in the
+ *       element: {@code gml:id}, {@code gco:uuid} and {@code xlink:href}. Those attributes
are
+ *       not part of the ISO 19115 specification. Those authorities are declared in the
  *       {@link IdentifierSpace} interfaces.</li>
  *
  *   <li>ISO 19115 attributes that we choose, for the SIS implementation, to merge
with

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Static.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Static.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8] Wed Apr  3
16:00:28 2013
@@ -47,6 +47,10 @@ package org.apache.sis.util;
  * <tr><td>{@link ArraysExt}</td>
  *     <td>Insert or remove elements in the middle of arrays.</td></tr>
  *
+ * <tr><th colspan="2" class="hsep">OGC/ISO objects (metadata, referencing, geometries)</th></tr>
+ * <tr><td>{@link org.apache.sis.metadata.iso.extent.Extents}</td>
+ *     <td>Extract information from {@link org.opengis.metadata.extent.Extent} objects.</td></tr>
+ *
  * <tr><th colspan="2" class="hsep">Input / Output (including CRS, XML, images)</th></tr>
  * <tr><td>{@link org.apache.sis.io.IO}</td>
  *     <td>Methods working on {@link Appendable} instances.</td></tr>
@@ -74,9 +78,8 @@ package org.apache.sis.util;
  */
 public class Static {
     /**
-     * Do not allow instantiation. This construction is defined only in order to allow
-     * subclassing. Subclasses shall declare their own private constructor in order to
-     * prevent instantiation.
+     * For subclasses only.
+     * Subclasses shall declare a private constructor for preventing instantiation.
      */
     protected Static() {
     }

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
[UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
[UTF-8] Wed Apr  3 16:00:28 2013
@@ -512,7 +512,7 @@ public class DefaultTreeTable implements
 
         /**
          * Adds a new child in the {@linkplain #getChildren() children list}.
-         * The default implementation delegates to {@link Node#Node(Node)},
+         * The default implementation delegates to {@code Node(Node)} constructor,
          * which has the following implications:
          *
          * <ul>

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8]
Wed Apr  3 16:00:28 2013
@@ -63,6 +63,12 @@ public final class Errors extends Indexe
         }
 
         /**
+         * No element can be added to this set because properties ‘{0}’ and ‘{1}’
are mutually
+         * exclusive.
+         */
+        public static final int CanNotAddToExclusiveSet_2 = 87;
+
+        /**
          * Can not compute the derivative.
          */
         public static final int CanNotComputeDerivative = 44;
@@ -210,6 +216,11 @@ public final class Errors extends Indexe
         public static final int IllegalRange_2 = 11;
 
         /**
+         * Property “{0}” has an incompatible value.
+         */
+        public static final int IncompatiblePropertyValue_1 = 86;
+
+        /**
          * Units “{0}” and “{1}” are incompatible.
          */
         public static final int IncompatibleUnits_2 = 67;
@@ -270,6 +281,16 @@ public final class Errors extends Indexe
         public static final int MismatchedDimension_3 = 58;
 
         /**
+         * This operation requires the “{0}” module.
+         */
+        public static final int MissingRequiredModule_1 = 84;
+
+        /**
+         * Missing value for property “{0}”.
+         */
+        public static final int MissingValueForProperty_1 = 85;
+
+        /**
          * Missing value in the “{0}” column.
          */
         public static final int MissingValueInColumn_1 = 77;

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1]
Wed Apr  3 16:00:28 2013
@@ -24,6 +24,7 @@
 # programmatic parameters do not have to be last in the formatted text, since each localized
message
 # can reorder the parameters as they want.
 #
+CanNotAddToExclusiveSet_2       = No element can be added to this set because properties
\u2018{0}\u2019 and \u2018{1}\u2019 are mutually exclusive.
 CanNotConvertFromType_2         = Can not convert from type \u2018{0}\u2019 to type \u2018{1}\u2019.
 CanNotConvertValue_2            = Can not convert value \u201c{0}\u201d to type \u2018{1}\u2019.
 CanNotComputeDerivative         = Can not compute the derivative.
@@ -52,6 +53,7 @@ IllegalLanguageCode_1           = The \u
 IllegalOrdinateRange_3          = The [{0} \u2026 {1}] range of ordinate values is not valid
for the \u201c{2}\u201d axis.
 IllegalPropertyClass_2          = Property \u2018{0}\u2019 can be associated to an instance
of \u2018{1}\u2019.
 IllegalRange_2                  = Range [{0} \u2026 {1}] is not valid.
+IncompatiblePropertyValue_1     = Property \u201c{0}\u201d has an incompatible value.
 IncompatibleUnits_2             = Units \u201c{0}\u201d and \u201c{1}\u201d are incompatible.
 InconsistentAttribute_2         = Value \u201c{1}\u201d of attribute \u2018{0}\u2019 is inconsistent
with other attributes.
 InconsistentTableColumns        = Inconsistent table columns.
@@ -66,6 +68,8 @@ MismatchedCRS                   = The co
 MismatchedDimension_2           = Mismatched object dimension: {0}D and {1}D.
 MismatchedDimension_3           = Argument \u2018{0}\u2019 has {2} dimension{2,choice,1#|2#s},
while {1} was expected.
 MissingValueInColumn_1          = Missing value in the \u201c{0}\u201d column.
+MissingRequiredModule_1         = This operation requires the \u201c{0}\u201d module.
+MissingValueForProperty_1       = Missing value for property \u201c{0}\u201d.
 NegativeArgument_2              = Argument \u2018{0}\u2019 shall not be negative. The given
value was {1}.
 NodeChildOfItself_1             = Node \u201c{0}\u201d can not be a child of itself.
 NodeHasAnotherParent_1          = Node \u201c{0}\u201d already has another parent.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] Wed Apr  3 16:00:28 2013
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+CanNotAddToExclusiveSet_2       = Aucun \u00e9l\u00e9ment ne peut \u00eatre ajout\u00e9 \u00e0
cet ensemble car les propri\u00e9t\u00e9s \u2018{0}\u2019 et \u2018{1}\u2019 sont mutuellement
exclusives.
 CanNotConvertFromType_2         = Ne peut pas convertir du type \u2018{0}\u2019 vers le type
\u2018{1}\u2019.
 CanNotConvertValue_2            = La valeur \u201c{0}\u201d ne peut pas \u00eatre convertie
vers le type \u2018{1}\u2019.
 CanNotComputeDerivative         = La d\u00e9riv\u00e9 ne peut pas \u00eatre calcul\u00e9e.
@@ -42,6 +43,7 @@ IllegalLanguageCode_1           = Le cod
 IllegalOrdinateRange_3          = La plage de valeurs de coordonn\u00e9es [{1} \u2026 {2}]
n\u2019est pas valide pour l\u2019axe \u201c{0}\u201d.
 IllegalPropertyClass_2          = La propri\u00e9t\u00e9 \u2018{0}\u2019 ne peut pas \u00eatre
associ\u00e9e \u00e0 une valeur de type \u2018{1}\u2019.
 IllegalRange_2                  = La plage [{0} \u2026 {1}] n\u2019est pas valide.
+IncompatiblePropertyValue_1     = La valeur de la propri\u00e9t\u00e9 \u201c{0}\u201d n\u2019est
pas compatible.
 IncompatibleUnits_2             = Les unit\u00e9s \u201c{0}\u201d et \u201c{1}\u201d ne sont
pas compatibles.
 InconsistentAttribute_2         = La valeur \u201c{1}\u201d de l\u2019attribut \u2018{0}\u2019
n\u2019est pas coh\u00e9rente avec celles des autres attributs.
 InconsistentTableColumns        = Les colonnes des tables ne sont pas coh\u00e9rentes.
@@ -55,6 +57,8 @@ MandatoryAttribute_2            = L\u201
 MismatchedCRS                   = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es
doit \u00eatre le m\u00eame pour tous les objets.
 MismatchedDimension_2           = Les dimensions des objets ({0}D et {1}D) ne concordent
pas.
 MismatchedDimension_3           = L\u2019argument \u2018{0}\u2019 a {2} dimension{2,choice,1#|2#s},
alors qu\u2019on en attendait {1}.
+MissingRequiredModule_1         = Cette op\u00e9ration requiert le module \u201c{0}\u201d.
+MissingValueForProperty_1       = Aucune valeur n\u2019a \u00e9t\u00e9 d\u00e9finie pour
la propri\u00e9t\u00e9 \u201c{0}\u201d.
 MissingValueInColumn_1          = Il manque une valeur dans la colonne \u201c{0}\u201d.
 NegativeArgument_2              = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre n\u00e9gatif.
La valeur donn\u00e9e \u00e9tait {1}.
 NodeChildOfItself_1             = Le n\u0153ud \u201c{0}\u201d ne peut pas \u00eatre un enfant
de lui-m\u00eame.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8]
Wed Apr  3 16:00:28 2013
@@ -60,6 +60,11 @@ public final class Messages extends Inde
         public static final int ChangedContainerCapacity_2 = 0;
 
         /**
+         * Text were discarded for some locales.
+         */
+        public static final int LocalesDiscarded = 2;
+
+        /**
          * Unavailable content.
          */
         public static final int UnavailableContent = 1;

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
[ISO-8859-1] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
[ISO-8859-1] Wed Apr  3 16:00:28 2013
@@ -15,4 +15,5 @@
 # limitations under the License.
 #
 ChangedContainerCapacity_2      = Changed the container capacity from {0} to {1} elements.
+LocalesDiscarded                = Text were discarded for some locales.
 UnavailableContent              = Unavailable content.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
[ISO-8859-1] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
[ISO-8859-1] Wed Apr  3 16:00:28 2013
@@ -15,4 +15,5 @@
 # limitations under the License.
 #
 ChangedContainerCapacity_2      = Changement de la capacit\u00e9 du conteneur de {0} vers
{1} \u00e9l\u00e9ments.
+LocalesDiscarded                = Des textes ont \u00e9t\u00e9 ignor\u00e9s pour certaines
langues.
 UnavailableContent              = Contenu non-disponible.

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8]
(original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8]
Wed Apr  3 16:00:28 2013
@@ -125,6 +125,11 @@ public final class Vocabulary extends In
         public static final int JavaHome = 30;
 
         /**
+         * Latitude
+         */
+        public static final int Latitude = 40;
+
+        /**
          * Libraries
          */
         public static final int Libraries = 35;
@@ -145,6 +150,11 @@ public final class Vocabulary extends In
         public static final int Localization = 19;
 
         /**
+         * Longitude
+         */
+        public static final int Longitude = 41;
+
+        /**
          * Maximum value
          */
         public static final int MaximumValue = 5;

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
[ISO-8859-1] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties
[ISO-8859-1] Wed Apr  3 16:00:28 2013
@@ -28,6 +28,8 @@ Destination        = Destination
 Directory          = Directory
 JavaExtensions     = Java extensions
 JavaHome           = Java home directory
+Latitude           = Latitude
+Longitude          = Longitude
 Libraries          = Libraries
 LocalConfiguration = Local configuration
 Locale             = Locale

Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
[ISO-8859-1] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
[ISO-8859-1] Wed Apr  3 16:00:28 2013
@@ -28,6 +28,8 @@ Destination        = Destination
 Directory          = R\u00e9pertoire
 JavaExtensions     = Extensions du Java
 JavaHome           = R\u00e9pertoire du Java
+Latitude           = Latitude
+Longitude          = Longitude
 Libraries          = Biblioth\u00e8ques
 LocalConfiguration = Configuration locale
 Locale             = Locale

Modified: sis/trunk/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java?rev=1464085&r1=1464084&r2=1464085&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java [UTF-8] Wed Apr
 3 16:00:28 2013
@@ -123,8 +123,8 @@ public final strictfp class ClassesTest 
     private static abstract class T3 extends T2 implements Transformation {}
 
     /**
-     * Tests {@link Classes#findCommonClass(Collection)}
-     * and {@link Classes#findSpecializedClass(Collection)}.
+     * Tests {@link Classes#findCommonClass(Iterable)}
+     * and {@link Classes#findSpecializedClass(Iterable)}.
      */
     @Test
     public void testFindCommonParent() {



Mime
View raw message