accept tags in comment, add ignored comment

umjammer · May 9, 2019 · 721f0e8 · 721f0e8
1 parent 8f67af9
commit 721f0e8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/org/codavaj/process/docparser/ParserUtils8.java b/src/main/java/org/codavaj/process/docparser/ParserUtils8.java
@@ -37,9 +37,15 @@ protected void determineComment(Type t, List<?> allNodes, List<String> commentTe
 
             if (node.getNodeType() == Node.ELEMENT_NODE) {
                 if ("DIV".equals(node.getName())) {
-                    String[] lines = node.getText().split("\\n");
-                    for (String line : lines) {
-                        commentText.add(line.trim());
+                    // TODO {@link} a tag
+                    String text = node.asXML().replace("<DIV>", "").replace("</DIV>", "").trim();
+                    if (!text.contains(rb.getString("token.comment.exclude"))) {
+                        String[] lines = text.split("\\n");
+                        for (String line : lines) {
+                            commentText.add(line.trim());
+                        }
+                    } else {
+System.err.println("ignore: " + text);
                     }
                 } else if ("DL".equals(node.getName())) {
                     List<Node> nodes = node.selectNodes("*[name()='DT' or name()='DD']");

diff --git a/src/main/native2ascii/token_ja.properties b/src/main/native2ascii/token_ja.properties
@@ -31,4 +31,5 @@ token.type_parameter=型パラメータ
 token.see=関連項目
 token.overrides=Overrides
 token.see.exclude.1=直列化された形式
-token.see.exclude.2=定数フィールド値
+token.see.exclude.2=定数フィールド値
+token.comment.exclude=インタフェースからコピーされた説明
diff --git a/src/main/resources/token.properties b/src/main/resources/token.properties
@@ -31,4 +31,5 @@ token.type_parameter=Type Parameters
 token.see=See Also
 token.overrides=Overrides
 token.see.exclude.1=Serialized Form
-token.see.exclude.2=Constant Field Values
+token.see.exclude.2=Constant Field Values
+token.comment.exclude=Description copied from interface
diff --git a/src/test/resources/codavaj/8/en/vavi/test/codavaj/Test2.java b/src/test/resources/codavaj/8/en/vavi/test/codavaj/Test2.java
@@ -30,7 +30,6 @@ public vavi.test.codavaj.Test3 method1(T arg1, java.lang.String... arg2) throws
     }
 
     /**
-     * Description copied from interface: 
      * description for this method.
      * more description.
      */

diff --git a/src/test/resources/codavaj/8/jp/vavi/test/codavaj/Test2.java b/src/test/resources/codavaj/8/jp/vavi/test/codavaj/Test2.java
@@ -30,7 +30,6 @@ public vavi.test.codavaj.Test3 method1(T arg1, java.lang.String... arg2) throws
     }
 
     /**
-     * インタフェースからコピーされた説明: 
      * description for this method.
      * more description.
      */
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * Description copied from interface:
          * description for this method.
          * more description.
          */
@@ Expand Down @@