You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/05/04 09:56:00 UTC
[maven-doxia] branch DOXIA-591 created (now b5216e1)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch DOXIA-591
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
at b5216e1 [DOXIA-591] Use Java 7 syntax
This branch includes the following new commits:
new b52f13d [DOXIA-591] Update minimum Java version to 7
new b46435b [DOXIA-591] Use never Java style
new b5216e1 [DOXIA-591] Use Java 7 syntax
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-doxia] 01/03: [DOXIA-591] Update minimum Java version to 7
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-591
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit b52f13d1ebd365df7812e652607053cc1c4187ea
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri May 3 23:18:57 2019 +0200
[DOXIA-591] Update minimum Java version to 7
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 07b4183..f146f65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@ under the License.
</distributionManagement>
<properties>
+ <javaVersion>7</javaVersion><!-- remove when upgrade to maven-parent 34 -->
<maven.site.path>doxia-archives/doxia-LATEST</maven.site.path>
<surefire.version>2.21.0</surefire.version>
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber</checkstyle.violation.ignore>
[maven-doxia] 03/03: [DOXIA-591] Use Java 7 syntax
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-591
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit b5216e18c540d5b3cb5d7973de29df5fa71c3734
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri May 3 23:45:13 2019 +0200
[DOXIA-591] Use Java 7 syntax
- use <>
- collapse identical catch Exceptions
- if to switch
---
.../org/apache/maven/doxia/index/IndexEntry.java | 4 +-
.../org/apache/maven/doxia/index/IndexingSink.java | 2 +-
.../org/apache/maven/doxia/macro/SwfMacro.java | 149 ++++++++++-----------
.../maven/doxia/macro/snippet/SnippetMacro.java | 4 +-
.../maven/doxia/macro/snippet/SnippetReader.java | 2 +-
.../maven/doxia/parser/AbstractXmlParser.java | 4 +-
.../maven/doxia/parser/Xhtml5BaseParser.java | 42 +++---
.../apache/maven/doxia/parser/XhtmlBaseParser.java | 40 +++---
.../parser/module/DefaultParserModuleManager.java | 2 +-
.../maven/doxia/sink/impl/RandomAccessSink.java | 4 +-
.../doxia/sink/impl/SinkEventAttributeSet.java | 8 +-
.../maven/doxia/sink/impl/Xhtml5BaseSink.java | 24 ++--
.../maven/doxia/sink/impl/XhtmlBaseSink.java | 22 +--
.../org/apache/maven/doxia/util/HtmlTools.java | 4 +-
.../org/apache/maven/doxia/util/XmlValidator.java | 6 +-
.../apache/maven/doxia/macro/EchoMacroTest.java | 2 +-
.../org/apache/maven/doxia/macro/SsiMacroTest.java | 2 +-
.../org/apache/maven/doxia/macro/SwfMacroTest.java | 4 +-
.../doxia/macro/snippet/SnippetMacroTest.java | 4 +-
.../apache/maven/doxia/macro/toc/TocMacroTest.java | 4 +-
.../doxia/sink/impl/SinkEventTestingSink.java | 2 +-
.../sink/impl/WellformednessCheckingSink.java | 4 +-
.../maven/doxia/xsd/AbstractXmlValidator.java | 2 +-
.../maven/doxia/xsd/AbstractXmlValidatorTest.java | 4 +-
.../apache/maven/doxia/module/apt/AptParser.java | 6 +-
.../org/apache/maven/doxia/module/apt/AptSink.java | 6 +-
.../doxia/module/confluence/ConfluenceParser.java | 2 +-
.../doxia/module/confluence/ConfluenceSink.java | 6 +-
.../confluence/parser/ChildBlocksBuilder.java | 10 +-
.../confluence/parser/list/TreeComponent.java | 2 +-
.../confluence/parser/list/TreeListBuilder.java | 4 +-
.../confluence/parser/table/TableBlockParser.java | 10 +-
.../maven/doxia/module/docbook/DocBookParser.java | 60 ++++-----
.../maven/doxia/module/docbook/DocBookSink.java | 8 +-
.../apache/maven/doxia/module/fml/FmlParser.java | 8 +-
.../maven/doxia/module/fo/FoAggregateSink.java | 4 +-
.../maven/doxia/module/fo/FoConfiguration.java | 7 +-
.../org/apache/maven/doxia/module/fo/FoSink.java | 26 ++--
.../apache/maven/doxia/module/itext/ITextSink.java | 8 +-
.../doxia/module/itext/SinkActionContext.java | 2 +-
.../apache/maven/doxia/module/latex/LatexSink.java | 4 +-
.../module/markdown/FlexmarkDoxiaExtension.java | 2 +-
.../module/markdown/FlexmarkDoxiaLinkResolver.java | 2 +-
.../module/markdown/FlexmarkDoxiaNodeRenderer.java | 34 +++--
.../doxia/module/markdown/MarkdownParser.java | 2 +-
.../org/apache/maven/doxia/module/rtf/RtfSink.java | 4 +-
.../maven/doxia/module/twiki/TWikiParser.java | 2 +-
.../apache/maven/doxia/module/twiki/TWikiSink.java | 8 +-
.../module/twiki/parser/FormatedTextParser.java | 4 +-
.../twiki/parser/GenericListBlockParser.java | 4 +-
.../module/twiki/parser/ParagraphBlockParser.java | 2 +-
.../module/twiki/parser/SectionBlockParser.java | 2 +-
.../module/twiki/parser/TableBlockParser.java | 4 +-
.../doxia/module/twiki/parser/TextParser.java | 2 +-
.../module/twiki/parser/VerbatimBlockParser.java | 2 +-
.../apache/maven/doxia/module/xdoc/XdocParser.java | 4 +-
.../maven/doxia/module/xhtml/XhtmlParser.java | 2 +-
.../maven/doxia/module/xhtml5/Xhtml5Parser.java | 2 +-
58 files changed, 291 insertions(+), 309 deletions(-)
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java b/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java
index 0f1d49e..6983f2c 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java
@@ -51,7 +51,7 @@ public class IndexEntry
/**
* The child entries.
*/
- private List<IndexEntry> childEntries = new ArrayList<IndexEntry>();
+ private List<IndexEntry> childEntries = new ArrayList<>();
/**
* System-dependent EOL.
@@ -155,7 +155,7 @@ public class IndexEntry
{
if ( entries == null )
{
- childEntries = new ArrayList<IndexEntry>();
+ childEntries = new ArrayList<>();
}
this.childEntries = entries;
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
index 3dd3fb8..4a5ac2e 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
@@ -77,7 +77,7 @@ public class IndexingSink
*/
public IndexingSink( IndexEntry sectionEntry )
{
- stack = new Stack<IndexEntry>();
+ stack = new Stack<>();
stack.push( sectionEntry );
init();
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java
index d03f75f..896f612 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java
@@ -59,91 +59,86 @@ public class SwfMacro
continue;
}
String str = (String) parameterObject;
- if ( key.equals( "src" ) )
+ switch ( key )
{
- if ( StringUtils.isNotEmpty( str ) )
- {
- src = str;
- }
- }
- else if ( key.equals( "id" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- id = str;
- }
- }
- else if ( key.equals( "width" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- width = str;
- }
- }
- else if ( key.equals( "height" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- height = str;
- }
- }
- else if ( key.equals( "quality" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- quality = str;
- }
- }
- else if ( key.equals( "menu" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- menu = str;
- }
- }
- else if ( key.equals( "loop" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- loop = str;
- }
- }
- else if ( key.equals( "play" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- play = str;
- }
- }
- else if ( key.equals( "version" ) )
- {
- // enable version shorthand
- // TODO: put in other shorthand versions
- if ( str.equals( "6" ) )
- {
- version = "6,0,29,0";
- }
- else
- {
- if ( str.equals( "9" ) )
+ case "src":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ src = str;
+ }
+ break;
+ case "id":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ id = str;
+ }
+ break;
+ case "width":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ width = str;
+ }
+ break;
+ case "height":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ height = str;
+ }
+ break;
+ case "quality":
+ if ( StringUtils.isNotEmpty( str ) )
{
- version = "9,0,45,0";
+ quality = str;
+ }
+ break;
+ case "menu":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ menu = str;
+ }
+ break;
+ case "loop":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ loop = str;
+ }
+ break;
+ case "play":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ play = str;
+ }
+ break;
+ case "version":
+ // enable version shorthand
+ // TODO: put in other shorthand versions
+ if ( str.equals( "6" ) )
+ {
+ version = "6,0,29,0";
}
else
{
- if ( StringUtils.isNotEmpty( str ) )
+ if ( str.equals( "9" ) )
+ {
+ version = "9,0,45,0";
+ }
+ else
{
- version = str;
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ version = str;
+ }
}
}
- }
- }
- else if ( key.equals( "allowScript" ) )
- {
- if ( StringUtils.isNotEmpty( str ) )
- {
- allowScript = str;
- }
+ break;
+ case "allowScript":
+ if ( StringUtils.isNotEmpty( str ) )
+ {
+ allowScript = str;
+ }
+ break;
+ default:
+ // ignore all other
}
}
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
index fb482bf..2166a3e 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
@@ -47,7 +47,7 @@ public class SnippetMacro
/**
* Holds the cache.
*/
- private static Map<String, String> cache = new HashMap<String, String>();
+ private static Map<String, String> cache = new HashMap<>();
private static final int HOUR = 60;
@@ -59,7 +59,7 @@ public class SnippetMacro
/**
* Holds the time cache.
*/
- private static Map<String, Long> timeCached = new HashMap<String, Long>();
+ private static Map<String, Long> timeCached = new HashMap<>();
/**
* Debug.
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
index 4ae468a..12d3e22 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
@@ -145,7 +145,7 @@ public class SnippetReader
reader = new BufferedReader( new InputStreamReader( source.openStream(), encoding ) );
}
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
try
{
boolean capture = false;
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
index 23141c2..4ac4df5 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
@@ -565,7 +565,7 @@ public abstract class AbstractXmlParser
{
if ( entities == null )
{
- entities = new LinkedHashMap<String, String>();
+ entities = new LinkedHashMap<>();
}
return entities;
@@ -724,7 +724,7 @@ public abstract class AbstractXmlParser
implements EntityResolver
{
/** Map with systemId as key and the content of systemId as byte[]. */
- protected static final Map<String, byte[]> ENTITY_CACHE = new Hashtable<String, byte[]>();
+ protected static final Map<String, byte[]> ENTITY_CACHE = new Hashtable<>();
/** {@inheritDoc} */
public InputSource resolveEntity( String publicId, String systemId )
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
index fb12426..58c45c8 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
@@ -70,7 +70,7 @@ public class Xhtml5BaseParser
private boolean inVerbatim;
/** Used to keep track of closing tags for content events */
- private Stack<String> divStack = new Stack<String>();
+ private Stack<String> divStack = new Stack<>();
/** Used to wrap the definedTerm with its definition, even when one is omitted */
boolean hasDefinitionListItem = false;
@@ -1163,25 +1163,25 @@ public class Xhtml5BaseParser
if ( style != null )
{
- if ( "list-style-type: upper-alpha".equals( style ) )
+ switch ( style )
{
- numbering = Sink.NUMBERING_UPPER_ALPHA;
- }
- else if ( "list-style-type: lower-alpha".equals( style ) )
- {
- numbering = Sink.NUMBERING_LOWER_ALPHA;
- }
- else if ( "list-style-type: upper-roman".equals( style ) )
- {
- numbering = Sink.NUMBERING_UPPER_ROMAN;
- }
- else if ( "list-style-type: lower-roman".equals( style ) )
- {
- numbering = Sink.NUMBERING_LOWER_ROMAN;
- }
- else if ( "list-style-type: decimal".equals( style ) )
- {
- numbering = Sink.NUMBERING_DECIMAL;
+ case "list-style-type: upper-alpha":
+ numbering = Sink.NUMBERING_UPPER_ALPHA;
+ break;
+ case "list-style-type: lower-alpha":
+ numbering = Sink.NUMBERING_LOWER_ALPHA;
+ break;
+ case "list-style-type: upper-roman":
+ numbering = Sink.NUMBERING_UPPER_ROMAN;
+ break;
+ case "list-style-type: lower-roman":
+ numbering = Sink.NUMBERING_LOWER_ROMAN;
+ break;
+ case "list-style-type: decimal":
+ numbering = Sink.NUMBERING_DECIMAL;
+ break;
+ default:
+ // ignore all other
}
}
@@ -1275,13 +1275,13 @@ public class Xhtml5BaseParser
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( log );
warnMessages.put( key, set );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
index 2e4ee88..4cfab7b 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
@@ -1172,25 +1172,25 @@ public class XhtmlBaseParser
if ( style != null )
{
- if ( "list-style-type: upper-alpha".equals( style ) )
+ switch ( style )
{
- numbering = Sink.NUMBERING_UPPER_ALPHA;
- }
- else if ( "list-style-type: lower-alpha".equals( style ) )
- {
- numbering = Sink.NUMBERING_LOWER_ALPHA;
- }
- else if ( "list-style-type: upper-roman".equals( style ) )
- {
- numbering = Sink.NUMBERING_UPPER_ROMAN;
- }
- else if ( "list-style-type: lower-roman".equals( style ) )
- {
- numbering = Sink.NUMBERING_LOWER_ROMAN;
- }
- else if ( "list-style-type: decimal".equals( style ) )
- {
- numbering = Sink.NUMBERING_DECIMAL;
+ case "list-style-type: upper-alpha":
+ numbering = Sink.NUMBERING_UPPER_ALPHA;
+ break;
+ case "list-style-type: lower-alpha":
+ numbering = Sink.NUMBERING_LOWER_ALPHA;
+ break;
+ case "list-style-type: upper-roman":
+ numbering = Sink.NUMBERING_UPPER_ROMAN;
+ break;
+ case "list-style-type: lower-roman":
+ numbering = Sink.NUMBERING_LOWER_ROMAN;
+ break;
+ case "list-style-type: decimal":
+ numbering = Sink.NUMBERING_DECIMAL;
+ break;
+ default:
+ // ignore all other
}
}
@@ -1275,13 +1275,13 @@ public class XhtmlBaseParser
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( log );
warnMessages.put( key, set );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/DefaultParserModuleManager.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/DefaultParserModuleManager.java
index 8f0e179..7b88cb6 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/DefaultParserModuleManager.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/DefaultParserModuleManager.java
@@ -45,7 +45,7 @@ public class DefaultParserModuleManager
{
if ( parserModulesValues == null )
{
- Map<Class<?>, ParserModule> parserModulesTmp = new LinkedHashMap<Class<?>, ParserModule>();
+ Map<Class<?>, ParserModule> parserModulesTmp = new LinkedHashMap<>();
for ( ParserModule module : parserModules.values() )
{
parserModulesTmp.put( module.getClass(), module );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
index 4a873d4..62f6e07 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
@@ -52,9 +52,9 @@ public class RandomAccessSink
private Sink coreSink;
- private List<Sink> sinks = new ArrayList<Sink>();
+ private List<Sink> sinks = new ArrayList<>();
- private List<ByteArrayOutputStream> outputStreams = new ArrayList<ByteArrayOutputStream>();
+ private List<ByteArrayOutputStream> outputStreams = new ArrayList<>();
private Sink currentSink;
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSet.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSet.java
index 9374dbd..bb7f230 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSet.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSet.java
@@ -130,7 +130,7 @@ public class SinkEventAttributeSet
*/
public SinkEventAttributeSet( int size )
{
- attribs = new LinkedHashMap<String, Object>( size );
+ attribs = new LinkedHashMap<>( size );
}
/**
@@ -149,7 +149,7 @@ public class SinkEventAttributeSet
throw new IllegalArgumentException( "Missing attribute!" );
}
- attribs = new LinkedHashMap<String, Object>( n / 2 );
+ attribs = new LinkedHashMap<>( n / 2 );
for ( int i = 0; i < n; i += 2 )
{
@@ -165,7 +165,7 @@ public class SinkEventAttributeSet
*/
public SinkEventAttributeSet( AttributeSet attributes )
{
- attribs = new LinkedHashMap<String, Object>( attributes.getAttributeCount() );
+ attribs = new LinkedHashMap<>( attributes.getAttributeCount() );
Enumeration<?> names = attributes.getAttributeNames();
@@ -362,7 +362,7 @@ public class SinkEventAttributeSet
public Object clone()
{
SinkEventAttributeSet attr = new SinkEventAttributeSet( attribs.size() );
- attr.attribs = new LinkedHashMap<String, Object>( attribs );
+ attr.attribs = new LinkedHashMap<>( attribs );
if ( resolveParent != null )
{
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index df9c5f2..bfa33f0 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -67,10 +67,10 @@ public class Xhtml5BaseSink
private boolean headFlag;
/** Keep track of the main and div tags for content events. */
- protected Stack<Tag> contentStack = new Stack<Tag>();
+ protected Stack<Tag> contentStack = new Stack<>();
/** Keep track of the closing tags for inline events. */
- protected Stack<List<Tag>> inlineStack = new Stack<List<Tag>>();
+ protected Stack<List<Tag>> inlineStack = new Stack<>();
/** An indication on if we're inside a paragraph flag. */
private boolean paragraphFlag;
@@ -135,13 +135,13 @@ public class Xhtml5BaseSink
{
this.writer = new PrintWriter( out );
- this.cellJustifStack = new LinkedList<int[]>();
- this.isCellJustifStack = new LinkedList<Boolean>();
- this.cellCountStack = new LinkedList<Integer>();
- this.tableContentWriterStack = new LinkedList<StringWriter>();
- this.tableCaptionWriterStack = new LinkedList<StringWriter>();
- this.tableCaptionXMLWriterStack = new LinkedList<PrettyPrintXMLWriter>();
- this.tableCaptionStack = new LinkedList<String>();
+ this.cellJustifStack = new LinkedList<>();
+ this.isCellJustifStack = new LinkedList<>();
+ this.cellCountStack = new LinkedList<>();
+ this.tableContentWriterStack = new LinkedList<>();
+ this.tableCaptionWriterStack = new LinkedList<>();
+ this.tableCaptionXMLWriterStack = new LinkedList<>();
+ this.tableCaptionStack = new LinkedList<>();
init();
}
@@ -1976,7 +1976,7 @@ public class Xhtml5BaseSink
{
if ( !headFlag )
{
- List<Tag> tags = new ArrayList<Tag>();
+ List<Tag> tags = new ArrayList<>();
if ( attributes != null )
{
@@ -2512,13 +2512,13 @@ public class Xhtml5BaseSink
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( mesg );
warnMessages.put( key, set );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
index 25de329..eea03a0 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
@@ -129,7 +129,7 @@ public class XhtmlBaseSink
protected boolean tableRows = false;
/** Keep track of the closing tags for inline events. */
- protected Stack<List<Tag>> inlineStack = new Stack<List<Tag>>();
+ protected Stack<List<Tag>> inlineStack = new Stack<>();
/** Map of warn messages with a String as key to describe the error type and a Set as value.
* Using to reduce warn messages. */
@@ -148,13 +148,13 @@ public class XhtmlBaseSink
{
this.writer = new PrintWriter( out );
- this.cellJustifStack = new LinkedList<int[]>();
- this.isCellJustifStack = new LinkedList<Boolean>();
- this.cellCountStack = new LinkedList<Integer>();
- this.tableContentWriterStack = new LinkedList<StringWriter>();
- this.tableCaptionWriterStack = new LinkedList<StringWriter>();
- this.tableCaptionXMLWriterStack = new LinkedList<PrettyPrintXMLWriter>();
- this.tableCaptionStack = new LinkedList<String>();
+ this.cellJustifStack = new LinkedList<>();
+ this.isCellJustifStack = new LinkedList<>();
+ this.cellCountStack = new LinkedList<>();
+ this.tableContentWriterStack = new LinkedList<>();
+ this.tableCaptionWriterStack = new LinkedList<>();
+ this.tableCaptionXMLWriterStack = new LinkedList<>();
+ this.tableCaptionStack = new LinkedList<>();
init();
}
@@ -1794,7 +1794,7 @@ public class XhtmlBaseSink
{
if ( !headFlag )
{
- List<Tag> tags = new ArrayList<Tag>();
+ List<Tag> tags = new ArrayList<>();
if ( attributes != null )
{
@@ -2297,13 +2297,13 @@ public class XhtmlBaseSink
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( mesg );
warnMessages.put( key, set );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
index 81a2d88..ef818b4 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
@@ -62,7 +62,7 @@ public class HtmlTools
HtmlMarkup.TR, HtmlMarkup.TT, HtmlMarkup.U, HtmlMarkup.UL, HtmlMarkup.VAR
};
- private static final Map<String, Tag> TAG_MAP = new HashMap<String, Tag>( ALL_TAGS.length );
+ private static final Map<String, Tag> TAG_MAP = new HashMap<>( ALL_TAGS.length );
private static final int ASCII = 0x7E;
@@ -254,7 +254,7 @@ public class HtmlTools
}
String tmp = unescaped;
- List<String> entities = new ArrayList<String>();
+ List<String> entities = new ArrayList<>();
while ( true )
{
int i = tmp.indexOf( "&#x" );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
index 2595b49..3a870de 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
@@ -107,11 +107,7 @@ public class XmlValidator
getLog().debug( "Validating the content..." );
getXmlReader( hasXsd && hasDoctype ).parse( new InputSource( new StringReader( content ) ) );
}
- catch ( IOException e )
- {
- throw new ParseException( "Error validating the model: " + e.getMessage(), e );
- }
- catch ( SAXException e )
+ catch ( IOException | SAXException e )
{
throw new ParseException( "Error validating the model: " + e.getMessage(), e );
}
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
index 33b5f3f..0825af5 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
@@ -44,7 +44,7 @@ public class EchoMacroTest
*/
public void testExecute()
{
- final Map<String,Object> macroParameters = new HashMap<String,Object>();
+ final Map<String,Object> macroParameters = new HashMap<>();
macroParameters.put( "paramName", "paramValue" );
macroParameters.put( "parser", "parserValue" );
macroParameters.put( "sourceContent", "sourceContentValue" );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/SsiMacroTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/SsiMacroTest.java
index e30bf92..b5c157e 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/SsiMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/SsiMacroTest.java
@@ -44,7 +44,7 @@ public class SsiMacroTest
throws MacroExecutionException
{
- Map<String, Object> macroParameters = new HashMap<String, Object>();
+ Map<String, Object> macroParameters = new HashMap<>();
macroParameters.put( "function", "include" );
macroParameters.put( "file", "include-file.html" );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java
index 8e56627..2580cec 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java
@@ -48,7 +48,7 @@ public class SwfMacroTest
throws MacroExecutionException
{
- Map<String, Object> macroParameters = new HashMap<String, Object>();
+ Map<String, Object> macroParameters = new HashMap<>();
macroParameters.put( "src", "src.swf" );
macroParameters.put( "id", "Movie" );
macroParameters.put( "width", "50" );
@@ -115,7 +115,7 @@ public class SwfMacroTest
throws MacroExecutionException
{
- Map<String, Object> macroParameters = new HashMap<String, Object>();
+ Map<String, Object> macroParameters = new HashMap<>();
macroParameters.put( "src", "src.swf" );
macroParameters.put( "id", "Movie" );
macroParameters.put( "width", "50" );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
index b89d81d..b4cb0c2 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
@@ -48,7 +48,7 @@ public class SnippetMacroTest
public void testExecute()
throws MacroExecutionException
{
- Map<String, Object> macroParameters = new HashMap<String, Object>();
+ Map<String, Object> macroParameters = new HashMap<>();
macroParameters.put( "file", "src/test/resources/macro/snippet/testSnippet.txt" );
macroParameters.put( "encoding", "UTF-8" );
@@ -140,7 +140,7 @@ public class SnippetMacroTest
public void testIgnoreDownloadError()
throws Exception
{
- Map<String, Object> macroParameters = new HashMap<String, Object>();
+ Map<String, Object> macroParameters = new HashMap<>();
macroParameters.put( "debug", "true" );
macroParameters.put( "ignoreDownloadError", "true" );
macroParameters.put( "url", "http://foo.bar.com/wine.txt" );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
index 6c8140b..3a59a66 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
@@ -58,7 +58,7 @@ public class TocMacroTest
XhtmlBaseParser parser = new XhtmlBaseParser();
parser.setSecondParsing( true );
- Map<String, Object> macroParameters = new HashMap<String, Object>();
+ Map<String, Object> macroParameters = new HashMap<>();
macroParameters.put( "parser", parser );
macroParameters.put( "sourceContent", sourceContent );
macroParameters.put( "section", "sec1" );
@@ -159,7 +159,7 @@ public class TocMacroTest
XhtmlBaseParser parser = new XhtmlBaseParser();
parser.setSecondParsing( true );
- Map<String, Object> macroParameters = new HashMap<String, Object>();
+ Map<String, Object> macroParameters = new HashMap<>();
macroParameters.put( "parser", parser );
macroParameters.put( "sourceContent", sourceContent );
macroParameters.put( "section", "sec1" );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
index 4618be0..851ab3e 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
@@ -37,7 +37,7 @@ public class SinkEventTestingSink
extends AbstractSink
{
/** The list of sink events. */
- private final List<SinkEventElement> events = new LinkedList<SinkEventElement>();
+ private final List<SinkEventElement> events = new LinkedList<>();
/**
* Return the collected list of SinkEventElements.
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java
index 01ddaef..2ad1a5a 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java
@@ -37,9 +37,9 @@ import org.apache.maven.doxia.sink.impl.AbstractSink;
public class WellformednessCheckingSink
extends AbstractSink
{
- private final Stack<String> elements = new Stack<String>();
+ private final Stack<String> elements = new Stack<>();
- private final List<String> errors = new LinkedList<String>();
+ private final List<String> errors = new LinkedList<>();
@Override
public void head()
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
index 4a66cb2..0388105 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
@@ -395,7 +395,7 @@ public abstract class AbstractXmlValidator
MessagesErrorHandler()
{
- messages = new ArrayList<ErrorMessage>( 8 );
+ messages = new ArrayList<>( 8 );
}
/** {@inheritDoc} */
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
index a8207d6..46b2250 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
@@ -57,7 +57,7 @@ public abstract class AbstractXmlValidatorTest
{
/** Simple cache mechanism to load test documents. */
- private static final Map<String,String> CACHE_DOXIA_TEST_DOCUMENTS = new Hashtable<String,String>();
+ private static final Map<String,String> CACHE_DOXIA_TEST_DOCUMENTS = new Hashtable<>();
/** Maven resource in the doxia-test-docs-XXX.jar */
private static final String MAVEN_RESOURCE_PATH = "META-INF/maven/org.apache.maven.doxia/doxia-test-docs/";
@@ -87,7 +87,7 @@ public abstract class AbstractXmlValidatorTest
}
Map<String,String> testDocs = getAllTestDocuments();
- Map<String,String> ret = new Hashtable<String,String>();
+ Map<String,String> ret = new Hashtable<>();
ret.putAll( testDocs );
for ( String key : testDocs.keySet() )
{
diff --git a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
index 08bd6f4..c1397d3 100644
--- a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
+++ b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
@@ -1622,13 +1622,13 @@ public class AptParser
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( msg );
warnMessages.put( key, set );
@@ -2906,7 +2906,7 @@ public class AptParser
String macroId = params[0];
- Map<String, Object> parameters = new HashMap<String, Object>();
+ Map<String, Object> parameters = new HashMap<>();
for ( int i = 1; i < params.length; i++ )
{
diff --git a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
index b232c4e..017c5fd 100644
--- a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
+++ b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
@@ -108,7 +108,7 @@ public class AptSink
private final Stack<String> listStyles;
/** Keep track of the closing tags for inline events. */
- protected Stack<List<String>> inlineStack = new Stack<List<String>>();
+ protected Stack<List<String>> inlineStack = new Stack<>();
// ----------------------------------------------------------------------
// Public protected methods
@@ -123,7 +123,7 @@ public class AptSink
protected AptSink( Writer writer )
{
this.writer = new PrintWriter( writer );
- this.listStyles = new Stack<String>();
+ this.listStyles = new Stack<>();
init();
}
@@ -827,7 +827,7 @@ public class AptSink
{
if ( !headerFlag )
{
- List<String> tags = new ArrayList<String>();
+ List<String> tags = new ArrayList<>();
if ( attributes != null )
{
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
index da3d868..f63acd0 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
@@ -68,7 +68,7 @@ public class ConfluenceParser
{
init();
- List<Block> blocks = new ArrayList<Block>();
+ List<Block> blocks = new ArrayList<>();
String line;
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
index 4aa968a..0f9e657 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
@@ -65,7 +65,7 @@ public class ConfluenceSink
private boolean monospacedFlag;
/** Keep track of the closing tags for inline events. */
- protected Stack<List<String>> inlineStack = new Stack<List<String>>();
+ protected Stack<List<String>> inlineStack = new Stack<>();
/** An indication on if we're in verbatim box mode. */
private boolean verbatimBoxedFlag;
@@ -88,7 +88,7 @@ public class ConfluenceSink
protected ConfluenceSink( Writer writer )
{
this.out = new PrintWriter( writer );
- this.listStyles = new Stack<String>();
+ this.listStyles = new Stack<>();
init();
}
@@ -433,7 +433,7 @@ public class ConfluenceSink
{
if ( !headFlag )
{
- List<String> tags = new ArrayList<String>();
+ List<String> tags = new ArrayList<>();
if ( attributes != null )
{
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
index 738d279..dfaef5f 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
@@ -49,7 +49,7 @@ public class ChildBlocksBuilder
private boolean insideSup = false;
- private List<Block> blocks = new ArrayList<Block>();
+ private List<Block> blocks = new ArrayList<>();
private StringBuilder text = new StringBuilder();
@@ -74,7 +74,7 @@ public class ChildBlocksBuilder
*/
public List<Block> getBlocks()
{
- List<Block> specialBlocks = new ArrayList<Block>();
+ List<Block> specialBlocks = new ArrayList<>();
for ( int i = 0; i < input.length(); i++ )
{
@@ -382,7 +382,7 @@ public class ChildBlocksBuilder
private List<Block> getList( Block block, List<Block> currentBlocks )
{
- List<Block> list = new ArrayList<Block>();
+ List<Block> list = new ArrayList<>();
if ( insideBold || insideItalic || insideMonospaced )
{
@@ -400,10 +400,10 @@ public class ChildBlocksBuilder
if ( currentBlocks.isEmpty() && StringUtils.isEmpty( txt ) )
{
- return new ArrayList<Block>();
+ return new ArrayList<>();
}
- ArrayList<Block> list = new ArrayList<Block>();
+ ArrayList<Block> list = new ArrayList<>();
if ( !insideBold && !insideItalic && !insideMonospaced )
{
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeComponent.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeComponent.java
index 52cf20d..1b3297a 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeComponent.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeComponent.java
@@ -30,7 +30,7 @@ class TreeComponent
{
private static final String EOL = System.getProperty( "line.separator" );
- private List<TreeComponent> children = new ArrayList<TreeComponent>();
+ private List<TreeComponent> children = new ArrayList<>();
private String text;
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
index 74695e7..c775f1a 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
@@ -110,11 +110,11 @@ public class TreeListBuilder
private List<Block> getListItems( TreeComponent tc )
{
- List<Block> blocks = new ArrayList<Block>();
+ List<Block> blocks = new ArrayList<>();
for ( TreeComponent child : tc.getChildren() )
{
- List<Block> childBlocks = new ArrayList<Block>();
+ List<Block> childBlocks = new ArrayList<>();
if ( child.getFather() != null )
{
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
index a34222e..08202fe 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
@@ -85,7 +85,7 @@ public class TableBlockParser
throw new IllegalAccessError( "call accept before this ;)" );
}
- List<Block> rows = new ArrayList<Block>();
+ List<Block> rows = new ArrayList<>();
String l = line;
@@ -93,7 +93,7 @@ public class TableBlockParser
{
l = l.substring( 0, l.lastIndexOf( "|" ) );
- List<Block> cells = new ArrayList<Block>();
+ List<Block> cells = new ArrayList<>();
if ( l.startsWith( "||" ) )
{
@@ -105,7 +105,7 @@ public class TableBlockParser
textBlocks.add( parseLine( s, new ByLineReaderSource( new StringReader( EMPTY_STRING ) ) ) );
- List<Block> blocks = new ArrayList<Block>();
+ List<Block> blocks = new ArrayList<>();
blocks.add( new BoldBlock( textBlocks ) );
@@ -116,7 +116,7 @@ public class TableBlockParser
{
int it = 0;
String[] text = StringUtils.split( l, "|" );
- List<String> texts = new LinkedList<String>();
+ List<String> texts = new LinkedList<>();
while ( it < text.length )
{
@@ -135,7 +135,7 @@ public class TableBlockParser
for ( String pText : texts )
{
- List<Block> blocks = new ArrayList<Block>();
+ List<Block> blocks = new ArrayList<>();
blocks.add( parseLine( pText, new ByLineReaderSource( new StringReader( EMPTY_STRING ) ) ) );
diff --git a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java b/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
index 1043c23..5267118 100644
--- a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
+++ b/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
@@ -68,50 +68,50 @@ public class DocBookParser
/**
* A selective stack of parent elements
*/
- private final Stack<String> parent = new Stack<String>();
+ private final Stack<String> parent = new Stack<>();
/**
* The list of DocBook elements that introduce a new level of hierarchy.
*/
- private static final Collection<String> HIER_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> HIER_ELEMENTS = new HashSet<>();
/**
* Simplified DocBook elements that are direct children of <article>
* and that should be emitted into the Sink's head.
*/
- private static final Collection<String> META_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> META_ELEMENTS = new HashSet<>();
/**
* Simplified DocBook elements that occur within <articleinfo>
* and that are currently recognized by the parser.
*/
- private static final Collection<String> ARTICLEINFO_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> ARTICLEINFO_ELEMENTS = new HashSet<>();
/**
* The list of DocBook elements that will be rendered verbatim
*/
- private static final Collection<String> VERBATIM_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> VERBATIM_ELEMENTS = new HashSet<>();
/**
* The list of DocBook elements that will be rendered inline and bold
*/
- private static final Collection<String> BOLD_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> BOLD_ELEMENTS = new HashSet<>();
/**
* The list of DocBook elements that will be rendered inline and italic
*/
- private static final Collection<String> ITALIC_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> ITALIC_ELEMENTS = new HashSet<>();
/**
* The list of DocBook elements that will be rendered inline and monospace
*/
- private static final Collection<String> MONOSPACE_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> MONOSPACE_ELEMENTS = new HashSet<>();
/**
* The list of DocBook elements that may be ignored, either because they don't
* require any special processing or because they are not yet implemented.
*/
- private static final Collection<String> IGNORABLE_ELEMENTS = new HashSet<String>();
+ private static final Collection<String> IGNORABLE_ELEMENTS = new HashSet<>();
static
{
META_ELEMENTS.add( SimplifiedDocbookMarkup.ARTICLEINFO_TAG.toString() );
@@ -495,28 +495,26 @@ public class DocBookParser
{
final String text = parser.getText();
- if ( "PB".equals( text.trim() ) )
- {
- sink.pageBreak();
- }
- else if ( "HR".equals( text.trim() ) )
- {
- sink.horizontalRule();
- }
- else if ( "LB".equals( text.trim() ) )
- {
- sink.lineBreak();
- }
- else if ( "anchor_end".equals( text.trim() ) )
- {
- sink.anchor_();
- }
- else
- {
- if ( isEmitComments() )
- {
- sink.comment( text );
- }
+ switch ( text.trim() )
+ {
+ case "PB":
+ sink.pageBreak();
+ break;
+ case "HR":
+ sink.horizontalRule();
+ break;
+ case "LB":
+ sink.lineBreak();
+ break;
+ case "anchor_end":
+ sink.anchor_();
+ break;
+ default:
+ if ( isEmitComments() )
+ {
+ sink.comment( text );
+ }
+ break;
}
}
diff --git a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java b/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
index 9cb996d..683cf8f 100644
--- a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
+++ b/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
@@ -154,7 +154,7 @@ public class DocBookSink
private String encoding;
/** Keep track of the closing tags for inline events. */
- protected Stack<List<String>> inlineStack = new Stack<List<String>>();
+ protected Stack<List<String>> inlineStack = new Stack<>();
/** Map of warn messages with a String as key to describe the error type and a Set as value.
* Using to reduce warn messages. */
@@ -1544,7 +1544,7 @@ public class DocBookSink
/** {@inheritDoc} */
public void inline( SinkEventAttributes attributes )
{
- List<String> tags = new ArrayList<String>();
+ List<String> tags = new ArrayList<>();
if ( attributes != null )
{
@@ -1797,13 +1797,13 @@ public class DocBookSink
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( msg );
warnMessages.put( key, set );
diff --git a/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java b/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
index c2a296e..51d83a4 100644
--- a/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
+++ b/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
@@ -87,7 +87,7 @@ public class FmlParser
private String macroName;
/** The macro parameters. */
- private Map<String, Object> macroParameters = new HashMap<String, Object>();
+ private Map<String, Object> macroParameters = new HashMap<>();
/** {@inheritDoc} */
public void parse( Reader source, Sink sink )
@@ -463,7 +463,7 @@ public class FmlParser
if ( macroParameters == null )
{
- macroParameters = new HashMap<String, Object>();
+ macroParameters = new HashMap<>();
}
if ( StringUtils.isEmpty( macroName ) )
@@ -719,13 +719,13 @@ public class FmlParser
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( msg );
warnMessages.put( key, set );
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
index 6c7fe94..f393288 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
@@ -124,7 +124,7 @@ public class FoAggregateSink
/**
* Used to get the current position in the TOC.
*/
- private final Stack<NumberedListItem> tocStack = new Stack<NumberedListItem>();
+ private final Stack<NumberedListItem> tocStack = new Stack<>();
/**
* Constructor.
@@ -346,7 +346,7 @@ public class FoAggregateSink
DocumentTOCItem tocItem = new DocumentTOCItem();
tocItem.setName( this.docModel.getToc().getName() );
tocItem.setRef( "./toc" );
- List<DocumentTOCItem> items = new LinkedList<DocumentTOCItem>();
+ List<DocumentTOCItem> items = new LinkedList<>();
if ( this.tocPosition == TOC_START )
{
items.add( tocItem );
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java
index 93ddd50..c05d6aa 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java
@@ -189,16 +189,11 @@ public class FoConfiguration
{
config.load( ReaderFactory.newXmlReader( getClass().getResourceAsStream( "/fo-styles.xslt" ) ) );
}
- catch ( ConfigurationException cex )
+ catch ( ConfigurationException | IOException cex )
{
// this should not happen
throw new RuntimeException( cex );
}
- catch ( IOException e )
- {
- // this should not happen
- throw new RuntimeException( e );
- }
this.sets = config.getList( "xsl:attribute-set[@name]" );
reset();
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
index a9421b6..289bf86 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
@@ -116,7 +116,7 @@ public class FoSink
private final LinkedList<String> tableCaptionStack;
/** Keep track of the closing tags for inline events. */
- protected Stack<List<Tag>> inlineStack = new Stack<List<Tag>>();
+ protected Stack<List<Tag>> inlineStack = new Stack<>();
/** Map of warn messages with a String as key to describe the error type and a Set as value.
* Using to reduce warn messages. */
@@ -167,15 +167,15 @@ public class FoSink
this.languageId = languageId;
this.config = new FoConfiguration();
- this.listStack = new Stack<NumberedListItem>();
- this.tableGridStack = new LinkedList<Boolean>();
- this.cellJustifStack = new LinkedList<int[]>();
- this.isCellJustifStack = new LinkedList<Boolean>();
- this.cellCountStack = new LinkedList<Integer>();
- this.tableContentWriterStack = new LinkedList<StringWriter>();
- this.tableCaptionWriterStack = new LinkedList<StringWriter>();
- this.tableCaptionXMLWriterStack = new LinkedList<PrettyPrintXMLWriter>();
- this.tableCaptionStack = new LinkedList<String>();
+ this.listStack = new Stack<>();
+ this.tableGridStack = new LinkedList<>();
+ this.cellJustifStack = new LinkedList<>();
+ this.isCellJustifStack = new LinkedList<>();
+ this.cellCountStack = new LinkedList<>();
+ this.tableContentWriterStack = new LinkedList<>();
+ this.tableCaptionWriterStack = new LinkedList<>();
+ this.tableCaptionXMLWriterStack = new LinkedList<>();
+ this.tableCaptionStack = new LinkedList<>();
setNameSpace( "fo" );
}
@@ -1266,7 +1266,7 @@ public class FoSink
/** {@inheritDoc} */
public void inline( SinkEventAttributes attributes )
{
- List<Tag> tags = new ArrayList<Tag>();
+ List<Tag> tags = new ArrayList<>();
if ( attributes != null )
{
@@ -1844,13 +1844,13 @@ public class FoSink
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( msg );
warnMessages.put( key, set );
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
index 1a3d60e..92771c0 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
@@ -123,7 +123,7 @@ public class ITextSink
private boolean figureDefined = false;
/** Keep track of the closing tags for inline events. */
- protected Stack<List<String>> inlineStack = new Stack<List<String>>();
+ protected Stack<List<String>> inlineStack = new Stack<>();
/** Map of warn messages with a String as key to describe the error type and a Set as value.
* Using to reduce warn messages. */
@@ -1283,7 +1283,7 @@ public class ITextSink
/** {@inheritDoc} */
public void inline( SinkEventAttributes attributes )
{
- List<String> tags = new ArrayList<String>();
+ List<String> tags = new ArrayList<>();
if ( attributes != null )
{
@@ -1873,13 +1873,13 @@ public class ITextSink
if ( warnMessages == null )
{
- warnMessages = new HashMap<String, Set<String>>();
+ warnMessages = new HashMap<>();
}
Set<String> set = warnMessages.get( key );
if ( set == null )
{
- set = new TreeSet<String>();
+ set = new TreeSet<>();
}
set.add( msg );
warnMessages.put( key, set );
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java
index 5128f47..7d7f1d7 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java
@@ -114,7 +114,7 @@ public class SinkActionContext
/** Constant <code>UNDEFINED=82</code> */
public static final int UNDEFINED = 82;
- private Stack<Integer> stack = new Stack<Integer>();
+ private Stack<Integer> stack = new Stack<>();
private int currentAction;
diff --git a/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java b/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
index 0d8e540..ba73aa6 100644
--- a/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
+++ b/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
@@ -84,7 +84,7 @@ public class LatexSink
private String title;
/** Keep track of the closing tags for inline events. */
- protected Stack<List<String>> inlineStack = new Stack<List<String>>();
+ protected Stack<List<String>> inlineStack = new Stack<>();
// ----------------------------------------------------------------------
//
@@ -1141,7 +1141,7 @@ public class LatexSink
/** {@inheritDoc} */
public void inline( SinkEventAttributes attributes )
{
- List<String> tags = new ArrayList<String>();
+ List<String> tags = new ArrayList<>();
if ( attributes != null )
{
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java
index bfd89b7..9233148 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaExtension.java
@@ -29,7 +29,7 @@ import com.vladsch.flexmark.util.options.MutableDataHolder;
*/
class FlexmarkDoxiaExtension implements HtmlRenderer.HtmlRendererExtension
{
- public static final DataKey<String> INPUT_FILE_EXTENSION = new DataKey<String>( "INPUT_FILE_EXTENSION", "md" );
+ public static final DataKey<String> INPUT_FILE_EXTENSION = new DataKey<>( "INPUT_FILE_EXTENSION", "md" );
@Override
public void rendererOptions( final MutableDataHolder options )
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java
index 10810af..cab9b2d 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaLinkResolver.java
@@ -90,7 +90,7 @@ public class FlexmarkDoxiaLinkResolver implements LinkResolver
@Override
public Set<Class<? extends LinkResolverFactory>> getBeforeDependents()
{
- Set<Class<? extends LinkResolverFactory>> set = new HashSet<Class<? extends LinkResolverFactory>>();
+ Set<Class<? extends LinkResolverFactory>> set = new HashSet<>();
set.add( WikiLinkLinkResolver.Factory.class );
return set;
}
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaNodeRenderer.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaNodeRenderer.java
index 090008e..aea3316 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaNodeRenderer.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/FlexmarkDoxiaNodeRenderer.java
@@ -48,24 +48,22 @@ class FlexmarkDoxiaNodeRenderer implements NodeRenderer
{
//noinspection unchecked
return new HashSet<NodeRenderingHandler<?>>( Arrays.asList(
- new NodeRenderingHandler<IndentedCodeBlock>( IndentedCodeBlock.class,
- new CustomNodeRenderer<IndentedCodeBlock>()
- {
- @Override
- public void render( IndentedCodeBlock node, NodeRendererContext context, HtmlWriter html )
- {
- FlexmarkDoxiaNodeRenderer.this.render( node, context, html );
- }
- } ),
- new NodeRenderingHandler<FencedCodeBlock>( FencedCodeBlock.class,
- new CustomNodeRenderer<FencedCodeBlock>()
- {
- @Override
- public void render( FencedCodeBlock node, NodeRendererContext context, HtmlWriter html )
- {
- FlexmarkDoxiaNodeRenderer.this.render( node, context, html );
- }
- } )
+ new NodeRenderingHandler<>( IndentedCodeBlock.class, new CustomNodeRenderer<IndentedCodeBlock>()
+ {
+ @Override
+ public void render( IndentedCodeBlock node, NodeRendererContext context, HtmlWriter html )
+ {
+ FlexmarkDoxiaNodeRenderer.this.render( node, context, html );
+ }
+ } ),
+ new NodeRenderingHandler<>( FencedCodeBlock.class, new CustomNodeRenderer<FencedCodeBlock>()
+ {
+ @Override
+ public void render( FencedCodeBlock node, NodeRendererContext context, HtmlWriter html )
+ {
+ FlexmarkDoxiaNodeRenderer.this.render( node, context, html );
+ }
+ } )
) );
}
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
index fa1454f..b9a2e14 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
@@ -130,7 +130,7 @@ public class MarkdownParser
String text = IOUtil.toString( source );
MutableDataHolder flexmarkOptions = PegdownOptionsAdapter.flexmarkOptions(
Extensions.ALL & ~( Extensions.HARDWRAPS | Extensions.ANCHORLINKS ) ).toMutable();
- ArrayList<Extension> extensions = new ArrayList<Extension>();
+ ArrayList<Extension> extensions = new ArrayList<>();
for ( Extension extension : flexmarkOptions.get( com.vladsch.flexmark.parser.Parser.EXTENSIONS ) )
{
extensions.add( extension );
diff --git a/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java b/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
index e878204..68195d2 100644
--- a/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
+++ b/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
@@ -217,7 +217,7 @@ public class RtfSink
protected OutputStream stream; // for raw image data
/** Keep track of the closing tags for inline events. */
- protected Stack<List<Integer>> inlineStack = new Stack<List<Integer>>();
+ protected Stack<List<Integer>> inlineStack = new Stack<>();
/** Map of warn messages with a String as key to describe the error type and a Set as value.
* Using to reduce warn messages. */
@@ -1457,7 +1457,7 @@ public class RtfSink
/** {@inheritDoc} */
public void inline( SinkEventAttributes attributes )
{
- List<Integer> tags = new ArrayList<Integer>();
+ List<Integer> tags = new ArrayList<>();
if ( attributes != null )
{
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
index 8e90cf6..82c0d71 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
@@ -106,7 +106,7 @@ public class TWikiParser
public final List<Block> parse( final ByLineSource source )
throws ParseException
{
- final List<Block> ret = new ArrayList<Block>();
+ final List<Block> ret = new ArrayList<>();
String line;
while ( ( line = source.getNextLine() ) != null )
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
index dffbcb6..384d31e 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
@@ -68,10 +68,10 @@ public class TWikiSink
private final Stack<String> listStyles;
/** Keep track of the nested bold flag. */
- protected Stack<Boolean> boldStack = new Stack<Boolean>();
+ protected Stack<Boolean> boldStack = new Stack<>();
/** Keep track of the closing tags for inline events. */
- protected Stack<List<String>> inlineStack = new Stack<List<String>>();
+ protected Stack<List<String>> inlineStack = new Stack<>();
/**
* Constructor, initialize the Writer and the variables.
@@ -82,7 +82,7 @@ public class TWikiSink
protected TWikiSink( Writer writer )
{
this.out = new PrintWriter( writer );
- this.listStyles = new Stack<String>();
+ this.listStyles = new Stack<>();
init();
}
@@ -405,7 +405,7 @@ public class TWikiSink
/** {@inheritDoc} */
public void inline( SinkEventAttributes attributes )
{
- List<String> tags = new ArrayList<String>();
+ List<String> tags = new ArrayList<>();
boldStack.push( boldFlag );
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java
index 039ca2d..919605f 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java
@@ -40,7 +40,7 @@ public class FormatedTextParser
/**
* map used to create blocks dependening on the text format
*/
- private static final Map<String, FormatBlockFactory> FACTORY_MAP = new HashMap<String, FormatBlockFactory>();
+ private static final Map<String, FormatBlockFactory> FACTORY_MAP = new HashMap<>();
/**
* creates bold blocks
@@ -163,7 +163,7 @@ public class FormatedTextParser
*/
private List<Block> parseFormat( final String line )
{
- final List<Block> ret = new ArrayList<Block>();
+ final List<Block> ret = new ArrayList<>();
final int[] lhOffsets = new int[SPECIAL_CHAR.length];
final int[] rhOffsets = new int[SPECIAL_CHAR.length];
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
index 9716582..a28bfdb 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
@@ -375,7 +375,7 @@ class TreeListBuilder
*/
private List<ListItemBlock> getListItems( final TreeComponent tc )
{
- final List<ListItemBlock> blocks = new ArrayList<ListItemBlock>();
+ final List<ListItemBlock> blocks = new ArrayList<>();
for ( int i = 0; i < tc.getChildren().length; i++ )
{
@@ -411,7 +411,7 @@ class TreeListBuilder
/**
* childrens
*/
- private List<TreeComponent> children = new ArrayList<TreeComponent>();
+ private List<TreeComponent> children = new ArrayList<>();
/**
* node text
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
index 09a29fb..4c28331 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
@@ -90,7 +90,7 @@ public class ParagraphBlockParser
throws ParseException
{
StringBuilder sb = new StringBuilder();
- List<Block> childs = new ArrayList<Block>();
+ List<Block> childs = new ArrayList<>();
boolean sawText = false;
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java
index 2ac84e2..9906772 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java
@@ -75,7 +75,7 @@ public class SectionBlockParser
}
String newLine;
- final ArrayList<Block> blocks = new ArrayList<Block>();
+ final ArrayList<Block> blocks = new ArrayList<>();
while ( ( newLine = source.getNextLine() ) != null && !accept( newLine ) )
{
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
index b2d9667..50555c2 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
@@ -63,7 +63,7 @@ public class TableBlockParser
throw new IllegalAccessError( "call accept before this ;)" );
}
- final List<Block> rows = new ArrayList<Block>();
+ final List<Block> rows = new ArrayList<>();
String l = line;
do
@@ -71,7 +71,7 @@ public class TableBlockParser
final Matcher m = TABLE_PATTERN.matcher( l );
if ( m.lookingAt() )
{
- final List<Block> cells = new ArrayList<Block>();
+ final List<Block> cells = new ArrayList<>();
/* for each cell... */
for ( int lh = l.indexOf( '|' ) + 1, rh; ( rh = l.indexOf( '|', lh ) ) != -1; lh = rh + 1 )
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
index 41f7f75..42214cd 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
@@ -99,7 +99,7 @@ public class TextParser
*/
public final List<Block> parse( final String line )
{
- final List<Block> ret = new ArrayList<Block>();
+ final List<Block> ret = new ArrayList<>();
final Matcher linkMatcher = SPECIFICLINK_PATTERN.matcher( line );
final Matcher wikiMatcher = WIKIWORD_PATTERN.matcher( line );
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.java
index 52c11c9..5dc7028 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.java
@@ -61,7 +61,7 @@ public class VerbatimBlockParser
throw new IllegalAccessError( "call accept before this ;)" );
}
- final List<Block> lines = new ArrayList<Block>();
+ final List<Block> lines = new ArrayList<>();
Matcher matcher = VERBATIM_START_PATTERN.matcher( line );
matcher.find();
String l = line.substring( matcher.end() );
diff --git a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
index fab515b..a5140a3 100644
--- a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
+++ b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
@@ -73,7 +73,7 @@ public class XdocParser
/**
* The macro parameters.
*/
- private Map<String, Object> macroParameters = new HashMap<String, Object>();
+ private Map<String, Object> macroParameters = new HashMap<>();
/**
* Indicates that we're inside <properties> or <head>.
@@ -410,7 +410,7 @@ public class XdocParser
if ( macroParameters == null )
{
- macroParameters = new HashMap<String, Object>();
+ macroParameters = new HashMap<>();
}
if ( StringUtils.isEmpty( macroName ) )
diff --git a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
index a801d41..3ea1a4a 100644
--- a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
+++ b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
@@ -247,7 +247,7 @@ public class XhtmlParser
String[] params = StringUtils.split( s, "|" );
String macroName = params[0];
- Map<String, Object> parameters = new HashMap<String, Object>();
+ Map<String, Object> parameters = new HashMap<>();
for ( int i = 1; i < params.length; i++ )
{
String[] param = StringUtils.split( params[i], "=" );
diff --git a/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java b/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
index 1cee1b0..1f4f5c7 100644
--- a/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
+++ b/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
@@ -248,7 +248,7 @@ public class Xhtml5Parser
String[] params = StringUtils.split( s, "|" );
String macroName = params[0];
- Map<String, Object> parameters = new HashMap<String, Object>();
+ Map<String, Object> parameters = new HashMap<>();
for ( int i = 1; i < params.length; i++ )
{
String[] param = StringUtils.split( params[i], "=" );
[maven-doxia] 02/03: [DOXIA-591] Use never Java style
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-591
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit b46435b917462317790786dfb5fc4db2011e29c7
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat May 4 11:51:38 2019 +0200
[DOXIA-591] Use never Java style
- 'for' loop replaceable with 'foreach'
- 'indexOf()' replace with 'contains()'
- replace StringBuffer with StringBuilder
- remove unnecessary boxing/unboxing
---
.../maven/doxia/macro/snippet/SnippetMacro.java | 6 ++---
.../maven/doxia/parser/AbstractXmlParser.java | 2 +-
.../maven/doxia/parser/Xhtml5BaseParser.java | 2 +-
.../apache/maven/doxia/parser/XhtmlBaseParser.java | 2 +-
.../maven/doxia/sink/impl/Xhtml5BaseSink.java | 8 +++----
.../maven/doxia/sink/impl/XhtmlBaseSink.java | 8 +++----
.../org/apache/maven/doxia/util/DoxiaUtils.java | 8 +++----
.../org/apache/maven/doxia/util/HtmlTools.java | 4 ++--
.../org/apache/maven/doxia/macro/SwfMacroTest.java | 2 +-
.../maven/doxia/parser/Xhtml5BaseParserTest.java | 2 +-
.../maven/doxia/parser/XhtmlBaseParserTest.java | 2 +-
.../doxia/sink/impl/SinkEventTestingSink.java | 8 +++----
.../maven/doxia/sink/impl/Xhtml5BaseSinkTest.java | 4 ++--
.../maven/doxia/sink/impl/XhtmlBaseSinkTest.java | 4 ++--
.../maven/doxia/xsd/AbstractXmlValidator.java | 8 ++-----
.../maven/doxia/xsd/AbstractXmlValidatorTest.java | 10 ++++----
.../apache/maven/doxia/module/apt/AptParser.java | 4 ++--
.../maven/doxia/module/apt/AptParserTest.java | 8 +++----
.../parser/DefinitionListBlockParser.java | 2 +-
.../confluence/parser/FigureBlockParser.java | 2 +-
.../confluence/parser/ParagraphBlockParser.java | 3 +--
.../confluence/parser/table/TableBlockParser.java | 4 ++--
.../module/confluence/ConfluenceParserTest.java | 4 ++--
.../maven/doxia/module/docbook/DocBookSink.java | 4 ++--
.../maven/doxia/module/fml/FmlParserTest.java | 2 +-
.../maven/doxia/module/fml/FmlValidatorTest.java | 2 +-
.../maven/doxia/module/fo/FoAggregateSink.java | 6 ++---
.../org/apache/maven/doxia/module/fo/FoSink.java | 10 ++++----
.../maven/doxia/module/fo/FoAggregateSinkTest.java | 28 +++++++++++-----------
.../apache/maven/doxia/module/itext/ITextSink.java | 6 ++---
.../apache/maven/doxia/module/itext/ITextUtil.java | 10 ++++----
.../doxia/module/itext/SinkActionContext.java | 4 ++--
.../apache/maven/doxia/module/latex/LatexSink.java | 4 ++--
.../org/apache/maven/doxia/module/rtf/RtfSink.java | 25 ++++++++++---------
.../apache/maven/doxia/module/rtf/WMFWriter.java | 8 +++----
.../module/twiki/parser/AbstractFatherBlock.java | 8 +++----
.../module/twiki/parser/ParagraphBlockParser.java | 4 ++--
.../doxia/module/twiki/parser/TextParser.java | 4 ++--
.../maven/doxia/module/twiki/parser/ListTest.java | 3 +--
.../apache/maven/doxia/module/xdoc/XdocParser.java | 2 +-
.../maven/doxia/module/xdoc/XdocParserTest.java | 6 ++---
.../maven/doxia/module/xdoc/XdocValidatorTest.java | 2 +-
.../maven/doxia/module/xhtml/XhtmlParser.java | 2 +-
.../maven/doxia/module/xhtml/XhtmlSinkTest.java | 12 +++++-----
.../maven/doxia/module/xhtml5/Xhtml5Parser.java | 2 +-
.../maven/doxia/module/xhtml5/Xhtml5SinkTest.java | 12 +++++-----
46 files changed, 130 insertions(+), 143 deletions(-)
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
index ae85ca8..fb482bf 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
@@ -103,7 +103,7 @@ public class SnippetMacro
if ( verbatimParam != null && !"".equals( verbatimParam ) )
{
- verbatim = Boolean.valueOf( verbatimParam ).booleanValue();
+ verbatim = Boolean.valueOf( verbatimParam );
}
String encoding = (String) request.getParameter( "encoding" );
@@ -274,7 +274,7 @@ public class SnippetMacro
{
String globalId = globalSnippetId( url, id );
- return timeCached.containsKey( globalId ) ? timeCached.get( globalId ).longValue() : 0;
+ return timeCached.containsKey( globalId ) ? timeCached.get( globalId ) : 0;
}
/**
@@ -321,7 +321,7 @@ public class SnippetMacro
{
cache.put( globalSnippetId( url, id ), content );
- timeCached.put( globalSnippetId( url, id ), Long.valueOf( System.currentTimeMillis() ) );
+ timeCached.put( globalSnippetId( url, id ), System.currentTimeMillis() );
}
/**
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
index ec25f19..23141c2 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
@@ -427,7 +427,7 @@ public abstract class AbstractXmlParser
*/
protected void handleUnknown( XmlPullParser parser, Sink sink, int type )
{
- Object[] required = new Object[] { Integer.valueOf( type ) };
+ Object[] required = new Object[] { type };
SinkEventAttributeSet attribs = getAttributesFromParser( parser );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
index 70dac8d..fb12426 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java
@@ -804,7 +804,7 @@ public class Xhtml5BaseParser
if ( isScriptBlock() )
{
- sink.unknown( CDATA, new Object[] { Integer.valueOf( CDATA_TYPE ), text}, null );
+ sink.unknown( CDATA, new Object[] { CDATA_TYPE, text }, null );
}
else
{
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
index b2424fe..2e4ee88 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
@@ -814,7 +814,7 @@ public class XhtmlBaseParser
if ( isScriptBlock() )
{
- sink.unknown( CDATA, new Object[] { Integer.valueOf( CDATA_TYPE ), text}, null );
+ sink.unknown( CDATA, new Object[] { CDATA_TYPE, text }, null );
}
else
{
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index 4ad403a..df9c5f2 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -1580,7 +1580,7 @@ public class Xhtml5BaseSink
writeStartTag( HtmlMarkup.TABLE, att );
- this.cellCountStack.addLast( Integer.valueOf( 0 ) );
+ this.cellCountStack.addLast( 0 );
}
/** {@inheritDoc} */
@@ -1647,7 +1647,7 @@ public class Xhtml5BaseSink
if ( !this.cellCountStack.isEmpty() )
{
this.cellCountStack.removeLast();
- this.cellCountStack.addLast( Integer.valueOf( 0 ) );
+ this.cellCountStack.addLast( 0 );
}
}
@@ -1761,7 +1761,7 @@ public class Xhtml5BaseSink
&& !this.cellCountStack.isEmpty() )
{
int cellCount = Integer.parseInt( this.cellCountStack.removeLast().toString() );
- this.cellCountStack.addLast( Integer.valueOf( ++cellCount ) );
+ this.cellCountStack.addLast( ++cellCount );
}
}
@@ -2288,7 +2288,7 @@ public class Xhtml5BaseSink
return;
}
- int tagType = ( (Integer) requiredParams[0] ).intValue();
+ int tagType = (Integer) requiredParams[0];
if ( tagType == ENTITY_TYPE )
{
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
index bf6c28a..25de329 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSink.java
@@ -1398,7 +1398,7 @@ public class XhtmlBaseSink
writeStartTag( HtmlMarkup.TABLE, att );
- this.cellCountStack.addLast( Integer.valueOf( 0 ) );
+ this.cellCountStack.addLast( 0 );
}
/** {@inheritDoc} */
@@ -1465,7 +1465,7 @@ public class XhtmlBaseSink
if ( !this.cellCountStack.isEmpty() )
{
this.cellCountStack.removeLast();
- this.cellCountStack.addLast( Integer.valueOf( 0 ) );
+ this.cellCountStack.addLast( 0 );
}
}
@@ -1579,7 +1579,7 @@ public class XhtmlBaseSink
&& !this.cellCountStack.isEmpty() )
{
int cellCount = Integer.parseInt( this.cellCountStack.removeLast().toString() );
- this.cellCountStack.addLast( Integer.valueOf( ++cellCount ) );
+ this.cellCountStack.addLast( ++cellCount );
}
}
@@ -2073,7 +2073,7 @@ public class XhtmlBaseSink
return;
}
- int tagType = ( (Integer) requiredParams[0] ).intValue();
+ int tagType = (Integer) requiredParams[0];
if ( tagType == ENTITY_TYPE )
{
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
index 155586b..e40c6e4 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
@@ -257,10 +257,10 @@ public class DoxiaUtils
bytes = new byte[0];
}
- for ( int j = 0; j < bytes.length; ++j )
+ for ( byte aByte : bytes )
{
buffer.append( '.' );
- buffer.append( String.format( "%02X", bytes[j] ) );
+ buffer.append( String.format( "%02X", aByte ) );
}
}
}
@@ -361,9 +361,9 @@ public class DoxiaUtils
return new Date();
}
- for ( int i = 0; i < DATE_PATTERNS.length; i++ )
+ for ( String datePattern : DATE_PATTERNS )
{
- DATE_PARSER.applyPattern( DATE_PATTERNS[i] );
+ DATE_PARSER.applyPattern( datePattern );
DATE_PARSE_POSITION.setIndex( 0 );
final Date date = DATE_PARSER.parse( str, DATE_PARSE_POSITION );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
index 37c9ad8..81a2d88 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
@@ -364,10 +364,10 @@ public class HtmlTools
bytes = new byte[0];
}
- for ( int j = 0; j < bytes.length; ++j )
+ for ( byte aByte : bytes )
{
encoded.append( '%' );
- encoded.append( String.format( "%02X", bytes[j] ) );
+ encoded.append( String.format( "%02X", aByte ) );
}
}
}
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java
index 2fd13d0..8e56627 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/SwfMacroTest.java
@@ -126,7 +126,7 @@ public class SwfMacroTest
macroParameters.put( "play", "false" );
macroParameters.put( "version", "6" );
macroParameters.put( "allowScript", "always" );
- macroParameters.put( "notAString", new Integer(0) );
+ macroParameters.put( "notAString", 0 );
SinkEventTestingSink sink = new SinkEventTestingSink();
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
index ee1ac18..853d37c 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
@@ -708,7 +708,7 @@ public class Xhtml5BaseParserTest
// DOXIA-374
SinkEventElement el = it.next();
assertEquals( "tableRows", el.getName() );
- assertFalse( ( (Boolean) el.getArgs()[1] ).booleanValue() );
+ assertFalse( (Boolean) el.getArgs()[1] );
assertEquals( "tableCaption", it.next().getName() );
assertEquals( "tableCaption_", it.next().getName() );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
index 45f8a3d..6b8b8e7 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
@@ -618,7 +618,7 @@ public class XhtmlBaseParserTest
// DOXIA-374
SinkEventElement el = it.next();
assertEquals( "tableRows", el.getName() );
- assertFalse( ( (Boolean) el.getArgs()[1] ).booleanValue() );
+ assertFalse( (Boolean) el.getArgs()[1] );
assertEquals( "tableCaption", it.next().getName() );
assertEquals( "tableCaption_", it.next().getName() );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
index b9d4651..4618be0 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
@@ -218,7 +218,7 @@ public class SinkEventTestingSink
@Override
public void numberedList( int numbering )
{
- addEvent( "numberedList", new Object[] {new Integer( numbering )} );
+ addEvent( "numberedList", new Object[] { numbering } );
}
@Override
@@ -302,7 +302,7 @@ public class SinkEventTestingSink
@Override
public void tableRows( int[] justification, boolean grid )
{
- addEvent( "tableRows", new Object[] {justification, new Boolean( grid )} );
+ addEvent( "tableRows", new Object[] { justification, grid } );
}
@Override
@@ -554,7 +554,7 @@ public class SinkEventTestingSink
@Override
public void verbatim( boolean boxed )
{
- addEvent( "verbatim", new Object[] {new Boolean( boxed )} );
+ addEvent( "verbatim", new Object[] { boxed } );
}
@Override
@@ -879,7 +879,7 @@ public class SinkEventTestingSink
@Override
public void numberedList( int numbering, SinkEventAttributes attributes )
{
- addEvent( "numberedList", new Object[] {new Integer( numbering ), attributes} );
+ addEvent( "numberedList", new Object[] { numbering, attributes } );
}
@Override
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
index 4d0723f..293fd0e 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
@@ -1399,8 +1399,8 @@ public class Xhtml5BaseSinkTest
*/
public void testAttributeEntities()
{
- final Object[] startTag = new Object[] { new Integer( Xhtml5BaseSink.TAG_TYPE_START ) };
- final Object[] endTag = new Object[] { new Integer( Xhtml5BaseSink.TAG_TYPE_END ) };
+ final Object[] startTag = new Object[] { Xhtml5BaseSink.TAG_TYPE_START };
+ final Object[] endTag = new Object[] { Xhtml5BaseSink.TAG_TYPE_END };
final String script = Xhtml5BaseSink.SCRIPT.toString();
final SinkEventAttributes src = new SinkEventAttributeSet(
new String[] {SinkEventAttributes.SRC.toString(), "http://ex.com/ex.js?v=l&l=e"} );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
index 0efe53a..917706f 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/XhtmlBaseSinkTest.java
@@ -952,8 +952,8 @@ public class XhtmlBaseSinkTest
*/
public void testAttributeEntities()
{
- final Object[] startTag = new Object[] { new Integer( XhtmlBaseSink.TAG_TYPE_START ) };
- final Object[] endTag = new Object[] { new Integer( XhtmlBaseSink.TAG_TYPE_END ) };
+ final Object[] startTag = new Object[] { XhtmlBaseSink.TAG_TYPE_START };
+ final Object[] endTag = new Object[] { XhtmlBaseSink.TAG_TYPE_END };
final String script = XhtmlBaseSink.SCRIPT.toString();
final SinkEventAttributes src = new SinkEventAttributeSet(
new String[] {SinkEventAttributes.SRC.toString(), "http://ex.com/ex.js?v=l&l=e"} );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
index 69a78f3..4a66cb2 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
@@ -103,10 +103,8 @@ public abstract class AbstractXmlValidator
final Logger logger =
( (DefaultPlexusContainer) getContainer() ).getLoggerManager().getLoggerForComponent( Parser.ROLE );
- for ( Iterator<Map.Entry<String, String>> it = getTestDocuments().entrySet().iterator(); it.hasNext(); )
+ for ( Map.Entry<String, String> entry : getTestDocuments().entrySet() )
{
- Map.Entry<String, String> entry = it.next();
-
if ( logger.isDebugEnabled() )
{
logger.debug( "Validate '" + entry.getKey() + "'" );
@@ -114,10 +112,8 @@ public abstract class AbstractXmlValidator
List<ErrorMessage> errors = parseXML( entry.getValue().toString() );
- for ( Iterator<ErrorMessage> it2 = errors.iterator(); it2.hasNext(); )
+ for ( ErrorMessage error : errors )
{
- ErrorMessage error = it2.next();
-
if ( isFailErrorMessage( error.getMessage() ) )
{
fail( entry.getKey() + EOL + error.toString() );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
index 89d69eb..a8207d6 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
@@ -89,10 +89,8 @@ public abstract class AbstractXmlValidatorTest
Map<String,String> testDocs = getAllTestDocuments();
Map<String,String> ret = new Hashtable<String,String>();
ret.putAll( testDocs );
- for ( Iterator<String> it = testDocs.keySet().iterator(); it.hasNext(); )
+ for ( String key : testDocs.keySet() )
{
- String key = it.next();
-
for ( int i = 0; i < getIncludes().length; i++ )
{
if ( !SelectorUtils.matchPath( getIncludes()[i], key.toLowerCase( Locale.ENGLISH ) ) )
@@ -187,9 +185,9 @@ public abstract class AbstractXmlValidatorTest
File testDocsDir = FileUtils.toFile( testJar ).getParentFile();
List<File> files = FileUtils.getFiles( testDocsDir, "**/*.*", FileUtils.getDefaultExcludesAsString(), true );
- for ( Iterator<File> it = files.iterator(); it.hasNext();)
+ for ( File file1 : files )
{
- File file = new File( it.next().toString() );
+ File file = new File( file1.toString() );
if ( file.getAbsolutePath().contains( "META-INF" ) )
{
@@ -197,7 +195,7 @@ public abstract class AbstractXmlValidatorTest
}
Reader reader = null;
- if ( XmlUtil.isXml( file ))
+ if ( XmlUtil.isXml( file ) )
{
reader = ReaderFactory.newXmlReader( file );
}
diff --git a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
index b69e4e1..08bd6f4 100644
--- a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
+++ b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
@@ -2616,9 +2616,9 @@ public class AptParser
{
// Skip empty row (a decorative line).
boolean traversed = false;
- for ( int i = 0; i < cells.length; ++i )
+ for ( StringBuilder cell1 : cells )
{
- if ( cells[i].length() > 0 )
+ if ( cell1.length() > 0 )
{
traversed = true;
break;
diff --git a/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java b/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
index 25b2e5f..7985e4a 100644
--- a/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
+++ b/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
@@ -88,7 +88,7 @@ public class AptParserTest
{
String linebreak = parseFileToAptSink( "test/linebreak" );
- assertTrue( linebreak.indexOf( "Line\\" + EOL + "break." ) != -1 );
+ assertTrue( linebreak.contains( "Line\\" + EOL + "break." ) );
}
/** @throws Exception */
@@ -97,7 +97,7 @@ public class AptParserTest
{
String macro = parseFileToAptSink( "test/macro" );
- assertTrue( macro.indexOf( "<modelVersion\\>4.0.0\\</modelVersion\\>" ) != -1 );
+ assertTrue( macro.contains( "<modelVersion\\>4.0.0\\</modelVersion\\>" ) );
}
/** @throws Exception */
@@ -161,8 +161,8 @@ public class AptParserTest
String toc = parseFileToAptSink( "test/toc" );
// No section, only subsection 1 and 2
- assertTrue( toc.indexOf( "* {{{SubSection_1.1}SubSection 1.1}}" ) != -1 );
- assertTrue( toc.indexOf( "* {{{SubSection_1.1.2.1.1}SubSection 1.1.2.1.1}}" ) == -1 );
+ assertTrue( toc.contains( "* {{{SubSection_1.1}SubSection 1.1}}" ) );
+ assertTrue( !toc.contains( "* {{{SubSection_1.1.2.1.1}SubSection 1.1.2.1.1}}" ) );
}
/**
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.java
index 93b4948..acd70a1 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.java
@@ -54,7 +54,7 @@ public class DefinitionListBlockParser
{
line = line.substring( index + 6 );
- while ( !( line.indexOf( "}" ) >= 0 ) && line != null )
+ while ( !( line.contains( "}" ) ) && line != null )
{
append( title, line );
line = source.getNextLine();
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java
index 32df7fb..23c7ff4 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java
@@ -42,7 +42,7 @@ public class FigureBlockParser
throws ParseException
{
String image = line.substring( 1, line.lastIndexOf( "!" ) );
- if ( image.indexOf( "|" ) >= 0 )
+ if ( image.contains( "|" ) )
{
// DOXIA-303: handle figure attributes
image = image.substring( 0, image.indexOf( "|" ) );
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
index 0bcdb86..fc7adc9 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
@@ -106,9 +106,8 @@ public class ParagraphBlockParser
}
boolean accepted = false;
- for ( int i = 0; i < parsers.length; i++ )
+ for ( BlockParser parser : parsers )
{
- BlockParser parser = parsers[i];
if ( parser.accept( line, source ) )
{
accepted = true;
diff --git a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
index 34f3e4e..a34222e 100644
--- a/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
+++ b/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
@@ -99,11 +99,11 @@ public class TableBlockParser
{
String[] text = StringUtils.split( l, "||" );
- for ( int i = 0; i < text.length; i++ )
+ for ( String s : text )
{
List<Block> textBlocks = new ArrayList<Block>();
- textBlocks.add( parseLine( text[i], new ByLineReaderSource( new StringReader( EMPTY_STRING ) ) ) );
+ textBlocks.add( parseLine( s, new ByLineReaderSource( new StringReader( EMPTY_STRING ) ) ) );
List<Block> blocks = new ArrayList<Block>();
diff --git a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
index 3b39610..5abe1ee 100644
--- a/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
+++ b/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
@@ -667,11 +667,11 @@ public class ConfluenceParserTest
lines = StringUtils.replace( lines, "\n", EOL );
if ( message != null )
{
- assertTrue( message, result.indexOf( lines ) != -1 );
+ assertTrue( message, result.contains( lines ) );
}
else
{
- assertTrue( result.indexOf( lines ) != -1 );
+ assertTrue( result.contains( lines ) );
}
}
diff --git a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java b/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
index da91a8e..9cb996d 100644
--- a/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
+++ b/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
@@ -1297,10 +1297,10 @@ public class DocBookSink
writeStartTag( SimplifiedDocbookMarkup.TGROUP_TAG, att );
- for ( int i = 0; i < justification.length; ++i )
+ for ( int i1 : justification )
{
String justif;
- switch ( justification[i] )
+ switch ( i1 )
{
case Sink.JUSTIFY_LEFT:
justif = "left";
diff --git a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
index 176650c..9d8eb6b 100644
--- a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
+++ b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
@@ -299,7 +299,7 @@ public class FmlParserTest
IOUtil.close( reader );
}
- assertTrue( content.indexOf( "<a name=\"macro-definition\">Macro Question</a>" ) != -1 );
+ assertTrue( content.contains( "<a name=\"macro-definition\">Macro Question</a>" ) );
}
private void assertTextEvent( SinkEventElement textEvt, String string )
diff --git a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java
index d5d2c49..d783e70 100644
--- a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java
+++ b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java
@@ -56,7 +56,7 @@ public class FmlValidatorTest
String root = matcher.group( 1 );
String value = matcher.group( 2 );
- if ( value.indexOf( FML_XSD.getName() ) == -1 )
+ if ( !value.contains( FML_XSD.getName() ) )
{
String faqs =
"<" + root + " xmlns=\"" + FmlMarkup.FML_NAMESPACE + "\""
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
index af42ce9..6c7fe94 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
@@ -389,7 +389,7 @@ public class FoAggregateSink
idName = idName.substring( 0, idName.lastIndexOf( "." ) );
}
- while ( idName.indexOf( "//" ) != -1 )
+ while ( idName.contains( "//" ) )
{
idName = StringUtils.replace( idName, "//", "/" );
}
@@ -493,7 +493,7 @@ public class FoAggregateSink
return;
}
- while ( name.indexOf( "//" ) != -1 )
+ while ( name.contains( "//" ) )
{
name = StringUtils.replace( name, "//", "/" );
}
@@ -567,7 +567,7 @@ public class FoAggregateSink
String base = docName.substring( 0, docName.lastIndexOf( "/" ) );
- if ( base.indexOf( "/" ) != -1 )
+ if ( base.contains( "/" ) )
{
while ( anchor.startsWith( "../" ) )
{
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
index 2a448a3..a9421b6 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
@@ -973,10 +973,10 @@ public class FoSink
/** {@inheritDoc} */
public void tableRows( int[] justification, boolean grid )
{
- this.tableGridStack.addLast( Boolean.valueOf( grid ) );
+ this.tableGridStack.addLast( grid );
this.cellJustifStack.addLast( justification );
- this.isCellJustifStack.addLast( Boolean.valueOf( true ) );
- this.cellCountStack.addLast( Integer.valueOf( 0 ) );
+ this.isCellJustifStack.addLast( Boolean.TRUE );
+ this.cellCountStack.addLast( 0 );
writeEOL();
writeStartTag( TABLE_BODY_TAG );
}
@@ -997,7 +997,7 @@ public class FoSink
// TODO spacer rows
writeStartTag( TABLE_ROW_TAG, "table.body.row" );
this.cellCountStack.removeLast();
- this.cellCountStack.addLast( Integer.valueOf( 0 ) );
+ this.cellCountStack.addLast( 0 );
}
/** {@inheritDoc} */
@@ -1127,7 +1127,7 @@ public class FoSink
if ( this.isCellJustifStack.getLast().equals( Boolean.TRUE ) )
{
int cellCount = Integer.parseInt( this.cellCountStack.removeLast().toString() );
- this.cellCountStack.addLast( Integer.valueOf( ++cellCount ) );
+ this.cellCountStack.addLast( ++cellCount );
}
}
diff --git a/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java b/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
index 9e6792e..b7ef2b6 100644
--- a/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
+++ b/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoAggregateSinkTest.java
@@ -83,7 +83,7 @@ public class FoAggregateSinkTest
sink.close();
}
- assertTrue( writer.toString().indexOf( "<fo:block id=\"./folder/documentName\">" ) != -1 );
+ assertTrue( writer.toString().contains( "<fo:block id=\"./folder/documentName\">" ) );
}
/**
@@ -103,7 +103,7 @@ public class FoAggregateSinkTest
sink.close();
}
- assertTrue( writer.toString().indexOf( "<fo:block id=\"./folder/documentName\">" ) != -1 );
+ assertTrue( writer.toString().contains( "<fo:block id=\"./folder/documentName\">" ) );
}
/**
@@ -151,7 +151,7 @@ public class FoAggregateSinkTest
{
SAXParseException sax = (SAXParseException) e.getCause();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( "Error creating PDF from " ).append( foFile.getAbsolutePath() ).append( ":" ).append( sax.getLineNumber() ).append( ":" ).append( sax.getColumnNumber() ).append( "\n" );
sb.append( e.getMessage() );
@@ -205,8 +205,8 @@ public class FoAggregateSinkTest
sink.close();
}
- assertTrue( writer.toString().indexOf( "<fo:inline id=\"#invalid_Anchor\">" ) != -1 );
- assertTrue( writer.toString().indexOf( "<fo:inline id=\"./folder/docName#validAnchor\">" ) != -1 );
+ assertTrue( writer.toString().contains( "<fo:inline id=\"#invalid_Anchor\">" ) );
+ assertTrue( writer.toString().contains( "<fo:inline id=\"./folder/docName#validAnchor\">" ) );
}
/**
@@ -247,13 +247,13 @@ public class FoAggregateSinkTest
String result = writer.toString();
- assertTrue( result.indexOf( "<fo:basic-link external-destination=\"http://www.example.com/\">" ) != -1 );
- assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./folder/docName#anchor\">" ) != -1 );
- assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./folder/index\">" ) != -1 );
- assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./download\">" ) != -1 );
- assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./folder/test\">" ) != -1 );
- assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./folder/whatsnew-1.1\">" ) != -1 );
- assertTrue( result.indexOf( "<fo:block id=\"./whatsnew-1.1\">" ) != -1 );
+ assertTrue( result.contains( "<fo:basic-link external-destination=\"http://www.example.com/\">" ) );
+ assertTrue( result.contains( "<fo:basic-link internal-destination=\"./folder/docName#anchor\">" ) );
+ assertTrue( result.contains( "<fo:basic-link internal-destination=\"./folder/index\">" ) );
+ assertTrue( result.contains( "<fo:basic-link internal-destination=\"./download\">" ) );
+ assertTrue( result.contains( "<fo:basic-link internal-destination=\"./folder/test\">" ) );
+ assertTrue( result.contains( "<fo:basic-link internal-destination=\"./folder/whatsnew-1.1\">" ) );
+ assertTrue( result.contains( "<fo:block id=\"./whatsnew-1.1\">" ) );
writer = new StringWriter();
try
@@ -276,7 +276,7 @@ public class FoAggregateSinkTest
result = writer.toString();
- assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./root\">" ) != -1 );
- assertTrue( result.indexOf( "<fo:basic-link internal-destination=\"./outside\">" ) != -1 );
+ assertTrue( result.contains( "<fo:basic-link internal-destination=\"./root\">" ) );
+ assertTrue( result.contains( "<fo:basic-link internal-destination=\"./outside\">" ) );
}
}
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
index 7dd32ec..1a3d60e 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
@@ -1828,11 +1828,11 @@ public class ITextSink
{
String[] strings = StringUtils.split( aString, " " );
StringBuilder sb = new StringBuilder();
- for ( int i = 0; i < strings.length; i++ )
+ for ( String string : strings )
{
- if ( strings[i].trim().length() != 0 )
+ if ( string.trim().length() != 0 )
{
- sb.append( strings[i].trim() );
+ sb.append( string.trim() );
sb.append( " " );
}
}
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
index 3bddb50..c82e0d8 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
@@ -69,9 +69,8 @@ public class ITextUtil
public static String getPageSize( Rectangle rect )
{
Field[] fields = PageSize.class.getFields();
- for ( int i = 0; i < fields.length; i++ )
+ for ( Field currentField : fields )
{
- Field currentField = fields[i];
try
{
if ( currentField.getType().equals( Rectangle.class ) )
@@ -102,11 +101,10 @@ public class ITextUtil
public static boolean isPageSizeSupported( String aPageSize )
{
Field[] fields = PageSize.class.getFields();
- for ( int i = 0; i < fields.length; i++ )
+ for ( Field currentField : fields )
{
- Field currentField = fields[i];
- if ( ( currentField.getName().equalsIgnoreCase( aPageSize ) )
- && ( currentField.getType().equals( Rectangle.class ) ) )
+ if ( ( currentField.getName().equalsIgnoreCase( aPageSize ) ) && ( currentField.getType().equals(
+ Rectangle.class ) ) )
{
return true;
}
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java
index 49fbd15..5128f47 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/SinkActionContext.java
@@ -132,7 +132,7 @@ public class SinkActionContext
}
else
{
- return stack.peek().intValue();
+ return stack.peek();
}
}
@@ -154,6 +154,6 @@ public class SinkActionContext
{
//currentAction = action;
- stack.push( Integer.valueOf( action ) );
+ stack.push( action );
}
}
diff --git a/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java b/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
index 9566af4..0d8e540 100644
--- a/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
+++ b/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
@@ -798,13 +798,13 @@ public class LatexSink
{
StringBuilder justif = new StringBuilder();
- for ( int i = 0; i < justification.length; ++i )
+ for ( int i1 : justification )
{
if ( grid )
{
justif.append( '|' );
}
- switch ( justification[i] )
+ switch ( i1 )
{
case Sink.JUSTIFY_CENTER:
justif.append( 'c' );
diff --git a/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java b/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
index 24da5ba..e878204 100644
--- a/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
+++ b/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
@@ -30,7 +30,6 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -703,7 +702,7 @@ public class RtfSink
/** {@inheritDoc} */
public void numberedList( int numbering )
{
- this.numbering.addElement( Integer.valueOf( numbering ) );
+ this.numbering.addElement( numbering );
itemNumber.addElement( new Counter( 0 ) );
indentation.add( LIST_INDENT );
@@ -757,7 +756,7 @@ public class RtfSink
private String getItemHeader()
{
- int nmb = ( (Integer) this.numbering.lastElement() ).intValue();
+ int nmb = (Integer) this.numbering.lastElement();
int iNmb = ( (Counter) this.itemNumber.lastElement() ).get();
StringBuilder buf = new StringBuilder();
@@ -1780,15 +1779,15 @@ public class RtfSink
if ( getLog().isWarnEnabled() && this.warnMessages != null )
{
- for ( Iterator it = this.warnMessages.entrySet().iterator(); it.hasNext(); )
+ for ( Object o1 : this.warnMessages.entrySet() )
{
- Map.Entry entry = (Map.Entry) it.next();
+ Map.Entry entry = (Map.Entry) o1;
Set set = (Set) entry.getValue();
- for ( Iterator it2 = set.iterator(); it2.hasNext(); )
+ for ( Object o : set )
{
- String msg = (String) it2.next();
+ String msg = (String) o;
getLog().warn( msg );
}
@@ -1901,7 +1900,7 @@ public class RtfSink
void set( int context )
{
- stack.addElement( Integer.valueOf( this.context ) );
+ stack.addElement( this.context );
this.context = context;
}
@@ -1909,7 +1908,7 @@ public class RtfSink
{
if ( !stack.isEmpty() )
{
- context = ( (Integer) stack.lastElement() ).intValue();
+ context = (Integer) stack.lastElement();
stack.removeElementAt( stack.size() - 1 );
}
}
@@ -2040,7 +2039,7 @@ public class RtfSink
void set( int space /*twips*/ )
{
- stack.addElement( Integer.valueOf( this.space ) );
+ stack.addElement( this.space );
this.space = space;
next = space;
}
@@ -2054,7 +2053,7 @@ public class RtfSink
{
if ( !stack.isEmpty() )
{
- space = ( (Integer) stack.lastElement() ).intValue();
+ space = (Integer) stack.lastElement();
stack.removeElementAt( stack.size() - 1 );
next = space;
}
@@ -2101,7 +2100,7 @@ public class RtfSink
void set( int indent /*twips*/ )
{
- stack.addElement( Integer.valueOf( this.indent ) );
+ stack.addElement( this.indent );
this.indent = indent;
}
@@ -2114,7 +2113,7 @@ public class RtfSink
{
if ( !stack.isEmpty() )
{
- indent = ( (Integer) stack.lastElement() ).intValue();
+ indent = (Integer) stack.lastElement();
stack.removeElementAt( stack.size() - 1 );
}
}
diff --git a/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java b/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
index 43ea91c..c87d9d7 100644
--- a/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
+++ b/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
@@ -262,9 +262,9 @@ class WMFWriter
write16( function, out );
if ( parameters != null )
{
- for ( int i = 0; i < parameters.length; ++i )
+ for ( short parameter : parameters )
{
- write16( parameters[i], out );
+ write16( parameter, out );
}
}
}
@@ -276,9 +276,9 @@ class WMFWriter
print16( function, out );
if ( parameters != null )
{
- for ( int i = 0; i < parameters.length; ++i )
+ for ( short parameter : parameters )
{
- print16( parameters[i], out );
+ print16( parameter, out );
}
}
}
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.java
index 09f63f4..b574b38 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.java
@@ -77,10 +77,8 @@ abstract class AbstractFatherBlock
public final void traverse( final Sink sink )
{
before( sink );
- for ( int i = 0; i < childBlocks.length; i++ )
+ for ( Block block : childBlocks )
{
- Block block = childBlocks[i];
-
block.traverse( sink );
}
after( sink );
@@ -127,9 +125,9 @@ abstract class AbstractFatherBlock
int result = 1;
if ( childBlocks != null )
{
- for ( int i = 0; i < childBlocks.length; i++ )
+ for ( Block childBlock : childBlocks )
{
- result += childBlocks[i].hashCode();
+ result += childBlock.hashCode();
}
}
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
index 5d155fd..09a29fb 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
@@ -133,11 +133,11 @@ public class ParagraphBlockParser
{
sb.append( l );
// specific
- if ( l.indexOf( "<pre>" ) != -1 )
+ if ( l.contains( "<pre>" ) )
{
pre = true;
}
- if ( l.indexOf( "</pre>" ) != -1 )
+ if ( l.contains( "</pre>" ) )
{
pre = false;
}
diff --git a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
index db06697..41f7f75 100644
--- a/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
+++ b/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
@@ -331,7 +331,7 @@ public class TextParser
private void parseXHTML( final String line, final List<Block> ret, final Matcher xhtmlMatcher )
{
ret.addAll( parse( line.substring( 0, xhtmlMatcher.start() ) ) );
- if ( xhtmlMatcher.group( 1 ).indexOf( "noautolink" ) != -1 )
+ if ( xhtmlMatcher.group( 1 ).contains( "noautolink" ) )
{
noautolink = true;
}
@@ -342,7 +342,7 @@ public class TextParser
ret.addAll( parse( xhtmlMatcher.group( 2 ) ) );
- if ( xhtmlMatcher.group( 1 ).indexOf( "noautolink" ) != -1 )
+ if ( xhtmlMatcher.group( 1 ).contains( "noautolink" ) )
{
noautolink = false;
}
diff --git a/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java b/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
index 0e25c35..b4e9c8c 100644
--- a/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
+++ b/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
@@ -57,9 +57,8 @@ public class ListTest
final int numberOfChild = 4;
assertEquals( numberOfChild, firstLevelBlocks.length );
- for ( int i = 0; i < firstLevelBlocks.length; i++ )
+ for ( Block block : firstLevelBlocks )
{
- Block block = firstLevelBlocks[i];
assertEquals( ListItemBlock.class, block.getClass() );
}
diff --git a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
index 32f062f..fab515b 100644
--- a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
+++ b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
@@ -441,7 +441,7 @@ public class XdocParser
}
else
{
- sink.unknown( "meta", new Object[]{ Integer.valueOf( TAG_TYPE_SIMPLE ) }, attribs );
+ sink.unknown( "meta", new Object[]{ TAG_TYPE_SIMPLE }, attribs );
}
}
diff --git a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
index a369033..7bbd443 100644
--- a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
+++ b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
@@ -133,7 +133,7 @@ public class XdocParserTest
IOUtil.close( reader );
}
- assertTrue( content.indexOf( "<modelVersion>4.0.0</modelVersion>" ) != -1 );
+ assertTrue( content.contains( "<modelVersion>4.0.0</modelVersion>" ) );
}
/** @throws Exception */
@@ -173,8 +173,8 @@ public class XdocParserTest
}
// No section, only subsection 1 and 2
- assertTrue( content.indexOf( "<a href=\"#Section_11\">Section 11</a>" ) != -1 );
- assertTrue( content.indexOf( "<a href=\"#Section_1211\">Section 1211</a>" ) == -1 );
+ assertTrue( content.contains( "<a href=\"#Section_11\">Section 11</a>" ) );
+ assertTrue( !content.contains( "<a href=\"#Section_1211\">Section 1211</a>" ) );
}
private Iterator<SinkEventElement> parseText( String text )
diff --git a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocValidatorTest.java b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocValidatorTest.java
index 8af1e6a..4a7ea38 100644
--- a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocValidatorTest.java
+++ b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocValidatorTest.java
@@ -56,7 +56,7 @@ public class XdocValidatorTest
String root = matcher.group( 1 );
String value = matcher.group( 2 );
- if ( value.indexOf( XDOC_XSD.getName() ) == -1 )
+ if ( !value.contains( XDOC_XSD.getName() ) )
{
String faqs =
"<" + root + " xmlns=\"http://maven.apache.org/XDOC/2.0\""
diff --git a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
index fe1a814..a801d41 100644
--- a/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
+++ b/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
@@ -108,7 +108,7 @@ public class XhtmlParser
}
else
{
- sink.unknown( "meta", new Object[] { Integer.valueOf( TAG_TYPE_SIMPLE ) }, attribs );
+ sink.unknown( "meta", new Object[] { TAG_TYPE_SIMPLE }, attribs );
}
}
/*
diff --git a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
index 1bb7507..cc96103 100644
--- a/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
+++ b/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
@@ -84,10 +84,10 @@ public class XhtmlSinkTest
}
String actual = writer.toString();
- assertTrue( actual.indexOf( "<a class=\"externalLink\" href=\"http:/www.xdoc.com\"></a>" ) != -1 );
- assertTrue( actual.indexOf( "<a href=\"./index.html#anchor\"></a>" ) != -1 );
- assertTrue( actual.indexOf( "<a href=\"../index.html#anchor\"></a>" ) != -1 );
- assertTrue( actual.indexOf( "<a href=\"index.html\"></a>" ) != -1 );
+ assertTrue( actual.contains( "<a class=\"externalLink\" href=\"http:/www.xdoc.com\"></a>" ) );
+ assertTrue( actual.contains( "<a href=\"./index.html#anchor\"></a>" ) );
+ assertTrue( actual.contains( "<a href=\"../index.html#anchor\"></a>" ) );
+ assertTrue( actual.contains( "<a href=\"index.html\"></a>" ) );
}
/** {@inheritDoc} */
@@ -432,7 +432,7 @@ public class XhtmlSinkTest
sink.author_();
SinkEventAttributeSet atts = new SinkEventAttributeSet( 1 );
atts.addAttribute( "href", "http://maven.apache.org/" );
- sink.unknown( "base", new Object[] {new Integer( HtmlMarkup.TAG_TYPE_SIMPLE )}, atts );
+ sink.unknown( "base", new Object[] { HtmlMarkup.TAG_TYPE_SIMPLE }, atts );
sink.head_();
}
finally
@@ -444,7 +444,7 @@ public class XhtmlSinkTest
"<head>\n<title>Title</title><!--A comment--><meta name=\"author\" content=\"ģ&\" />"
+ "<base href=\"http://maven.apache.org/\" /></head>";
String actual = writer.toString();
- assertTrue( actual, actual.indexOf( expected ) != -1 );
+ assertTrue( actual, actual.contains( expected ) );
}
/** {@inheritDoc} */
diff --git a/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java b/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
index fac80bd..1cee1b0 100644
--- a/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
+++ b/doxia-modules/doxia-module-xhtml5/src/main/java/org/apache/maven/doxia/module/xhtml5/Xhtml5Parser.java
@@ -109,7 +109,7 @@ public class Xhtml5Parser
}
else
{
- sink.unknown( "meta", new Object[] { Integer.valueOf( TAG_TYPE_SIMPLE ) }, attribs );
+ sink.unknown( "meta", new Object[] { TAG_TYPE_SIMPLE }, attribs );
}
}
/*
diff --git a/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java b/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java
index 133d7aa..54ce04a 100644
--- a/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java
+++ b/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java
@@ -80,10 +80,10 @@ public class Xhtml5SinkTest
}
String actual = writer.toString();
- assertTrue( actual.indexOf( "<a class=\"externalLink\" href=\"http:/www.xdoc.com\"></a>" ) != -1 );
- assertTrue( actual.indexOf( "<a href=\"./index.html#anchor\"></a>" ) != -1 );
- assertTrue( actual.indexOf( "<a href=\"../index.html#anchor\"></a>" ) != -1 );
- assertTrue( actual.indexOf( "<a href=\"index.html\"></a>" ) != -1 );
+ assertTrue( actual.contains( "<a class=\"externalLink\" href=\"http:/www.xdoc.com\"></a>" ) );
+ assertTrue( actual.contains( "<a href=\"./index.html#anchor\"></a>" ) );
+ assertTrue( actual.contains( "<a href=\"../index.html#anchor\"></a>" ) );
+ assertTrue( actual.contains( "<a href=\"index.html\"></a>" ) );
}
/** {@inheritDoc} */
@@ -426,7 +426,7 @@ public class Xhtml5SinkTest
sink.author_();
SinkEventAttributeSet atts = new SinkEventAttributeSet( 1 );
atts.addAttribute( "href", "http://maven.apache.org/" );
- sink.unknown( "base", new Object[] {new Integer( HtmlMarkup.TAG_TYPE_SIMPLE )}, atts );
+ sink.unknown( "base", new Object[] { HtmlMarkup.TAG_TYPE_SIMPLE }, atts );
sink.head_();
}
finally
@@ -438,7 +438,7 @@ public class Xhtml5SinkTest
"<head>\n<title>Title</title><!--A comment--><meta name=\"author\" content=\"ģ&\" />"
+ "<base href=\"http://maven.apache.org/\" /></head>";
String actual = writer.toString();
- assertTrue( actual, actual.indexOf( expected ) != -1 );
+ assertTrue( actual, actual.contains( expected ) );
}
/** {@inheritDoc} */