diff options
Diffstat (limited to 'core/testdata')
28 files changed, 104 insertions, 67 deletions
diff --git a/core/testdata/format/dac/deprecation/DeprecatedBar.kt b/core/testdata/format/dac/deprecation/DeprecatedBar.kt index 8eb729299..39ac1c43d 100644 --- a/core/testdata/format/dac/deprecation/DeprecatedBar.kt +++ b/core/testdata/format/dac/deprecation/DeprecatedBar.kt @@ -4,14 +4,14 @@ class Bar { fun badBarMethod(): DeprecatedBar { return DeprecatedBar() } /** - * @deprecated Use {@link #replacementBarMethod()} instead. + * This method has been deprecated in favor of replacementBarMethod(). */ - @Deprecated + @Deprecated("Obsolete method", ReplaceWith("replacementBarMethod()")) fun goodBarMethod(): DeprecatedBar { return DeprecatedBar() } } /** - * @deprecated Use {@link #Bar} instead. + * This class has been deprecated in favor of Bar. */ -@Deprecated +@Deprecated("Obsolete class", ReplaceWith("Bar")) class DeprecatedBar
\ No newline at end of file diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Bar.html b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html index d77fa9e64..9f9346ee7 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/Bar.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Bar</h1> - <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">Bar</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">Bar</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Bar</a></td> @@ -43,7 +43,7 @@ <td><span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td> <td> <div><code><a href="#goodBarMethod()">goodBarMethod</a>()</code></div> - <p></p> + <p>This method has been deprecated in favor of replacementBarMethod().</p> </td> </tr> <tr> @@ -71,7 +71,8 @@ <div class="api apilevel-" data-version-added=""> <h3 class="api-name">goodBarMethod</h3> <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a> <span class="identifier">goodBarMethod</span><span class="symbol">(</span><span class="symbol">)</span></pre> - <p class="caution"><strong>Deprecated: </strong><em>Deprecated</em></p> + <p class="caution"><strong>Deprecated: </strong><em>Obsolete method. ReplaceWith("replacementBarMethod()"). </em></p> + <p>This method has been deprecated in favor of replacementBarMethod().</p> </div> <a name="replacementBarMethod()"></a> <div class="api apilevel-" data-version-added=""> diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html index 56283f6e5..d6e955413 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html @@ -7,12 +7,13 @@ <body> <div id="api-info-block"></div> <h1>DeprecatedBar</h1> - <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">DeprecatedBar</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">DeprecatedBar</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">DeprecatedBar</a></td> </tr> </table> + <p>This class has been deprecated in favor of Bar.</p> <h2>Summary</h2> <table class="responsive" id="pubctors"> <tbody> @@ -22,7 +23,7 @@ <tr> <td> <div><code><a href="#DeprecatedBar()">DeprecatedBar</a>()</code></div> - <p></p> + <p>This class has been deprecated in favor of Bar.</p> </td> </tr> </tbody> @@ -32,6 +33,7 @@ <div class="api apilevel-" data-version-added=""> <h3 class="api-name">DeprecatedBar</h3> <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">DeprecatedBar</span><span class="symbol">(</span><span class="symbol">)</span></pre> + <p>This class has been deprecated in favor of Bar.</p> </div> </body> </html> diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html index e7e2fecb0..360b24ef3 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>DeprecatedFoo</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">DeprecatedFoo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">DeprecatedFoo</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">DeprecatedFoo</a></td> diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Foo.html b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html index c898800da..b468e4daa 100644 --- a/core/testdata/format/dac/deprecation/dac-as-java/Foo.html +++ b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Foo</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td> diff --git a/core/testdata/format/dac/deprecation/dac/Bar.html b/core/testdata/format/dac/deprecation/dac/Bar.html index f20112e16..7ae5c5c46 100644 --- a/core/testdata/format/dac/deprecation/dac/Bar.html +++ b/core/testdata/format/dac/deprecation/dac/Bar.html @@ -21,7 +21,7 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Bar()">Bar</a>()</code></div> <p></p> </td> </tr> @@ -43,7 +43,7 @@ <td><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td> <td> <div><code><a href="#goodBarMethod()">goodBarMethod</a>()</code></div> - <p></p> + <p>This method has been deprecated in favor of replacementBarMethod().</p> </td> </tr> <tr> @@ -56,9 +56,9 @@ </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Bar()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Bar</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> <h2>Public methods</h2> @@ -71,7 +71,8 @@ <div class="api apilevel-" data-version-added=""> <h3 class="api-name">goodBarMethod</h3> <pre class="api-signature no-pretty-print"><span class="keyword">fun </span><del><span class="identifier">goodBarMethod</span></del><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></pre> - <p class="caution"><strong>Deprecated.</strong><em></em></p> + <p class="caution"><strong>Deprecated: </strong><em>Obsolete method. Replace with: "replacementBarMethod()". </em></p> + <p>This method has been deprecated in favor of replacementBarMethod().</p> </div> <a name="replacementBarMethod()"></a> <div class="api apilevel-" data-version-added=""> diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html index 15be9a06e..11a6a5667 100644 --- a/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html +++ b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html @@ -13,6 +13,7 @@ <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">DeprecatedBar</a></td> </tr> </table> + <p>This class has been deprecated in favor of Bar.</p> <h2>Summary</h2> <table class="responsive" id="pubctors"> <tbody> @@ -21,17 +22,18 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> - <p></p> + <div><code><a href="#DeprecatedBar()">DeprecatedBar</a>()</code></div> + <p>This class has been deprecated in favor of Bar.</p> </td> </tr> </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="DeprecatedBar()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">DeprecatedBar</h3> <pre class="api-signature no-pretty-print"><span class="identifier">DeprecatedBar</span><span class="symbol">(</span><span class="symbol">)</span></pre> + <p>This class has been deprecated in favor of Bar.</p> </div> </body> </html> diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html index 610c46b60..4dcf39c19 100644 --- a/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html +++ b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html @@ -21,16 +21,16 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#DeprecatedFoo()">DeprecatedFoo</a>()</code></div> <p></p> </td> </tr> </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="DeprecatedFoo()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">DeprecatedFoo</h3> <pre class="api-signature no-pretty-print"><span class="identifier">DeprecatedFoo</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> </body> diff --git a/core/testdata/format/dac/deprecation/dac/Foo.html b/core/testdata/format/dac/deprecation/dac/Foo.html index 76c0760a0..9fe6ad2d2 100644 --- a/core/testdata/format/dac/deprecation/dac/Foo.html +++ b/core/testdata/format/dac/deprecation/dac/Foo.html @@ -21,7 +21,7 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Foo()">Foo</a>()</code></div> <p></p> </td> </tr> @@ -56,9 +56,9 @@ </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Foo()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Foo</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> <h2>Public methods</h2> diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html index dd305f7f8..977e693d8 100644 --- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html +++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Parent</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Parent</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Parent</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Parent</a></td> diff --git a/core/testdata/format/dac/inheritedMethods/dac/Child.html b/core/testdata/format/dac/inheritedMethods/dac/Child.html index dff52afbe..c645a89e7 100644 --- a/core/testdata/format/dac/inheritedMethods/dac/Child.html +++ b/core/testdata/format/dac/inheritedMethods/dac/Child.html @@ -25,7 +25,7 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Child()">Child</a>()</code></div> <p></p> </td> </tr> @@ -78,9 +78,9 @@ </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Child()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Child</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Child</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> <h2>Public methods</h2> diff --git a/core/testdata/format/dac/inheritedMethods/dac/Parent.html b/core/testdata/format/dac/inheritedMethods/dac/Parent.html index ff9048b96..72b0b72a1 100644 --- a/core/testdata/format/dac/inheritedMethods/dac/Parent.html +++ b/core/testdata/format/dac/inheritedMethods/dac/Parent.html @@ -42,7 +42,7 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Parent()">Parent</a>()</code></div> <p></p> </td> </tr> @@ -70,9 +70,9 @@ </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Parent()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Parent</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Parent</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> <h2>Public methods</h2> diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html index cbabc2920..64d0c4cd8 100644 --- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html +++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Bar</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Bar</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Bar</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Bar</a></td> @@ -40,9 +40,9 @@ </td> </tr> <tr> - <td><a href="http://docs.oracle.com/javase/6/docs/api/java/util/ArrayList.html"><span class="identifier">java.util.ArrayList</span></a><span class="symbol"><</span><span class="identifier">java.lang.String</span><span class="symbol">></span></td> + <td><a href="http://docs.oracle.com/javase/6/docs/api/java/util/ArrayList.html"><span class="identifier">ArrayList</span></a><span class="symbol"><</span><span class="identifier">String</span><span class="symbol">></span></td> <td> - <div><code><a href="#getMyList(java.util.HashSet)">getMyList</a>(<a href="http://docs.oracle.com/javase/6/docs/api/java/util/HashSet.html"><span class="identifier">java.util.HashSet</span></a> <span class="identifier">input</span>)</code></div> + <div><code><a href="#getMyList(HashSet)">getMyList</a>(<a href="http://docs.oracle.com/javase/6/docs/api/java/util/HashSet.html"><span class="identifier">HashSet</span></a> <span class="identifier">input</span>)</code></div> <p></p> </td> </tr> @@ -100,10 +100,10 @@ </tbody> </table> </div> -<a name="getMyList(java.util.HashSet)"></a> +<a name="getMyList(HashSet)"></a> <div class="api apilevel-" data-version-added=""> <h3 class="api-name">getMyList</h3> - <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <a href="http://docs.oracle.com/javase/6/docs/api/java/util/ArrayList.html"><span class="identifier">java.util.ArrayList</span></a><span class="symbol"><</span><span class="identifier">java.lang.String</span><span class="symbol">></span> <span class="identifier">getMyList</span><span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/HashSet.html"><span class="identifier">java.util.HashSet</span></a> <span class="identifier">input</span><span class="symbol">)</span></pre> + <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <a href="http://docs.oracle.com/javase/6/docs/api/java/util/ArrayList.html"><span class="identifier">ArrayList</span></a><span class="symbol"><</span><span class="identifier">String</span><span class="symbol">></span> <span class="identifier">getMyList</span><span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/HashSet.html"><span class="identifier">HashSet</span></a> <span class="identifier">input</span><span class="symbol">)</span></pre> <table class="responsive"> <tbody> <tr> @@ -111,7 +111,7 @@ </tr> <tr> <td><code>input</code></td> - <td><a href="http://docs.oracle.com/javase/6/docs/api/java/util/HashSet.html"><span class="identifier">java.util.HashSet</span></a><span class="symbol">:</span> The best set you can afford.</td> + <td><a href="http://docs.oracle.com/javase/6/docs/api/java/util/HashSet.html"><span class="identifier">HashSet</span></a><span class="symbol">:</span> The best set you can afford.</td> </tr> </tbody> </table> @@ -121,7 +121,7 @@ <th colspan="2">Return</th> </tr> <tr> - <td><code><a href="http://docs.oracle.com/javase/6/docs/api/java/util/ArrayList.html"><span class="identifier">java.util.ArrayList</span></a><span class="symbol"><</span><span class="identifier">java.lang.String</span><span class="symbol">></span></code></td> + <td><code><a href="http://docs.oracle.com/javase/6/docs/api/java/util/ArrayList.html"><span class="identifier">ArrayList</span></a><span class="symbol"><</span><span class="identifier">String</span><span class="symbol">></span></code></td> <td></td> </tr> </tbody> diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html index 0ae4d255b..bddb7ff8a 100644 --- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Foo</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td> diff --git a/core/testdata/format/dac/javaClassLinks/dac/Bar.html b/core/testdata/format/dac/javaClassLinks/dac/Bar.html index 87f2c3adf..c8961e07f 100644 --- a/core/testdata/format/dac/javaClassLinks/dac/Bar.html +++ b/core/testdata/format/dac/javaClassLinks/dac/Bar.html @@ -21,7 +21,7 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Bar()">Bar</a>()</code></div> <p></p> </td> </tr> @@ -56,9 +56,9 @@ </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Bar()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Bar</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></pre> <table class="responsive"> <tbody> diff --git a/core/testdata/format/dac/javaClassLinks/dac/Foo.html b/core/testdata/format/dac/javaClassLinks/dac/Foo.html index 51ba0204c..b1ed934c3 100644 --- a/core/testdata/format/dac/javaClassLinks/dac/Foo.html +++ b/core/testdata/format/dac/javaClassLinks/dac/Foo.html @@ -21,16 +21,16 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Foo()">Foo</a>()</code></div> <p></p> </td> </tr> </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Foo()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Foo</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> </body> diff --git a/core/testdata/format/dac/javaConstructor/Foo.java b/core/testdata/format/dac/javaConstructor/Foo.java index 0a2b05268..4d70be4fb 100644 --- a/core/testdata/format/dac/javaConstructor/Foo.java +++ b/core/testdata/format/dac/javaConstructor/Foo.java @@ -1,2 +1,4 @@ public class Foo { + public Foo() {} + public Foo(String value) {} }
\ No newline at end of file diff --git a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html index 0ae4d255b..01cb1bb19 100644 --- a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Foo</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td> @@ -25,6 +25,12 @@ <p></p> </td> </tr> + <tr> + <td> + <div><code><a href="#Foo(String)">Foo</a>(<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/String.html"><span class="identifier">String</span></a> <span class="identifier">value</span>)</code></div> + <p></p> + </td> + </tr> </tbody> </table> <h2>Public constructors</h2> @@ -33,5 +39,10 @@ <h3 class="api-name">Foo</h3> <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> +<a name="Foo(String)"></a> + <div class="api apilevel-" data-version-added=""> + <h3 class="api-name">Foo</h3> + <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">Foo</span><span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/lang/String.html"><span class="identifier">String</span></a> <span class="identifier">value</span><span class="symbol">)</span></pre> + </div> </body> </html> diff --git a/core/testdata/format/dac/javaConstructor/dac/Foo.html b/core/testdata/format/dac/javaConstructor/dac/Foo.html index 51ba0204c..948d024b8 100644 --- a/core/testdata/format/dac/javaConstructor/dac/Foo.html +++ b/core/testdata/format/dac/javaConstructor/dac/Foo.html @@ -21,17 +21,28 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Foo()">Foo</a>()</code></div> + <p></p> + </td> + </tr> + <tr> + <td> + <div><code><a href="#Foo(kotlin.String)">Foo</a>(<span class="identifier" id="Foo$<init>(kotlin.String)/value">value</span><span class="symbol">:</span> <span class="identifier">String</span><span class="symbol">!</span>)</code></div> <p></p> </td> </tr> </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Foo()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Foo</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> +<a name="Foo(kotlin.String)"></a> + <div class="api apilevel-" data-version-added=""> + <h3 class="api-name">Foo</h3> + <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="identifier" id="Foo$<init>(kotlin.String)/value">value</span><span class="symbol">:</span> <span class="identifier">String</span><span class="symbol">!</span><span class="symbol">)</span></pre> + </div> </body> </html> diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html index 0ae4d255b..bddb7ff8a 100644 --- a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Foo</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td> diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html index 51ba0204c..b1ed934c3 100644 --- a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html +++ b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html @@ -21,16 +21,16 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Foo()">Foo</a>()</code></div> <p></p> </td> </tr> </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Foo()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Foo</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> </body> diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html index 1ed04c547..978b1071d 100644 --- a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Foo</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td> diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html index 0bcdcae90..b4dddf185 100644 --- a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html +++ b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html @@ -21,7 +21,7 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Foo()">Foo</a>()</code></div> <p></p> </td> </tr> @@ -70,9 +70,9 @@ </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Foo()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Foo</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre> </div> <h2>Public methods</h2> diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html index 6b4d75f4a..7eb3cdf85 100644 --- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html +++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Bar</h1> - <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">Bar</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">final</span> <span class="keyword">class</span> <span class="identifier">Bar</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Bar</a></td> diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html index b9f23dc59..4529fd04d 100644 --- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html +++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html @@ -7,7 +7,7 @@ <body> <div id="api-info-block"></div> <h1>Foo</h1> - <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">java.lang.Object</span></pre> + <pre><span class="keyword">public</span> <span class="keyword">class</span> <span class="identifier">Foo</span> <span class="keyword">implements</span> <span class="identifier">Object</span></pre> <table class="jd-inheritance-table"> <tr> <td class="jd-inheritance-class-cell" colSpan="1"><a href="#">Foo</a></td> diff --git a/core/testdata/format/dac/javaSeeTag/dac/Bar.html b/core/testdata/format/dac/javaSeeTag/dac/Bar.html index 10a5f59ed..c21dfb27b 100644 --- a/core/testdata/format/dac/javaSeeTag/dac/Bar.html +++ b/core/testdata/format/dac/javaSeeTag/dac/Bar.html @@ -21,16 +21,16 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Bar()">Bar</a>()</code></div> <p></p> </td> </tr> </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Bar()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Bar</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></pre> <div> <p><b>See Also</b></p> diff --git a/core/testdata/format/dac/javaSeeTag/dac/Foo.html b/core/testdata/format/dac/javaSeeTag/dac/Foo.html index 7ca410c06..7640805ff 100644 --- a/core/testdata/format/dac/javaSeeTag/dac/Foo.html +++ b/core/testdata/format/dac/javaSeeTag/dac/Foo.html @@ -21,7 +21,7 @@ </tr> <tr> <td> - <div><code><a href="#%3Cinit%3E()"><init></a>()</code></div> + <div><code><a href="#Foo()">Foo</a>()</code></div> <p></p> </td> </tr> @@ -42,9 +42,9 @@ </tbody> </table> <h2>Public constructors</h2> -<a name="%3Cinit%3E()"></a> +<a name="Foo()"></a> <div class="api apilevel-" data-version-added=""> - <h3 class="api-name"><init></h3> + <h3 class="api-name">Foo</h3> <pre class="api-signature no-pretty-print"><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></pre> <div> <p><b>See Also</b></p> diff --git a/core/testdata/functions/functionWithAnnotatedLambdaParam.kt b/core/testdata/functions/functionWithAnnotatedLambdaParam.kt new file mode 100644 index 000000000..4136e03b3 --- /dev/null +++ b/core/testdata/functions/functionWithAnnotatedLambdaParam.kt @@ -0,0 +1,7 @@ +@Target(AnnotationTarget.TYPE) +@Retention(AnnotationRetention.SOURCE) +@MustBeDocumented +public annotation class Fancy + +fun function(notInlined: @Fancy () -> Unit) { +} |