sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] branch geoapi-4.0 updated: Documentation fixes, and class names of taglet to load.
Date Sun, 12 Aug 2018 18:59:30 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
     new 3663f58  Documentation fixes, and class names of taglet to load.
3663f58 is described below

commit 3663f589451b3799ebc441c8657851efee1a36ea
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Sun Aug 12 14:28:41 2018 +0200

    Documentation fixes, and class names of taglet to load.
---
 .../src/main/java/org/apache/sis/internal/doclet/Doclet.java        | 2 +-
 .../src/main/java/org/apache/sis/internal/doclet/Include.java       | 2 +-
 .../src/main/java/org/apache/sis/internal/doclet/InlineTaglet.java  | 2 +-
 .../src/main/java/org/apache/sis/internal/doclet/Module.java        | 2 +-
 .../src/main/java/org/apache/sis/internal/doclet/Preformat.java     | 2 +-
 .../src/main/java/org/apache/sis/internal/doclet/Rewriter.java      | 2 +-
 .../src/main/java/org/apache/sis/internal/doclet/package-info.java  | 2 +-
 .../java/org/apache/sis/referencing/datum/BursaWolfParameters.java  | 4 ++--
 core/sis-utility/src/main/java/org/apache/sis/measure/Prefixes.java | 2 +-
 .../src/main/java/org/apache/sis/measure/UnitFormat.java            | 4 ++--
 .../java/org/apache/sis/util/resources/IndexedResourceBundle.java   | 2 +-
 pom.xml                                                             | 6 +++---
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
index 24a0478..7c3741b 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
@@ -57,7 +57,7 @@ import jdk.javadoc.doclet.StandardDoclet;
  * <p>This class presumes that all CSS files are encoded in UTF-8.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.5
  * @module
  */
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java
index 3c6cc6a..d444bac 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Include.java
@@ -33,7 +33,7 @@ import com.sun.source.doctree.DocTree;
  * just before the parts to copy in the javadoc.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.5
  * @module
  */
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/InlineTaglet.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/InlineTaglet.java
index 7d220f6..3beeebb 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/InlineTaglet.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/InlineTaglet.java
@@ -35,7 +35,7 @@ import jdk.javadoc.doclet.DocletEnvironment;
  * Base class of inline taglets.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
index 276e09a..1ef02df 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
@@ -29,7 +29,7 @@ import javax.lang.model.element.Element;
  * The <code>@module</code> tag. This tag expects no argument.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
index c370054..b95341f 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
@@ -32,7 +32,7 @@ import org.apache.sis.internal.book.CodeColorizer;
  * we can not use that character directly inside this taglet.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.3
  * @module
  */
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
index 41d8f60..038f961 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
@@ -42,7 +42,7 @@ import java.io.Writer;
  * We may revisit when JDK 9 become available, if their new standard doclet API is public.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.7
+ * @version 1.0
  * @since   0.7
  * @module
  */
diff --git a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
index 22a22e4..c1e16f1 100644
--- a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
+++ b/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
@@ -21,7 +21,7 @@
  * together with doclet performing post-processing after Javadoc generation.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
  * @since   0.5
  * @module
  */
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
index 21ec81a..85f6884 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
@@ -79,8 +79,8 @@ import java.util.Objects;
  * </td><td style="padding-left: 40pt; white-space: nowrap">
  * <center><b>Geocentric coordinates transformation</b></center>
  * <center>from (<var>X</var><sub>s</sub>, <var>Y</var><sub>s</sub>,
<var>Z</var><sub>s</sub>)
- *           to (<var>X</var><sub>t</sub>, <var>Y</var><sub>t</sub>,
<var>Z</var><sub>t</sub>)</center>
- * <center style="font-size: small">(ignoring unit conversions)</center>
+ *           to (<var>X</var><sub>t</sub>, <var>Y</var><sub>t</sub>,
<var>Z</var><sub>t</sub>)
+ * <br><span style="font-size:small">(ignoring unit conversions)</span></center>
  *
  * <p>{@include formulas.html#Bursa-Wolf}</p>
  * </td></tr></table>
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/Prefixes.java b/core/sis-utility/src/main/java/org/apache/sis/measure/Prefixes.java
index 353023f..e410409 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/Prefixes.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/Prefixes.java
@@ -207,7 +207,7 @@ final class Prefixes {
                 {
                     symbol = symbol.substring(1);
                     UnitConverter c = converter('m');
-                    return new ConventionalUnit<>(unit, c, symbol, UnitRegistry.PREFIXABLE,
(byte) 0).unique(symbol);
+                    return new ConventionalUnit<>(unit, c, symbol, UnitRegistry.PREFIXABLE,
(short) 0).unique(symbol);
                 }
             }
         }
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
index cdf6332..31f52b0 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
@@ -94,7 +94,7 @@ public class UnitFormat extends Format implements javax.measure.format.UnitForma
     /**
      * The unit name for dimensionless unit.
      */
-    static final String UNITY = "unity";
+    private static final String UNITY = "unity";
 
     /**
      * The default instance used by {@link Units#valueOf(String)} for parsing units of measurement.
@@ -625,7 +625,7 @@ public class UnitFormat extends Format implements javax.measure.format.UnitForma
         }
         /*
          * Choice 3: if the unit has a specific symbol, appends that symbol.
-         * Apache SIS implementation use Unicode characters in the symbol, which are not
valid for UCUM.
+         * Apache SIS implementation uses Unicode characters in the symbol, which are not
valid for UCUM.
          * But Styme.UCUM.appendSymbol(…) performs required replacements.
          */
         {
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
b/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
index 1ae2d76..beb1879 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
@@ -334,7 +334,7 @@ public class IndexedResourceBundle extends ResourceBundle implements Localized
{
                     }
                     record.setParameters(new String[] {language, baseName});
                     Logging.log(IndexedResourceBundle.class, methodName, record);
-                    resources = null; // Not needed anymore, let GC do its job.
+                    resources = null;                                           // Not needed
anymore, let GC do its job.
                 }
                 this.values = values;
             }
diff --git a/pom.xml b/pom.xml
index bb6e321..15e4fd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -856,9 +856,9 @@
             <tag><placement>a</placement> <name>todo</name>
    <head>TODO:</head></tag>
           </tags>
           <taglets>
-            <taglet><tagletClass>org.apache.sis.internal.taglet.Module</tagletClass></taglet>
-            <taglet><tagletClass>org.apache.sis.internal.taglet.Include</tagletClass></taglet>
-            <taglet><tagletClass>org.apache.sis.internal.taglet.Preformat</tagletClass></taglet>
+            <taglet><tagletClass>org.apache.sis.internal.doclet.Module</tagletClass></taglet>
+            <taglet><tagletClass>org.apache.sis.internal.doclet.Include</tagletClass></taglet>
+            <taglet><tagletClass>org.apache.sis.internal.doclet.Preformat</tagletClass></taglet>
           </taglets>
           <doclet>org.apache.sis.internal.doclet.Doclet</doclet>
           <tagletArtifact>


Mime
View raw message