Author: khmarbaise
Date: Thu Oct 1 17:41:18 2015
New Revision: 1706298
URL: http://svn.apache.org/viewvc?rev=1706298&view=rev
Log:
Cleaned up code warnings and removed unused code.
Fixed name of _staticDefaultEncoding into staticDefaultEncoding to
fullfil checkstyle.
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/StringUtils.java
Thu Oct 1 17:41:18 2015
@@ -52,7 +52,6 @@ import javax.annotation.Nullable;
* @version $Id$
*
*/
-@SuppressWarnings( "JavaDoc" )
public class StringUtils
{
/**
@@ -796,7 +795,6 @@ public class StringUtils
* @return String with overlayed text
* @throws NullPointerException if text or overlay is <code>null</code>
*/
- @SuppressWarnings( "ConstantConditions" )
@Nonnull public static String overlayString( @Nonnull String text,
@Nonnull String overlay, int start, int end )
{
if ( overlay == null )
@@ -2480,7 +2478,6 @@ public class StringUtils
* false if not or <code>null</code> string input
*
*/
- @SuppressWarnings( "ConstantConditions" )
public static boolean contains( @Nullable String str, char searchChar )
{
return !isEmpty( str ) && str.indexOf( searchChar ) >= 0;
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
Thu Oct 1 17:41:18 2015
@@ -29,6 +29,11 @@ public class CommandLineTimeOutException
{
/**
+ *
+ */
+ private static final long serialVersionUID = 7322428741683224481L;
+
+ /**
* @param message
* @param cause
*/
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
Thu Oct 1 17:41:18 2015
@@ -44,7 +44,6 @@ public abstract class CommandLineUtils
/**
*
*/
- @SuppressWarnings( "UnusedDeclaration" )
public static class StringStreamConsumer
implements StreamConsumer
{
@@ -82,14 +81,12 @@ public abstract class CommandLineUtils
}
- @SuppressWarnings( "UnusedDeclaration" )
public static int executeCommandLine( @Nonnull Commandline cl,
StreamConsumer systemOut, StreamConsumer systemErr )
throws CommandLineException
{
return executeCommandLine( cl, null, systemOut, systemErr, 0 );
}
- @SuppressWarnings( "UnusedDeclaration" )
public static int executeCommandLine( @Nonnull Commandline cl,
StreamConsumer systemOut, StreamConsumer systemErr,
int timeoutInSeconds )
throws CommandLineException
@@ -97,7 +94,6 @@ public abstract class CommandLineUtils
return executeCommandLine( cl, null, systemOut, systemErr,
timeoutInSeconds );
}
- @SuppressWarnings( "UnusedDeclaration" )
public static int executeCommandLine( @Nonnull Commandline cl, InputStream
systemIn, StreamConsumer systemOut,
StreamConsumer systemErr )
throws CommandLineException
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java
Thu Oct 1 17:41:18 2015
@@ -375,25 +375,4 @@ final class XMLEncode
}
}
- // combine multiple checks in one methods for speed
- private static boolean contains( String text, char[] chars )
- {
- if ( text == null || chars == null || chars.length == 0 )
- {
- return false;
- }
- for ( int i = 0; i < text.length(); i++ )
- {
- char c = text.charAt( i );
- for ( char aChar : chars )
- {
- if ( aChar == c )
- {
- return true;
- }
- }
- }
- return false;
- }
-
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
Thu Oct 1 17:41:18 2015
@@ -36,6 +36,11 @@ import java.io.InputStream;
class XmlReaderException
extends IOException
{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5044326391409597950L;
+
private final String bomEncoding;
private final String xmlGuessEncoding;
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
Thu Oct 1 17:41:18 2015
@@ -36,17 +36,16 @@ public class XmlStreamReader
{
private final org.apache.commons.io.input.XmlStreamReader reader;
- @SuppressWarnings( "checkstyle:staticvariablename" )
- private static String _staticDefaultEncoding = null;
+ private static String staticDefaultEncoding = null;
public static void setDefaultEncoding( String encoding )
{
- _staticDefaultEncoding = encoding;
+ staticDefaultEncoding = encoding;
}
public static String getDefaultEncoding()
{
- return _staticDefaultEncoding;
+ return staticDefaultEncoding;
}
public XmlStreamReader( File file )
@@ -64,7 +63,7 @@ public class XmlStreamReader
public XmlStreamReader( InputStream is, boolean lenient )
throws IOException, XmlStreamReaderException
{
- reader = new org.apache.commons.io.input.XmlStreamReader( is, lenient,
_staticDefaultEncoding );
+ reader = new org.apache.commons.io.input.XmlStreamReader( is, lenient,
staticDefaultEncoding );
}
public XmlStreamReader( URL url )
@@ -76,7 +75,7 @@ public class XmlStreamReader
public XmlStreamReader( URLConnection conn )
throws IOException
{
- reader = new org.apache.commons.io.input.XmlStreamReader( conn,
_staticDefaultEncoding );
+ reader = new org.apache.commons.io.input.XmlStreamReader( conn,
staticDefaultEncoding );
}
public XmlStreamReader( InputStream is, String httpContentType )
@@ -90,7 +89,7 @@ public class XmlStreamReader
{
reader = new org.apache.commons.io.input.XmlStreamReader( is,
httpContentType, lenient,
( defaultEncoding == null )
- ? _staticDefaultEncoding
+ ? staticDefaultEncoding
: defaultEncoding );
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
Thu Oct 1 17:41:18 2015
@@ -38,6 +38,11 @@ class XmlStreamReaderException
extends XmlReaderException
{
/**
+ *
+ */
+ private static final long serialVersionUID = 1007947701939672080L;
+
+ /**
* Creates an exception instance if the charset encoding could not be
determined.
* <p/>
* Instances of this exception are thrown by the XmlReader.
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java?rev=1706298&r1=1706297&r2=1706298&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
Thu Oct 1 17:41:18 2015
@@ -37,7 +37,6 @@ import javax.annotation.Nonnull;
public class Xpp3Dom
implements Iterable<Xpp3Dom>
{
- @SuppressWarnings( "UnusedDeclaration" )
private static final long serialVersionUID = 2567894443061173996L;
private String name; // plexus: protected
