Merge pull request #25 from demianr/master

No more complaints when javadocs are built with Java 8
This commit is contained in:
René Jeschke 2015-03-01 15:49:47 +01:00
commit 9b1865da35
6 changed files with 53 additions and 49 deletions

View File

@ -23,15 +23,15 @@ import java.util.List;
* <pre>
* <code>public void emitBlock(StringBuilder out, List&lt;String&gt; lines, String meta)
* {
* out.append("&lt;pre>&lt;code>");
* out.append("&lt;pre&gt;&lt;code&gt;");
* for(final String s : lines)
* {
* for(int i = 0; i < s.length(); i++)
* for(int i = 0; i &lt; s.length(); i++)
* {
* final char c = s.charAt(i);
* switch(c)
* {
* case '&':
* case '&amp;':
* out.append("&amp;amp;");
* break;
* case '&lt;':
@ -47,13 +47,13 @@ import java.util.List;
* }
* out.append('\n');
* }
* out.append("&lt;/code>&lt;/pre>\n");
* out.append("&lt;/code&gt;&lt;/pre&gt;\n");
* }
* </code>
* </pre>
*
*
* @author René Jeschke <rene_jeschke@yahoo.de>
* @author René Jeschke &lt;rene_jeschke@yahoo.de&gt;
* @since 0.7
*/
public interface BlockEmitter

View File

@ -18,7 +18,7 @@ package com.github.rjeschke.txtmark;
/**
* Txtmark configuration.
*
* @author René Jeschke <rene_jeschke@yahoo.de>
* @author René Jeschke &lt;rene_jeschke@yahoo.de&gt;
* @since 0.7
*/
public class Configuration
@ -90,7 +90,7 @@ public class Configuration
/**
* Configuration builder.
*
* @author René Jeschke <rene_jeschke@yahoo.de>
* @author René Jeschke &lt;rene_jeschke@yahoo.de&gt;
* @since 0.7
*/
public static class Builder

View File

@ -18,7 +18,7 @@ package com.github.rjeschke.txtmark;
/**
* Decorator interface.
*
* @author René Jeschke <rene_jeschke@yahoo.de>
* @author René Jeschke &lt;rene_jeschke@yahoo.de&gt;
*/
public interface Decorator
{
@ -30,7 +30,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;p>");</code>
* <code>out.append("&lt;p&gt;");</code>
* </pre>
*
* @param out
@ -46,7 +46,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/p>\n");</code>
* <code>out.append("&lt;/p&gt;\n");</code>
* </pre>
*
* @param out
@ -60,7 +60,7 @@ public interface Decorator
* Default implementation is:
*
* <pre>
* <code>out.append("&lt;blockquote>");</code>
* <code>out.append("&lt;blockquote&gt;");</code>
* </pre>
*
* @param out
@ -76,7 +76,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/blockquote>\n");</code>
* <code>out.append("&lt;/blockquote&gt;\n");</code>
* </pre>
*
* @param out
@ -92,7 +92,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;pre>&lt;code>");</code>
* <code>out.append("&lt;pre&gt;&lt;code&gt;");</code>
* </pre>
*
* @param out
@ -108,7 +108,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/code>&lt;/pre>\n");</code>
* <code>out.append("&lt;/code&gt;&lt;/pre&gt;\n");</code>
* </pre>
*
* @param out
@ -124,7 +124,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;code>");</code>
* <code>out.append("&lt;code&gt;");</code>
* </pre>
*
* @param out
@ -140,7 +140,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/code>");</code>
* <code>out.append("&lt;/code&gt;");</code>
* </pre>
*
* @param out
@ -165,6 +165,8 @@ public interface Decorator
*
* @param out
* The StringBuilder to write to.
* @param level
* The level to use.
*/
public void openHeadline(final StringBuilder out, int level);
@ -178,11 +180,13 @@ public interface Decorator
* <pre>
* <code> out.append("&lt;/h");
* out.append(level);
* out.append(">\n");</code>
* out.append("&gt;\n");</code>
* </pre>
*
* @param out
* The StringBuilder to write to.
* @param level
* The level to use.
*/
public void closeHeadline(final StringBuilder out, int level);
@ -194,7 +198,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;strong>");</code>
* <code>out.append("&lt;strong&gt;");</code>
* </pre>
*
* @param out
@ -210,7 +214,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/strong>");</code>
* <code>out.append("&lt;/strong&gt;");</code>
* </pre>
*
* @param out
@ -226,7 +230,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;em>");</code>
* <code>out.append("&lt;em&gt;");</code>
* </pre>
*
* @param out
@ -242,7 +246,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/em>");</code>
* <code>out.append("&lt;/em&gt;");</code>
* </pre>
*
* @param out
@ -258,7 +262,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;sup>");</code>
* <code>out.append("&lt;sup&gt;");</code>
* </pre>
*
* @param out
@ -274,7 +278,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/sup>");</code>
* <code>out.append("&lt;/sup&gt;");</code>
* </pre>
*
* @param out
@ -290,7 +294,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;ol>\n");</code>
* <code>out.append("&lt;ol&gt;\n");</code>
* </pre>
*
* @param out
@ -306,7 +310,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/ol>\n");</code>
* <code>out.append("&lt;/ol&gt;\n");</code>
* </pre>
*
* @param out
@ -322,7 +326,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;ul>\n");</code>
* <code>out.append("&lt;ul&gt;\n");</code>
* </pre>
*
* @param out
@ -338,7 +342,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/ul>\n");</code>
* <code>out.append("&lt;/ul&gt;\n");</code>
* </pre>
*
* @param out
@ -373,7 +377,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;/li>\n");</code>
* <code>out.append("&lt;/li&gt;\n");</code>
* </pre>
*
* @param out
@ -389,7 +393,7 @@ public interface Decorator
* </p>
*
* <pre>
* <code>out.append("&lt;hr />\n");</code>
* <code>out.append("&lt;hr /&gt;\n");</code>
* </pre>
*
* @param out

View File

@ -19,7 +19,7 @@ package com.github.rjeschke.txtmark;
* Default Decorator implementation.
*
* <p>
* Example for a user Decorator having a class attribute on &lt;p> tags.
* Example for a user Decorator having a class attribute on &lt;p&gt; tags.
* </p>
*
* <pre>
@ -28,13 +28,13 @@ package com.github.rjeschke.txtmark;
* &#64;Override
* public void openParagraph(StringBuilder out)
* {
* out.append("&lt;p class=\"myclass\">");
* out.append("&lt;p class=\"myclass\"&gt;");
* }
* }
* </code>
* </pre>
*
* @author René Jeschke <rene_jeschke@yahoo.de>
* @author René Jeschke &lt;rene_jeschke@yahoo.de&gt;
*/
public class DefaultDecorator implements Decorator
{

View File

@ -36,7 +36,7 @@ import java.io.StringReader;
* </code>
* </pre>
*
* @author René Jeschke <rene_jeschke@yahoo.de>
* @author René Jeschke &lt;rene_jeschke@yahoo.de&gt;
*/
public class Processor
{
@ -110,8 +110,8 @@ public class Processor
/**
* Transforms an input file into HTML using the given Configuration.
*
* @param file
* The File to process.
* @param file The File to process.
* @param configuration the Configuration
* @return The processed String.
* @throws IOException
* if an IO error occurs

View File

@ -43,24 +43,24 @@ import java.io.InputStreamReader;
* </p>
*
* <pre>
* <code>&lt;?xml version="1.0" encoding="UTF-8"?>
* <code>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
* &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
* "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
* &lt;html xmlns="http://www.w3.org/1999/xhtml">
* &lt;head>
* &lt;title>markdown&lt;/title>
* &lt;link type="text/css" href="style.css" rel="stylesheet"/>
* &lt;meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
* &lt;/head>
* &lt;body>
* &lt;!-- the following line separates header from footer -->
* &lt;!-- ### -->
* &lt;/body>
* &lt;/html>
* "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
* &lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
* &lt;head&gt;
* &lt;title&gt;markdown&lt;/title&gt;
* &lt;link type="text/css" href="style.css" rel="stylesheet"/&gt;
* &lt;meta http-equiv="content-type" content="text/html; charset=UTF-8"/&gt;
* &lt;/head&gt;
* &lt;body&gt;
* &lt;!-- the following line separates header from footer --&gt;
* &lt;!-- ### --&gt;
* &lt;/body&gt;
* &lt;/html&gt;
* </code>
* </pre>
*
* @author René Jeschke <rene_jeschke@yahoo.de>
* @author René Jeschke &lt;rene_jeschke@yahoo.de&gt;
*/
public class Run
{