Author: ltheussl
Date: Mon Oct 17 11:33:00 2011
New Revision: 1185112
URL: http://svn.apache.org/viewvc?rev=1185112&view=rev
Log:
some java 5 updates
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractTextParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
Mon Oct 17 11:33:00 2011
@@ -73,6 +73,7 @@ public interface HtmlMarkup
Tag ABBR = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "abbr";
@@ -83,6 +84,7 @@ public interface HtmlMarkup
Tag ACRONYM = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "acronym";
@@ -111,6 +113,7 @@ public interface HtmlMarkup
Tag BDO = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "bdo";
@@ -133,6 +136,7 @@ public interface HtmlMarkup
Tag BUTTON = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "button";
@@ -155,6 +159,7 @@ public interface HtmlMarkup
Tag COL = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "col";
@@ -165,6 +170,7 @@ public interface HtmlMarkup
Tag COLGROUP = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "colgroup";
@@ -178,6 +184,7 @@ public interface HtmlMarkup
Tag DEL = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "del";
@@ -206,6 +213,7 @@ public interface HtmlMarkup
Tag FIELDSET = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "fieldset";
@@ -258,6 +266,7 @@ public interface HtmlMarkup
Tag IFRAME = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "iframe";
@@ -274,6 +283,7 @@ public interface HtmlMarkup
Tag INS = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "ins";
@@ -290,6 +300,7 @@ public interface HtmlMarkup
Tag LABEL = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "label";
@@ -300,6 +311,7 @@ public interface HtmlMarkup
Tag LEGEND = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "legend";
@@ -328,6 +340,7 @@ public interface HtmlMarkup
Tag NOSCRIPT = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "noscript";
@@ -344,6 +357,7 @@ public interface HtmlMarkup
Tag OPTGROUP = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "optgroup";
@@ -366,6 +380,7 @@ public interface HtmlMarkup
Tag Q = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "q";
@@ -412,6 +427,7 @@ public interface HtmlMarkup
Tag TBODY = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "tbody";
@@ -428,6 +444,7 @@ public interface HtmlMarkup
Tag TFOOT = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "tfoot";
@@ -441,6 +458,7 @@ public interface HtmlMarkup
Tag THEAD = new Tag()
{
/** {@inheritDoc} */
+ @Override
public String toString()
{
return "thead";
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractTextParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractTextParser.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractTextParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractTextParser.java
Mon Oct 17 11:33:00 2011
@@ -33,6 +33,7 @@ public abstract class AbstractTextParser
implements TextMarkup
{
/** {@inheritDoc} */
+ @Override
public final int getType()
{
return TXT_TYPE;
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
Mon Oct 17 11:33:00 2011
@@ -109,13 +109,15 @@ public abstract class AbstractXmlParser
{
init();
+ Reader src = source;
+
// 1 first parsing if validation is required
if ( isValidate() )
{
String content;
try
{
- content = IOUtil.toString( new BufferedReader( source ) );
+ content = IOUtil.toString( new BufferedReader( src ) );
}
catch ( IOException e )
{
@@ -124,7 +126,7 @@ public abstract class AbstractXmlParser
new XmlValidator( getLog() ).validate( content );
- source = new StringReader( content );
+ src = new StringReader( content );
}
// 2 second parsing to process
@@ -132,7 +134,7 @@ public abstract class AbstractXmlParser
{
XmlPullParser parser = new MXParser();
- parser.setInput( source );
+ parser.setInput( src );
sink.enableLogging( getLog() );
@@ -157,6 +159,7 @@ public abstract class AbstractXmlParser
*
* Convenience method to parse an arbitrary string and emit any xml events
into the given sink.
*/
+ @Override
public void parse( String string, Sink sink )
throws ParseException
{
@@ -164,6 +167,7 @@ public abstract class AbstractXmlParser
}
/** {@inheritDoc} */
+ @Override
public final int getType()
{
return XML_TYPE;
@@ -224,7 +228,7 @@ public abstract class AbstractXmlParser
if ( isIgnorableWhitespace() )
{
- if ( !text.trim().equals( "" ) )
+ if ( text.trim().length() != 0 )
{
handleText( parser, sink );
}
@@ -509,7 +513,7 @@ public abstract class AbstractXmlParser
if ( isCollapsibleWhitespace() )
{
- StringBuffer newText = new StringBuffer();
+ StringBuilder newText = new StringBuilder();
String[] elts = StringUtils.split( text, " \r\n" );
for ( int i = 0; i < elts.length; i++ )
{
@@ -618,12 +622,11 @@ public abstract class AbstractXmlParser
if ( entitiesCount > 0 )
{
// text should be foo [...]
- int start = text.indexOf( "[" );
- int end = text.lastIndexOf( "]" );
+ int start = text.indexOf( '[');
+ int end = text.lastIndexOf( ']');
if ( start != -1 && end != -1 )
{
- text = text.substring( start + 1, end );
- addDTDEntities( parser, text );
+ addDTDEntities( parser, text.substring( start + 1, end ) );
}
}
}
@@ -649,8 +652,8 @@ public abstract class AbstractXmlParser
int entitiesCount = StringUtils.countMatches( text, ENTITY_START );
if ( entitiesCount > 0 )
{
- text = StringUtils.replace( text, ENTITY_START, "\n" +
ENTITY_START );
- BufferedReader reader = new BufferedReader( new StringReader( text
) );
+ final String txt = StringUtils.replace( text, ENTITY_START, "\n" +
ENTITY_START );
+ BufferedReader reader = new BufferedReader( new StringReader( txt
) );
String line;
String tmpLine = "";
try
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
Mon Oct 17 11:33:00 2011
@@ -79,6 +79,7 @@ public class XhtmlBaseParser
private Map<String, Set<String>> warnMessages;
/** {@inheritDoc} */
+ @Override
public void parse( Reader source, Sink sink )
throws ParseException
{
@@ -462,6 +463,7 @@ public class XhtmlBaseParser
}
/** {@inheritDoc} */
+ @Override
protected void handleText( XmlPullParser parser, Sink sink )
throws XmlPullParserException
{
@@ -480,6 +482,7 @@ public class XhtmlBaseParser
}
/** {@inheritDoc} */
+ @Override
protected void handleComment( XmlPullParser parser, Sink sink )
throws XmlPullParserException
{
@@ -496,6 +499,7 @@ public class XhtmlBaseParser
}
/** {@inheritDoc} */
+ @Override
protected void handleCdsect( XmlPullParser parser, Sink sink )
throws XmlPullParserException
{
@@ -698,6 +702,7 @@ public class XhtmlBaseParser
}
/** {@inheritDoc} */
+ @Override
protected void init()
{
super.init();
@@ -736,7 +741,7 @@ public class XhtmlBaseParser
if ( href != null )
{
- int hashIndex = href.indexOf( "#" );
+ int hashIndex = href.indexOf( '#');
if ( hashIndex != -1 && !DoxiaUtils.isExternalLink( href ) )
{
String hash = href.substring( hashIndex + 1 );
@@ -954,10 +959,10 @@ public class XhtmlBaseParser
*/
private void logMessage( String key, String msg )
{
- msg = "[XHTML Parser] " + msg;
+ final String log = "[XHTML Parser] " + msg;
if ( getLog().isDebugEnabled() )
{
- getLog().debug( msg );
+ getLog().debug( log );
return;
}
@@ -972,7 +977,7 @@ public class XhtmlBaseParser
{
set = new TreeSet<String>();
}
- set.add( msg );
+ set.add( log );
warnMessages.put( key, set );
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
Mon Oct 17 11:33:00 2011
@@ -77,7 +77,7 @@ public abstract class AbstractSink
int length = text.length();
- StringBuffer buffer = new StringBuffer( length );
+ StringBuilder buffer = new StringBuilder( length );
for ( int i = 0; i < length; i++ )
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
Mon Oct 17 11:33:00 2011
@@ -106,7 +106,7 @@ public abstract class AbstractXmlSink
throw new IllegalArgumentException( "A tag is required" );
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( LESS_THAN );
if ( nameSpace != null )
@@ -150,7 +150,7 @@ public abstract class AbstractXmlSink
throw new IllegalArgumentException( "A tag is required" );
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( LESS_THAN );
sb.append( SLASH );
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
Mon Oct 17 11:33:00 2011
@@ -85,7 +85,7 @@ public class PipelineSink
public static Sink newInstance( List<Sink> pipeline )
{
return (Sink) Proxy.newProxyInstance(
PipelineSink.class.getClassLoader(),
- new Class[]{Sink.class},
+ new Class<?>[]{Sink.class},
new PipelineSink( pipeline ) );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
Mon Oct 17 11:33:00 2011
@@ -149,7 +149,7 @@ public class SinkEventAttributeSet
attribs = new LinkedHashMap<String, Object>( n / 2 );
- for ( int i = 0; i < n; i = i + 2 )
+ for ( int i = 0; i < n; i += 2 )
{
attribs.put( attributes[i], attributes[i + 1] );
}
@@ -356,6 +356,7 @@ public class SinkEventAttributeSet
}
/** {@inheritDoc} */
+ @Override
public Object clone()
{
SinkEventAttributeSet attr = new SinkEventAttributeSet( attribs.size()
);
@@ -370,6 +371,7 @@ public class SinkEventAttributeSet
}
/** {@inheritDoc} */
+ @Override
public int hashCode()
{
final int parentHash = ( resolveParent == null ? 0 :
resolveParent.hashCode() );
@@ -378,6 +380,7 @@ public class SinkEventAttributeSet
}
/** {@inheritDoc} */
+ @Override
public boolean equals( Object obj )
{
if ( this == obj )
@@ -394,9 +397,10 @@ public class SinkEventAttributeSet
}
/** {@inheritDoc} */
+ @Override
public String toString()
{
- StringBuffer s = new StringBuffer();
+ StringBuilder s = new StringBuilder();
Enumeration<String> names = getAttributeNames();
while ( names.hasMoreElements() )
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
Mon Oct 17 11:33:00 2011
@@ -184,7 +184,7 @@ public class SinkUtils
return "";
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Enumeration<?> names = att.getAttributeNames();
@@ -215,7 +215,7 @@ public class SinkUtils
private static String asCssString( AttributeSet att )
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Enumeration<?> names = att.getAttributeNames();
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Mon Oct 17 11:33:00 2011
@@ -224,7 +224,7 @@ public class XhtmlBaseSink
*/
protected int[] getCellJustif()
{
- return (int[]) this.cellJustifStack.getLast();
+ return this.cellJustifStack.getLast();
}
/**
@@ -258,6 +258,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
protected void init()
{
super.init();
@@ -301,144 +302,168 @@ public class XhtmlBaseSink
// ----------------------------------------------------------------------
/** {@inheritDoc} */
+ @Override
public void section( int level, SinkEventAttributes attributes )
{
onSection( level, attributes );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle( int level, SinkEventAttributes attributes )
{
onSectionTitle( level, attributes );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle_( int level )
{
onSectionTitle_( level );
}
/** {@inheritDoc} */
+ @Override
public void section_( int level )
{
onSection_( level );
}
/** {@inheritDoc} */
+ @Override
public void section1()
{
onSection( SECTION_LEVEL_1, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle1()
{
onSectionTitle( SECTION_LEVEL_1, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle1_()
{
onSectionTitle_( SECTION_LEVEL_1 );
}
/** {@inheritDoc} */
+ @Override
public void section1_()
{
onSection_( SECTION_LEVEL_1 );
}
/** {@inheritDoc} */
+ @Override
public void section2()
{
onSection( SECTION_LEVEL_2, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle2()
{
onSectionTitle( SECTION_LEVEL_2, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle2_()
{
onSectionTitle_( SECTION_LEVEL_2 );
}
/** {@inheritDoc} */
+ @Override
public void section2_()
{
onSection_( SECTION_LEVEL_2 );
}
/** {@inheritDoc} */
+ @Override
public void section3()
{
onSection( SECTION_LEVEL_3, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle3()
{
onSectionTitle( SECTION_LEVEL_3, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle3_()
{
onSectionTitle_( SECTION_LEVEL_3 );
}
/** {@inheritDoc} */
+ @Override
public void section3_()
{
onSection_( SECTION_LEVEL_3 );
}
/** {@inheritDoc} */
+ @Override
public void section4()
{
onSection( SECTION_LEVEL_4, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle4()
{
onSectionTitle( SECTION_LEVEL_4, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle4_()
{
onSectionTitle_( SECTION_LEVEL_4 );
}
/** {@inheritDoc} */
+ @Override
public void section4_()
{
onSection_( SECTION_LEVEL_4 );
}
/** {@inheritDoc} */
+ @Override
public void section5()
{
onSection( SECTION_LEVEL_5, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle5()
{
onSectionTitle( SECTION_LEVEL_5, null );
}
/** {@inheritDoc} */
+ @Override
public void sectionTitle5_()
{
onSectionTitle_( SECTION_LEVEL_5 );
}
/** {@inheritDoc} */
+ @Override
public void section5_()
{
onSection_( SECTION_LEVEL_5 );
@@ -560,6 +585,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#UL
*/
+ @Override
public void list()
{
list( null );
@@ -569,6 +595,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#UL
*/
+ @Override
public void list( SinkEventAttributes attributes )
{
if ( paragraphFlag )
@@ -589,6 +616,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#UL
*/
+ @Override
public void list_()
{
writeEndTag( HtmlMarkup.UL );
@@ -598,6 +626,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#LI
*/
+ @Override
public void listItem()
{
listItem( null );
@@ -607,6 +636,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#LI
*/
+ @Override
public void listItem( SinkEventAttributes attributes )
{
MutableAttributeSet atts = SinkUtils.filterAttributes(
@@ -619,6 +649,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#LI
*/
+ @Override
public void listItem_()
{
writeEndTag( HtmlMarkup.LI );
@@ -630,6 +661,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#OL
*/
+ @Override
public void numberedList( int numbering )
{
numberedList( numbering, null );
@@ -641,6 +673,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#OL
*/
+ @Override
public void numberedList( int numbering, SinkEventAttributes attributes )
{
if ( paragraphFlag )
@@ -688,6 +721,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#OL
*/
+ @Override
public void numberedList_()
{
writeEndTag( HtmlMarkup.OL );
@@ -697,6 +731,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#LI
*/
+ @Override
public void numberedListItem()
{
numberedListItem( null );
@@ -706,6 +741,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#LI
*/
+ @Override
public void numberedListItem( SinkEventAttributes attributes )
{
MutableAttributeSet atts = SinkUtils.filterAttributes(
@@ -718,6 +754,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#LI
*/
+ @Override
public void numberedListItem_()
{
writeEndTag( HtmlMarkup.LI );
@@ -727,6 +764,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DL
*/
+ @Override
public void definitionList()
{
definitionList( null );
@@ -736,6 +774,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DL
*/
+ @Override
public void definitionList( SinkEventAttributes attributes )
{
if ( paragraphFlag )
@@ -756,6 +795,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DL
*/
+ @Override
public void definitionList_()
{
writeEndTag( HtmlMarkup.DL );
@@ -765,6 +805,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DT
*/
+ @Override
public void definedTerm( SinkEventAttributes attributes )
{
MutableAttributeSet atts = SinkUtils.filterAttributes(
@@ -777,6 +818,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DT
*/
+ @Override
public void definedTerm()
{
definedTerm( null );
@@ -786,6 +828,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DT
*/
+ @Override
public void definedTerm_()
{
writeEndTag( HtmlMarkup.DT );
@@ -795,6 +838,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DD
*/
+ @Override
public void definition()
{
definition( null );
@@ -804,6 +848,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DD
*/
+ @Override
public void definition( SinkEventAttributes attributes )
{
MutableAttributeSet atts = SinkUtils.filterAttributes(
@@ -816,6 +861,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#DD
*/
+ @Override
public void definition_()
{
writeEndTag( HtmlMarkup.DD );
@@ -828,6 +874,7 @@ public class XhtmlBaseSink
* backward compatibility. Note that the behavior is different though, as
this method
* writes an img tag, while correctly the img tag should be written by
figureGraphics().
*/
+ @Override
public void figure()
{
write( String.valueOf( LESS_THAN ) + HtmlMarkup.IMG );
@@ -838,6 +885,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#IMG
*/
+ @Override
public void figure( SinkEventAttributes attributes )
{
inFigure = true;
@@ -859,6 +907,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void figure_()
{
if ( legacyFigure )
@@ -886,12 +935,14 @@ public class XhtmlBaseSink
* this method is only kept for backward compatibility. Note that the
behavior is
* different though, as this method does not write the img tag, only the
src attribute.
*/
+ @Override
public void figureGraphics( String name )
{
write( String.valueOf( SPACE ) + Attribute.SRC + EQUAL + QUOTE +
escapeHTML( name ) + QUOTE );
}
/** {@inheritDoc} */
+ @Override
public void figureGraphics( String src, SinkEventAttributes attributes )
{
if ( inFigure )
@@ -934,6 +985,7 @@ public class XhtmlBaseSink
* this method is only kept for backward compatibility. Note that the
behavior is
* different though, as this method only writes an alt attribute.
*/
+ @Override
public void figureCaption()
{
figureCaptionFlag = true;
@@ -942,6 +994,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void figureCaption( SinkEventAttributes attributes )
{
if ( legacyFigureCaption )
@@ -963,6 +1016,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void figureCaption_()
{
if ( legacyFigureCaption )
@@ -980,6 +1034,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#P
*/
+ @Override
public void paragraph()
{
paragraph( null );
@@ -989,6 +1044,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#P
*/
+ @Override
public void paragraph( SinkEventAttributes attributes )
{
paragraphFlag = true;
@@ -1003,6 +1059,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#P
*/
+ @Override
public void paragraph_()
{
if ( paragraphFlag )
@@ -1019,6 +1076,7 @@ public class XhtmlBaseSink
* @see javax.swing.text.html.HTML.Tag#DIV
* @see javax.swing.text.html.HTML.Tag#PRE
*/
+ @Override
public void verbatim( boolean boxed )
{
if ( boxed )
@@ -1038,6 +1096,7 @@ public class XhtmlBaseSink
* @see javax.swing.text.html.HTML.Tag#DIV
* @see javax.swing.text.html.HTML.Tag#PRE
*/
+ @Override
public void verbatim( SinkEventAttributes attributes )
{
if ( paragraphFlag )
@@ -1084,6 +1143,7 @@ public class XhtmlBaseSink
* @see javax.swing.text.html.HTML.Tag#DIV
* @see javax.swing.text.html.HTML.Tag#PRE
*/
+ @Override
public void verbatim_()
{
writeEndTag( HtmlMarkup.PRE );
@@ -1097,6 +1157,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#HR
*/
+ @Override
public void horizontalRule()
{
horizontalRule( null );
@@ -1106,6 +1167,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#HR
*/
+ @Override
public void horizontalRule( SinkEventAttributes attributes )
{
MutableAttributeSet atts = SinkUtils.filterAttributes(
@@ -1115,6 +1177,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void table()
{
// start table with tableRows
@@ -1122,6 +1185,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void table( SinkEventAttributes attributes )
{
this.tableContentWriterStack.addLast( new StringWriter() );
@@ -1151,6 +1215,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TABLE
*/
+ @Override
public void table_()
{
this.tableRows = false;
@@ -1182,7 +1247,7 @@ public class XhtmlBaseSink
if ( tableCaption != null )
{
// DOXIA-177
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( tableContent.substring( 0, tableContent.indexOf(
Markup.GREATER_THAN ) + 1 ) );
sb.append( tableCaption );
sb.append( tableContent.substring( tableContent.indexOf(
Markup.GREATER_THAN ) + 1 ) );
@@ -1202,6 +1267,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TABLE
*/
+ @Override
public void tableRows( int[] justification, boolean grid )
{
this.tableRows = true;
@@ -1233,6 +1299,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void tableRows_()
{
this.tableRows = false;
@@ -1254,6 +1321,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TR
*/
+ @Override
public void tableRow()
{
// To be backward compatible
@@ -1270,6 +1338,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TR
*/
+ @Override
public void tableRow( SinkEventAttributes attributes )
{
MutableAttributeSet att = new SinkEventAttributeSet();
@@ -1301,24 +1370,28 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TR
*/
+ @Override
public void tableRow_()
{
writeEndTag( HtmlMarkup.TR );
}
/** {@inheritDoc} */
+ @Override
public void tableCell()
{
tableCell( (SinkEventAttributeSet) null );
}
/** {@inheritDoc} */
+ @Override
public void tableHeaderCell()
{
tableHeaderCell( (SinkEventAttributeSet) null );
}
/** {@inheritDoc} */
+ @Override
public void tableCell( String width )
{
MutableAttributeSet att = new SinkEventAttributeSet();
@@ -1328,6 +1401,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void tableHeaderCell( String width )
{
MutableAttributeSet att = new SinkEventAttributeSet();
@@ -1337,12 +1411,14 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void tableCell( SinkEventAttributes attributes )
{
tableCell( false, attributes );
}
/** {@inheritDoc} */
+ @Override
public void tableHeaderCell( SinkEventAttributes attributes )
{
tableCell( true, attributes );
@@ -1358,26 +1434,26 @@ public class XhtmlBaseSink
{
Tag t = ( headerRow ? HtmlMarkup.TH : HtmlMarkup.TD );
- MutableAttributeSet att = new SinkEventAttributeSet();
-
if ( attributes == null )
{
- attributes = new SinkEventAttributeSet( 0 );
+ writeStartTag( t, null );
+ }
+ else
+ {
+ writeStartTag( t,
+ SinkUtils.filterAttributes( attributes,
SinkUtils.SINK_TD_ATTRIBUTES ) );
}
-
- att.addAttributes( SinkUtils.filterAttributes(
- attributes, SinkUtils.SINK_TD_ATTRIBUTES ) );
-
- writeStartTag( t, att );
}
/** {@inheritDoc} */
+ @Override
public void tableCell_()
{
tableCell_( false );
}
/** {@inheritDoc} */
+ @Override
public void tableHeaderCell_()
{
tableCell_( true );
@@ -1408,6 +1484,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#CAPTION
*/
+ @Override
public void tableCaption()
{
tableCaption( null );
@@ -1417,6 +1494,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#CAPTION
*/
+ @Override
public void tableCaption( SinkEventAttributes attributes )
{
StringWriter sw = new StringWriter();
@@ -1434,6 +1512,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#CAPTION
*/
+ @Override
public void tableCaption_()
{
writeEndTag( HtmlMarkup.CAPTION );
@@ -1449,6 +1528,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#A
*/
+ @Override
public void anchor( String name )
{
anchor( name, null );
@@ -1458,6 +1538,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#A
*/
+ @Override
public void anchor( String name, SinkEventAttributes attributes )
{
if ( name == null )
@@ -1494,6 +1575,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#A
*/
+ @Override
public void anchor_()
{
if ( !headFlag )
@@ -1503,12 +1585,14 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void link( String name )
{
link( name, null );
}
/** {@inheritDoc} */
+ @Override
public void link( String name, SinkEventAttributes attributes )
{
if ( attributes == null )
@@ -1575,6 +1659,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#A
*/
+ @Override
public void link_()
{
if ( !headFlag )
@@ -1587,6 +1672,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#I
*/
+ @Override
public void italic()
{
if ( !headFlag )
@@ -1599,6 +1685,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#I
*/
+ @Override
public void italic_()
{
if ( !headFlag )
@@ -1611,6 +1698,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#B
*/
+ @Override
public void bold()
{
if ( !headFlag )
@@ -1623,6 +1711,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#B
*/
+ @Override
public void bold_()
{
if ( !headFlag )
@@ -1635,6 +1724,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TT
*/
+ @Override
public void monospaced()
{
if ( !headFlag )
@@ -1647,6 +1737,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#TT
*/
+ @Override
public void monospaced_()
{
if ( !headFlag )
@@ -1659,6 +1750,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#BR
*/
+ @Override
public void lineBreak()
{
lineBreak( null );
@@ -1668,6 +1760,7 @@ public class XhtmlBaseSink
* {@inheritDoc}
* @see javax.swing.text.html.HTML.Tag#BR
*/
+ @Override
public void lineBreak( SinkEventAttributes attributes )
{
if ( headFlag || isVerbatimFlag() )
@@ -1684,12 +1777,14 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void pageBreak()
{
comment( "PB" );
}
/** {@inheritDoc} */
+ @Override
public void nonBreakingSpace()
{
if ( headFlag )
@@ -1703,6 +1798,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void text( String text )
{
if ( headFlag )
@@ -1720,6 +1816,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void text( String text, SinkEventAttributes attributes )
{
if ( attributes == null )
@@ -1767,6 +1864,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void rawText( String text )
{
if ( headFlag )
@@ -1780,25 +1878,27 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void comment( String comment )
{
- if ( StringUtils.isNotEmpty( comment ) && comment.contains( "--" ) )
+ String cmt = comment;
+
+ if ( StringUtils.isNotEmpty( cmt ) && cmt.contains( "--" ) )
{
- String originalComment = comment;
+ String originalComment = cmt;
// http://www.w3.org/TR/2000/REC-xml-20001006#sec-comments
- while ( comment.contains( "--" ) )
+ while ( cmt.contains( "--" ) )
{
- comment = StringUtils.replace( comment, "--", "- -" );
+ cmt = StringUtils.replace( cmt, "--", "- -" );
}
- getLog()
- .warn( "[Xhtml Sink] Modified invalid comment: '" +
originalComment + "' to '" + comment + "'" );
+ getLog().warn( "[Xhtml Sink] Modified invalid comment: '" +
originalComment + "' to '" + cmt + "'" );
}
- StringBuffer buf = new StringBuffer( comment.length() + 9 );
+ StringBuilder buf = new StringBuilder( cmt.length() + 9 );
buf.append( LESS_THAN ).append( BANG ).append( MINUS ).append( MINUS
).append( SPACE );
- buf.append( comment );
+ buf.append( cmt );
buf.append( SPACE ).append( MINUS ).append( MINUS ).append(
GREATER_THAN );
write( buf.toString() );
@@ -1843,6 +1943,7 @@ public class XhtmlBaseSink
* @param attributes a set of attributes for the event. May be null.
* The attributes will always be written, no validity check is
performed.
*/
+ @Override
public void unknown( String name, Object[] requiredParams,
SinkEventAttributes attributes )
{
if ( requiredParams == null || !( requiredParams[0] instanceof Integer
) )
@@ -1915,12 +2016,14 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
public void flush()
{
writer.flush();
}
/** {@inheritDoc} */
+ @Override
public void close()
{
writer.close();
@@ -1953,9 +2056,9 @@ public class XhtmlBaseSink
protected void content( String text )
{
// small hack due to DOXIA-314
- text = escapeHTML( text );
- text = StringUtils.replace( text, "&#", "&#" );
- write( text );
+ String txt = escapeHTML( text );
+ txt = StringUtils.replace( txt, "&#", "&#" );
+ write( txt );
}
/**
@@ -2010,6 +2113,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
protected void writeStartTag( Tag t, MutableAttributeSet att, boolean
isSimpleTag )
{
if ( this.tableCaptionXMLWriterStack.isEmpty() )
@@ -2041,6 +2145,7 @@ public class XhtmlBaseSink
}
/** {@inheritDoc} */
+ @Override
protected void writeEndTag( Tag t )
{
if ( this.tableCaptionXMLWriterStack.isEmpty() )
@@ -2063,10 +2168,10 @@ public class XhtmlBaseSink
*/
private void logMessage( String key, String msg )
{
- msg = "[XHTML Sink] " + msg;
+ final String mesg = "[XHTML Sink] " + msg;
if ( getLog().isDebugEnabled() )
{
- getLog().debug( msg );
+ getLog().debug( mesg );
return;
}
@@ -2081,7 +2186,7 @@ public class XhtmlBaseSink
{
set = new TreeSet<String>();
}
- set.add( msg );
+ set.add( mesg );
warnMessages.put( key, set );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
Mon Oct 17 11:33:00 2011
@@ -224,7 +224,7 @@ public class DoxiaUtils
return "a";
}
- StringBuffer buffer = new StringBuffer( length );
+ StringBuilder buffer = new StringBuilder( length );
for ( int i = 0; i < length; ++i )
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
Mon Oct 17 11:33:00 2011
@@ -143,7 +143,7 @@ public class HtmlTools
}
int length = text.length();
- StringBuffer buffer = new StringBuffer( length );
+ StringBuilder buffer = new StringBuilder( length );
for ( int i = 0; i < length; ++i )
{
@@ -301,7 +301,7 @@ public class HtmlTools
return null;
}
- StringBuffer encoded = new StringBuffer();
+ StringBuilder encoded = new StringBuilder();
int length = url.length();
char[] unicode = new char[1];
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
Mon Oct 17 11:33:00 2011
@@ -184,6 +184,7 @@ public class XmlValidator
}
/** {@inheritDoc} */
+ @Override
public void warning( SAXParseException e )
throws SAXException
{
@@ -191,6 +192,7 @@ public class XmlValidator
}
/** {@inheritDoc} */
+ @Override
public void error( SAXParseException e )
throws SAXException
{
@@ -211,6 +213,7 @@ public class XmlValidator
}
/** {@inheritDoc} */
+ @Override
public void fatalError( SAXParseException e )
throws SAXException
{
@@ -220,7 +223,7 @@ public class XmlValidator
private void processException( int type, SAXParseException e )
throws SAXException
{
- StringBuffer message = new StringBuffer();
+ StringBuilder message = new StringBuilder();
switch ( type )
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
Mon Oct 17 11:33:00 2011
@@ -78,8 +78,8 @@ public class DocumentModelTest
private void verifyModel( DocumentModel model )
{
+ assertNotNull( model );
assertTrue( model.equals( model ) );
- assertFalse( model.equals( null ) );
assertTrue ( model.hashCode() != 0 );
assertTrue( model.toString().length() > 0 );
@@ -359,7 +359,7 @@ public class DocumentModelTest
}
catch ( XmlPullParserException e )
{
- throw (IOException) new IOException( "Error parsing document
descriptor" ).initCause( e );
+ throw new IOException( "Error parsing document descriptor", e );
}
finally
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
Mon Oct 17 11:33:00 2011
@@ -44,7 +44,7 @@ public class EchoMacroTest
*/
public void testExecute()
{
- Map macroParameters = new HashMap();
+ final Map<String,Object> macroParameters = new
HashMap<String,Object>();
macroParameters.put( "paramName", "paramValue" );
macroParameters.put( "parser", "parserValue" );
macroParameters.put( "sourceContent", "sourceContentValue" );
@@ -54,16 +54,16 @@ public class EchoMacroTest
new EchoMacro().execute( sink, request );
- Iterator it = sink.getEventList().iterator();
- SinkEventElement event = (SinkEventElement) it.next();
+ Iterator<SinkEventElement> it = sink.getEventList().iterator();
+ SinkEventElement event = it.next();
assertEquals( "verbatim", event.getName() );
- event = (SinkEventElement) it.next();
+ event = it.next();
assertEquals( "text", event.getName() );
assertEquals( "echo" + Macro.EOL, (String) event.getArgs()[0] );
- event = (SinkEventElement) it.next();
+ event = it.next();
assertEquals( "text", event.getName() );
assertEquals( "paramName ---> paramValue" + Macro.EOL, (String)
event.getArgs()[0] );
- event = (SinkEventElement) it.next();
+ event = it.next();
assertEquals( "verbatim_", event.getName() );
assertFalse( it.hasNext() );
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
Mon Oct 17 11:33:00 2011
@@ -51,6 +51,7 @@ public class XhtmlBaseParserTest
sink.reset();
}
+ /** Test Doxia version. */
public void testDoxiaVersion()
{
assertNotNull( XhtmlBaseParser.doxiaVersion() );
@@ -319,7 +320,7 @@ public class XhtmlBaseParserTest
public void testDoxia250()
throws Exception
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( "<!DOCTYPE test [" ).append( XhtmlBaseParser.EOL );
sb.append( "<!ENTITY foo \"ř\">" ).append( XhtmlBaseParser.EOL );
sb.append( "<!ENTITY foo1 \" \">" ).append( XhtmlBaseParser.EOL );
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java?rev=1185112&r1=1185111&r2=1185112&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java
Mon Oct 17 11:33:00 2011
@@ -587,7 +587,7 @@ public class WellformednessCheckingSink
*/
public boolean isWellformed()
{
- return errors.size() == 0;
+ return errors.isEmpty();
}
/**
