From commits-return-8485-apmail-sis-commits-archive=sis.apache.org@sis.apache.org Wed Dec 7 04:15:04 2016 Return-Path: X-Original-To: apmail-sis-commits-archive@www.apache.org Delivered-To: apmail-sis-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 20A7D19AA7 for ; Wed, 7 Dec 2016 04:15:04 +0000 (UTC) Received: (qmail 29672 invoked by uid 500); 7 Dec 2016 04:15:04 -0000 Delivered-To: apmail-sis-commits-archive@sis.apache.org Received: (qmail 29646 invoked by uid 500); 7 Dec 2016 04:15:04 -0000 Mailing-List: contact commits-help@sis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sis-dev@sis.apache.org Delivered-To: mailing list commits@sis.apache.org Received: (qmail 29637 invoked by uid 99); 7 Dec 2016 04:15:03 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2016 04:15:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 49F8B1A02B7 for ; Wed, 7 Dec 2016 04:15:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id cFOQ3YHVVUVG for ; Wed, 7 Dec 2016 04:14:52 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 53A1B5FB6B for ; Wed, 7 Dec 2016 04:14:51 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 7D15AE8EA8 for ; Wed, 7 Dec 2016 04:14:49 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 59B513A0EDB for ; Wed, 7 Dec 2016 04:14:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1773010 [6/8] - in /sis/branches/JDK7: ./ application/sis-console/src/main/artifact/ application/sis-openoffice/src/main/unopkg/ core/sis-build-helper/src/main/javadoc/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-featur... Date: Wed, 07 Dec 2016 04:14:47 -0000 To: commits@sis.apache.org From: desruisseaux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161207041449.59B513A0EDB@svn01-us-west.apache.org> Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -41,7 +41,7 @@ CircularReference = R\u0 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. ClosedReader_1 = Ce lecteur {0} est ferm\u00e9. -DatabaseError_2 = Erreur de base de donn\u00e9es lors de la cr\u00e9ation d\u2019un objet \u2018{0}\u2019 pour le code \u00ab\u202f{1}\u202f\u00bb. +DatabaseError_2 = Erreur de base de donn\u00e9es lors de la cr\u00e9ation d\u2019un objet \u2018{0}\u2019 pour l\u2019identifiant \u00ab\u202f{1}\u202f\u00bb. DeadThread_1 = La t\u00e2che \u00ab\u202f{0}\u202f\u00bb est morte. DisposedInstanceOf_1 = Cette instance de \u2018{0}\u2019 a \u00e9t\u00e9 dispos\u00e9e. DuplicatedElement_1 = L\u2019\u00e9lement \u00ab\u202f{0}\u202f\u00bb est dupliqu\u00e9. @@ -141,6 +141,7 @@ OddArrayLength_1 = La l OutsideDomainOfValidity = La coordonn\u00e9e est en dehors du domaine de validit\u00e9. PropertyNotFound_2 = Aucune propri\u00e9t\u00e9 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb. RecordAlreadyDefined_2 = L\u2019enregistrement \u00ab\u202f{1}\u202f\u00bb est d\u00e9j\u00e0 d\u00e9finit dans le sch\u00e9ma \u00ab\u202f{0}\u202f\u00bb. +RecordNotFound_2 = Aucune entr\u00e9e n\u2019a \u00e9t\u00e9 trouv\u00e9e dans la table \u00ab\u202f{0}\u202f\u00bb pour la cl\u00e9 \u00ab\u202f{1}\u202f\u00bb. RecursiveCreateCallForKey_1 = Appel r\u00e9cursif lors de la cr\u00e9ation d\u2019un objet pour la cl\u00e9 \u00ab\u202f{0}\u202f\u00bb. RequireDecimalSeparator = Un s\u00e9parateur d\u00e9cimal est requis. StalledThread_1 = La t\u00e2che \u00ab\u202f{0}\u202f\u00bb semble bloqu\u00e9e. Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -197,6 +197,11 @@ public final class Vocabulary extends In public static final short DefaultValue = 71; /** + * Deprecated + */ + public static final short Deprecated = 117; + + /** * Derived from {0} */ public static final short DerivedFrom_1 = 108; @@ -487,6 +492,11 @@ public final class Vocabulary extends In public static final short Quoted_1 = 86; /** + * Remarks + */ + public static final short Remarks = 116; + + /** * Remote configuration */ public static final short RemoteConfiguration = 93; Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -42,6 +42,7 @@ Datum = Datum DatumShift = Datum shift DaylightTime = Daylight time DefaultValue = Default value +Deprecated = Deprecated DerivedFrom_1 = Derived from {0} Description = Description Destination = Destination @@ -100,6 +101,7 @@ Others = Others OtherSurface = Other surface Paths = Paths Quoted_1 = \u201c{0}\u201d +Remarks = Remarks RemoteConfiguration = Remote configuration Root = Root RootMeanSquare = Root Mean Square Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -49,6 +49,7 @@ Datum = R\u00e9f\u00e9 DatumShift = Changement de r\u00e9f\u00e9rentiel DaylightTime = Heure normale DefaultValue = Valeur par d\u00e9faut +Deprecated = Obsol\u00e8te DerivedFrom_1 = D\u00e9riv\u00e9 de {0} Description = Description Destination = Destination @@ -107,6 +108,7 @@ Others = Autres OtherSurface = Autre surface Paths = Chemins Quoted_1 = \u00ab\u202f{0}\u202f\u00bb +Remarks = Remarques RemoteConfiguration = Configuration distante Root = Racine RootMeanSquare = Moyenne quadratique Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -160,8 +160,8 @@ public class MarshallerPool { * for the {@code Unmarshaller}, then consider overriding the {@link #createMarshaller()} * or {@link #createUnmarshaller()} methods instead.

* - * @param properties The properties to be given to the (un)marshaller, or {@code null} if none. - * @throws JAXBException If the JAXB context can not be created. + * @param properties the properties to be given to the (un)marshaller, or {@code null} if none. + * @throws JAXBException if the JAXB context can not be created. */ public MarshallerPool(final Map properties) throws JAXBException { this(TypeRegistration.getSharedContext(), properties); @@ -177,11 +177,11 @@ public class MarshallerPool { * for the {@code Unmarshaller}, then consider overriding the {@link #createMarshaller()} * or {@link #createUnmarshaller()} methods instead.

* - * @param context The JAXB context. - * @param properties The properties to be given to the (un)marshaller, or {@code null} if none. - * @throws JAXBException If the marshaller pool can not be created. + * @param context the JAXB context. + * @param properties the properties to be given to the (un)marshaller, or {@code null} if none. + * @throws JAXBException if the marshaller pool can not be created. */ - @SuppressWarnings({"unchecked", "rawtypes"}) // Generic array creation + @SuppressWarnings({"unchecked", "rawtypes"}) // Generic array creation public MarshallerPool(final JAXBContext context, final Map properties) throws JAXBException { ArgumentChecks.ensureNonNull("context", context); this.context = context; @@ -276,7 +276,7 @@ public class MarshallerPool { final void removeExpired() { isRemovalScheduled.set(false); final long now = System.nanoTime(); - if (!removeExpired(marshallers, now) | // Really |, not || + if (!removeExpired(marshallers, now) | // Really |, not || !removeExpired(unmarshallers, now)) { scheduleRemoval(); @@ -286,9 +286,9 @@ public class MarshallerPool { /** * Removes expired (un)marshallers from the given queue. * - * @param Either {@code Marshaller} or {@code Unmarshaller} type. - * @param queue The queue from which to remove expired (un)marshallers. - * @param now Current value of {@link System#nanoTime()}. + * @param either {@code Marshaller} or {@code Unmarshaller} type. + * @param queue the queue from which to remove expired (un)marshallers. + * @param now current value of {@link System#nanoTime()}. * @return {@code true} if the queue became empty as a result of this method call. */ private static boolean removeExpired(final Deque queue, final long now) { @@ -333,8 +333,8 @@ public class MarshallerPool { * Note that {@link #recycle(Marshaller)} shall not be invoked in case of exception, * since the marshaller may be in an invalid state. * - * @return A marshaller configured for formatting OGC/ISO XML. - * @throws JAXBException If an error occurred while creating and configuring a marshaller. + * @return a marshaller configured for formatting OGC/ISO XML. + * @throws JAXBException if an error occurred while creating and configuring a marshaller. */ public Marshaller acquireMarshaller() throws JAXBException { Marshaller marshaller = marshallers.poll(); @@ -359,8 +359,8 @@ public class MarshallerPool { * Note that {@link #recycle(Unmarshaller)} shall not be invoked in case of exception, * since the unmarshaller may be in an invalid state. * - * @return A unmarshaller configured for parsing OGC/ISO XML. - * @throws JAXBException If an error occurred while creating and configuring the unmarshaller. + * @return a unmarshaller configured for parsing OGC/ISO XML. + * @throws JAXBException if an error occurred while creating and configuring the unmarshaller. */ public Unmarshaller acquireUnmarshaller() throws JAXBException { Unmarshaller unmarshaller = unmarshallers.poll(); @@ -388,7 +388,7 @@ public class MarshallerPool { * Note that this method does not close any output stream. * Closing the marshaller stream is caller's or JAXB responsibility. * - * @param marshaller The marshaller to return to the pool. + * @param marshaller the marshaller to return to the pool. */ public void recycle(final Marshaller marshaller) { recycle(marshallers, marshaller); @@ -412,7 +412,7 @@ public class MarshallerPool { * Note that this method does not close any input stream. * Closing the unmarshaller stream is caller's or JAXB responsibility. * - * @param unmarshaller The unmarshaller to return to the pool. + * @param unmarshaller the unmarshaller to return to the pool. */ public void recycle(final Unmarshaller unmarshaller) { recycle(unmarshallers, unmarshaller); @@ -423,8 +423,8 @@ public class MarshallerPool { * This method is invoked only when no existing marshaller is available in the pool. * Subclasses can override this method if they need to change the marshaller configuration. * - * @return A new marshaller configured for formatting OGC/ISO XML. - * @throws JAXBException If an error occurred while creating and configuring the marshaller. + * @return a new marshaller configured for formatting OGC/ISO XML. + * @throws JAXBException if an error occurred while creating and configuring the marshaller. */ protected Marshaller createMarshaller() throws JAXBException { final Marshaller marshaller = context.createMarshaller(); @@ -456,8 +456,8 @@ public class MarshallerPool { * This method is invoked only when no existing unmarshaller is available in the pool. * Subclasses can override this method if they need to change the unmarshaller configuration. * - * @return A new unmarshaller configured for parsing OGC/ISO XML. - * @throws JAXBException If an error occurred while creating and configuring the unmarshaller. + * @return a new unmarshaller configured for parsing OGC/ISO XML. + * @throws JAXBException if an error occurred while creating and configuring the unmarshaller. */ protected Unmarshaller createUnmarshaller() throws JAXBException { final Unmarshaller unmarshaller = context.createUnmarshaller(); Propchange: sis/branches/JDK7/core/sis-utility/src/main/javadoc/overview.html ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Wed Dec 7 04:14:44 2016 @@ -1 +1 @@ -text/html +text/html;charset=UTF-8 Modified: sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -9,7 +9,8 @@ d=day dbar=decibar F=farad ft=foot -ft_US=US survey foot +ftCla=Clarke\u2019s foot +ftUS=US survey foot grad=grad h=hour ha=hectare @@ -26,8 +27,8 @@ lm=lumen lx=lux M=nautical mile m=metre -m²=square metre -m³=cubic metre +m\u00b2=square metre +m\u00b3=cubic metre m\u2215s=metres per second mi=statute mile min=minute @@ -51,11 +52,11 @@ V=volt W=watt Wb=weber wk=week -µrad=microradian +\u00b5rad=microradian \u03a9=ohm %=percentage -°=degree +\u00b0=degree \u2032=arc-minute \u2033=arc-second -°C=Celsius -°F=Fahrenheit +\u00b0C=Celsius +\u00b0F=Fahrenheit Modified: sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -1,31 +1,33 @@ # Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. -A=ampère -a=année -atm=atmosphère -cm=centimètre +A=amp\u00e8re +a=ann\u00e9e +atm=atmosph\u00e8re +cm=centim\u00e8tre d=jour ft=pied +ftCla=pied de Clarke +ftUS=pied am\u00e9ricain grad=grade h=heure in=pouce kg=kilogramme -km=kilomètre -km\u2215h=kilomètres par heure +km=kilom\u00e8tre +km\u2215h=kilom\u00e8tres par heure M=mille marin international -m=mètre -m²=mètre carré -m³=mètre cube -m\u2215s=mètres par seconde +m=m\u00e8tre +m\u00b2=m\u00e8tre carr\u00e9 +m\u00b3=m\u00e8tre cube +m\u2215s=m\u00e8tres par seconde mi=mille terrestre international -mm=millimètre +mm=millim\u00e8tre ms=milliseconde -nm=nanomètre +nm=nanom\u00e8tre ppm=parties par million s=seconde -sr=stéradian -unity=unité +sr=st\u00e9radian +unity=unit\u00e9 wk=semaine %=pourcentage -°=degrée +\u00b0=degr\u00e9e \u2032=arc-minute \u2033=arc-seconde Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/RangeFormatTest.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -144,7 +144,7 @@ public final strictfp class RangeFormatT assertEquals("maxPos.endIndex", 1, maxPos.getEndIndex()); // Negative infinity - assertEquals("(-∞ … 30]", format(NumberRange.create(Double.NEGATIVE_INFINITY, true, 30, true))); + assertEquals("(−∞ … 30]", format(NumberRange.create(Double.NEGATIVE_INFINITY, true, 30, true))); assertEquals("minPos.beginIndex", 1, minPos.getBeginIndex()); assertEquals("minPos.endIndex", 3, minPos.getEndIndex()); assertEquals("maxPos.beginIndex", 6, maxPos.getBeginIndex()); @@ -158,7 +158,7 @@ public final strictfp class RangeFormatT assertEquals("maxPos.endIndex", 7, maxPos.getEndIndex()); // Positive infinities - assertEquals("(-∞ … ∞)", format(NumberRange.create(Double.NEGATIVE_INFINITY, true, Double.POSITIVE_INFINITY, true))); + assertEquals("(−∞ … ∞)", format(NumberRange.create(Double.NEGATIVE_INFINITY, true, Double.POSITIVE_INFINITY, true))); assertEquals("minPos.beginIndex", 1, minPos.getBeginIndex()); assertEquals("minPos.endIndex", 3, minPos.getEndIndex()); assertEquals("maxPos.beginIndex", 6, maxPos.getBeginIndex()); @@ -172,7 +172,7 @@ public final strictfp class RangeFormatT assertEquals("maxPos.endIndex", 7, maxPos.getEndIndex()); // Negative infinity with integers - assertEquals("(-∞ … 40]", format(new NumberRange<>(Integer.class, null, true, 40, true))); + assertEquals("(−∞ … 40]", format(new NumberRange<>(Integer.class, null, true, 40, true))); assertEquals("minPos.beginIndex", 1, minPos.getBeginIndex()); assertEquals("minPos.endIndex", 3, minPos.getEndIndex()); assertEquals("maxPos.beginIndex", 6, maxPos.getBeginIndex()); @@ -247,6 +247,7 @@ public final strictfp class RangeFormatT assertEquals(NumberRange.create(-10.0, true, 20.0, true), parse("[-10 … 20]" )); assertEquals(NumberRange.create(NEGATIVE_INFINITY, true, 30.0, true), parse("[-∞ … 30]")); + assertEquals(NumberRange.create(NEGATIVE_INFINITY, true, 30.0, true), parse("[−∞ … 30]")); assertEquals(NumberRange.create(50.0, true, POSITIVE_INFINITY, true), parse("[50 … ∞]")); } @@ -334,7 +335,7 @@ public final strictfp class RangeFormatT it = format.formatToCharacterIterator(range); text = it.toString(); findYears(it, RangeFormat.Field.MAX_VALUE, maxPos); - assertEquals("(-∞ … 01/01/90 00:00]", text); + assertEquals("(−∞ … 01/01/90 00:00]", text); assertEquals(12, maxPos.getBeginIndex()); assertEquals(14, maxPos.getEndIndex()); assertEquals(range, parse(text)); Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -64,7 +64,8 @@ public final strictfp class UnitFormatTe verify(declared, "KILOMETRE", "L", "km", "kilometre", Units.KILOMETRE); verify(declared, "NAUTICAL_MILE", "L", "M", "nautical mile", Units.NAUTICAL_MILE); verify(declared, "STATUTE_MILE", "L", "mi", "statute mile", Units.STATUTE_MILE); - verify(declared, "US_SURVEY_FOOT", "L", "ft_US", "US survey foot", Units.US_SURVEY_FOOT); + verify(declared, "US_SURVEY_FOOT", "L", "ftUS", "US survey foot", Units.US_SURVEY_FOOT); + verify(declared, "CLARKE_FOOT", "L", "ftCla", "Clarke’s foot", Units.CLARKE_FOOT); verify(declared, "FOOT", "L", "ft", "foot", Units.FOOT); verify(declared, "INCH", "L", "in", "inch", Units.INCH); verify(declared, "POINT", "L", "pt", "point", Units.POINT); Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -182,7 +182,7 @@ public strictfp class Assert extends org */ public static void assertSetEquals(final Collection expected, final Collection actual) { if (expected != null && actual != null && !expected.isEmpty()) { - final Set r = new LinkedHashSet<>(expected); + final Set r = new LinkedHashSet(expected); assertTrue("The two sets are disjoint.", r.removeAll(actual)); assertTrue("The set is missing elements: " + r, r.isEmpty()); assertTrue("The set unexpectedly became empty.", r.addAll(actual)); @@ -203,7 +203,7 @@ public strictfp class Assert extends org */ public static void assertMapEquals(final Map expected, final Map actual) { if (expected != null && actual != null && !expected.isEmpty()) { - final Map r = new LinkedHashMap<>(expected); + final Map r = new LinkedHashMap(expected); for (final Map.Entry entry : actual.entrySet()) { final Object key = entry.getKey(); if (!r.containsKey(key)) { Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/LocalesTest.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -91,7 +91,6 @@ public final strictfp class LocalesTest /** * Tests the {@link Locales#parse(String)} method with a IETF BCP 47 language tag string. - * This functionality is supported only on the JDK7 branch. */ @Test public void testParseIETF() { Modified: sis/branches/JDK7/ide-project/NetBeans/build.xml URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/build.xml?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/ide-project/NetBeans/build.xml (original) +++ sis/branches/JDK7/ide-project/NetBeans/build.xml Wed Dec 7 04:14:44 2016 @@ -48,6 +48,9 @@ + + + - - + + @@ -76,7 +76,7 @@ is divided into following sections: - + @@ -179,6 +179,7 @@ is divided into following sections: + @@ -985,7 +986,7 @@ is divided into following sections: - + @@ -997,7 +998,7 @@ is divided into following sections: - + @@ -1140,15 +1141,15 @@ is divided into following sections: - + - + - + @@ -1156,7 +1157,7 @@ is divided into following sections: - + @@ -1351,7 +1352,7 @@ is divided into following sections: Must select one file in the IDE or set run.class - + Must select one file in the IDE or set applet.url Copied: sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml~ (from r1773005, sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml) URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml%7E?p2=sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml%7E&p1=sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml&r1=1773005&r2=1773010&rev=1773010&view=diff ============================================================================== --- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original) +++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml~ Wed Dec 7 04:14:44 2016 @@ -46,8 +46,8 @@ is divided into following sections: - - + + @@ -76,7 +76,7 @@ is divided into following sections: - + @@ -179,6 +179,7 @@ is divided into following sections: + @@ -985,7 +986,7 @@ is divided into following sections: - + @@ -997,7 +998,7 @@ is divided into following sections: - + @@ -1140,15 +1141,15 @@ is divided into following sections: - + - + - + @@ -1156,7 +1157,7 @@ is divided into following sections: - + @@ -1351,7 +1352,7 @@ is divided into following sections: Must select one file in the IDE or set run.class - + Must select one file in the IDE or set applet.url 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=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -4,5 +4,5 @@ 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=f9f0175b -nbproject/build-impl.xml.script.CRC32=c6b211a6 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 +nbproject/build-impl.xml.script.CRC32=33578922 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -89,15 +89,17 @@ georss.version = 0.9.8 rome.version = 0.9 jdom1.version = 1.0 jdom2.version = 2.0.4 -jee.version = 6.0 +jee.version = 7.0 osgi.version = 6.0.0 -netcdf.version = 4.6.4 +netcdf.version = 4.6.6 joda-time.version = 2.2 httpclient.version = 4.3.6 slf4j.version = 1.7.7 junit.version = 4.12 hamcrest.version = 1.3 jaxb-ns-mapper = 2.2.4 +hsqldb.version = 2.3.4 +postgresql.version = 9.4.1212.jre7 # # Classpaths for compilation, execution and tests. @@ -133,6 +135,8 @@ run.classpath=\ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir}:\ + ${maven.repository}/org/hsqldb/hsqldb/${hsqldb.version}/hsqldb-${hsqldb.version}.jar:\ + ${maven.repository}/org/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar:\ ${maven.repository}/org/jdom/jdom2/${jdom2.version}/jdom2-${jdom2.version}.jar:\ ${maven.repository}/edu/ucar/udunits/${netcdf.version}/udunits-${netcdf.version}.jar:\ ${maven.repository}/edu/ucar/httpservices/${netcdf.version}/httpservices-${netcdf.version}.jar:\ Modified: sis/branches/JDK7/pom.xml URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/pom.xml (original) +++ sis/branches/JDK7/pom.xml Wed Dec 7 04:14:44 2016 @@ -432,6 +432,20 @@ Apache SIS is a free software, Java lang 1.12 + + + org.hsqldb + hsqldb + 2.3.4 + test + + + org.postgresql + postgresql + 9.4.1212.jre7 + test + + org.osgi @@ -490,11 +504,13 @@ Apache SIS is a free software, Java lang apache-release - false + false true true + + jdk8 @@ -537,6 +553,31 @@ Apache SIS is a free software, Java lang + + + + + + sis-data + + + !env.SIS_DATA + + + + + + maven-surefire-plugin + + + ${session.executionRootDirectory}/target + + + + Propchange: sis/branches/JDK7/src/main/javadoc/overview.html ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Wed Dec 7 04:14:44 2016 @@ -1 +1 @@ -text/html +text/html;charset=UTF-8 Modified: sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java [UTF-8] (original) +++ sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -47,6 +47,7 @@ import org.apache.sis.metadata.iso.citat import org.apache.sis.metadata.iso.content.DefaultAttributeGroup; import org.apache.sis.metadata.iso.content.DefaultBand; import org.apache.sis.metadata.iso.content.DefaultCoverageDescription; +import org.apache.sis.metadata.sql.MetadataStoreException; import org.apache.sis.referencing.CRS; import org.apache.sis.referencing.CommonCRS; import org.apache.sis.storage.DataStoreException; @@ -413,15 +414,15 @@ final class LandsatReader { * Invoked for every key-value pairs found in the file. * Leading and trailing spaces, if any, have been removed. * - * @param key the key in upper cases. - * @param band the band number, or 0 if none. - * @param value the value, without quotes if those quotes existed. + * @param key the key in upper cases. + * @param band the band number, or 0 if none. + * @param value the value, without quotes if those quotes existed. * @throws NumberFormatException if the value was expected to be a string but the parsing failed. * @throws DateTimeException if the value was expected to be a date but the parsing failed, * or if the result of the parsing was not of the expected type. * @throws IllegalArgumentException if the value is out of range. */ - private void parseKeyValuePair(final String key, final int band, final String value) + private void parseKeyValuePair(final String key, final int band, String value) throws IllegalArgumentException, DateTimeException, DataStoreException { switch (key) { @@ -510,7 +511,14 @@ final class LandsatReader { * Value is "GEOTIFF". */ case "OUTPUT_FORMAT": { - metadata.addFormat(value); + if ("GeoTIFF".equalsIgnoreCase(value)) { + value = "GeoTIFF"; // Because 'metadata.setFormat(…)' is case-sensitive. + } + try { + metadata.setFormat(value); + } catch (MetadataStoreException e) { + warning(key, null, e); + } break; } /* @@ -882,7 +890,7 @@ final class LandsatReader { */ final Metadata getMetadata() throws FactoryException { metadata.add(Locale.ENGLISH); - metadata.add(ScopeCode.DATASET); + metadata.add(ScopeCode.COVERAGE); try { flushSceneTime(); } catch (DateTimeException e) { Propchange: sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/doc-files/LandsatMetadata.html ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Wed Dec 7 04:14:44 2016 @@ -1 +1 @@ -text/html +text/html;charset=UTF-8 Modified: sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java [UTF-8] (original) +++ sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -95,7 +95,7 @@ public class LandsatReaderTest extends T assertMultilinesEquals( "Metadata\n" + "  ├─Language…………………………………………………………………………………………… en\n" - + "  ├─Spatial representation info (1 of 3)\n" + + "  ├─Spatial representation info (1 of 2)\n" + "  │   ├─Number of dimensions………………………………………………… 2\n" + "  │   ├─Axis dimension properties (1 of 2)\n" + "  │   │   ├─Dimension name……………………………………………………… Sample\n" @@ -103,8 +103,9 @@ public class LandsatReaderTest extends T + "  │   ├─Axis dimension properties (2 of 2)\n" + "  │   │   ├─Dimension name……………………………………………………… Line\n" + "  │   │   └─Dimension size……………………………………………………… 15500\n" - + "  │   └─Transformation parameter availability…… false\n" - + "  ├─Spatial representation info (2 of 3)\n" + + "  │   ├─Transformation parameter availability…… false\n" + + "  │   └─Check point availability……………………………………… false\n" + + "  ├─Spatial representation info (2 of 2)\n" + "  │   ├─Number of dimensions………………………………………………… 2\n" + "  │   ├─Axis dimension properties (1 of 2)\n" + "  │   │   ├─Dimension name……………………………………………………… Sample\n" @@ -112,16 +113,8 @@ public class LandsatReaderTest extends T + "  │   ├─Axis dimension properties (2 of 2)\n" + "  │   │   ├─Dimension name……………………………………………………… Line\n" + "  │   │   └─Dimension size……………………………………………………… 7800\n" - + "  │   └─Transformation parameter availability…… false\n" - + "  ├─Spatial representation info (3 of 3)\n" - + "  │   ├─Number of dimensions………………………………………………… 2\n" - + "  │   ├─Axis dimension properties (1 of 2)\n" - + "  │   │   ├─Dimension name……………………………………………………… Sample\n" - + "  │   │   └─Dimension size……………………………………………………… 7600\n" - + "  │   ├─Axis dimension properties (2 of 2)\n" - + "  │   │   ├─Dimension name……………………………………………………… Line\n" - + "  │   │   └─Dimension size……………………………………………………… 7800\n" - + "  │   └─Transformation parameter availability…… false\n" + + "  │   ├─Transformation parameter availability…… false\n" + + "  │   └─Check point availability……………………………………… false\n" + "  ├─Reference system info………………………………………………………… EPSG:WGS 84 / UTM zone 49N\n" + "  ├─Identification info\n" + "  │   ├─Citation\n" @@ -134,7 +127,7 @@ public class LandsatReaderTest extends T + "  │   ├─Resource format\n" + "  │   │   └─Format specification citation\n" + "  │   │       ├─Title…………………………………………………………………… GeoTIFF Coverage Encoding Profile\n" - + "  │   │       └─Alternate title………………………………………… GEOTIFF\n" + + "  │   │       └─Alternate title………………………………………… GeoTIFF\n" + "  │   ├─Spatial resolution (1 of 2)\n" + "  │   │   └─Distance……………………………………………………………………… 15.0\n" + "  │   ├─Spatial resolution (2 of 2)\n" @@ -297,7 +290,7 @@ public class LandsatReaderTest extends T + "  │   ├─Date…………………………………………………………………………………………… 2016-06-27 16:48:12\n" + "  │   └─Date type……………………………………………………………………………… Creation\n" + "  ├─Metadata scope\n" - + "  │   └─Resource scope………………………………………………………………… Dataset\n" + + "  │   └─Resource scope………………………………………………………………… Coverage\n" + "  ├─Metadata identifier\n" + "  │   └─Code…………………………………………………………………………………………… LandsatTest\n" + "  ├─Metadata standard (1 of 2)\n" Modified: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java [UTF-8] (original) +++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -20,8 +20,10 @@ import java.net.URL; import java.util.Locale; import java.util.MissingResourceException; import javax.annotation.Generated; +import org.opengis.util.InternationalString; import org.apache.sis.util.resources.KeyConstants; import org.apache.sis.util.resources.IndexedResourceBundle; +import org.apache.sis.util.resources.ResourceInternationalString; /** @@ -59,10 +61,98 @@ public final class Resources extends Ind } /** + * No value specified for the “{0}” TIFF tag. Computed the {1} value from other tags. + */ + public static final short ComputedValueForAttribute_2 = 0; + + /** * Apache SIS implementation requires that all “{0}” elements have the same value, but the * element found in “{1}” are {2}. */ - public static final short ConstantValueRequired_3 = 0; + public static final short ConstantValueRequired_3 = 1; + + /** + * No value specified for the “{0}” TIFF tag. The {1} default value will be used. + */ + public static final short DefaultValueForAttribute_2 = 2; + + /** + * An ordered dither or halftone technique has been applied to the image data. The dithering or + * halftoning matrix size is {0}×{1}. + */ + public static final short DitheringOrHalftoningApplied_2 = 3; + + /** + * The “{0}” GeoTIFF key has been ignored. + */ + public static final short IgnoredGeoKey_1 = 16; + + /** + * The “{0}” TIFF tag has been ignored. + */ + public static final short IgnoredTag_1 = 4; + + /** + * TIFF image “{0}” shall be either tiled or organized into strips. + */ + public static final short InconsistentTileStrip_1 = 5; + + /** + * “{1}” is not a valid value for the “{0}” GeoTIFF key. + */ + public static final short InvalidGeoValue_2 = 12; + + /** + * TIFF tag “{0}” shall contain at least {1} values but found only {2}. + */ + public static final short ListTooShort_3 = 14; + + /** + * TIFF tags “{0}” and “{1}” have values of different lengths. Found “{2}” and “{3}” elements + * respectively. + */ + public static final short MismatchedLength_4 = 6; + + /** + * No value has been found for the “{0}” GeoTIFF key. + */ + public static final short MissingGeoValue_1 = 9; + + /** + * Can not read TIFF image from “{0}” because the “{1}” tag is missing. + */ + public static final short MissingValue_2 = 7; + + /** + * The file defines “{2}” with a value of {3}{4}, but that value should be {1}{4} for + * consistency with {0}. + */ + public static final short NotTheEpsgValue_5 = 17; + + /** + * A randomized process such as error diffusion has been applied to the image data. + */ + public static final short RandomizedProcessApplied = 8; + + /** + * A single value was expected for the “{0}” key but {1} values have been found. + */ + public static final short UnexpectedListOfValues_2 = 15; + + /** + * Found {2} tiles or strips in the “{0}” file while {1} were expected. + */ + public static final short UnexpectedTileCount_3 = 10; + + /** + * Coordinate system kind {0} is unsupported. + */ + public static final short UnsupportedCoordinateSystemKind_1 = 11; + + /** + * Version {0} of GeoTIFF key directory is not supported. + */ + public static final short UnsupportedGeoKeyDirectory_1 = 13; } /** @@ -95,4 +185,43 @@ public final class Resources extends Ind public static Resources forLocale(final Locale locale) throws MissingResourceException { return getBundle(Resources.class, locale); } + + /** + * The international string to be returned by {@link formatInternational}. + */ + private static final class International extends ResourceInternationalString { + private static final long serialVersionUID = 8489130907339662434L; + + International(short key) {super(key);} + International(short key, Object args) {super(key, args);} + @Override protected KeyConstants getKeyConstants() {return Keys.INSTANCE;} + @Override protected IndexedResourceBundle getBundle(final Locale locale) { + return forLocale(locale); + } + } + + /** + * Gets an international string for the given key. This method does not check for the key + * validity. If the key is invalid, then a {@link MissingResourceException} may be thrown + * when a {@link InternationalString#toString(Locale)} method is invoked. + * + * @param key the key for the desired string. + * @return an international string for the given key. + */ + public static InternationalString formatInternational(final short key) { + return new International(key); + } + + /** + * Gets an international string for the given key. This method does not check for the key + * validity. If the key is invalid, then a {@link MissingResourceException} may be thrown + * when a {@link InternationalString#toString(Locale)} method is invoked. + * + * @param key the key for the desired string. + * @param args values to substitute to "{0}", "{1}", etc. + * @return an international string for the given key. + */ + public static InternationalString formatInternational(final short key, final Object... args) { + return new International(key, args); + } } Modified: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -20,3 +20,20 @@ # For resources shared by all modules in the Apache SIS project, see "org.apache.sis.util.resources" package. # ConstantValueRequired_3 = Apache SIS implementation requires that all \u201c{0}\u201d elements have the same value, but the element found in \u201c{1}\u201d are {2}. +ComputedValueForAttribute_2 = No value specified for the \u201c{0}\u201d TIFF tag. Computed the {1} value from other tags. +DefaultValueForAttribute_2 = No value specified for the \u201c{0}\u201d TIFF tag. The {1} default value will be used. +DitheringOrHalftoningApplied_2 = An ordered dither or halftone technique has been applied to the image data. The dithering or halftoning matrix size is {0}\u00d7{1}. +IgnoredTag_1 = The \u201c{0}\u201d TIFF tag has been ignored. +IgnoredGeoKey_1 = The \u201c{0}\u201d GeoTIFF key has been ignored. +InconsistentTileStrip_1 = TIFF image \u201c{0}\u201d shall be either tiled or organized into strips. +InvalidGeoValue_2 = \u201c{1}\u201d is not a valid value for the \u201c{0}\u201d GeoTIFF key. +ListTooShort_3 = TIFF tag \u201c{0}\u201d shall contain at least {1} values but found only {2}. +MismatchedLength_4 = TIFF tags \u201c{0}\u201d and \u201c{1}\u201d have values of different lengths. Found \u201c{2}\u201d and \u201c{3}\u201d elements respectively. +MissingGeoValue_1 = No value has been found for the \u201c{0}\u201d GeoTIFF key. +MissingValue_2 = Can not read TIFF image from \u201c{0}\u201d because the \u201c{1}\u201d tag is missing. +NotTheEpsgValue_5 = The file defines \u201c{2}\u201d with a value of {3}{4}, but that value should be {1}{4} for consistency with {0}. +RandomizedProcessApplied = A randomized process such as error diffusion has been applied to the image data. +UnexpectedListOfValues_2 = A single value was expected for the \u201c{0}\u201d key but {1} values have been found. +UnexpectedTileCount_3 = Found {2} tiles or strips in the \u201c{0}\u201d file while {1} were expected. +UnsupportedCoordinateSystemKind_1 = Coordinate system kind {0} is unsupported. +UnsupportedGeoKeyDirectory_1 = Version {0}\u00a0of GeoTIFF key directory is not supported. Modified: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties?rev=1773010&r1=1773009&r2=1773010&view=diff ============================================================================== --- sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties [ISO-8859-1] (original) +++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/internal/geotiff/Resources_fr.properties [ISO-8859-1] Wed Dec 7 04:14:44 2016 @@ -25,3 +25,20 @@ # U+00A0 NO-BREAK SPACE before : # ConstantValueRequired_3 = L\u2019impl\u00e9mentation de Apache SIS requiert que tous les \u00e9l\u00e9ments de \u00ab\u202f{0}\u202f\u00bb aient la m\u00eame valeur, mais les \u00e9l\u00e9ments trouv\u00e9s dans \u00ab\u202f{1}\u202f\u00bb sont {2}. +ComputedValueForAttribute_2 = Aucune valeur n\u2019a \u00e9t\u00e9 sp\u00e9cifi\u00e9e pour le tag TIFF \u00ab\u202f{0}\u202f\u00bb. La valeur {1} a \u00e9t\u00e9 calcul\u00e9e \u00e0 partir des autres tags. +DefaultValueForAttribute_2 = Aucune valeur n\u2019a \u00e9t\u00e9 sp\u00e9cifi\u00e9e pour le tag TIFF \u00ab\u202f{0}\u202f\u00bb. La valeur par d\u00e9faut sera {1}. +DitheringOrHalftoningApplied_2 = Un tramage ordonn\u00e9 ou une technique en demi-teinte a \u00e9t\u00e9 appliqu\u00e9. La taille de la matrice de tramage est {0}\u00d7{1}. +IgnoredTag_1 = Le tag TIFF \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 ignor\u00e9. +IgnoredGeoKey_1 = La cl\u00e9 GeoTIFF \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 ignor\u00e9e. +InconsistentTileStrip_1 = L\u2019image TIFF \u00ab\u202f{0}\u202f\u00bb doit \u00eatre soit tuil\u00e9e, soit organis\u00e9e par bandes. +InvalidGeoValue_2 = La valeur \u00ab\u202f{1}\u202f\u00bb n\u2019est pas valide pour la cl\u00e9 GeoTIFF \u00ab\u202f{0}\u202f\u00bb. +ListTooShort_3 = Le tag TIFF \u00ab\u202f{0}\u202f\u00bb devrait contenir au moins {1} valeurs alors qu\u2019on n\u2019en a trouv\u00e9 que {2}. +MismatchedLength_4 = Les tags TIFF \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb contiennent des valeurs de longueurs diff\u00e9rentes. On a trouv\u00e9 {2} et {3} \u00e9l\u00e9ments respectivement. +MissingGeoValue_1 = Aucune valeur n\u2019a \u00e9t\u00e9 trouv\u00e9e pour la cl\u00e9 GeoTIFF \u00ab\u202f{0}\u202f\u00bb. +MissingValue_2 = Ne peut pas lire l\u2019image TIFF provenant de \u00ab\u202f{0}\u202f\u00bb car le tag \u00ab\u202f{1}\u202f\u00bb est manquant. +NotTheEpsgValue_5 = Le fichier d\u00e9finit \u00ab\u202f{2}\u202f\u00bb avec la valeur {3}{4}, mais cette valeur devrait \u00eatre {1}{4} pour \u00eatre coh\u00e9rent avec {0}. +RandomizedProcessApplied = Un processus randomis\u00e9 comme la diffusion d\u2019erreur a \u00e9t\u00e9 appliqu\u00e9. +UnexpectedListOfValues_2 = Une seule valeur \u00e9tait attendue pour la cl\u00e9 \u00ab\u202f{0}\u202f\u00bb, mais on en a trouv\u00e9es {1}. +UnexpectedTileCount_3 = {2} tuiles ont \u00e9t\u00e9 trouv\u00e9es dans le fichier \u00ab\u202f{0}\u202f\u00bb alors qu\u2019on en attendait {1}. +UnsupportedCoordinateSystemKind_1 = Le type de syst\u00e8me de coordonn\u00e9es {0} n\u2019est pas support\u00e9. +UnsupportedGeoKeyDirectory_1 = La version {0} du r\u00e9pertoire de cl\u00e9s GeoTIFF n\u2019est pas support\u00e9e. Copied: sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java (from r1773005, sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java) URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java?p2=sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java&p1=sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java&r1=1773005&r2=1773010&rev=1773010&view=diff ============================================================================== --- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java [UTF-8] (original) +++ sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java [UTF-8] Wed Dec 7 04:14:44 2016 @@ -20,7 +20,6 @@ import java.util.Map; import java.util.HashMap; import java.util.Iterator; import java.util.Collections; -import java.util.StringJoiner; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.NoSuchElementException; @@ -347,9 +346,12 @@ final class CRSBuilder { if (value != null) { if (value.getClass().isArray()) { final int length = Array.getLength(value); - final StringJoiner buffer = new StringJoiner(", "); + final StringBuffer buffer = new StringBuffer(); for (int i=0; iunsigned short. */ - final int tag; + final short tag; /** * The GeoTIFF type of the value to read. @@ -54,7 +54,7 @@ final class DeferredEntry implements Com /** * Creates a new deferred entry. */ - DeferredEntry(final ImageFileDirectory owner, final int tag, final Type type, final long count, final long offset) { + DeferredEntry(final ImageFileDirectory owner, final short tag, final Type type, final long count, final long offset) { this.owner = owner; this.tag = tag; this.type = type;