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
commit 7b8f3d62bf45acc059bf0654002cdf1d35eeb58e
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Dec 28 17:06:10 2022 +0100
Final cleanup for https://issues.apache.org/jira/browse/SIS-565
---
.../org/apache/sis/internal/doclet/Module.java | 96 --------
.../org/apache/sis/internal/doclet/Preformat.java | 243 ---------------------
pom.xml | 2 -
src/main/javadoc/sis.css | 6 +-
4 files changed, 2 insertions(+), 345 deletions(-)
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
deleted file mode 100644
index 65889114d7..0000000000
---
a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Module.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.internal.doclet;
-
-import java.util.Set;
-import java.util.EnumSet;
-import java.nio.file.Path;
-import com.sun.source.doctree.DocTree;
-
-
-/**
- * The <code>@module</code> tag. This tag expects no argument.
- *
- * @author Martin Desruisseaux (IRD, Geomatys)
- * @version 1.0
- * @since 0.3
- */
-public final class Module extends Taglet {
- /**
- * Constructs a <code>@module</code> taglet.
- */
- public Module() {
- }
-
- /**
- * Returns the name of this custom tag.
- *
- * @return "module".
- */
- @Override
- public String getName() {
- return "module";
- }
-
- /**
- * Returns the set of locations in which this taglet may be used.
- *
- * @return the set of locations in which this taglet may be used.
- */
- @Override
- public Set<Location> getAllowedLocations() {
- return EnumSet.of(Location.PACKAGE, Location.TYPE);
- }
-
- /**
- * Returns {@code false} since <code>@module</code> is not an inline tag.
- *
- * @return always {@code false}.
- */
- @Override
- public boolean isInlineTag() {
- return false;
- }
-
- /**
- * Given a {@code DocTree}s representing this custom tag, appends its
string representation.
- *
- * @param tag the tag to format.
- * @param buffer the buffer where to format the tag.
- */
- @Override
- protected void format(final DocTree tag, final StringBuilder buffer) {
- buffer.append("\n<p><font size=\"-1\">");
- Path file = getCurrentFile();
- if (file != null) {
- String module = file.getFileName().toString();
- while ((file = file.getParent()) != null) {
- if (file.getFileName().toString().equals("src")) {
- file = file.getParent();
- if (file != null) {
- module = file.getFileName().toString();
- }
- break;
- }
- }
- /*
- * Appends the module link.
- */
- buffer.append("Defined in the
<code>").append(module).append("</code> module").append("</font></p>\n");
- }
- }
-}
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
deleted file mode 100644
index 581da6e8d5..0000000000
---
a/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Preformat.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.internal.doclet;
-
-import java.util.StringTokenizer;
-import com.sun.source.doctree.DocTree;
-import org.apache.sis.internal.book.CodeColorizer;
-
-
-/**
- * The <code>@preformat</code> tag for inserting a pre-formatted code in a
javadoc comment.
- * The first word after the tag must be the format name ("java", "math",
"wkt", "xml", "sql",
- * "shell" or "text").
- * The remaining is the text to format.
- *
- * <p>This taglet will automatically replace {@code &}, {@code <} and {@code
>} by their HTML entities.
- * The only exception is {@code @}, which is converted to the original
{@code @} character because
- * we cannot use that character directly inside this taglet.</p>
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 1.0
- * @since 0.3
- */
-public final class Preformat extends Taglet {
- /**
- * The set of legal words after {@code preformat}. We write them in
lower-cases even if this is not
- * conform to the Java convention for enumeration constants, because we
will use {@link Enum#name()}
- * for getting the string to look for after {@code preformat}.
- */
- private enum Style {
- java, math, wkt, xml, sql, shell, text
- }
-
- /**
- * Special characters to replace by HTML entities.
- */
- private static final String[] SPECIAL_CHARS = new String[] {
- "@", "@", // Because we cannot use @ directly in {@preformat}.
- "&", "&",
- "<", "<",
- ">", ">"
- };
-
- /**
- * Constructs a <code>@preformat</code> taglet.
- */
- public Preformat() {
- super();
- }
-
- /**
- * Returns the name of this custom tag.
- *
- * @return "preformat".
- */
- @Override
- public String getName() {
- return "preformat";
- }
-
- /**
- * Given the <code>DocTree</code> representation of this custom tag,
appends its string representation.
- *
- * @param tag the tag to format.
- * @param buffer the buffer where to format the tag.
- */
- @Override
- protected void format(final DocTree tag, final StringBuilder buffer) {
- String text = text(tag).replace("\r\n", "\n").replace('\r', '\n');
- String format = "<unspecified>";
- /*
- * Extracts the first word, which is expected to be the format name.
- */
- for (int i=0; i<text.length(); i++) {
- if (Character.isWhitespace(text.charAt(i))) {
- format = text.substring(0, i);
- text = trim(text.substring(i));
- break;
- }
- }
- Style style;
- try {
- style = Style.valueOf(format);
- } catch (IllegalArgumentException e) {
- printWarning("Unknown format: " + format);
- style = Style.text;
- }
- /*
- * Counts the minimal amount of spaces in the margin.
- */
- int margin = 0;
- StringTokenizer tk = new StringTokenizer(text, "\r\n");
-all: while (tk.hasMoreTokens()) {
- final String line = tk.nextToken();
- int stop = line.length();
- if (margin != 0 && margin < stop) {
- stop = margin;
- }
- for (int i=0; i<stop; i++) {
- if (!Character.isSpaceChar(line.charAt(i))) {
- if (margin == 0 || i < margin) {
- margin = i;
- }
- if (i == 0) {
- break all;
- }
- break;
- }
- }
- }
- /*
- * Nows inserts each line.
- */
- buffer.append("<blockquote><pre>");
- tk = new StringTokenizer(text, "\r\n", true);
- while (tk.hasMoreTokens()) {
- String line = tk.nextToken();
- if (!line.startsWith("\n")) {
- if (margin < line.length()) {
- line = line.substring(margin);
- }
- for (int i=0; i<SPECIAL_CHARS.length;) {
- line = line.replace(SPECIAL_CHARS[i++],
SPECIAL_CHARS[i++]);
- }
- switch (style) {
- case java: colorJava(line, buffer); continue;
- case math: styleMath(line, buffer); continue;
- }
- }
- buffer.append(line);
- }
- buffer.append("</pre></blockquote>");
- }
-
- /**
- * Adds syntactic coloration for the given line.
- */
- private static void colorJava(final String line, final StringBuilder
buffer) {
- char quote = 0; // The kind of quoting in
progress (" or ').
- final int length = line.length();
- for (int i=0; i<length; i++) {
- final char c = line.charAt(i);
- if (quote == 0) {
- if (Character.isJavaIdentifierStart(c)) {
- int j = i;
- while (++j < length &&
Character.isJavaIdentifierPart(line.charAt(j)));
- final String word = line.substring(i, j);
- final boolean keyword =
CodeColorizer.JAVA_KEYWORDS.contains(word);
- i = j-1;
- boolean function = false;
- if (!keyword || word.equals("this") ||
word.equals("super")) {
- while (j < length) {
- final char t = line.charAt(j++);
- if (!Character.isWhitespace(t)) {
- function = (t == '(');
- break;
- }
- }
- }
- if (function) buffer.append("<b>");
- if (keyword) buffer.append("<font color=\"green\">");
- if (true) buffer.append(word);
- if (keyword) buffer.append("</font>");
- if (function) buffer.append("</b>");
- continue;
- }
- switch (c) {
- case '/': {
- if (i+1 < length && line.charAt(i+1) == '/') {
- buffer.append("<i><font
color=\"gray\">").append(line.substring(i)).append("</font></i>");
- return;
- }
- break;
- }
- case '\'': // fall through
- case '"': {
- quote = c;
- buffer.append("<font color=\"orangered\">").append(c);
- continue;
- }
- }
- } else if (c == quote) {
- quote = 0;
- buffer.append(c).append("</font>");
- continue;
- }
- buffer.append(c);
- }
- }
-
- /**
- * Adds italic on variables in a math formulas.
- * We will put in italic only the single latin letters.
- */
- private static void styleMath(final String line, final StringBuilder
buffer) {
- final int length = line.length();
- for (int i=0; i<length; i++) {
- final char c = line.charAt(i);
- if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) {
- if ((i == 0 ||
!Character.isLetterOrDigit(line.codePointBefore(i))) &&
- (i+1 >= length ||
!Character.isLetterOrDigit(line.codePointAt(i+1))))
- {
- buffer.append("<var>").append(c).append("</var>");
- continue;
- }
- }
- buffer.append(c);
- }
- }
-
- /**
- * Removes the leading and trailing linefeeds (but not other kind of
spaces).
- */
- private static String trim(final String line) {
- int high = line.length();
- while (high != 0) {
- final char c = line.charAt(high - 1);
- if (c != '\r' && c != '\n') break;
- high--;
- }
- int low = 0;
- while (low != high) {
- final char c = line.charAt(low);
- if (c != '\r' && c != '\n') break;
- low++;
- }
- return line.substring(low, high);
- }
-}
diff --git a/pom.xml b/pom.xml
index 48a80bf84c..273d02a1f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -925,9 +925,7 @@
<tag><placement>a</placement> <name>todo</name>
<head>TODO:</head></tag>
</tags>
<taglets>
-
<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>
diff --git a/src/main/javadoc/sis.css b/src/main/javadoc/sis.css
index cc771d60c3..7514090095 100644
--- a/src/main/javadoc/sis.css
+++ b/src/main/javadoc/sis.css
@@ -231,11 +231,9 @@ div.preformat {
}
/*
- * Output of {@preformat} inline tag.
+ * Preformatted blocks.
*/
-pre.code-sample {
- margin-left: 40px;
- margin-right: 40px;
+pre.text, pre.math {
margin-top: 12px;
margin-bottom: 12px;
}
