Author: baerrach
Date: Fri Sep 23 00:35:53 2011
New Revision: 1174465
URL: http://svn.apache.org/viewvc?rev=1174465&view=rev
Log:
Cleaned up eclipse warnings of unused code/use of deprecated code.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriterTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=1174465&r1=1174464&r2=1174465&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Fri Sep 23 00:35:53 2011
@@ -1357,7 +1357,6 @@ public class EclipsePlugin
config.setProjectnatures( projectnatures );
config.setProjectFacets( additionalProjectFacets );
config.setSourceDirs( sourceDirs );
- config.setAddVersionToProjectName( isAddVersionToProjectName() );
config.setPackaging( packaging );
config.setLinkedResources( linkedResources );
config.setClasspathContainersLast( classpathContainersLast );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=1174465&r1=1174464&r2=1174465&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Fri Sep 23 00:35:53 2011
@@ -447,12 +447,6 @@ public class IdeUtils
return getProjectName( template, project.getGroupId(),
project.getArtifactId(), project.getVersion() );
}
- private static String getProjectName( IdeDependency dep, boolean
addVersionToProjectName )
- {
- return getProjectName( addVersionToProjectName ?
PROJECT_NAME_WITH_VERSION_TEMPLATE
- : PROJECT_NAME_DEFAULT_TEMPLATE, dep );
- }
-
public static String getProjectName( MavenProject project, boolean
addVersionToProjectName )
{
return getProjectName( addVersionToProjectName ?
PROJECT_NAME_WITH_VERSION_TEMPLATE
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=1174465&r1=1174464&r2=1174465&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Fri Sep 23 00:35:53 2011
@@ -30,8 +30,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Map.Entry;
+import java.util.Properties;
import junit.framework.AssertionFailedError;
@@ -55,7 +55,6 @@ import org.apache.maven.shared.invoker.I
import org.apache.maven.shared.test.plugin.BuildTool;
import org.apache.maven.shared.test.plugin.PluginTestTool;
import org.apache.maven.shared.test.plugin.ProjectTool;
-import org.apache.maven.shared.test.plugin.RepositoryTool;
import org.apache.maven.shared.test.plugin.TestToolsException;
import org.codehaus.classworlds.ClassRealm;
import org.codehaus.plexus.PlexusContainer;
@@ -82,8 +81,6 @@ public abstract class AbstractEclipsePlu
private ProjectTool projectTool;
- private RepositoryTool repositoryTool;
-
/**
* Test repository directory.
*/
@@ -145,8 +142,6 @@ public abstract class AbstractEclipsePlu
projectTool = (ProjectTool) lookup( ProjectTool.ROLE, "default" );
- repositoryTool = (RepositoryTool) lookup( RepositoryTool.ROLE,
"default" );
-
String mavenHome = System.getProperty( "maven.home" );
// maven.home is set by surefire when the test is run with maven, but
better make the test
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriterTest.java?rev=1174465&r1=1174464&r2=1174465&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriterTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriterTest.java
Fri Sep 23 00:35:53 2011
@@ -129,7 +129,6 @@ public class EclipseProjectWriterTest
reader = new InputStreamReader( new FileInputStream( dotProject ),
"UTF-8" );
Xpp3Dom linkedResourcesElement1 = dom.getChild( "linkedResources" );
assertNotNull( "No linkedResources present", linkedResourcesElement1 );
- Xpp3Dom[] currentLinks = linkedResourcesElement.getChildren( "link" );
String currentName = existingLinks[0].getChild( "name" ).getValue();
String currentType = existingLinks[0].getChild( "type" ).getValue();
String currentLocation = existingLinks[0].getChild( "location"
).getValue();
