You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/30 07:18:51 UTC
svn commit: r1635400 - in /maven/shared/trunk/maven-shared-io: ./
src/main/java/org/apache/maven/shared/io/download/
src/main/java/org/apache/maven/shared/io/location/
src/main/java/org/apache/maven/shared/io/logging/
Author: hboutemy
Date: Thu Oct 30 06:18:51 2014
New Revision: 1635400
URL: http://svn.apache.org/r1635400
Log:
upgraded parent pom
Modified:
maven/shared/trunk/maven-shared-io/pom.xml
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/download/DefaultDownloadManager.java
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/ClasspathResourceLocatorStrategy.java
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/FileLocation.java
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/MessageLevels.java
maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/PlexusLoggerSink.java
Modified: maven/shared/trunk/maven-shared-io/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/pom.xml?rev=1635400&r1=1635399&r2=1635400&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/pom.xml (original)
+++ maven/shared/trunk/maven-shared-io/pom.xml Thu Oct 30 06:18:51 2014
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
@@ -60,6 +60,10 @@
</site>
</distributionManagement>
+ <properties>
+ <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,JavadocType</checkstyle.violation.ignore>
+ </properties>
+
<dependencies>
<!-- Maven -->
<dependency>
Modified: maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/download/DefaultDownloadManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/download/DefaultDownloadManager.java?rev=1635400&r1=1635399&r2=1635400&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/download/DefaultDownloadManager.java (original)
+++ maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/download/DefaultDownloadManager.java Thu Oct 30 06:18:51 2014
@@ -85,7 +85,8 @@ public class DefaultDownloadManager
}
catch ( MalformedURLException e )
{
- throw new DownloadFailedException( url, "Download failed due to invalid URL. Reason: " + e.getMessage(), e );
+ throw new DownloadFailedException( url, "Download failed due to invalid URL. Reason: " + e.getMessage(),
+ e );
}
Wagon wagon = null;
Modified: maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/ClasspathResourceLocatorStrategy.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/ClasspathResourceLocatorStrategy.java?rev=1635400&r1=1635399&r2=1635400&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/ClasspathResourceLocatorStrategy.java (original)
+++ maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/ClasspathResourceLocatorStrategy.java Thu Oct 30 06:18:51 2014
@@ -37,7 +37,8 @@ public class ClasspathResourceLocatorStr
{
}
- public ClasspathResourceLocatorStrategy( String tempFilePrefix, String tempFileSuffix, boolean tempFileDeleteOnExit )
+ public ClasspathResourceLocatorStrategy( String tempFilePrefix, String tempFileSuffix,
+ boolean tempFileDeleteOnExit )
{
this.tempFilePrefix = tempFilePrefix;
this.tempFileSuffix = tempFileSuffix;
Modified: maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/FileLocation.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/FileLocation.java?rev=1635400&r1=1635399&r2=1635400&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/FileLocation.java (original)
+++ maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/location/FileLocation.java Thu Oct 30 06:18:51 2014
@@ -67,7 +67,7 @@ public class FileLocation
{
stream.close();
}
- catch( IOException e )
+ catch ( IOException e )
{
// swallow it.
}
Modified: maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java?rev=1635400&r1=1635399&r2=1635400&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java (original)
+++ maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/DefaultMessageHolder.java Thu Oct 30 06:18:51 2014
@@ -29,7 +29,7 @@ public class DefaultMessageHolder
implements MessageHolder
{
- private List messages = new ArrayList();
+ private List<Message> messages = new ArrayList<Message>();
private Message currentMessage;
@@ -149,7 +149,7 @@ public class DefaultMessageHolder
StringBuffer buffer = new StringBuffer();
int counter = 1;
- for ( Iterator it = messages.iterator(); it.hasNext(); )
+ for ( Iterator<Message> it = messages.iterator(); it.hasNext(); )
{
Message message = (Message) it.next();
@@ -364,9 +364,8 @@ public class DefaultMessageHolder
{
int count = 0;
- for ( Iterator it = messages.iterator(); it.hasNext(); )
+ for ( Message message : messages )
{
- Message message = (Message) it.next();
if ( messageLevel == message.getMessageLevel() )
{
count++;
@@ -487,43 +486,34 @@ public class DefaultMessageHolder
public void render( MessageSink sink )
{
- for ( Iterator it = messages.iterator(); it.hasNext(); )
+ for ( Message message : messages )
{
- Message message = (Message) it.next();
-
renderTo( message, sink );
}
}
protected void renderTo( Message message, MessageSink sink )
{
- switch( message.getMessageLevel() )
- {
- case( MessageLevels.LEVEL_SEVERE ):
- {
- sink.severe( message.render().toString() );
- break;
- }
- case( MessageLevels.LEVEL_ERROR ):
- {
- sink.error( message.render().toString() );
- break;
- }
- case( MessageLevels.LEVEL_WARNING ):
- {
- sink.warning( message.render().toString() );
- break;
- }
- case( MessageLevels.LEVEL_INFO ):
+ switch ( message.getMessageLevel() )
{
- sink.info( message.render().toString() );
- break;
- }
- default:
- {
- sink.debug( message.render().toString() );
- break;
- }
+ case ( MessageLevels.LEVEL_SEVERE ):
+ sink.severe( message.render().toString() );
+ break;
+
+ case ( MessageLevels.LEVEL_ERROR ):
+ sink.error( message.render().toString() );
+ break;
+
+ case ( MessageLevels.LEVEL_WARNING ):
+ sink.warning( message.render().toString() );
+ break;
+
+ case ( MessageLevels.LEVEL_INFO ):
+ sink.info( message.render().toString() );
+ break;
+
+ default:
+ sink.debug( message.render().toString() );
}
}
Modified: maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/MessageLevels.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/MessageLevels.java?rev=1635400&r1=1635399&r2=1635400&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/MessageLevels.java (original)
+++ maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/MessageLevels.java Thu Oct 30 06:18:51 2014
@@ -24,7 +24,9 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
+/**
+ *
+ */
public final class MessageLevels
{
@@ -35,11 +37,11 @@ public final class MessageLevels
public static final int LEVEL_SEVERE = 4;
public static final int LEVEL_DISABLED = 5;
- private static final List LEVEL_NAMES;
+ private static final List<String> LEVEL_NAMES;
static
{
- List names = new ArrayList();
+ List<String> names = new ArrayList<String>();
names.add( "DEBUG" );
names.add( "INFO" );
names.add( "WARN" );
@@ -61,21 +63,17 @@ public final class MessageLevels
switch ( maxMessageLevel )
{
- case (LEVEL_DEBUG): {
- states[LEVEL_DEBUG] = true;
- }
- case (LEVEL_INFO): {
- states[LEVEL_INFO] = true;
- }
- case (LEVEL_WARNING): {
- states[LEVEL_WARNING] = true;
- }
- case (LEVEL_ERROR): {
- states[LEVEL_ERROR] = true;
- }
- case (LEVEL_SEVERE): {
- states[LEVEL_SEVERE] = true;
- }
+ case ( LEVEL_DEBUG ):
+ states[LEVEL_DEBUG] = true;
+ case ( LEVEL_INFO ):
+ states[LEVEL_INFO] = true;
+ case ( LEVEL_WARNING ):
+ states[LEVEL_WARNING] = true;
+ case ( LEVEL_ERROR ):
+ states[LEVEL_ERROR] = true;
+ case ( LEVEL_SEVERE ):
+ states[LEVEL_SEVERE] = true;
+ default:
}
return states;
Modified: maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/PlexusLoggerSink.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/PlexusLoggerSink.java?rev=1635400&r1=1635399&r2=1635400&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/PlexusLoggerSink.java (original)
+++ maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/logging/PlexusLoggerSink.java Thu Oct 30 06:18:51 2014
@@ -21,7 +21,9 @@ package org.apache.maven.shared.io.loggi
import org.codehaus.plexus.logging.Logger;
-
+/**
+ *
+ */
public class PlexusLoggerSink
implements MessageSink
{