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:33 UTC
[20/21] git commit: Remove dead code (initializers)
Remove dead code (initializers)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5f29be79
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5f29be79
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5f29be79
Branch: refs/heads/master
Commit: 5f29be799fc31ee33f34bc0a793ed35a79cbb2f6
Parents: cefae8d
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Jan 6 11:21:26 2014 +0000
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Jan 6 11:21:26 2014 +0000
----------------------------------------------------------------------
.../apache/maven/repository/internal/RemoteSnapshotMetadata.java | 2 +-
.../apache/maven/repository/legacy/TransferListenerAdapter.java | 2 +-
.../org/apache/maven/repository/metadata/ClasspathContainer.java | 3 +--
.../maven/repository/metadata/DefaultClasspathTransformation.java | 3 +--
.../maven/configuration/internal/DefaultBeanConfigurator.java | 2 +-
.../main/java/org/apache/maven/project/DefaultProjectBuilder.java | 2 +-
.../org/apache/maven/project/DefaultProjectBuildingHelper.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +-
.../org/apache/maven/cli/logging/impl/Log4j2Configuration.java | 2 +-
.../org/apache/maven/cli/logging/impl/LogbackConfiguration.java | 2 +-
.../apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java | 2 +-
12 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
index 60b8749..4494cae 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
@@ -68,7 +68,7 @@ final class RemoteSnapshotMetadata
protected void merge( Metadata recessive )
{
Snapshot snapshot;
- String lastUpdated = "";
+ String lastUpdated;
if ( metadata.getVersioning() == null )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/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 c7c4fd0..b20bd72 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
@@ -67,7 +67,7 @@ public class TransferListenerAdapter
{
ArtifactTransferEvent event = wrap( transferEvent );
- Long transferred = null;
+ Long transferred;
synchronized ( transfers )
{
transferred = transfers.remove( transferEvent.getResource() );
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
index cdf28f6..b0cb5b2 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
@@ -87,11 +87,10 @@ implements Iterable<ArtifactMetadata>
MetadataTreeNode tree = null;
MetadataTreeNode parent = null;
- MetadataTreeNode node = null;
for ( ArtifactMetadata md : classpath )
{
- node = new MetadataTreeNode( md, parent, md.isResolved(), md.getArtifactScope() );
+ MetadataTreeNode node = new MetadataTreeNode( md, parent, md.isResolved(), md.getArtifactScope() );
if ( tree == null )
{
tree = node;
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
index f3f459a..03984fb 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
@@ -70,9 +70,8 @@ public class DefaultClasspathTransformation
{
ClasspathGraphVisitor v = new ClasspathGraphVisitor( cleanGraph, cpc );
MetadataGraphVertex entry = cleanGraph.getEntry();
- ArtifactMetadata md = entry.getMd();
// entry point
- v.visit( entry ); // , md.getVersion(), md.getArtifactUri() );
+ v.visit( entry );
}
return cpc;
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
index e742d88..32b8ae4 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
@@ -69,7 +69,7 @@ public class DefaultBeanConfigurator
return;
}
- PlexusConfiguration plexusConfig = null;
+ PlexusConfiguration plexusConfig;
if ( configuration instanceof PlexusConfiguration )
{
plexusConfig = (PlexusConfiguration) configuration;
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/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 d09cabc..7e2b754 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
@@ -191,7 +191,7 @@ public class DefaultProjectBuilder
private DependencyResolutionResult resolveDependencies( MavenProject project, RepositorySystemSession session )
{
- DependencyResolutionResult resolutionResult = null;
+ DependencyResolutionResult resolutionResult;
try
{
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
index cba7432..58a87fc 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
@@ -166,7 +166,7 @@ public class DefaultProjectBuildingHelper
ProjectBuildingRequest request )
throws PluginResolutionException, PluginVersionResolutionException
{
- ClassRealm projectRealm = null;
+ ClassRealm projectRealm;
List<Plugin> extensionPlugins = new ArrayList<Plugin>();
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index dfa317b..b175031 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -235,7 +235,7 @@ public class CLIManager
int cleanedSz = cleaned.size();
- String[] cleanArgs = null;
+ String[] cleanArgs;
if ( cleanedSz == 0 )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 1c142c4..04c02a3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -389,7 +389,7 @@ public class MavenCli
cliRequest.classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() );
}
- DefaultPlexusContainer container = null;
+ DefaultPlexusContainer container;
ContainerConfiguration cc = new DefaultContainerConfiguration()
.setClassWorld( cliRequest.classWorld )
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
index 7bbc29b..27fae1f 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
@@ -33,7 +33,7 @@ public class Log4j2Configuration
@Override
public void setRootLoggerLevel( Level level )
{
- String value = "info";
+ String value;
switch ( level )
{
case DEBUG:
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
index 62480f6..5d04961 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
@@ -35,7 +35,7 @@ public class LogbackConfiguration
@Override
public void setRootLoggerLevel( Level level )
{
- ch.qos.logback.classic.Level value = ch.qos.logback.classic.Level.INFO;
+ ch.qos.logback.classic.Level value;
switch ( level )
{
case DEBUG:
http://git-wip-us.apache.org/repos/asf/maven/blob/5f29be79/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
index ce7063f..5d12d5a 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
@@ -35,7 +35,7 @@ public class Slf4jSimpleConfiguration
@Override
public void setRootLoggerLevel( Level level )
{
- String value = "info";
+ String value;
switch ( level )
{
case DEBUG: