You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2013/06/14 10:31:44 UTC
[03/14] git commit: Code cleanup - Maven requires Java 5+ : Remove
unnecessary unboxing
Code cleanup - Maven requires Java 5+ : Remove unnecessary unboxing
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a2897f86
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a2897f86
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a2897f86
Branch: refs/heads/slf4j-log4j2
Commit: a2897f86b3628d1ba8b7fe4a79eef46f2545f13e
Parents: 96db1ab
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 21:47:18 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 21:47:18 2013 +0200
----------------------------------------------------------------------
.../repository/internal/util/ConsoleTransferListener.java | 2 +-
.../maven/artifact/resolver/DefaultArtifactResolver.java | 2 +-
.../src/main/java/org/apache/maven/project/ModelUtils.java | 8 ++++----
.../inheritance/DefaultModelInheritanceAssembler.java | 4 ++--
.../maven/repository/legacy/TransferListenerAdapter.java | 2 +-
.../main/java/org/apache/maven/cli/CLIReportingUtils.java | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
index 1b77d4d..fb44283 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
@@ -69,7 +69,7 @@ public class ConsoleTransferListener
for ( Map.Entry<TransferResource, Long> entry : downloads.entrySet() )
{
long total = entry.getKey().getContentLength();
- long complete = entry.getValue().longValue();
+ long complete = entry.getValue();
buffer.append( getStatus( complete, total ) ).append( " " );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 9a9b31a..fff16e0 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -101,7 +101,7 @@ public class DefaultArtifactResolver
public DefaultArtifactResolver()
{
- int threads = Integer.getInteger( "maven.artifact.threads", 5 ).intValue();
+ int threads = Integer.getInteger( "maven.artifact.threads", 5 );
if ( threads <= 1 )
{
executor = new Executor()
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
index 758c78f..92b5eb9 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
@@ -75,7 +75,7 @@ public final class ModelUtils
String inherited = plugin.getInherited();
- if ( ( inherited != null ) && !Boolean.valueOf( inherited ).booleanValue() )
+ if ( ( inherited != null ) && !Boolean.valueOf( inherited ) )
{
it.remove();
}
@@ -96,7 +96,7 @@ public final class ModelUtils
// 2. the parent's <inherited/> flag is not set
// 3. the parent's <inherited/> flag is set to true
if ( !handleAsInheritance || ( parentInherited == null )
- || Boolean.valueOf( parentInherited ).booleanValue() )
+ || Boolean.valueOf( parentInherited ) )
{
Plugin childPlugin = (Plugin) childPlugins.get( parentPlugin.getKey() );
@@ -216,7 +216,7 @@ public final class ModelUtils
// from here to the end of the method is dealing with merging of the <executions/> section.
String parentInherited = parent.getInherited();
- boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ).booleanValue();
+ boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited );
List<PluginExecution> parentExecutions = parent.getExecutions();
@@ -233,7 +233,7 @@ public final class ModelUtils
String inherited = parentExecution.getInherited();
boolean parentExecInherited =
- parentIsInherited && ( ( inherited == null ) || Boolean.valueOf( inherited ).booleanValue() );
+ parentIsInherited && ( ( inherited == null ) || Boolean.valueOf( inherited ) );
if ( !handleAsInheritance || parentExecInherited )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index b16e389..85f7526 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -389,7 +389,7 @@ public class DefaultModelInheritanceAssembler
String parentInherited = parentPlugin.getInherited();
if ( !handleAsInheritance || ( parentInherited == null )
- || Boolean.valueOf( parentInherited ).booleanValue() )
+ || Boolean.valueOf( parentInherited ) )
{
ReportPlugin assembledPlugin = parentPlugin;
@@ -481,7 +481,7 @@ public class DefaultModelInheritanceAssembler
// from here to the end of the method is dealing with merging of the <executions/> section.
String parentInherited = parent.getInherited();
- boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ).booleanValue();
+ boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited );
List parentReportSets = parent.getReportSets();
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
index d6836cb..497828d 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
@@ -74,7 +74,7 @@ public class TransferListenerAdapter
}
if ( transferred != null )
{
- event.setTransferredBytes( transferred.longValue() );
+ event.setTransferredBytes( transferred );
}
synchronized ( artifacts )
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 6173959..0ed30dc 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -87,7 +87,7 @@ public final class CLIReportingUtils
if ( timestamp != null )
{
SimpleDateFormat fmt = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ssZ" );
- String ts = fmt.format( new Date( Long.valueOf( timestamp ).longValue() ) );
+ String ts = fmt.format( new Date( Long.valueOf( timestamp ) ) );
msg += ( rev != null ? "; " : "" ) + ts;
}
msg += ")";