sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1685238 - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache/sis/referencing/ sis-referencing/src/main/java/org/apache/sis/referencing/factory/ sis-referencing/src/test/ja...
Date Sat, 13 Jun 2015 11:01:47 GMT
Author: desruisseaux
Date: Sat Jun 13 11:01:46 2015
New Revision: 1685238

URL: http://svn.apache.org/r1685238
Log:
WKT: warning message include the name of the root element.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -232,7 +232,7 @@ abstract class AbstractParser implements
      */
     final void warning(final Element parent, final Element element, final Exception ex) {
         if (warnings == null) {
-            warnings = new Warnings(errorLocale, ignoredElements);
+            warnings = new Warnings(errorLocale, (byte) 1, ignoredElements);
         }
         warnings.add(null, ex, new String[] {parent.keyword, element.keyword});
     }
@@ -243,13 +243,19 @@ abstract class AbstractParser implements
      *
      * <p>The returned object is valid only until a new parsing starts. If a longer
lifetime is desired,
      * then the callers <strong>must</strong> invoke {@link Warnings#publish()}.</p>
+     *
+     * @param object The object that resulted from the parsing operation, or {@code null}.
      */
-    final Warnings getAndClearWarnings() {
+    final Warnings getAndClearWarnings(final Object object) {
         Warnings w = warnings;
         warnings = null;
-        if (w == null && !ignoredElements.isEmpty()) {
-            w = new Warnings(errorLocale, ignoredElements);
+        if (w == null) {
+            if (ignoredElements.isEmpty()) {
+                return null;
+            }
+            w = new Warnings(errorLocale, (byte) 1, ignoredElements);
         }
+        w.setRoot(object);
         return w;
     }
 }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -526,10 +526,11 @@ public class WKTFormat extends CompoundF
                     (DateFormat)   getFormat(Date.class),
                     convention, getLocale(), factories);
         }
+        Object object = null;
         try {
-            return parser.parseObject(text.toString(), pos);
+            return object = parser.parseObject(text.toString(), pos);
         } finally {
-            warnings = parser.getAndClearWarnings();
+            warnings = parser.getAndClearWarnings(object);
         }
     }
 
@@ -588,8 +589,9 @@ public class WKTFormat extends CompoundF
             formatter.clear();
         }
         if (warning != null) {
-            warnings = new Warnings(getLocale(), Collections.emptyMap());
+            warnings = new Warnings(getLocale(), (byte) 0, Collections.emptyMap());
             warnings.add(warning, formatter.getErrorCause(), null);
+            warnings.setRoot(object);
         }
         if (!valid) {
             throw new ClassCastException(Errors.format(

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -26,16 +26,20 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Iterator;
 import java.io.Serializable;
+import org.opengis.metadata.Identifier;
+import org.opengis.referencing.IdentifiedObject;
 import org.opengis.util.InternationalString;
+import org.apache.sis.util.Classes;
 import org.apache.sis.util.Exceptions;
 import org.apache.sis.util.Localized;
 import org.apache.sis.util.resources.Errors;
+import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.resources.Vocabulary;
 
 
 /**
  * Warnings that occurred during a <cite>Well Known Text</cite> (WKT) parsing
or formatting.
- * Some example of information provided by this object are:
+ * Information provided by this object include:
  *
  * <ul>
  *   <li>Recoverable exceptions.</li>
@@ -43,6 +47,26 @@ import org.apache.sis.util.resources.Voc
  *   <li>At parsing time, unknown keywords.</li>
  * </ul>
  *
+ * <div class="note"><b>Example:</b> after parsing the following WKT:
+ *
+ * {@preformat wkt
+ *   GeographicCRS[“WGS 84”,
+ *     Datum[“World Geodetic System 1984”,
+ *       Ellipsoid[“WGS84”, 6378137.0, 298.257223563, Intruder[“some text here”]]],
+ *       PrimeMeridian[“Greenwich”, 0.0, Intruder[“other text here”]],
+ *     AngularUnit[“degree”, 0.017453292519943295]]
+ * }
+ *
+ * a call to {@link WKTFormat#getWarnings()} would return a {@code Warnings} instance with
the following informations:
+ *
+ * <ul>
+ *   <li>{@link #getRootElement()} returns <code>"WGS 84"</code>,</li>
+ *   <li>{@link #getUnknownElements()} returns <code>{"Intruder"}</code>,
and</li>
+ *   <li><code>{@linkplain #getUnknownElementLocations(String) getUnknownElementLocations}("Intruder")</code>
+ *       returns <code>{"Ellipsoid", "PrimeMeridian"}</code>.</li>
+ * </ul>
+ * </div>
+ *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
  * @version 0.6
@@ -65,6 +89,19 @@ public final class Warnings implements L
     private final Locale errorLocale;
 
     /**
+     * {@code 0} if the warnings occurred while formatting, or
+     * {@code 1} if they occurred while parsing.
+     */
+    private final byte operation;
+
+    /**
+     * Name identifier or class name of the root object being parsed or formatted.
+     *
+     * @see #setRoot(Object)
+     */
+    private String root;
+
+    /**
      * Warning messages or exceptions emitted during parsing or formatting.
      * Initially {@code null} and created when first needed.
      *
@@ -110,34 +147,29 @@ public final class Warnings implements L
      * Creates a new object for declaring warnings.
      *
      * @param locale The locale for reporting warning messages.
+     * @param operation {@code 0} if formatting, or {@code 1} if parsing.
      * @param ignoredElements The {@link Parser#ignoredElements} map, or an empty map (can
not be null).
      */
-    Warnings(final Locale locale, final Map<String, List<String>> ignoredElements)
{
+    Warnings(final Locale locale, final byte operation, final Map<String, List<String>>
ignoredElements) {
         this.errorLocale     = locale;
+        this.operation       = operation;
         this.ignoredElements = ignoredElements;
     }
 
     /**
-     * Must be invoked before this {@code Warnings} instance is given to the user,
-     * in order to protect this instance from changes caused by the next parsing operation.
-     */
-    final void publish() {
-        if (!published) {
-            ignoredElements = ignoredElements.isEmpty() ? Collections.emptyMap() : new LinkedHashMap<>(ignoredElements);
-            published = true;
+     * Invoked after construction for setting the identifier name or class name of the root
object being
+     * parsed or formatted. Defined as a separated method instead than as an argument for
the constructor
+     * because this information is more easily provided by {@link WKTFormat} rather than
by the parser or
+     * formatter that created the {@code Warnings} object.
+     */
+    final void setRoot(final Object obj) {
+        if (obj instanceof IdentifiedObject) {
+            final Identifier id = ((IdentifiedObject) obj).getName();
+            if (id != null && (root = id.getCode()) != null) {
+                return;
+            }
         }
-    }
-
-    /**
-     * Returns the locale in which warning messages are reported by the default {@link #toString()}
method.
-     * This is not necessarily the same locale than the one used for parsing and formatting
dates and numbers
-     * in the WKT.
-     *
-     * @return The locale or warning messages are reported.
-     */
-    @Override
-    public Locale getLocale() {
-        return errorLocale;
+        root = Classes.getShortClassName(obj);
     }
 
     /**
@@ -165,6 +197,41 @@ public final class Warnings implements L
     }
 
     /**
+     * Must be invoked before this {@code Warnings} instance is given to the user,
+     * in order to protect this instance from changes caused by the next parsing operation.
+     */
+    final void publish() {
+        if (!published) {
+            ignoredElements = ignoredElements.isEmpty() ? Collections.emptyMap() : new LinkedHashMap<>(ignoredElements);
+            published = true;
+        }
+    }
+
+    /**
+     * Returns the locale in which warning messages are reported by the default {@link #toString()}
method.
+     * This is not necessarily the same locale than the one used for parsing and formatting
dates and numbers
+     * in the WKT.
+     *
+     * @return The locale or warning messages are reported.
+     */
+    @Override
+    public Locale getLocale() {
+        return errorLocale;
+    }
+
+    /**
+     * Returns the name of the root element being parsed or formatted.
+     * If the parsed of formatted object implement the {@link IdentifiedObject} interface,
+     * then this method returns the value of {@code IdentifiedObject.getName().getCode()}.
+     * Otherwise this method returns a simple class name.
+     *
+     * @return The name of the root element, or {@code null} if unknown.
+     */
+    public String getRootElement() {
+        return root;
+    }
+
+    /**
      * Returns the non-fatal exceptions that occurred during the parsing or formatting.
      * If no exception occurred, returns an empty set.
      *
@@ -236,7 +303,9 @@ public final class Warnings implements L
     public String toString(final Locale locale) {
         final StringBuilder buffer = new StringBuilder(250);
         final String lineSeparator = System.lineSeparator();
-        final Errors resources = Errors.getResources(locale);
+        final Messages resources   = Messages.getResources(locale);
+        buffer.append(resources.getString(Messages.Keys.IncompleteFormattingOrParsing_2,
operation, root))
+              .append(lineSeparator);
         if (messages != null) {
             for (final Iterator<?> it = messages.iterator(); it.hasNext();) {
                 InternationalString i18n = (InternationalString) it.next();
@@ -246,12 +315,12 @@ public final class Warnings implements L
                     message = i18n.toString(locale);
                 } else {
                     /*
-                     * If there is no message, then we must have at least one exception.
-                     * Consequently a NullPointerException below would be a bug.
+                     * If there is no message, then we must have at least an exception.
+                     * Consequently a NullPointerException in following line would be a bug.
                      */
                     final String[] sources = exceptionSources.get(cause);
                     if (sources != null) {
-                        message = resources.getString(Errors.Keys.UnparsableStringInElement_2,
sources);
+                        message = Errors.getResources(locale).getString(Errors.Keys.UnparsableStringInElement_2,
sources);
                     } else {
                         message = cause.toString();
                         cause = null;
@@ -272,7 +341,7 @@ public final class Warnings implements L
          */
         if (!ignoredElements.isEmpty()) {
             final Vocabulary vocabulary = Vocabulary.getResources(locale);
-            buffer.append(" • ").append(resources.getString(Errors.Keys.UnknownElementsInText)).append(lineSeparator);
+            buffer.append(" • ").append(resources.getString(Messages.Keys.UnknownElementsInText)).append(lineSeparator);
             for (final Map.Entry<String, List<String>> entry : ignoredElements.entrySet())
{
                 buffer.append("    ‣ ").append(vocabulary.getString(Vocabulary.Keys.Quoted_1,
entry.getKey()));
                 String separator = vocabulary.getString(Vocabulary.Keys.InBetweenWords);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -213,7 +213,7 @@ public final class CRS extends Static {
      * <ul>
      *   <li>Performance may be sub-optimal in a multi-thread environment.</li>
      *   <li>No control on the WKT {@linkplain org.apache.sis.io.wkt.Convention conventions}
in use.</li>
-     *   <li>No control on the handling of {@linkplain org.apache.sis.io.wkt.warnings}.</li>
+     *   <li>No control on the handling of {@linkplain org.apache.sis.io.wkt.Warnings
warnings}.</li>
      * </ul>
      *
      * Applications which need to parse a large amount of WKT strings should consider to
use

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -1371,7 +1371,7 @@ public class GeodeticObjectFactory exten
      * with the addition of thread-safety. This is okay for occasional use,
      * but is sub-optimal if this method is extensively used in a multi-thread environment.
      * Furthermore this method offers no control on the WKT {@linkplain org.apache.sis.io.wkt.Convention
conventions}
-     * in use and on the handling of {@linkplain org.apache.sis.io.wkt.warnings}.
+     * in use and on the handling of {@linkplain org.apache.sis.io.wkt.Warnings warnings}.
      * Applications which need to parse a large amount of WKT strings should consider to
use
      * the {@link org.apache.sis.io.wkt.WKTFormat} class instead than this method.
      *

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -79,7 +79,7 @@ public final strictfp class GeodeticObje
         final Object obj = parser.parseObject(text, position);
         assertEquals("errorIndex", -1, position.getErrorIndex());
         assertEquals("index", text.length(), position.getIndex());
-        assertNull("warnings", parser.getAndClearWarnings());
+        assertNull("warnings", parser.getAndClearWarnings(obj));
         assertTrue("ignoredElements", parser.ignoredElements.isEmpty());
         assertInstanceOf("GeodeticObjectParser.parseObject", type, obj);
         return type.cast(obj);
@@ -634,20 +634,24 @@ public final strictfp class GeodeticObje
     public void testWarnings() throws ParseException {
         parser = new GeodeticObjectParser();
         final ParsePosition position = new ParsePosition(0);
-        verifyGeographicCRS(0, (GeographicCRS) parser.parseObject(
+        final GeographicCRS crs = (GeographicCRS) parser.parseObject(
                "  GEOGCS[“WGS 84”,\n" +
                "    DATUM[“World Geodetic System 1984”,\n" +
                "      SPHEROID[“WGS84”, 6378137.0, 298.257223563, Ext1[“foo”], Ext2[“bla”]]],\n"
+
                "      PRIMEM[“Greenwich”, 0.0, Intruder[“unknown”]],\n" +
-               "    UNIT[“degree”, 0.017453292519943295], Intruder[“foo”]]", position));
+               "    UNIT[“degree”, 0.017453292519943295], Intruder[“foo”]]", position);
 
+        verifyGeographicCRS(0, crs);
         assertEquals("errorIndex", -1, position.getErrorIndex());
-        final Warnings warnings = parser.getAndClearWarnings();
+        final Warnings warnings = parser.getAndClearWarnings(crs);
         assertNotNull("warnings", warnings);
 
         assertTrue("warnings.getExceptions()",
                 warnings.getExceptions().isEmpty());
 
+        assertEquals("warnings.getRootElement()", "WGS 84",
+                warnings.getRootElement());
+
         assertArrayEquals("warnings.getUnknownElements()",
                 new String[] {"Intruder", "Ext1", "Ext2"},
                 warnings.getUnknownElements().toArray());
@@ -664,12 +668,14 @@ public final strictfp class GeodeticObje
                 new String[] {"SPHEROID"},
                 warnings.getUnknownElementLocations("Ext2").toArray());
 
-        assertMultilinesEquals(" • The text contains unknown elements:\n" +
+        assertMultilinesEquals("Parsing of “WGS 84” done, but some elements were ignored.\n"
+
+                               " • The text contains unknown elements:\n" +
                                "    ‣ “Intruder” in PRIMEM, GEOGCS.\n" +
                                "    ‣ “Ext1” in SPHEROID.\n" +
                                "    ‣ “Ext2” in SPHEROID.\n", warnings.toString(Locale.US));
 
-        assertMultilinesEquals(" • Le texte contient des éléments inconnus :\n" +
+        assertMultilinesEquals("La lecture de « WGS 84 » a été faite, mais en ignorant
certains éléments.\n" +
+                               " • Le texte contient des éléments inconnus :\n" +
                                "    ‣ « Intruder » dans PRIMEM, GEOGCS.\n"
+
                                "    ‣ « Ext1 » dans SPHEROID.\n" +
                                "    ‣ « Ext2 » dans SPHEROID.\n", warnings.toString(Locale.FRANCE));

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -911,11 +911,6 @@ public final class Errors extends Indexe
         public static final short UnknownCommand_1 = 113;
 
         /**
-         * The text contains unknown elements:
-         */
-        public static final short UnknownElementsInText = 193;
-
-        /**
          * “{1}” is not a known or supported value for the ‘{0}’ enumeration.
          */
         public static final short UnknownEnumValue_2 = 114;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
[ISO-8859-1] Sat Jun 13 11:01:46 2015
@@ -193,7 +193,6 @@ UnitlessParameter_1               = Para
 UnknownAuthority_1                = Authority \u201c{0}\u201d is unknown.
 UnknownAxisDirection_1            = Axis direction \u201c{0}\u201d is unknown.
 UnknownCommand_1                  = Command \u201c{0}\u201d is not recognized.
-UnknownElementsInText             = The text contains unknown elements:
 UnknownEnumValue_2                = \u201c{1}\u201d is not a known or supported value for
the \u2018{0}\u2019 enumeration.
 UnknownFormatFor_1                = Format of \u201c{0}\u201d is not recognized.
 UnknownKeyword_1                  = Keyword \u201c{0}\u201d is unknown.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
[ISO-8859-1] Sat Jun 13 11:01:46 2015
@@ -189,7 +189,6 @@ UnitlessParameter_1               = Le p
 UnknownAuthority_1                = L\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est
pas reconnue.
 UnknownAxisDirection_1            = La direction d\u2019axe \u00ab\u202f{0}\u202f\u00bb n\u2019est
pas reconnue.
 UnknownCommand_1                  = La commande \u00ab\u202f{0}\u202f\u00bb n\u2019est pas
reconnue.
-UnknownElementsInText             = Le texte contient des \u00e9l\u00e9ments inconnus\u00a0:
 UnknownEnumValue_2                = \u00ab\u202f{1}\u202f\u00bb n\u2019est pas une valeur
connue ou support\u00e9e pour l\u2019\u00e9num\u00e9ration \u2018{0}\u2019.
 UnknownFormatFor_1                = Le format de \u00ab\u202f{0}\u202f\u00bb n\u2019est pas
reconnu.
 UnknownKeyword_1                  = Le mot-cl\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est
pas reconnu.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
[UTF-8] Sat Jun 13 11:01:46 2015
@@ -93,6 +93,11 @@ public final class Messages extends Inde
         public static final short IgnoredPropertyAssociatedTo_1 = 7;
 
         /**
+         * {0,choice,0#Formatting|1#Parsing} of “{1}” done, but some elements were ignored.
+         */
+        public static final short IncompleteFormattingOrParsing_2 = 14;
+
+        /**
          * Text were discarded for some locales.
          */
         public static final short LocalesDiscarded = 3;
@@ -120,6 +125,11 @@ public final class Messages extends Inde
         public static final short PropertyHiddenBy_2 = 4;
 
         /**
+         * The text contains unknown elements:
+         */
+        public static final short UnknownElementsInText = 13;
+
+        /**
          * Can not parse “{1}” as an instance of ‘{0}’. The value is stored as plain
text instead, but
          * will be ignored by some processing.
          */

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
[ISO-8859-1] Sat Jun 13 11:01:46 2015
@@ -21,9 +21,11 @@ ConstantProjParameterValue_1    = This p
 DiscardedExclusiveProperty_2    = Property \u201c{0}\u201d has been discarded in favor of
\u201c{1}\u201d, because those two properties are mutually exclusive.
 IgnoredPropertiesAfterFirst_1   = Ignored properties after the first occurrence of \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1   = Ignored property associated to \u2018{0}\u2019.
+IncompleteFormattingOrParsing_2 = {0,choice,0#Formatting|1#Parsing} of \u201c{1}\u201d done,
but some elements were ignored.
 LocalesDiscarded                = Text were discarded for some locales.
 OptionalModuleNotFound_1        = Optional module \u201c{0}\u201d requested but not found.
 PropertyHiddenBy_2              = Property \u201c{0}\u201d is hidden by \u201c{1}\u201d.
 MismatchedEllipsoidAxisLength_3 = The \u201c{1}\u201d parameter could have been omitted.
But it has been given a value of {2} which does not match the definition of the \u201c{0}\u201d
ellipsoid.
 NotFormalProjectionParameter_1  = This parameter borrowed from the \u201c{0}\u201d projection
is not formally a parameter of this projection.
+UnknownElementsInText           = The text contains unknown elements:
 UnparsableValueStoredAsText_2   = Can not parse \u201c{1}\u201d as an instance of \u2018{0}\u2019.
The value is stored as plain text instead, but will be ignored by some processing.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties?rev=1685238&r1=1685237&r2=1685238&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
[ISO-8859-1] Sat Jun 13 11:01:46 2015
@@ -28,9 +28,11 @@ ConstantProjParameterValue_1    = Ce par
 DiscardedExclusiveProperty_2    = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9
\u00e9cart\u00e9e en faveur de \u00ab\u202f{1}\u202f\u00bb, parce que ces deux propri\u00e9t\u00e9s
sont mutuellement exclusives.
 IgnoredPropertiesAfterFirst_1   = Des propri\u00e9t\u00e9s ont \u00e9t\u00e9 ignor\u00e9es
apr\u00e8s la premi\u00e8re occurrence de \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1   = Une propri\u00e9t\u00e9 associ\u00e9e \u00e0 \u2018{0}\u2019
a \u00e9t\u00e9 ignor\u00e9e.
+IncompleteFormattingOrParsing_2 = {0,choice,0#L\u2019\u00e9criture|1#La lecture} de \u00ab\u202f{1}\u202f\u00bb
a \u00e9t\u00e9 faite, mais en ignorant certains \u00e9l\u00e9ments.
 LocalesDiscarded                = Des textes ont \u00e9t\u00e9 ignor\u00e9s pour certaines
langues.
 OptionalModuleNotFound_1        = Le module optionnel \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9
demand\u00e9 mais n\u2019a pas \u00e9t\u00e9 trouv\u00e9.
 PropertyHiddenBy_2              = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb est
masqu\u00e9e par \u00ab\u202f{1}\u202f\u00bb.
 MismatchedEllipsoidAxisLength_3 = Le param\u00e8tre \u00ab\u202f{1}\u202f\u00bb aurait pu
\u00eatre omis. Mais il lui a \u00e9t\u00e9 donn\u00e9 la valeur {2} qui ne correspond pas
\u00e0 la d\u00e9finition de l\u2019ellipso\u00efde \u00ab\u202f{0}\u202f\u00bb.
 NotFormalProjectionParameter_1  = Ce param\u00e8tre emprunt\u00e9 \u00e0 la projection \u00ab\u202f{0}\u202f\u00bb
n\u2019est pas formellement un param\u00e8tre de cette projection.
+UnknownElementsInText           = Le texte contient des \u00e9l\u00e9ments inconnus\u00a0:
 UnparsableValueStoredAsText_2   = La valeur \u00ab\u202f{1}\u202f\u00bb ne peut pas \u00eatre
interpr\u00e9t\u00e9e comme une instance de \u2018{0}\u2019. Elle est donc m\u00e9moris\u00e9e
sous sa forme textuelle, mais sera ignor\u00e9e par certains traitements.



Mime
View raw message