You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2014/01/06 12:25:16 UTC

[03/21] git commit: Remove unnecessary unboxing

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/9a559140
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9a559140
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9a559140

Branch: refs/heads/master
Commit: 9a55914061ebc5dc90dd3644c8389c90ea7c91ca
Parents: c30c76e
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Jan 6 10:32:16 2014 +0000
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Jan 6 10:32:16 2014 +0000

----------------------------------------------------------------------
 .../project/interpolation/StringSearchModelInterpolator.java     | 2 +-
 .../apache/maven/repository/legacy/TransferListenerAdapter.java  | 4 ++--
 .../maven/project/inheritance/t02/ProjectInheritanceTest.java    | 4 ++--
 .../java/org/apache/maven/project/DefaultProjectBuilder.java     | 2 +-
 .../apache/maven/cli/transfer/ConsoleMavenTransferListener.java  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/9a559140/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index dcb8e2b..864f57f 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -360,7 +360,7 @@ public class StringSearchModelInterpolator
                 fieldIsPrimitiveByClass.put( fieldType, fieldType.isPrimitive() );
             }
 
-            if ( fieldIsPrimitiveByClass.get( fieldType ).booleanValue() )
+            if ( fieldIsPrimitiveByClass.get( fieldType ) )
             {
                 return false;
             }

http://git-wip-us.apache.org/repos/asf/maven/blob/9a559140/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 497828d..c7c4fd0 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
@@ -114,7 +114,7 @@ public class TransferListenerAdapter
             }
             else
             {
-                transferred = transferred.longValue() + length;
+                transferred = transferred + length;
             }
             transfers.put( transferEvent.getResource(), transferred );
         }
@@ -123,7 +123,7 @@ public class TransferListenerAdapter
         event.setDataBuffer( buffer );
         event.setDataOffset( 0 );
         event.setDataLength( length );
-        event.setTransferredBytes( transferred.longValue() );
+        event.setTransferredBytes( transferred );
 
         listener.transferProgress( event );
     }

http://git-wip-us.apache.org/repos/asf/maven/blob/9a559140/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index 808f8f0..1e40631 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -149,13 +149,13 @@ public class ProjectInheritanceTest
 
                 Integer count = (Integer) validPluginCounts.get( pluginArtifactId );
 
-                if ( count.intValue() > 0 )
+                if ( count > 0 )
                 {
                     fail( "Multiple copies of plugin: " + pluginArtifactId + " found in POM." );
                 }
                 else
                 {
-                    count = count.intValue() + 1;
+                    count = count + 1;
 
                     validPluginCounts.put( pluginArtifactId, count );
                 }

http://git-wip-us.apache.org/repos/asf/maven/blob/9a559140/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index a5abc29..d09cabc 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -654,7 +654,7 @@ public class DefaultProjectBuilder
                 profilesXml = new File( basedir, "profiles.xml" ).exists();
                 profilesXmls.put( basedir, profilesXml );
             }
-            if ( profilesXml.booleanValue() )
+            if ( profilesXml )
             {
                 return modelId;
             }

http://git-wip-us.apache.org/repos/asf/maven/blob/9a559140/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
index bfc84c0..f8911cc 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
@@ -61,7 +61,7 @@ public class ConsoleMavenTransferListener
             // NOTE: This null check guards against http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6312056
             if ( complete != null )
             {
-                buffer.append( getStatus( complete.longValue(), total ) ).append( "  " );
+                buffer.append( getStatus( complete, total ) ).append( "  " );
             }
         }