sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1637099 - in /sis/branches/JDK7: ./ core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/ core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ core/sis-utility/src/main/java/org/apache/sis/util/resources/ core/s...
Date Thu, 06 Nov 2014 13:37:48 GMT
Author: desruisseaux
Date: Thu Nov  6 13:37:47 2014
New Revision: 1637099

URL: http://svn.apache.org/r1637099
Log:
Merge from the JDK8 branch (in particular the update for GeoAPI change).

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK8:r1635931-1637098

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1637099&r1=1637098&r2=1637099&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] Thu Nov  6 13:37:47 2014
@@ -26,6 +26,8 @@ import java.io.OutputStreamWriter;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FilenameFilter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.nio.file.FileSystemException;
 import java.nio.file.Files;
 import com.sun.javadoc.RootDoc;
@@ -86,7 +88,10 @@ public final class Doclet extends HtmlDo
             copyStylesheet(input, output);
             copyResources(input.getParentFile(), output);
         } catch (IOException e) {
-            root.printError(e.toString());
+            final StringWriter buffer = new StringWriter();
+            final PrintWriter p = new PrintWriter(buffer);
+            e.printStackTrace(p);
+            root.printError(buffer.toString());
             return false;
         }
         return status;

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java?rev=1637099&r1=1637098&r2=1637099&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
[UTF-8] Thu Nov  6 13:37:47 2014
@@ -340,7 +340,6 @@ class IndexedResourceCompiler implements
             if (argumentCount != expected) {
                 final String suffix = ARGUMENT_COUNT_PREFIX + expected;
                 warning(file, key, "Key name should ends with \"" + suffix + "\".", null);
-                continue;
             }
         }
         /*
@@ -385,8 +384,8 @@ search: for (int i=0; i<buffer.length();
                      */
                     if (i+2 < buffer.length()  &&  buffer.charAt(i+2) == '\'')
{
                         switch (buffer.charAt(i+1)) {
-                            case '{': i += 2; continue search;
-                            case '}': i += 2; continue search;
+                            case '{': i += 2; continue;
+                            case '}': i += 2; continue;
                         }
                     }
                     if (level <= 0) {
@@ -394,7 +393,7 @@ search: for (int i=0; i<buffer.length();
                          * If we weren't between braces, we must double the quotes.
                          */
                         buffer.insert(i++, '\'');
-                        continue search;
+                        continue;
                     }
                     /*
                      * If we find ourselves between braces, we don't normally need to double
@@ -408,7 +407,6 @@ search: for (int i=0; i<buffer.length();
                         final int end = scan + choice.length();
                         if (end < buffer.length() && buffer.substring(scan, end).equalsIgnoreCase(choice))
{
                             buffer.insert(i++, '\'');
-                            continue search;
                         }
                     }
                 }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1637099&r1=1637098&r2=1637099&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
[UTF-8] Thu Nov  6 13:37:47 2014
@@ -20,6 +20,7 @@ import java.net.URL;
 import java.util.Map;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import javax.annotation.Generated;
 import org.opengis.util.InternationalString;
 
 
@@ -48,9 +49,9 @@ public final class Errors extends Indexe
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
      * @since   0.3 (derived from geotk-2.2)
-     * @version 0.3
      * @module
      */
+    @Generated("org.apache.sis.util.resources.IndexedResourceCompiler")
     public static final class Keys extends KeyConstants {
         /**
          * The unique instance of key constants handler.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1637099&r1=1637098&r2=1637099&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
[UTF-8] Thu Nov  6 13:37:47 2014
@@ -19,6 +19,7 @@ package org.apache.sis.util.resources;
 import java.net.URL;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import javax.annotation.Generated;
 import org.opengis.util.InternationalString;
 
 
@@ -39,9 +40,9 @@ public final class Messages extends Inde
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
      * @since   0.3 (derived from geotk-2.2)
-     * @version 0.3
      * @module
      */
+    @Generated("org.apache.sis.util.resources.IndexedResourceCompiler")
     public static final class Keys extends KeyConstants {
         /**
          * The unique instance of key constants handler.

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=1637099&r1=1637098&r2=1637099&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] Thu Nov  6 13:37:47 2014
@@ -19,6 +19,7 @@ package org.apache.sis.util.resources;
 import java.net.URL;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import javax.annotation.Generated;
 import org.opengis.util.InternationalString;
 
 
@@ -39,9 +40,9 @@ public final class Vocabulary extends In
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
      * @since   0.3 (derived from geotk-2.2)
-     * @version 0.3
      * @module
      */
+    @Generated("org.apache.sis.util.resources.IndexedResourceCompiler")
     public static final class Keys extends KeyConstants {
         /**
          * The unique instance of key constants handler.

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java?rev=1637099&r1=1637098&r2=1637099&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java
[UTF-8] Thu Nov  6 13:37:47 2014
@@ -29,6 +29,7 @@ import org.opengis.temporal.TemporalPosi
 import org.opengis.temporal.TemporalPrimitive;
 import org.opengis.temporal.TemporalGeometricPrimitive;
 import org.opengis.util.InternationalString;
+import org.apache.sis.internal.simple.SimpleIdentifiedObject;
 
 
 /**
@@ -37,10 +38,11 @@ import org.opengis.util.InternationalStr
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3 (derived from geotk-3.20)
- * @version 0.3
+ * @version 0.5
  * @module
  */
-final class DummyInstant implements Instant, Position {
+@SuppressWarnings("serial")
+final class DummyInstant extends SimpleIdentifiedObject implements Instant, Position {
     /**
      * The time, in milliseconds elapsed since January 1st, 1970.
      */



Mime
View raw message