sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1706356 - in /sis/branches/JDK8/core/sis-build-helper/src/main: java/org/apache/sis/internal/book/ resources/org/apache/sis/internal/book/
Date Fri, 02 Oct 2015 08:15:01 GMT
Author: desruisseaux
Date: Fri Oct  2 08:15:00 2015
New Revision: 1706356

URL: http://svn.apache.org/viewvc?rev=1706356&view=rev
Log:
Rename the file containing the list of identifiers.

Added:
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
      - copied unchanged from r1706355, sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GeoAPI.txt
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
      - copied unchanged from r1706355, sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.txt
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
      - copied unchanged from r1706355, sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.txt
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/XML_PREFIX.lst
      - copied unchanged from r1706355, sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/XML_PREFIX.txt
Removed:
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GeoAPI.txt
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.txt
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.txt
    sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/XML_PREFIX.txt
Modified:
    sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
    sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java

Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java?rev=1706356&r1=1706355&r2=1706356&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
[UTF-8] Fri Oct  2 08:15:00 2015
@@ -318,7 +318,7 @@ public final class Assembler {
                                 ((Element) node).setAttribute("class", style);
                             }
                         }
-                        break;
+                        return; // Do not scan recursively the <code> text content.
                     }
                     default: {
                         if (name.length() == 2 && name.charAt(0) == 'h') {

Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java?rev=1706356&r1=1706355&r2=1706356&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
[UTF-8] Fri Oct  2 08:15:00 2015
@@ -108,14 +108,7 @@ public final class CodeColorizer {
         this.document = document;
         identifierSpecifiers = new HashMap<>(1000);
         for (final Specifier specifier : Specifier.values()) {
-            final String filename;
-            switch (specifier) {
-                case OGC:        filename = "OGC.txt";        break;
-                case GEOAPI:     filename = "GeoAPI.txt";     break;
-                case SIS:        filename = "SIS.txt";        break;
-                case XML_PREFIX: filename = "XML_PREFIX.txt"; break;
-                default: continue;
-            }
+            final String filename = specifier.name() + ".lst";
             final InputStream in = CodeColorizer.class.getResourceAsStream(filename);
             if (in == null) {
                 throw new FileNotFoundException(filename);



Mime
View raw message