You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/25 20:51:55 UTC

svn commit: r1517364 [3/3] - in /maven/plugins/trunk: maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ maven-eclipse-plugin/src/main/java/org/apache/maven/plu...

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1517364&r1=1517363&r2=1517364&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Sun Aug 25 18:51:54 2013
@@ -442,11 +442,8 @@ public abstract class AbstractFixJavadoc
 
             if ( javaClasses != null )
             {
-                for ( int i = 0; i < javaClasses.length; i++ )
-                {
-                    JavaClass javaClass = javaClasses[i];
-
-                    processFix( javaClass );
+                for (JavaClass javaClass : javaClasses) {
+                    processFix(javaClass);
                 }
             }
         }
@@ -535,19 +532,14 @@ public abstract class AbstractFixJavadoc
         {
             String[] split = StringUtils.split( fixTags, "," );
             List<String> filtered = new LinkedList<String>();
-            for ( int j = 0; j < split.length; j++ )
-            {
-                String s = split[j].trim();
-                if ( JavadocUtil.equalsIgnoreCase( s, FIX_TAGS_ALL, AUTHOR_TAG, VERSION_TAG, SINCE_TAG, PARAM_TAG,
-                                                   THROWS_TAG, LINK_TAG ) )
-                {
-                    filtered.add( s );
-                }
-                else
-                {
-                    if ( getLog().isWarnEnabled() )
-                    {
-                        getLog().warn( "Unrecognized '" + s + "' for fixTags parameter. Ignored it!" );
+            for (String aSplit : split) {
+                String s = aSplit.trim();
+                if (JavadocUtil.equalsIgnoreCase(s, FIX_TAGS_ALL, AUTHOR_TAG, VERSION_TAG, SINCE_TAG, PARAM_TAG,
+                        THROWS_TAG, LINK_TAG)) {
+                    filtered.add(s);
+                } else {
+                    if (getLog().isWarnEnabled()) {
+                        getLog().warn("Unrecognized '" + s + "' for fixTags parameter. Ignored it!");
                     }
                 }
             }
@@ -685,7 +677,7 @@ public abstract class AbstractFixJavadoc
                     StringUtils.unifyLineSeparators( FileUtils.fileRead( invokerLogFile, "UTF-8" ) );
                 // see org.codehaus.mojo.clirr.AbstractClirrMojo#getComparisonArtifact()
                 final String artifactNotFoundMsg = "Unable to find a previous version of the project in the repository";
-                if ( invokerLogContent.indexOf( artifactNotFoundMsg ) != -1 )
+                if (invokerLogContent.contains(artifactNotFoundMsg))
                 {
                     getLog().warn( "No previous artifact has been deployed, Clirr is ignored." );
                     return;
@@ -743,7 +735,7 @@ public abstract class AbstractFixJavadoc
         {
             reader = ReaderFactory.newReader( clirrTextOutputFile, "UTF-8" );
             input = new BufferedReader( reader );
-            String line = null;
+            String line;
             while ( ( line = input.readLine() ) != null )
             {
                 String[] split = StringUtils.split( line, ":" );
@@ -842,10 +834,8 @@ public abstract class AbstractFixJavadoc
             return true;
         }
 
-        for ( int i = 0; i < fixTagsSplitted.length; i++ )
-        {
-            if ( fixTagsSplitted[i].trim().equals( tag ) )
-            {
+        for (String aFixTagsSplitted : fixTagsSplitted) {
+            if (aFixTagsSplitted.trim().equals(tag)) {
                 return true;
             }
         }
@@ -1109,7 +1099,7 @@ public abstract class AbstractFixJavadoc
         String extraComment = javadocComment.substring( javadocComment.indexOf( END_JAVADOC ) + END_JAVADOC.length() );
         if ( StringUtils.isNotEmpty( extraComment ) )
         {
-            if ( extraComment.indexOf( EOL ) != -1 )
+            if (extraComment.contains(EOL))
             {
                 stringWriter.write( extraComment.substring( extraComment.indexOf( EOL ) + EOL.length() ) );
             }
@@ -1334,24 +1324,18 @@ public abstract class AbstractFixJavadoc
             {
                 StringBuilder value = new StringBuilder();
                 String[] lines = getLines( field.getInitializationExpression() );
-                for ( int i = 0; i < lines.length; i++ )
-                {
-                    String line = lines[i];
-
-                    StringTokenizer token = new StringTokenizer( line.trim(), "\"\n\r" );
-                    while ( token.hasMoreTokens() )
-                    {
+                for (String line : lines) {
+                    StringTokenizer token = new StringTokenizer(line.trim(), "\"\n\r");
+                    while (token.hasMoreTokens()) {
                         String s = token.nextToken();
 
-                        if ( s.trim().equals( "+" ) )
-                        {
+                        if (s.trim().equals("+")) {
                             continue;
                         }
-                        if ( s.trim().endsWith( "\\" ) )
-                        {
+                        if (s.trim().endsWith("\\")) {
                             s += "\"";
                         }
-                        value.append( s );
+                        value.append(s);
                     }
                 }
 
@@ -1717,10 +1701,9 @@ public abstract class AbstractFixJavadoc
         }
 
         String[] lines = getLines( comment );
-        for ( int i = 0; i < lines.length; i++ )
-        {
-            sb.append( indent ).append( " " ).append( lines[i].trim() );
-            sb.append( EOL );
+        for (String line : lines) {
+            sb.append(indent).append(" ").append(line.trim());
+            sb.append(EOL);
         }
     }
 
@@ -1940,8 +1923,7 @@ public abstract class AbstractFixJavadoc
                     {
                         String originalJavadocTag = it.next();
 
-                        if ( StringUtils.removeDuplicateWhitespace( originalJavadocTag ).trim().indexOf(
-                            "@" + docletTag.getName() ) != -1 )
+                        if (StringUtils.removeDuplicateWhitespace(originalJavadocTag).trim().contains("@" + docletTag.getName()))
                         {
                             it.remove();
                             sb.append( originalJavadocTag );
@@ -1956,8 +1938,7 @@ public abstract class AbstractFixJavadoc
                 {
                     String originalJavadocTag = it.next();
 
-                    if ( StringUtils.removeDuplicateWhitespace( originalJavadocTag ).trim().indexOf(
-                        "@" + docletTag.getName() ) != -1 )
+                    if (StringUtils.removeDuplicateWhitespace(originalJavadocTag).trim().contains("@" + docletTag.getName()))
                     {
                         it.remove();
                         sb.append( originalJavadocTag );
@@ -1999,10 +1980,8 @@ public abstract class AbstractFixJavadoc
         {
             // is generic?
             TypeVariable[] typeParams = javaMethod.getTypeParameters();
-            for ( int i = 0; i < typeParams.length; i++ )
-            {
-                if ( typeParams[i].getGenericValue().equals( paramName ) )
-                {
+            for (TypeVariable typeParam : typeParams) {
+                if (typeParam.getGenericValue().equals(paramName)) {
                     found = true;
                 }
             }
@@ -3393,7 +3372,7 @@ public abstract class AbstractFixJavadoc
     private static String removeLastEmptyJavadocLines( final String content )
         throws IOException
     {
-        if ( content.indexOf( EOL ) == -1 )
+        if (!content.contains(EOL))
         {
             return content;
         }
@@ -3493,7 +3472,7 @@ public abstract class AbstractFixJavadoc
             line = reader.readLine();
         }
 
-        return (String[]) lines.toArray( new String[0] );
+        return (String[]) lines.toArray(new String[lines.size()]);
     }
 
     /**
@@ -3566,7 +3545,7 @@ public abstract class AbstractFixJavadoc
             l.remove( 0 );
             l.remove( 1 );
 
-            return (String[]) l.toArray( new String[0] );
+            return (String[]) l.toArray(new String[l.size()]);
         }
 
         return params;

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1517364&r1=1517363&r2=1517364&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun Aug 25 18:51:54 2013
@@ -2841,7 +2841,7 @@ public abstract class AbstractJavadocMoj
                                + " or <doclets/>." );
         }
 
-        return path.toString();
+        return path;
     }
 
     /**
@@ -4206,7 +4206,7 @@ public abstract class AbstractJavadocMoj
                     currentSourcePath += "/";
                 }
 
-                if ( currentFile.indexOf( currentSourcePath ) != -1 )
+                if (currentFile.contains(currentSourcePath))
                 {
                     String packagename = currentFile.substring( currentSourcePath.length() + 1 );
 
@@ -4214,7 +4214,7 @@ public abstract class AbstractJavadocMoj
                      * Remove the miscellaneous files
                      * http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
                      */
-                    if ( packagename.indexOf( "doc-files" ) != -1 )
+                    if (packagename.contains("doc-files"))
                     {
                         continue;
                     }
@@ -4258,7 +4258,7 @@ public abstract class AbstractJavadocMoj
         File optionsFile = new File( javadocOutputDirectory, OPTIONS_FILE_NAME );
 
         StringBuilder options = new StringBuilder();
-        options.append( StringUtils.join( arguments.toArray( new String[0] ), SystemUtils.LINE_SEPARATOR ) );
+        options.append( StringUtils.join(arguments.toArray(new String[arguments.size()]), SystemUtils.LINE_SEPARATOR ) );
 
         try
         {
@@ -4837,19 +4837,14 @@ public abstract class AbstractJavadocMoj
             return;
         }
 
-        for ( int i = 0; i < taglets.length; i++ )
-        {
-            if ( ( taglets[i] == null ) || ( StringUtils.isEmpty( taglets[i].getTagletClass() ) ) )
-            {
-                if ( getLog().isWarnEnabled() )
-                {
-                    getLog().warn( "A taglet option is empty. Ignore this option." );
-                }
-            }
-            else
-            {
-                addArgIfNotEmpty( arguments, "-taglet", JavadocUtil.quotedArgument( taglets[i].getTagletClass() ),
-                                  SINCE_JAVADOC_1_4 );
+        for (Taglet taglet1 : taglets) {
+            if ((taglet1 == null) || (StringUtils.isEmpty(taglet1.getTagletClass()))) {
+                if (getLog().isWarnEnabled()) {
+                    getLog().warn("A taglet option is empty. Ignore this option.");
+                }
+            } else {
+                addArgIfNotEmpty(arguments, "-taglet", JavadocUtil.quotedArgument(taglet1.getTagletClass()),
+                        SINCE_JAVADOC_1_4);
             }
         }
     }

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=1517364&r1=1517363&r2=1517364&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Sun Aug 25 18:51:54 2013
@@ -196,10 +196,9 @@ public class JavadocUtil
         List<String> excludedNames = new ArrayList<String>();
         for ( String path : sourcePaths )
         {
-            for ( int j = 0; j < subpackagesList.length; j++ )
-            {
-                List<String> excludes = getExcludedPackages( path, excludedPackages );
-                excludedNames.addAll( excludes );
+            for (String aSubpackagesList : subpackagesList) {
+                List<String> excludes = getExcludedPackages(path, excludedPackages);
+                excludedNames.addAll(excludes);
             }
         }
 
@@ -272,7 +271,7 @@ public class JavadocUtil
 
         if ( StringUtils.isNotEmpty( arg ) )
         {
-            if ( arg.indexOf( "'" ) != -1 )
+            if (arg.contains("'"))
             {
                 arg = StringUtils.replace( arg, "'", "\\'" );
             }
@@ -299,7 +298,7 @@ public class JavadocUtil
         if ( StringUtils.isNotEmpty( path ) )
         {
             path = path.replace( '\\', '/' );
-            if ( path.indexOf( "\'" ) != -1 )
+            if (path.contains("\'"))
             {
                 String split[] = path.split( "\'" );
                 path = "";
@@ -409,62 +408,46 @@ public class JavadocUtil
     {
         List<String> files = new ArrayList<String>();
 
-        for ( int j = 0; j < fileList.length; j++ )
-        {
+        for (String aFileList : fileList) {
             boolean include = true;
-            for ( int k = 0; k < excludePackages.length && include; k++ )
-            {
+            for (int k = 0; k < excludePackages.length && include; k++) {
                 // handle wildcards (*) in the excludePackageNames
-                String[] excludeName = excludePackages[k].split( "[*]" );
+                String[] excludeName = excludePackages[k].split("[*]");
 
-                if ( excludeName.length == 0 )
-                {
+                if (excludeName.length == 0) {
                     continue;
                 }
 
-                if ( excludeName.length > 1 )
-                {
+                if (excludeName.length > 1) {
                     int u = 0;
-                    while ( include && u < excludeName.length )
-                    {
-                        if ( !"".equals( excludeName[u].trim() ) && fileList[j].indexOf( excludeName[u] ) != -1 )
-                        {
+                    while (include && u < excludeName.length) {
+                        if (!"".equals(excludeName[u].trim()) && aFileList.indexOf(excludeName[u]) != -1) {
                             include = false;
                         }
                         u++;
                     }
-                }
-                else
-                {
-                    if ( fileList[j].startsWith( sourceDirectory.toString() + File.separatorChar + excludeName[0] ) )
-                    {
-                        if ( excludeName[0].endsWith( String.valueOf( File.separatorChar ) ) )
-                        {
-                            int i = fileList[j].lastIndexOf( File.separatorChar );
-                            String packageName = fileList[j].substring( 0, i + 1 );
-                            File currentPackage = new File( packageName );
-                            File excludedPackage = new File( sourceDirectory, excludeName[0] );
-                            if ( currentPackage.equals( excludedPackage )
-                                && fileList[j].substring( i ).indexOf( ".java" ) != -1 )
-                            {
+                } else {
+                    if (aFileList.startsWith(sourceDirectory.toString() + File.separatorChar + excludeName[0])) {
+                        if (excludeName[0].endsWith(String.valueOf(File.separatorChar))) {
+                            int i = aFileList.lastIndexOf(File.separatorChar);
+                            String packageName = aFileList.substring(0, i + 1);
+                            File currentPackage = new File(packageName);
+                            File excludedPackage = new File(sourceDirectory, excludeName[0]);
+                            if (currentPackage.equals(excludedPackage)
+                                    && aFileList.substring(i).indexOf(".java") != -1) {
                                 include = true;
-                            }
-                            else
-                            {
+                            } else {
                                 include = false;
                             }
-                        }
-                        else
-                        {
+                        } else {
                             include = false;
                         }
                     }
                 }
             }
 
-            if ( include )
-            {
-                files.add( quotedPathArgument( fileList[j] ) );
+            if (include) {
+                files.add(quotedPathArgument(aFileList));
             }
         }
 
@@ -482,19 +465,15 @@ public class JavadocUtil
     protected static List<String> getExcludedPackages( String sourceDirectory, String[] excludePackagenames )
     {
         List<String> files = new ArrayList<String>();
-        for ( int i = 0; i < excludePackagenames.length; i++ )
-        {
-            String[] fileList = FileUtils.getFilesFromExtension( sourceDirectory, new String[] { "java" } );
-            for ( int j = 0; j < fileList.length; j++ )
-            {
-                String[] excludeName = excludePackagenames[i].split( "[*]" );
+        for (String excludePackagename : excludePackagenames) {
+            String[] fileList = FileUtils.getFilesFromExtension(sourceDirectory, new String[]{"java"});
+            for (int j = 0; j < fileList.length; j++) {
+                String[] excludeName = excludePackagename.split("[*]");
                 int u = 0;
-                while ( u < excludeName.length )
-                {
-                    if ( !"".equals( excludeName[u].trim() ) && fileList[j].indexOf( excludeName[u] ) != -1
-                        && sourceDirectory.indexOf( excludeName[u] ) == -1 )
-                    {
-                        files.add( fileList[j] );
+                while (u < excludeName.length) {
+                    if (!"".equals(excludeName[u].trim()) && fileList[j].contains(excludeName[u])
+                            && !sourceDirectory.contains(excludeName[u])) {
+                        files.add(fileList[j]);
                     }
                     u++;
                 }
@@ -1009,8 +988,8 @@ public class JavadocUtil
             String invokerLogContent = readFile( invokerLog, "UTF-8" );
 
             // see DefaultMaven
-            if ( invokerLogContent != null && ( invokerLogContent.indexOf( "Scanning for projects..." ) == -1
-                || invokerLogContent.indexOf( OutOfMemoryError.class.getName() ) != -1 ) )
+            if ( invokerLogContent != null && (!invokerLogContent.contains("Scanning for projects...")
+                || invokerLogContent.contains(OutOfMemoryError.class.getName())) )
             {
                 if ( log != null )
                 {
@@ -1030,8 +1009,8 @@ public class JavadocUtil
             String invokerLogContent = readFile( invokerLog, "UTF-8" );
 
             // see DefaultMaven
-            if ( invokerLogContent != null && ( invokerLogContent.indexOf( "Scanning for projects..." ) == -1
-                || invokerLogContent.indexOf( OutOfMemoryError.class.getName() ) != -1 ) )
+            if ( invokerLogContent != null && (!invokerLogContent.contains("Scanning for projects...")
+                || invokerLogContent.contains(OutOfMemoryError.class.getName())) )
             {
                 throw new MavenInvocationException( ERROR_INIT_VM );
             }
@@ -1472,7 +1451,7 @@ public class JavadocUtil
         public String nextToken()
             throws NoSuchElementException
         {
-            String token = null;
+            String token;
             if ( lookahead != null )
             {
                 token = lookahead;

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java?rev=1517364&r1=1517363&r2=1517364&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java Sun Aug 25 18:51:54 2013
@@ -607,10 +607,8 @@ public class FixJavadocMojoTest
         File generatedDir = new File( testPomBasedir, "target/generated/fix/test" );
         assertTrue( generatedDir.exists() );
 
-        for ( int i = 0; i < clazzToCompare.length; i++ )
-        {
-            String className = clazzToCompare[i];
-            assertEquals( new File( expectedDir, className ), new File( generatedDir, className ) );
+        for (String className : clazzToCompare) {
+            assertEquals(new File(expectedDir, className), new File(generatedDir, className));
         }
     }
 

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=1517364&r1=1517363&r2=1517364&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java Sun Aug 25 18:51:54 2013
@@ -805,7 +805,7 @@ public class JavadocReportTest
 
         // real proxy
         ProxyServer proxyServer = null;
-        AuthAsyncProxyServlet proxyServlet = null;
+        AuthAsyncProxyServlet proxyServlet;
         try
         {
             proxyServlet = new AuthAsyncProxyServlet();

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java?rev=1517364&r1=1517363&r2=1517364&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocUtilTest.java Sun Aug 25 18:51:54 2013
@@ -227,7 +227,7 @@ public class JavadocUtilTest
         + "-J-Dhttp.proxyPort=80 " + "-J-Dhttp.nonProxyHosts=\"www.google.com|*.somewhere.com\" "
         + "-J-Dhttp.proxyUser=\"toto\" " + "-J-Dhttp.proxyPassword=\"toto\" " + "@options @packages";
         cmdLine = JavadocUtil.hideProxyPassword( cmdLine, null );
-        assertFalse( cmdLine.indexOf( "-J-Dhttp.proxyPassword=\"****\"" ) != -1 );
+        assertFalse(cmdLine.contains("-J-Dhttp.proxyPassword=\"****\""));
 
         Settings settings = new Settings();
         Proxy proxy = new Proxy();
@@ -244,7 +244,7 @@ public class JavadocUtilTest
             + "-J-Dhttp.proxyPort=80 " + "-J-Dhttp.nonProxyHosts=\"www.google.com|*.somewhere.com\" "
             + "-J-Dhttp.proxyUser=\"toto\" " + "-J-Dhttp.proxyPassword=\"toto\" " + "@options @packages";
         cmdLine = JavadocUtil.hideProxyPassword( cmdLine, settings );
-        assertTrue( cmdLine.indexOf( "-J-Dhttp.proxyPassword=\"****\"" ) != -1 );
+        assertTrue(cmdLine.contains("-J-Dhttp.proxyPassword=\"****\""));
 
         settings = new Settings();
         proxy = new Proxy();
@@ -260,7 +260,7 @@ public class JavadocUtilTest
         + "-J-Dhttp.proxyPort=80 " + "-J-Dhttp.nonProxyHosts=\"www.google.com|*.somewhere.com\" "
         + "-J-Dhttp.proxyUser=\"toto\" " + "-J-Dhttp.proxyPassword=\"toto\" " + "@options @packages";
         cmdLine = JavadocUtil.hideProxyPassword( cmdLine, null );
-        assertFalse( cmdLine.indexOf( "-J-Dhttp.proxyPassword=\"****\"" ) != -1 );
+        assertFalse(cmdLine.contains("-J-Dhttp.proxyPassword=\"****\""));
     }
 
     /**
@@ -272,10 +272,10 @@ public class JavadocUtilTest
         throws Exception
     {
         Settings settings = null;
-        Proxy proxy = null;
+        Proxy proxy;
 
         URL url = null;
-        URL wrongUrl = null;
+        URL wrongUrl;
         try
         {
             JavadocUtil.isValidPackageList( url, settings, false );
@@ -317,7 +317,7 @@ public class JavadocUtilTest
 
         // real proxy
         ProxyServer proxyServer = null;
-        AuthAsyncProxyServlet proxyServlet = null;
+        AuthAsyncProxyServlet proxyServlet;
         try
         {
             proxyServlet = new AuthAsyncProxyServlet();

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java?rev=1517364&r1=1517363&r2=1517364&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/ProxyServer.java Sun Aug 25 18:51:54 2013
@@ -221,7 +221,7 @@ class ProxyServer
                             // nop
                         }
                     }
-                    String authPass = this.authentications.get( user ).toString();
+                    String authPass = this.authentications.get(user);
                     if ( password.equals( authPass ) )
                     {
                         // could throw exceptions...