You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/02/22 11:31:14 UTC

[ignite] branch ignite-11189-java11 updated: IGNITE-11189: Java 11: fixing compilation for ignite-tools

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch ignite-11189-java11
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/ignite-11189-java11 by this push:
     new eb344a4  IGNITE-11189: Java 11: fixing compilation for ignite-tools
eb344a4 is described below

commit eb344a4579232111c721cfa6d2711f2a263d0584
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Feb 22 14:31:03 2019 +0300

    IGNITE-11189: Java 11: fixing compilation for ignite-tools
---
 modules/tools/pom.xml                              | 11 ---------
 ...niteLinkTaglet11.java => IgniteLinkTaglet.java} | 27 +++++++++++-----------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index fa8bc46..3f10287 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -63,17 +63,6 @@
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>src/main/java/**/*.java</include>
-                        <include>${src.javaspecific.dir}/**/*.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <version>3.0.0</version>
diff --git a/modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet11.java b/modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
similarity index 87%
rename from modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet11.java
rename to modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
index 5a1afb3..842a5e0 100644
--- a/modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet11.java
+++ b/modules/tools/src/main/java11/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
@@ -21,6 +21,7 @@ import com.sun.javadoc.Tag;
 import com.sun.source.doctree.DocTree;
 import java.io.File;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -32,7 +33,7 @@ import jdk.javadoc.doclet.Taglet;
  * be used as replacement of {@link Class} tag that references to the Ignite class that is not in classpath.
  * Class and its arguments should have fully qualified names.
  */
-public class IgniteLinkTaglet11 implements Taglet {
+public class IgniteLinkTaglet implements Taglet {
     /** */
     private static final String NAME = "ignitelink";
 
@@ -44,7 +45,15 @@ public class IgniteLinkTaglet11 implements Taglet {
     }
 
     @Override public String toString(List<? extends DocTree> tags, Element element) {
-        return null;
+        StringBuilder sb = new StringBuilder();
+
+        for (Iterator<? extends DocTree> iter = tags.iterator(); iter.hasNext(); ) {
+            DocTree next = iter.next();
+
+            sb.append(""); //todo
+        }
+
+        return sb.toString();
     }
 
     @Override public Set<Location> getAllowedLocations() {
@@ -65,8 +74,8 @@ public class IgniteLinkTaglet11 implements Taglet {
      *
      * @param tagletMap the map to register this tag to.
      */
-    public static void register(Map<String, IgniteLinkTaglet11> tagletMap) {
-        IgniteLinkTaglet11 tag = new IgniteLinkTaglet11();
+    public static void register(Map<String, IgniteLinkTaglet> tagletMap) {
+        IgniteLinkTaglet tag = new IgniteLinkTaglet();
 
         Taglet t = tagletMap.get(tag.getName());
 
@@ -121,14 +130,4 @@ public class IgniteLinkTaglet11 implements Taglet {
             (tokens.length > 1 ? ("#" + tokens[1].replace("[]", "...")) : "") +
             "\"><code>" + simpleClsName + (tokens.length > 1 ? ("." + tokens[1]) : "") + "</code></a>";
     }
-
-    /**
-     * This method should not be called since arrays of inline tags do not exist.  Method {@link #toString(Tag)} should
-     * be used to convert this inline tag to a string.
-     *
-     * @param tags the array of <code>Tag</code>s representing of this custom tag.
-     */
-    public String toString(Tag[] tags) {
-        return null;
-    }
 }
\ No newline at end of file