Author: hboutemy
Date: Sun Sep 18 06:46:17 2011
New Revision: 1172204
URL: http://svn.apache.org/viewvc?rev=1172204&view=rev
Log:
code simplification
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.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/XmlValidator.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/index/IndexEntryTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java?rev=1172204&r1=1172203&r2=1172204&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
Sun Sep 18 06:46:17 2011
@@ -179,9 +179,9 @@ public class SnippetReader
protected boolean isDemarcator( String snippetId, String what, String line
)
{
String upper = line.toUpperCase( Locale.ENGLISH );
- return upper.indexOf( what.toUpperCase( Locale.ENGLISH ) ) != -1
- && upper.indexOf( "SNIPPET" ) != -1
- && line.indexOf( snippetId ) != -1;
+ return upper.contains( what.toUpperCase( Locale.ENGLISH ) )
+ && upper.contains( "SNIPPET" )
+ && line.contains( snippetId );
}
/**
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=1172204&r1=1172203&r2=1172204&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
Sun Sep 18 06:46:17 2011
@@ -1792,11 +1792,11 @@ public class XhtmlBaseSink
/** {@inheritDoc} */
public void comment( String comment )
{
- if ( StringUtils.isNotEmpty( comment ) && comment.indexOf( "--" ) !=
-1 )
+ if ( StringUtils.isNotEmpty( comment ) && comment.contains( "--" ) )
{
String originalComment = comment;
// http://www.w3.org/TR/2000/REC-xml-20001006#sec-comments
- while ( comment.indexOf( "--" ) != -1 )
+ while ( comment.contains( "--" ) )
{
comment = StringUtils.replace( comment, "--", "- -" );
}
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=1172204&r1=1172203&r2=1172204&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
Sun Sep 18 06:46:17 2011
@@ -98,7 +98,7 @@ public class DoxiaUtils
return ( text.startsWith( "http:/" ) || text.startsWith( "https:/" )
|| text.startsWith( "ftp:/" ) || text.startsWith( "mailto:"; )
- || text.startsWith( "file:/" ) || text.indexOf( "://" ) != -1 );
+ || text.startsWith( "file:/" ) || text.contains( "://" ) );
}
/**
@@ -362,8 +362,7 @@ public class DoxiaUtils
public static Date parseDate( final String str )
throws ParseException
{
- if ( "today".equals( str.toLowerCase( Locale.ENGLISH ) )
- || "now".equals( str.toLowerCase( Locale.ENGLISH ) ) )
+ if ( "today".equalsIgnoreCase( str ) || "now".equalsIgnoreCase( str ) )
{
return new Date();
}
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=1172204&r1=1172203&r2=1172204&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
Sun Sep 18 06:46:17 2011
@@ -97,7 +97,7 @@ public class XmlValidator
{
String value = matcher.group( 2 );
- if ( value.indexOf(
XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI ) != -1 )
+ if ( value.contains(
XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI ) )
{
hasXsd = true;
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/index/IndexEntryTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/index/IndexEntryTest.java?rev=1172204&r1=1172203&r2=1172204&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/index/IndexEntryTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/index/IndexEntryTest.java
Sun Sep 18 06:46:17 2011
@@ -59,7 +59,7 @@ public class IndexEntryTest
assertIndexEntry( chapter2, root, 0, chapter1, null );
chapter2.setTitle( "Title 2" );
- assertTrue( chapter2.toString().indexOf( "Title 2" ) != -1 );
+ assertTrue( chapter2.toString().contains( "Title 2" ) );
}
private void assertIndexEntry( IndexEntry entry, IndexEntry parent, int
childCount,
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java?rev=1172204&r1=1172203&r2=1172204&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/snippet/SnippetMacroTest.java
Sun Sep 18 06:46:17 2011
@@ -66,11 +66,11 @@ public class SnippetMacroTest
assertEquals( "verbatim_", ( it.next() ).getName() );
assertFalse( it.hasNext() );
- assertTrue( snippet.indexOf( "preamble" ) != -1 );
- assertTrue( snippet.indexOf( "first snippet" ) != -1 );
- assertTrue( snippet.indexOf( "interlude" ) != -1 );
- assertTrue( snippet.indexOf( "second snippet" ) != -1 );
- assertTrue( snippet.indexOf( "conclusion" ) != -1 );
+ assertTrue( snippet.contains( "preamble" ) );
+ assertTrue( snippet.contains( "first snippet" ) );
+ assertTrue( snippet.contains( "interlude" ) );
+ assertTrue( snippet.contains( "second snippet" ) );
+ assertTrue( snippet.contains( "conclusion" ) );
// again
@@ -88,11 +88,11 @@ public class SnippetMacroTest
assertEquals( "verbatim_", ( it.next() ).getName() );
assertFalse( it.hasNext() );
- assertTrue( snippet.indexOf( "preamble" ) == -1 );
- assertTrue( snippet.indexOf( "first snippet" ) != -1 );
- assertTrue( snippet.indexOf( "interlude" ) == -1 );
- assertTrue( snippet.indexOf( "second snippet" ) == -1 );
- assertTrue( snippet.indexOf( "conclusion" ) == -1 );
+ assertFalse( snippet.contains( "preamble" ) );
+ assertTrue( snippet.contains( "first snippet" ) );
+ assertFalse( snippet.contains( "interlude" ) );
+ assertFalse( snippet.contains( "second snippet" ) );
+ assertFalse( snippet.contains( "conclusion" ) );
// again
@@ -108,10 +108,10 @@ public class SnippetMacroTest
snippet = (String) event.getArgs()[0];
assertFalse( it.hasNext() );
- assertTrue( snippet.indexOf( "preamble" ) == -1 );
- assertTrue( snippet.indexOf( "first snippet" ) == -1 );
- assertTrue( snippet.indexOf( "interlude" ) == -1 );
- assertTrue( snippet.indexOf( "second snippet" ) != -1 );
- assertTrue( snippet.indexOf( "conclusion" ) == -1 );
+ assertFalse( snippet.contains( "preamble" ) );
+ assertFalse( snippet.contains( "first snippet" ) );
+ assertFalse( snippet.contains( "interlude" ) );
+ assertTrue( snippet.contains( "second snippet" ) );
+ assertFalse( snippet.contains( "conclusion" ) );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java?rev=1172204&r1=1172203&r2=1172204&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
Sun Sep 18 06:46:17 2011
@@ -172,8 +172,8 @@ public class TocMacroTest
TocMacro macro = new TocMacro();
macro.execute( sink, request );
- assertTrue( out.toString().indexOf( "<a href=\"#h21\">h21</a>" ) != -1
);
- assertTrue( out.toString().indexOf( "<a href=\"#h22\">h22</a>" ) != -1
);
- assertTrue( out.toString().indexOf( "<a href=\"#h3\">h3</a>" ) != -1 );
+ assertTrue( out.toString().contains( "<a href=\"#h21\">h21</a>" ) );
+ assertTrue( out.toString().contains( "<a href=\"#h22\">h22</a>" ) );
+ assertTrue( out.toString().contains( "<a href=\"#h3\">h3</a>" ) );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java?rev=1172204&r1=1172203&r2=1172204&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
Sun Sep 18 06:46:17 2011
@@ -924,8 +924,8 @@ public class XhtmlBaseSinkTest
String result = writer.toString();
- assertTrue( result.indexOf( "ex.js?v=l&l=e" ) != -1 );
- assertTrue( result.indexOf( "ex.jpg?v=l&l=e" ) != -1 );
+ assertTrue( result.contains( "ex.js?v=l&l=e" ) );
+ assertTrue( result.contains( "ex.jpg?v=l&l=e" ) );
}
/**
@@ -974,6 +974,6 @@ public class XhtmlBaseSinkTest
final String result = writer.toString();
- assertTrue( result.indexOf( "✓" ) != -1 );
+ assertTrue( result.contains( "✓" ) );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java?rev=1172204&r1=1172203&r2=1172204&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
Sun Sep 18 06:46:17 2011
@@ -68,17 +68,12 @@ public abstract class AbstractXmlValidat
*/
protected boolean isFailErrorMessage( String message )
{
- if ( message.indexOf( "schema_reference.4: Failed to read schema
document 'http://www.w3.org/2001/xml.xsd'" ) == -1
- && message.indexOf( "cvc-complex-type.4: Attribute 'alt' must
appear on element 'img'." ) == -1
- && message.indexOf( "cvc-complex-type.2.4.a: Invalid content
starting with element" ) == -1
- && message.indexOf( "cvc-complex-type.2.4.a: Invalid content was
found starting with element" ) == -1
- && message.indexOf( "cvc-datatype-valid.1.2.1:" ) == -1 // Doxia
allow space
- && message.indexOf( "cvc-attribute.3:" ) == -1 ) // Doxia allow
space
- {
- return true;
- }
-
- return false;
+ return !( message.contains( "schema_reference.4: Failed to read schema
document 'http://www.w3.org/2001/xml.xsd'" )
+ || message.contains( "cvc-complex-type.4: Attribute 'alt' must
appear on element 'img'." )
+ || message.contains( "cvc-complex-type.2.4.a: Invalid content
starting with element" )
+ || message.contains( "cvc-complex-type.2.4.a: Invalid content was
found starting with element" )
+ || message.contains( "cvc-datatype-valid.1.2.1:" ) // Doxia allow
space
+ || message.contains( "cvc-attribute.3:" ) ); // Doxia allow space
}
@Override
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java?rev=1172204&r1=1172203&r2=1172204&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
Sun Sep 18 06:46:17 2011
@@ -191,7 +191,7 @@ public abstract class AbstractXmlValidat
{
File file = new File( it.next().toString() );
- if ( file.getAbsolutePath().indexOf( "META-INF" ) != -1 )
+ if ( file.getAbsolutePath().contains( "META-INF" ) )
{
continue;
}
