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=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Sun Mar 17 23:50:02 2013 @@ -17,11 +17,14 @@ 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. +CanNotInstantiate_1 = Ne peut pas cr\u00e9er un objet de type \u2018{0}\u2019. CanNotSetPropertyValue_1 = Ne peut pas d\u00e9finir une valeur pour la propri\u00e9t\u00e9 \u201c{0}\u201d. ClassNotFinal_1 = La classe \u2018{0}\u2019 n\u2019est pas finale. CloneNotSupported_1 = Un objet de type \u2018{0}\u2019 ne peut pas \u00eatre clon\u00e9. DeadThread_1 = La t\u00e2che \u201c{0}\u201d est morte. DuplicatedValue_1 = La valeur \u201c{0}\u201d est dupliqu\u00e9e. +DuplicatedValuesForProperty_1 = Plusieurs valeurs ont \u00e9t\u00e9 sp\u00e9cifi\u00e9es pour la propri\u00e9t\u00e9 \u201c{0}\u201d. +DuplicatedValuesCount_1 = {0} valeurs dupliqu\u00e9es ont \u00e9t\u00e9 trouv\u00e9es. ElementAlreadyPresent_1 = L\u2019\u00e9lement \u201c{0}\u201d est d\u00e9j\u00e0 pr\u00e9sent. EmptyArgument_1 = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre vide. EmptyDictionary = Le dictionnaire doit contenir au moins une entr\u00e9e. @@ -52,12 +55,15 @@ 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}. +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. NodeHasAnotherParent_1 = Le n\u0153ud \u201c{0}\u201d a d\u00e9j\u00e0 un autre parent. NodeHasNoParent_1 = Le n\u0153ud \u201c{0}\u201d n\u2019a pas de parent. NodeNotFound_1 = Aucun n\u0153ud \u201c{0}\u201d n\u2019a \u00e9t\u00e9 trouv\u00e9. NonEquilibratedParenthesis_2 = Il manque une parenth\u00e8se \u2018{1}\u2019 dans \u201c{0}\u201d. +NonInvertibleConversion = La conversion n\u2019est pas inversible. +NonInvertibleTransform = La transformation n\u2019est pas inversible. NonAngularUnit_1 = \u201c{0}\u201d n\u2019est pas une unit\u00e9 d\u2019angles. NonLinearUnit_1 = \u201c{0}\u201d n\u2019est pas une unit\u00e9 de longueurs. NonScaleUnit_1 = \u201c{0}\u201d n\u2019est pas une unit\u00e9 d\u2019\u00e9chelles. @@ -78,6 +84,7 @@ UndefinedOrderingForElements_2 = L\u201 UnexpectedChange_1 = Changement inattendu dans \u2018{0}\u2019. UnexpectedEndOfString_1 = D\u2019autres caract\u00e8res \u00e9taient attendus \u00e0 la fin du texte \u201c{0}\u201d. UnknownType_1 = Le type \u2018{0}\u2019 n\u2019est pas reconnu dans ce contexte. +UnknownTypeForProperty_1 = Le type de la propri\u00e9t\u00e9 \u201c{0}\u201d est inconnu. UnmodifiableAffineTransform = Cette transformation affine n\u2019est pas modifiable. UnmodifiableGeometry = Cette g\u00e9om\u00e9trie n\u2019est pas modifiable. UnmodifiableMetadata = Cette m\u00e9ta-donn\u00e9e n\u2019est pas modifiable.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -40,7 +40,7 @@ import org.apache.sis.util.CharSequences import org.apache.sis.util.logging.Logging; // Related to JDK7 -import org.apache.sis.internal.util.JDK7; +import org.apache.sis.internal.jdk7.JDK7; /** Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -29,7 +29,7 @@ import org.apache.sis.util.ArgumentCheck import org.apache.sis.util.iso.AbstractInternationalString; // Related to JDK7 -import org.apache.sis.internal.util.Objects; +import org.apache.sis.internal.jdk7.Objects; /** Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -105,6 +105,11 @@ public final class Vocabulary extends In public static final int DaylightTime = 24; /** + * Destination + */ + public static final int Destination = 38; + + /** * Directory */ public static final int Directory = 36; @@ -205,6 +210,11 @@ public final class Vocabulary extends In public static final int Scale = 23; /** + * Source + */ + public static final int Source = 39; + + /** * Standard deviation */ public static final int StandardDeviation = 8; Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] Sun Mar 17 23:50:02 2013 @@ -24,6 +24,7 @@ Code_1 = {0} code CurrentDateTime = Current date and time CurrentDirectory = Current directory DaylightTime = Daylight time +Destination = Destination Directory = Directory JavaExtensions = Java extensions JavaHome = Java home directory @@ -44,6 +45,7 @@ Paths = Paths Root = Root RootMeanSquare = Root Mean Square Scale = Scale +Source = Source StandardDeviation = Standard deviation TemporaryFiles = Temporary files Timezone = Timezone Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] Sun Mar 17 23:50:02 2013 @@ -24,6 +24,7 @@ Code_1 = Code {0} CurrentDateTime = Date et heure courantes CurrentDirectory = R\u00e9pertoire courant DaylightTime = Heure normale +Destination = Destination Directory = R\u00e9pertoire JavaExtensions = Extensions du Java JavaHome = R\u00e9pertoire du Java @@ -44,6 +45,7 @@ Paths = Chemins Root = Racine RootMeanSquare = Moyenne quadratique Scale = \u00c9chelle +Source = Source StandardDeviation = \u00c9cart type TemporaryFiles = Fichiers temporaires Timezone = Fuseau horaire Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -64,7 +64,7 @@ import org.opengis.metadata.citation.Cit * @module * * @see IdentifierSpace - * @see org.apache.sis.metadata.iso.MetadataEntity + * @see org.apache.sis.metadata.iso.ISOMetadata * @see ReferenceResolver#newIdentifiedObject(MarshalContext, Class, Identifier[]) */ public interface IdentifiedObject { Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -34,7 +34,7 @@ import org.apache.sis.internal.jaxb.Iden import org.apache.sis.internal.jaxb.IdentifierMapWithSpecialCases; // Related to JDK7 -import org.apache.sis.internal.util.Objects; +import org.apache.sis.internal.jdk7.Objects; /** 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=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -31,7 +31,7 @@ import org.apache.sis.util.logging.Loggi import org.apache.sis.util.resources.Errors; // Related to JDK7 -import org.apache.sis.internal.util.Objects; +import org.apache.sis.internal.jdk7.Objects; /** Modified: sis/branches/JDK6/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter?rev=1457600&r1=1457583&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter [UTF-8] Sun Mar 17 23:50:02 2013 @@ -13,7 +13,6 @@ org.apache.sis.internal.converter.String org.apache.sis.internal.converter.StringConverter$Charset org.apache.sis.internal.converter.StringConverter$InternationalString org.apache.sis.internal.converter.StringConverter$File -org.apache.sis.internal.converter.StringConverter$Path org.apache.sis.internal.converter.StringConverter$URI org.apache.sis.internal.converter.StringConverter$URL org.apache.sis.internal.converter.StringConverter$Angle Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java?rev=1457600&r1=1457583&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -58,7 +58,7 @@ public final strictfp class ConverterReg * All converters registered in a test case. Only the converter type and properties * will be verified; no conversion or serialization shall be attempted. */ - private Deque<ObjectConverter<?,?>> converters = new ArrayDeque<>(); + private Deque<ObjectConverter<?,?>> converters = new ArrayDeque<ObjectConverter<?,?>>(); /** * Registers a converter to test. @@ -319,7 +319,7 @@ public final strictfp class ConverterReg * Expected side-effect: none */ assertAllConvertersAreRegistered(); - register(new NumberConverter<>(Number.class, Float.class)); + register(new NumberConverter<Number,Float>(Number.class, Float.class)); assertSameConverterForTarget(Float.class); assertMultilinesEquals("After NumberConverter.Float", "ConverterRegistry\n" + Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java?rev=1457600&r1=1457583&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -25,7 +25,6 @@ import java.net.URL; import java.net.URISyntaxException; import java.net.MalformedURLException; import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import org.opengis.util.InternationalString; import org.opengis.metadata.spatial.PixelOrientation; import org.apache.sis.measure.Angle; @@ -40,8 +39,7 @@ import org.junit.Test; import static org.apache.sis.test.Assert.*; // Related to JDK7 -import java.nio.file.Path; -import java.nio.file.Paths; +import org.apache.sis.internal.jdk7.StandardCharsets; /** @@ -256,17 +254,6 @@ public final strictfp class StringConver } /** - * Tests conversions to {@link Path}. - */ - @Test - public void testPath() { - final ObjectConverter<String,Path> c = new StringConverter.Path(); - final String path = "home/user/index.txt".replace('/', File.separatorChar); - runInvertibleConversion(c, path, Paths.get(path)); - assertSerializedEquals(c); - } - - /** * Tests conversions to {@link URI}. * * @throws URISyntaxException Should never happen. @@ -295,7 +282,7 @@ public final strictfp class StringConver */ @Test public void testCodeList() { - final ObjectConverter<String, PixelOrientation> c = new StringConverter.CodeList<>(PixelOrientation.class); + final ObjectConverter<String, PixelOrientation> c = new StringConverter.CodeList<PixelOrientation>(PixelOrientation.class); runInvertibleConversion(c, "LOWER_RIGHT", PixelOrientation.LOWER_RIGHT); tryUnconvertibleValue(c); assertSerializedEquals(c); Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -23,7 +23,7 @@ import org.junit.Test; import static org.junit.Assert.*; // Related to JK7 -import org.apache.sis.internal.util.JDK7; +import org.apache.sis.internal.jdk7.JDK7; /** Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -25,7 +25,7 @@ import static org.junit.Assert.*; import static org.apache.sis.util.Characters.SOFT_HYPHEN; // Related to JK7 -import org.apache.sis.internal.util.JDK7; +import org.apache.sis.internal.jdk7.JDK7; /** Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -35,7 +35,7 @@ import org.apache.sis.util.CharSequences import org.apache.sis.util.ComparisonMode; // Related to JDK7 -import org.apache.sis.internal.util.Objects; +import org.apache.sis.internal.jdk7.Objects; /** Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -50,7 +50,7 @@ import static org.apache.sis.util.Charac import static org.apache.sis.util.CharSequences.trimWhitespaces; // Related to JDK7 -import org.apache.sis.internal.util.JDK7; +import org.apache.sis.internal.jdk7.JDK7; /** 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=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -90,6 +90,15 @@ import org.junit.runners.Suite; org.apache.sis.util.collection.TreeTableFormatTest.class, org.apache.sis.util.collection.RangeSetTest.class, + // Converters + org.apache.sis.internal.converter.AngleConverterTest.class, + org.apache.sis.internal.converter.PathConverterTest.class, + org.apache.sis.internal.converter.StringConverterTest.class, + org.apache.sis.internal.converter.FallbackConverterTest.class, + org.apache.sis.internal.converter.ConverterRegistryTest.class, + org.apache.sis.internal.converter.SystemRegistryTest.class, + org.apache.sis.internal.converter.NumberConverterTest.class, // Shall be after SystemRegistryTest. + // XML most basic types. org.apache.sis.xml.XLinkTest.class, org.apache.sis.xml.NilReasonTest.class, Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -88,7 +88,7 @@ public final strictfp class ClassesTest */ @Test public void testGetAllInterfaces() { - final Set<Class<?>> interfaces = getAllInterfaces(ArrayList.class); + final Set<Class<?>> interfaces = getInterfaceSet(ArrayList.class); assertTrue(interfaces.contains(List .class)); assertTrue(interfaces.contains(Collection .class)); assertTrue(interfaces.contains(Iterable .class)); Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -148,25 +148,37 @@ public final class NumbersTest extends T } /** - * Tests {@link Numbers#narrowestClass(double)}. + * Tests {@link Numbers#narrowestClass(Number)}. */ @Test public void testNarrowestClassForValue() { - assertEquals(Byte .class, narrowestClass( 10.0)); - assertEquals(Short .class, narrowestClass( 1000.0)); - assertEquals(Integer.class, narrowestClass(100000.0)); - assertEquals(Float .class, narrowestClass( 10.5)); + assertEquals(Byte .class, narrowestClass( 127.0)); + assertEquals(Short .class, narrowestClass( 128.0)); + assertEquals(Integer.class, narrowestClass( 100000.0)); + assertEquals(Float .class, narrowestClass( 10.5)); + assertEquals(Byte .class, narrowestClass( -128 )); + assertEquals(Short .class, narrowestClass( -129 )); + assertEquals(Integer.class, narrowestClass(-100000 )); + assertEquals(Integer.class, narrowestClass((double) (1L << 30))); + assertEquals(Float .class, narrowestClass((double) (1L << 40))); + assertEquals(Double .class, narrowestClass(Math.PI)); } /** - * Tests {@link Numbers#narrowestNumber(double)}. + * Tests {@link Numbers#narrowestNumber(Number)}. */ @Test public void testNarrowestNumber() { - assertEquals(Byte .valueOf((byte) 10), narrowestNumber( 10.0)); - assertEquals(Short .valueOf((short) 1000), narrowestNumber( 1000.0)); - assertEquals(Integer.valueOf( 100000), narrowestNumber(100000.0)); - assertEquals(Float .valueOf( 10.5f), narrowestNumber( 10.5)); + assertEquals(Byte .valueOf((byte) 127), narrowestNumber( 127.0)); + assertEquals(Short .valueOf((short) 128), narrowestNumber( 128.0)); + assertEquals(Integer.valueOf( 100000), narrowestNumber( 100000.0)); + assertEquals(Float .valueOf( 10.5f), narrowestNumber( 10.5)); + assertEquals(Byte .valueOf((byte) -128), narrowestNumber( -128 )); + assertEquals(Short .valueOf((short) -129), narrowestNumber( -129 )); + assertEquals(Integer.valueOf( -100000), narrowestNumber(-100000 )); + assertEquals(Integer.valueOf(1 << 30), narrowestNumber((double) (1L << 30))); + assertEquals(Float .valueOf(1L << 40), narrowestNumber((double) (1L << 40))); + assertEquals(Double .valueOf(Math.PI), narrowestNumber(Math.PI)); } /** Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java [UTF-8] (original) +++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java [UTF-8] Sun Mar 17 23:50:02 2013 @@ -73,19 +73,19 @@ public final strictfp class TreeTablesTe public void testConcatenateSingletons() throws ParseException { final TreeTable table = TreeTables.parse( "root\n" + - "├───users\n" + - "│ └───alice\n" + - "│ ├───data\n" + - "│ │ └───mercator\n" + - "│ └───document\n" + - "└───lib\n", NAME); + " ├─users\n" + + " │ └─alice\n" + + " │ ├─data\n" + + " │ │ └─mercator\n" + + " │ └─document\n" + + " └─lib\n", NAME); ((DefaultTreeTable) table).setRoot(concatenateSingletons(table.getRoot())); assertMultilinesEquals( "root\n" + - "├───users/alice\n" + - "│ ├───data/mercator\n" + - "│ └───document\n" + - "└───lib\n".replace("/", File.separator), table.toString()); + " ├─users/alice\n" + + " │ ├─data/mercator\n" + + " │ └─document\n" + + " └─lib\n".replace("/", File.separator), table.toString()); } /** @@ -104,14 +104,14 @@ public final strictfp class TreeTablesTe nodeForPath(files, NAME, new File("users/Alice/data/mercator")).setValue(VALUE_AS_NUMBER, 60); assertMultilinesEquals( "Root\n" + - "├───users\n" + - "│ ├───Alice\n" + - "│ │ ├───data………………………… 10\n" + - "│ │ │ └───mercator…… 60\n" + - "│ │ └───document……………… 50\n" + - "│ └───Bob……………………………………… 30\n" + - "│ └───data………………………… 20\n" + - "└───lib………………………………………………… 40\n", table.toString()); + " ├─users\n" + + " │ ├─Alice\n" + + " │ │ ├─data………………………… 10\n" + + " │ │ │ └─mercator…… 60\n" + + " │ │ └─document……………… 50\n" + + " │ └─Bob……………………………………… 30\n" + + " │ └─data………………………… 20\n" + + " └─lib………………………………………………… 40\n", table.toString()); } /** Modified: sis/branches/JDK6/sis-webapp/pom.xml URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-webapp/pom.xml?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/sis-webapp/pom.xml (original) +++ sis/branches/JDK6/sis-webapp/pom.xml Sun Mar 17 23:50:02 2013 @@ -54,11 +54,10 @@ <build> <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> + <plugin> + <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> - <execution> <id>reserve-ports</id> <phase>initialize</phase> Modified: sis/branches/JDK6/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/site/apt/index.apt?rev=1457600&r1=1457599&r2=1457600&view=diff ============================================================================== --- sis/branches/JDK6/src/site/apt/index.apt [UTF-8] (original) +++ sis/branches/JDK6/src/site/apt/index.apt [UTF-8] Sun Mar 17 23:50:02 2013 @@ -28,6 +28,8 @@ The Apache SIS™ library * Developer Guide (English - translation to be provided later) ({{{./book/fr.xhtml}Français}}) + * {{{http://cwiki.apache.org/confluence/display/SIS}SIS Wiki}} + ** SIS developer documentation
