Author: hboutemy
Date: Fri Sep 28 18:02:20 2012
New Revision: 1391579
URL: http://svn.apache.org/viewvc?rev=1391579&view=rev
Log:
added generics
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ExecutionPlanItemTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ThreadOutputMuxerTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -13,8 +15,6 @@
* the License.
*/
-package org.apache.maven.lifecycle.internal;
-
import junit.framework.TestCase;
import org.apache.maven.execution.MavenSession;
import
org.apache.maven.lifecycle.internal.stub.LifecycleTaskSegmentCalculatorStub;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -13,8 +15,6 @@
* the License.
*/
-package org.apache.maven.lifecycle.internal;
-
import junit.framework.TestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -12,7 +14,6 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.maven.lifecycle.internal;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ProjectDependencyGraph;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ExecutionPlanItemTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ExecutionPlanItemTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ExecutionPlanItemTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ExecutionPlanItemTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -12,7 +14,6 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.maven.lifecycle.internal;
import junit.framework.TestCase;
import org.apache.maven.lifecycle.Schedule;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -13,10 +15,6 @@
* the License.
*/
-package org.apache.maven.lifecycle.internal;
-
-import java.io.File;
-
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.MavenExecutionPlan;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -12,7 +14,6 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.maven.lifecycle.internal;
import junit.framework.TestCase;
import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -41,7 +42,7 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
/**
- * @author Kristian Rosenvold>
+ * @author Kristian Rosenvold
*/
public class LifecycleWeaveBuilderTest
extends TestCase
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
Fri Sep 28 18:02:20 2012
@@ -1,4 +1,5 @@
package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -13,6 +14,7 @@ package org.apache.maven.lifecycle.inter
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
+
import junit.framework.TestCase;
import org.apache.maven.lifecycle.MavenExecutionPlan;
import
org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -12,7 +14,6 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.maven.lifecycle.internal;
import junit.framework.TestCase;
import org.apache.maven.execution.MavenSession;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ThreadOutputMuxerTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ThreadOutputMuxerTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ThreadOutputMuxerTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ThreadOutputMuxerTest.java
Fri Sep 28 18:02:20 2012
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
* agreements. See the NOTICE file distributed with this work for additional
information regarding
@@ -12,7 +14,6 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.maven.lifecycle.internal;
import junit.framework.TestCase;
import org.apache.maven.execution.MavenSession;
@@ -94,7 +95,6 @@ public class ThreadOutputMuxerTest
Arrays.asList( "Thinkin", "of", "a", "master", "plan", "Cuz",
"ainât", "nuthin", "but", "sweat", "inside",
"my", "hand" );
Iterator<String> lyrics = stringList.iterator();
- List<Outputter> outputters = new ArrayList<Outputter>();
ExecutorService executor = Executors.newFixedThreadPool( 10 );
CompletionService<ProjectSegment> service = new
ExecutorCompletionService<ProjectSegment>( executor );
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
Fri Sep 28 18:02:20 2012
@@ -26,11 +26,10 @@ import org.apache.maven.artifact.metadat
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.codehaus.plexus.component.annotations.Component;
-@Component(role=ArtifactMetadataSource.class,hint="classpath")
+@Component( role = ArtifactMetadataSource.class, hint = "classpath" )
public class TestMetadataSource
extends MavenMetadataSource
{
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
Fri Sep 28 18:02:20 2012
@@ -20,7 +20,6 @@ package org.apache.maven.project.canonic
*/
import java.io.File;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.model.Plugin;
@@ -52,17 +51,15 @@ public class CanonicalProjectBuilderTest
// Plugins
//
----------------------------------------------------------------------
- List plugins = project.getBuildPlugins();
+ List<Plugin> plugins = project.getBuildPlugins();
// Plugin0 [plexus]
String key = "org.apache.maven.plugins:maven-plexus-plugin";
Plugin plugin = null;
- for ( Iterator it = plugins.iterator(); it.hasNext(); )
+ for ( Plugin check : plugins )
{
- Plugin check = (Plugin) it.next();
-
if ( key.equals( check.getKey() ) )
{
plugin = check;
@@ -87,7 +84,7 @@ public class CanonicalProjectBuilderTest
// Goal specific configuration
//
----------------------------------------------------------------------
- List executions = plugin.getExecutions();
+ List<PluginExecution> executions = plugin.getExecutions();
PluginExecution execution = (PluginExecution) executions.get( 0 );
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java?rev=1391579&r1=1391578&r2=1391579&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
Fri Sep 28 18:02:20 2012
@@ -41,7 +41,7 @@ public class SettingsUtilsTest
SettingsUtils.merge( dominant, recessive, Settings.GLOBAL_LEVEL );
- List pluginGroups = dominant.getPluginGroups();
+ List<String> pluginGroups = dominant.getPluginGroups();
assertNotNull( pluginGroups );
assertEquals( 3, pluginGroups.size() );
