sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1640308 [2/2] - in /sis/branches/JDK6: ./ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feature/src/test/java/org/apache/sis/feature/ core/sis-feature/src/test/java/org/apache/sis/test/suite/ core/sis-metadata/src/main/ja...
Date Tue, 18 Nov 2014 10:58:49 GMT
Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1640308&r1=1640307&r2=1640308&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] Tue Nov 18 10:58:48 2014
@@ -81,6 +81,11 @@ public final class Errors extends Indexe
         public static final short CanNotAddToExclusiveSet_2 = 0;
 
         /**
+         * Can not assign “{1}” to “{0}”.
+         */
+        public static final short CanNotAssign_2 = 167;
+
+        /**
          * Can not compute the derivative.
          */
         public static final short CanNotComputeDerivative = 1;
@@ -176,7 +181,7 @@ public final class Errors extends Indexe
         public static final short DuplicatedElement_1 = 16;
 
         /**
-         * Identifier “{0}” is duplicated.
+         * Name or identifier “{0}” is used more than once.
          */
         public static final short DuplicatedIdentifier_1 = 17;
 
@@ -679,7 +684,7 @@ public final class Errors extends Indexe
         public static final short ParameterNotFound_2 = 147;
 
         /**
-         * Property “{1}” is already exists in “{0}”.
+         * Property “{1}” already exists in “{0}”.
          */
         public static final short PropertyAlreadyExists_2 = 156;
 

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1640308&r1=1640307&r2=1640308&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] Tue Nov 18 10:58:48 2014
@@ -27,6 +27,7 @@
 AbstractType_1                    = Type \u2018{0}\u2019 is abstract.
 AmbiguousName_3                   = Name \u201c{2}\u201d is ambiguous because it can be understood
as either \u201c{0}\u201d or \u201c{1}\u201d.
 CanNotAddToExclusiveSet_2         = No element can be added to this set because properties
\u2018{0}\u2019 and \u2018{1}\u2019 are mutually exclusive.
+CanNotAssign_2                    = Can not assign \u201c{1}\u201d to \u201c{0}\u201d.
 CanNotConcatenateTransforms_2     = Can not concatenate transforms \u201c{0}\u201d and \u201c{1}\u201d.
 CanNotConnectTo_1                 = Can not connect to \u201c{0}\u201d.
 CanNotConvertFromType_2           = Can not convert from type \u2018{0}\u2019 to type \u2018{1}\u2019.
@@ -46,7 +47,7 @@ ColinearAxisDirections_2          = Axis
 DeadThread_1                      = Thread \u201c{0}\u201d is dead.
 DirectoryNotExpected_1            = The \u201c{0}\u201d file points to a directory instead
of a regular file.
 DuplicatedElement_1               = Element \u201c{0}\u201d is duplicated.
-DuplicatedIdentifier_1            = Identifier \u201c{0}\u201d is duplicated.
+DuplicatedIdentifier_1            = Name or identifier \u201c{0}\u201d is used more than
once.
 DuplicatedOption_1                = Option \u201c{0}\u201d is duplicated.
 DuplicatedParameterName_4         = Name or alias for parameter \u201c{0}\u201d at index
{1} conflict with name \u201c{2}\u201d at index {3}.
 ElementAlreadyPresent_1           = Element \u201c{0}\u201d is already present.
@@ -146,7 +147,7 @@ NullCollectionElement_1           = \u20
 NullMapKey                        = Null key is not allowed in this dictionary.
 NullMapValue                      = Null values are not allowed in this dictionary.
 OddArrayLength_1                  = Array length is {0}, while we expected an even length.
-PropertyAlreadyExists_2           = Property \u201c{1}\u201d is already exists in \u201c{0}\u201d.
+PropertyAlreadyExists_2           = Property \u201c{1}\u201d already exists in \u201c{0}\u201d.
 ParameterNotFound_2               = No parameter named \u201c{1}\u201d has been found in
\u201c{0}\u201d.
 PropertyNotFound_2                = No property named \u201c{1}\u201d has been found in \u201c{0}\u201d.
 RecordAlreadyDefined_2            = Record \u201c{1}\u201d is already defined in schema \u201c{0}\u201d.

Modified: sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1640308&r1=1640307&r2=1640308&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] Tue Nov 18 10:58:48 2014
@@ -17,6 +17,7 @@
 AbstractType_1                    = Le type \u2018{0}\u2019 est abstrait.
 AmbiguousName_3                   = Le nom \u00ab\u202f{2}\u202f\u00bb est ambigu\u00eb car
il peut \u00eatre interpr\u00e9t\u00e9 comme \u00ab\u202f{0}\u202f\u00bb ou \u00ab\u202f{1}\u202f\u00bb.
 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.
+CanNotAssign_2                    = Ne peut pas assigner \u00ab\u202f{1}\u202f\u00bb \u00e0
\u00ab\u202f{0}\u202f\u00bb.
 CanNotConcatenateTransforms_2     = Les transformations \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb
ne peuvent pas \u00eatre combin\u00e9es.
 CanNotConnectTo_1                 = Ne peut pas se connecter \u00e0 \u00ab\u202f{0}\u202f\u00bb.
 CanNotConvertFromType_2           = Ne peut pas convertir du type \u2018{0}\u2019 vers le
type \u2018{1}\u2019.
@@ -36,7 +37,7 @@ ColinearAxisDirections_2          = Les 
 DeadThread_1                      = La t\u00e2che \u00ab\u202f{0}\u202f\u00bb est morte.
 DirectoryNotExpected_1            = Le fichier \u00ab\u202f{0}\u202f\u00bb d\u00e9signe un
r\u00e9pertoire plut\u00f4t qu\u2019un fichier r\u00e9gulier.
 DuplicatedElement_1               = L\u2019\u00e9lement \u00ab\u202f{0}\u202f\u00bb est dupliqu\u00e9.
-DuplicatedIdentifier_1            = L\u2019identifiant \u00ab\u202f{0}\u202f\u00bb est dupliqu\u00e9.
+DuplicatedIdentifier_1            = Le nom ou l\u2019identifiant \u00ab\u202f{0}\u202f\u00bb
est utilis\u00e9 plus d\u2019une fois.
 DuplicatedOption_1                = L\u2019option \u00ab\u202f{0}\u202f\u00bb est dupliqu\u00e9e.
 DuplicatedParameterName_4         = Le nom ou un alias pour le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb
\u00e0 l\u2019index {1} duplique le nom \u00ab\u202f{2}\u202f\u00bb \u00e0 l\u2019index {3}.
 ElementAlreadyPresent_1           = L\u2019\u00e9lement \u00ab\u202f{0}\u202f\u00bb est d\u00e9j\u00e0
pr\u00e9sent.

Copied: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
(from r1640304, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java?p2=sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java&p1=sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java&r1=1640304&r2=1640308&rev=1640308&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/AbstractMapTest.java
[UTF-8] Tue Nov 18 10:58:48 2014
@@ -47,7 +47,7 @@ public final strictfp class AbstractMapT
      * or consistency.
      */
     private static final class Count extends AbstractMap<Integer,String> {
-        private final List<String> values = new ArrayList<>(Arrays.asList("one",
"two", "three"));
+        private final List<String> values = new ArrayList<String>(Arrays.asList("one",
"two", "three"));
 
         @Override public    void    clear   ()                    {       values.clear();}
         @Override public    int     size    ()                    {return values.size();}
@@ -88,12 +88,12 @@ public final strictfp class AbstractMapT
         assertArrayEquals("values", new String[] {"one", "two", "three"}, values.toArray());
 
         final Collection<Map.Entry<Integer,String>> entries = map.entrySet();
-        assertTrue ("contains", entries.contains(new SimpleEntry<>(2, "two")));
-        assertFalse("contains", entries.contains(new SimpleEntry<>(2, "deux")));
+        assertTrue ("contains", entries.contains(new SimpleEntry<Integer,String>(2,
"two")));
+        assertFalse("contains", entries.contains(new SimpleEntry<Integer,String>(2,
"deux")));
         assertArrayEquals("entrySet", new SimpleEntry<?,?>[] {
-                    new SimpleEntry<>(1, "one"),
-                    new SimpleEntry<>(2, "two"),
-                    new SimpleEntry<>(3, "three")
+                    new SimpleEntry<Integer,String>(1, "one"),
+                    new SimpleEntry<Integer,String>(2, "two"),
+                    new SimpleEntry<Integer,String>(3, "three")
                 }, entries.toArray());
 
         map.clear();
@@ -114,10 +114,10 @@ public final strictfp class AbstractMapT
         final Count map = new Count();
         assertTrue(map.keySet().add(4));
         assertArrayEquals("entrySet", new SimpleEntry<?,?>[] {
-                    new SimpleEntry<>(1, "one"),
-                    new SimpleEntry<>(2, "two"),
-                    new SimpleEntry<>(3, "three"),
-                    new SimpleEntry<>(4, "four")
+                    new SimpleEntry<Integer,String>(1, "one"),
+                    new SimpleEntry<Integer,String>(2, "two"),
+                    new SimpleEntry<Integer,String>(3, "three"),
+                    new SimpleEntry<Integer,String>(4, "four")
                 }, map.entrySet().toArray());
     }
 
@@ -131,10 +131,10 @@ public final strictfp class AbstractMapT
         final Count map = new Count();
         assertTrue(map.values().add("quatre"));
         assertArrayEquals("entrySet", new SimpleEntry<?,?>[] {
-                    new SimpleEntry<>(1, "one"),
-                    new SimpleEntry<>(2, "two"),
-                    new SimpleEntry<>(3, "three"),
-                    new SimpleEntry<>(4, "quatre")
+                    new SimpleEntry<Integer,String>(1, "one"),
+                    new SimpleEntry<Integer,String>(2, "two"),
+                    new SimpleEntry<Integer,String>(3, "three"),
+                    new SimpleEntry<Integer,String>(4, "quatre")
                 }, map.entrySet().toArray());
     }
 
@@ -145,7 +145,7 @@ public final strictfp class AbstractMapT
     @Test
     public void testEquals() {
         final Count map = new Count();
-        final Map<Integer,String> copy = new HashMap<>(map);
+        final Map<Integer,String> copy = new HashMap<Integer,String>(map);
         assertTrue  ("equals",   copy.equals(map));
         assertTrue  ("equals",   map.equals(copy));
         assertEquals("hashCode", copy.hashCode(), map.hashCode());

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1640308&r1=1640307&r2=1640308&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] Tue Nov 18 10:58:48 2014
@@ -75,6 +75,7 @@ import org.junit.BeforeClass;
     org.apache.sis.util.collection.TreeTablesTest.class,
     org.apache.sis.util.collection.CodeListSetTest.class,
     org.apache.sis.internal.util.CollectionsExtTest.class,
+    org.apache.sis.internal.util.AbstractMapTest.class,
 
     // GeoAPI most basic types.
     org.apache.sis.internal.util.DefinitionURITest.class,



Mime
View raw message