build Kotlin documentation for Java files based on descriptors

author: Dmitry Jemerov <yole@jetbrains.com> 2015-11-03 19:36:48 +0100
committer: Dmitry Jemerov <yole@jetbrains.com> 2015-11-03 19:36:48 +0100
commit: f724ba6fc6cddfe09015b5ee1d66122c158f11ba (patch)
tree: 851dedb47d0a9915fcee949d5cd11f316fab7299 /test/data/format
parent: 6813d65272284b3aaa37907f7c23b3c01ed6f526 (diff)
download: dokka-f724ba6fc6cddfe09015b5ee1d66122c158f11ba.tar.gz
dokka-f724ba6fc6cddfe09015b5ee1d66122c158f11ba.tar.bz2
dokka-f724ba6fc6cddfe09015b5ee1d66122c158f11ba.zip
20 files changed, 105 insertions, 51 deletions
diff --git a/test/data/format/javaCodeInParam.java b/test/data/format/javaCodeInParam.java
index d1cdf6cd..73025fcc 100644
--- a/test/data/format/javaCodeInParam.java
+++ b/test/data/format/javaCodeInParam.java
@@ -1,5 +1,3 @@
-package test;
-
 /**
  * @param T this is {@code some code} and other text
  */
diff --git a/test/data/format/javaCodeInParam.md b/test/data/format/javaCodeInParam.md
index 88cb6912..b1d2d871 100644
--- a/test/data/format/javaCodeInParam.md
+++ b/test/data/format/javaCodeInParam.md
@@ -1,9 +1,9 @@
-[test](test/index) / [test](test/test/index) / [C](test/test/-c)
+[test](test/index) / [C](test/-c/index)
 
 
 # C
 
-`open class C&lt;T&gt;`
+`protected open class C&lt;T&nbsp;:&nbsp;Any&gt;`
 
 
 
@@ -13,3 +13,9 @@
 `T` - this is `some code` and other text
 
 
+
+### Constructors
+
+
+| [&lt;init&gt;](test/-c/-init-) | `C()` |
+
diff --git a/test/data/format/javaCodeLiteralTags.java b/test/data/format/javaCodeLiteralTags.java
index cf071f07..e71ddaa7 100644
--- a/test/data/format/javaCodeLiteralTags.java
+++ b/test/data/format/javaCodeLiteralTags.java
@@ -1,5 +1,3 @@
-package test;
-
 /**
  * <p>{@code A<B>C}</p>
  * <p>{@literal A<B>C}</p>
diff --git a/test/data/format/javaCodeLiteralTags.md b/test/data/format/javaCodeLiteralTags.md
index 17438bff..83c9cc33 100644
--- a/test/data/format/javaCodeLiteralTags.md
+++ b/test/data/format/javaCodeLiteralTags.md
@@ -1,9 +1,9 @@
-[test](test/index) / [test](test/test/index) / [C](test/test/-c)
+[test](test/index) / [C](test/-c/index)
 
 
 # C
 
-`open class C`
+`protected open class C`
 
 
 `A&lt;B&gt;C`
@@ -15,3 +15,9 @@ A&lt;B&gt;C
 
 
 
+
+### Constructors
+
+
+| [&lt;init&gt;](test/-c/-init-) | `C()` |
+
diff --git a/test/data/format/javaDeprecated.html b/test/data/format/javaDeprecated.html
index 9e8958a2..236c6490 100644
--- a/test/data/format/javaDeprecated.html
+++ b/test/data/format/javaDeprecated.html
@@ -1,13 +1,13 @@
 <HTML>
 <HEAD>
-<title>test / test.Foo.foo</title>
+<title>test / Foo.foo</title>
 </HEAD>
 <BODY>
-<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/test/index">test</a>&nbsp;/&nbsp;<a href="test/test/-foo/index">Foo</a>&nbsp;/&nbsp;<a href="test/test/-foo/foo">foo</a><br/>
+<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/-foo/index">Foo</a>&nbsp;/&nbsp;<a href="test/-foo/foo">foo</a><br/>
 <br/>
 <h1>foo</h1>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><s><span class="identifier">foo</span></s><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
-<strong>Deprecated:</strong> use <code><a href="test/test/-foo/bar">#bar</a></code> instead <p></p>
+<strong>Deprecated:</strong> use <code><a href="test/-foo/bar">#bar</a></code> instead <p></p>
 <br/>
 <br/>
 </BODY>
diff --git a/test/data/format/javaDeprecated.java b/test/data/format/javaDeprecated.java
index 4216f205..9694a444 100644
--- a/test/data/format/javaDeprecated.java
+++ b/test/data/format/javaDeprecated.java
@@ -1,5 +1,3 @@
-package test;
-
 class Foo {
   /** @deprecated  use {@link #bar} instead */
   public void foo() {}
diff --git a/test/data/format/javaLinkTag.html b/test/data/format/javaLinkTag.html
index af63710d..1b6921ab 100644
--- a/test/data/format/javaLinkTag.html
+++ b/test/data/format/javaLinkTag.html
@@ -1,21 +1,32 @@
 <HTML>
 <HEAD>
-<title>test / test.Foo</title>
+<title>test / Foo</title>
 </HEAD>
 <BODY>
-<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/test/index">test</a>&nbsp;/&nbsp;<a href="test/test/-foo/index">Foo</a><br/>
+<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/-foo/index">Foo</a><br/>
 <br/>
 <h1>Foo</h1>
-<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></code><br/>
-<p>Call <code><a href="test/test/-foo/bar">#bar()</a></code> to do the job. </p>
+<code><span class="keyword">protected</span> <span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></code><br/>
+<p>Call <code><a href="test/-foo/bar">#bar()</a></code> to do the job. </p>
 <br/>
 <br/>
+<h3>Constructors</h3>
+<table>
+<tbody>
+<tr>
+<td>
+<a href="test/-foo/-init-">&lt;init&gt;</a></td>
+<td>
+<code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
+</tr>
+</tbody>
+</table>
 <h3>Functions</h3>
 <table>
 <tbody>
 <tr>
 <td>
-<a href="test/test/-foo/bar">bar</a></td>
+<a href="test/-foo/bar">bar</a></td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/test/data/format/javaLinkTag.java b/test/data/format/javaLinkTag.java
index 06452f16..84f761c6 100644
--- a/test/data/format/javaLinkTag.java
+++ b/test/data/format/javaLinkTag.java
@@ -1,5 +1,3 @@
-package test;
-
 /**
  * Call {@link #bar()} to do the job.
  */
diff --git a/test/data/format/javaLinkTagWithLabel.html b/test/data/format/javaLinkTagWithLabel.html
index ccf3c712..aabfbc58 100644
--- a/test/data/format/javaLinkTagWithLabel.html
+++ b/test/data/format/javaLinkTagWithLabel.html
@@ -1,21 +1,32 @@
 <HTML>
 <HEAD>
-<title>test / test.Foo</title>
+<title>test / Foo</title>
 </HEAD>
 <BODY>
-<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/test/index">test</a>&nbsp;/&nbsp;<a href="test/test/-foo/index">Foo</a><br/>
+<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/-foo/index">Foo</a><br/>
 <br/>
 <h1>Foo</h1>
-<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></code><br/>
-<p>Call <code><a href="test/test/-foo/bar">this wonderful method</a></code> to do the job. </p>
+<code><span class="keyword">protected</span> <span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></code><br/>
+<p>Call <code><a href="test/-foo/bar">this wonderful method</a></code> to do the job. </p>
 <br/>
 <br/>
+<h3>Constructors</h3>
+<table>
+<tbody>
+<tr>
+<td>
+<a href="test/-foo/-init-">&lt;init&gt;</a></td>
+<td>
+<code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
+</tr>
+</tbody>
+</table>
 <h3>Functions</h3>
 <table>
 <tbody>
 <tr>
 <td>
-<a href="test/test/-foo/bar">bar</a></td>
+<a href="test/-foo/bar">bar</a></td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/test/data/format/javaLinkTagWithLabel.java b/test/data/format/javaLinkTagWithLabel.java
index 7226f1c9..1db5ad70 100644
--- a/test/data/format/javaLinkTagWithLabel.java
+++ b/test/data/format/javaLinkTagWithLabel.java
@@ -1,5 +1,3 @@
-package test;
-
 /**
  * Call {@link #bar() this wonderful method} to do the job.
  */
diff --git a/test/data/format/javaSeeTag.html b/test/data/format/javaSeeTag.html
index cf7b7941..a6813df3 100644
--- a/test/data/format/javaSeeTag.html
+++ b/test/data/format/javaSeeTag.html
@@ -1,23 +1,34 @@
 <HTML>
 <HEAD>
-<title>test / test.Foo</title>
+<title>test / Foo</title>
 </HEAD>
 <BODY>
-<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/test/index">test</a>&nbsp;/&nbsp;<a href="test/test/-foo/index">Foo</a><br/>
+<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/-foo/index">Foo</a><br/>
 <br/>
 <h1>Foo</h1>
 <code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></code><br/>
 <p></p>
 <strong>See Also</strong><br/>
-<a href="test/test/-foo/bar">#bar</a><br/>
+<a href="test/-foo/bar">#bar</a><br/>
 <br/>
 <br/>
+<h3>Constructors</h3>
+<table>
+<tbody>
+<tr>
+<td>
+<a href="test/-foo/-init-">&lt;init&gt;</a></td>
+<td>
+<code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
+</tr>
+</tbody>
+</table>
 <h3>Functions</h3>
 <table>
 <tbody>
 <tr>
 <td>
-<a href="test/test/-foo/bar">bar</a></td>
+<a href="test/-foo/bar">bar</a></td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/test/data/format/javaSeeTag.java b/test/data/format/javaSeeTag.java
index e0b95f11..94a24606 100644
--- a/test/data/format/javaSeeTag.java
+++ b/test/data/format/javaSeeTag.java
@@ -1,8 +1,6 @@
-package test;
-
 /**
  * @see #bar
  */
-class Foo {
+public class Foo {
   public void bar() {}
 }
 \ No newline at end of file
diff --git a/test/data/format/javaSpaceInAuthor.java b/test/data/format/javaSpaceInAuthor.java
index b96f5884..f980ae07 100644
--- a/test/data/format/javaSpaceInAuthor.java
+++ b/test/data/format/javaSpaceInAuthor.java
@@ -1,5 +1,3 @@
-package test;
-
 /**
  * @author Dmitry Jemerov
  */
diff --git a/test/data/format/javaSpaceInAuthor.md b/test/data/format/javaSpaceInAuthor.md
index 425d4c9a..4d19ed01 100644
--- a/test/data/format/javaSpaceInAuthor.md
+++ b/test/data/format/javaSpaceInAuthor.md
@@ -1,9 +1,9 @@
-[test](test/index) / [test](test/test/index) / [C](test/test/-c)
+[test](test/index) / [C](test/-c/index)
 
 
 # C
 
-`open class C`
+`protected open class C`
 
 
 
@@ -11,3 +11,9 @@
 Dmitry Jemerov
 
 
+
+### Constructors
+
+
+| [&lt;init&gt;](test/-c/-init-) | `C()` |
+
diff --git a/test/data/format/javaSupertype.html b/test/data/format/javaSupertype.html
index 2bcc2fce..4c847281 100644
--- a/test/data/format/javaSupertype.html
+++ b/test/data/format/javaSupertype.html
@@ -1,22 +1,33 @@
 <HTML>
 <HEAD>
-<title>test / test.C.Bar</title>
+<title>test / C.Bar</title>
 </HEAD>
 <BODY>
-<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/test/index">test</a>&nbsp;/&nbsp;<a href="test/test/-c/index">C</a>&nbsp;/&nbsp;<a href="test/test/-c/-bar/index">Bar</a><br/>
+<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/-c/index">C</a>&nbsp;/&nbsp;<a href="test/-c/-bar/index">Bar</a><br/>
 <br/>
 <h1>Bar</h1>
-<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Bar</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="test/test/-c/-foo"><span class="identifier">Foo</span></a></code><br/>
+<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Bar</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="test/-c/-foo/index"><span class="identifier">Foo</span></a></code><br/>
 <br/>
 <br/>
+<h3>Constructors</h3>
+<table>
+<tbody>
+<tr>
+<td>
+<a href="test/-c/-bar/-init-">&lt;init&gt;</a></td>
+<td>
+<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
+</tr>
+</tbody>
+</table>
 <h3>Functions</h3>
 <table>
 <tbody>
 <tr>
 <td>
-<a href="test/test/-c/-bar/return-foo">returnFoo</a></td>
+<a href="test/-c/-bar/return-foo">returnFoo</a></td>
 <td>
-<code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">returnFoo</span><span class="symbol">(</span><span class="identifier">foo</span><span class="symbol">:</span>&nbsp;<a href="test/test/-c/-foo"><span class="identifier">Foo</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="test/test/-c/-foo"><span class="identifier">Foo</span></a></code></td>
+<code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">returnFoo</span><span class="symbol">(</span><span class="identifier">foo</span><span class="symbol">:</span>&nbsp;<a href="test/-c/-foo/index"><span class="identifier">Foo</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="test/-c/-foo/index"><span class="identifier">Foo</span></a></code></td>
 </tr>
 </tbody>
 </table>
diff --git a/test/data/format/javaSupertype.java b/test/data/format/javaSupertype.java
index 295c319f..b3142ff6 100644
--- a/test/data/format/javaSupertype.java
+++ b/test/data/format/javaSupertype.java
@@ -1,5 +1,3 @@
-package test;
-
 class C {
   public static class Foo {
   }
diff --git a/test/data/format/javadocHtml.java b/test/data/format/javadocHtml.java
index bcb2cf91..622116b2 100644
--- a/test/data/format/javadocHtml.java
+++ b/test/data/format/javadocHtml.java
@@ -1,5 +1,3 @@
-package test;
-
 /**
  * <b>Bold</b>
  * <strong>Strong</strong>
diff --git a/test/data/format/javadocHtml.md b/test/data/format/javadocHtml.md
index a75ebf35..db71cc3b 100644
--- a/test/data/format/javadocHtml.md
+++ b/test/data/format/javadocHtml.md
@@ -1,4 +1,4 @@
-[test](test/index) / [test](test/test/index) / [C](test/test/-c)
+[test](test/index) / [C](test/-c/index)
 
 
 # C
@@ -19,3 +19,9 @@ Block code
 
 
 
+
+### Constructors
+
+
+| [&lt;init&gt;](test/-c/-init-) | `C()` |
+
diff --git a/test/data/format/javadocOrderedList.java b/test/data/format/javadocOrderedList.java
index 1c7f8a3e..c32d9032 100644
--- a/test/data/format/javadocOrderedList.java
+++ b/test/data/format/javadocOrderedList.java
@@ -1,5 +1,3 @@
-package test;
-
 /**
  * <ol>
  *   <li>Rinse</li>
diff --git a/test/data/format/javadocOrderedList.md b/test/data/format/javadocOrderedList.md
index acd3e809..02a3c095 100644
--- a/test/data/format/javadocOrderedList.md
+++ b/test/data/format/javadocOrderedList.md
@@ -1,4 +1,4 @@
-[test](test/index) / [test](test/test/index) / [Bar](test/test/-bar)
+[test](test/index) / [Bar](test/-bar/index)
 
 
 # Bar
@@ -12,3 +12,9 @@
 
 
 
+
+### Constructors
+
+
+| [&lt;init&gt;](test/-bar/-init-) | `Bar()` |
+
author	Dmitry Jemerov <yole@jetbrains.com>	2015-11-03 19:36:48 +0100
committer	Dmitry Jemerov <yole@jetbrains.com>	2015-11-03 19:36:48 +0100
commit	f724ba6fc6cddfe09015b5ee1d66122c158f11ba (patch)
tree	851dedb47d0a9915fcee949d5cd11f316fab7299 /test/data/format
parent	6813d65272284b3aaa37907f7c23b3c01ed6f526 (diff)
download	dokka-f724ba6fc6cddfe09015b5ee1d66122c158f11ba.tar.gz dokka-f724ba6fc6cddfe09015b5ee1d66122c158f11ba.tar.bz2 dokka-f724ba6fc6cddfe09015b5ee1d66122c158f11ba.zip