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 2007/11/21 23:10:23 UTC
svn commit: r597229 -
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Author: aheritier
Date: Wed Nov 21 14:10:22 2007
New Revision: 597229
URL: http://svn.apache.org/viewvc?rev=597229&view=rev
Log:
Remove unused vars
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java?rev=597229&r1=597228&r2=597229&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java Wed Nov 21 14:10:22 2007
@@ -148,7 +148,8 @@
{
// No JEE dependency detected. Try to resolve the JEE
// version from SERVLET.
- JeeDescriptor descriptor = getJeeDescriptorFromServletVersion( findServletVersionInDependencies( artifacts ) );
+ JeeDescriptor descriptor =
+ getJeeDescriptorFromServletVersion( findServletVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getJeeVersion();
}
@@ -187,7 +188,8 @@
{
// No jsp dependency detected. Try to resolve the jsp
// version from Servlet.
- JeeDescriptor descriptor = getJeeDescriptorFromServletVersion( findServletVersionInDependencies( artifacts ) );
+ JeeDescriptor descriptor =
+ getJeeDescriptorFromServletVersion( findServletVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getJspVersion();
}
@@ -246,9 +248,8 @@
private static String findJeeVersionInDependencies( IdeDependency[] artifacts )
{
- String[] artifactIds = new String[] { "javaee-api", "j2ee", "geronimo-spec-j2ee" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- String version = IdeUtils.getArtifactVersion( artifactIds, artifacts, 3 );
+ String version =
+ IdeUtils.getArtifactVersion( new String[] { "javaee-api", "j2ee", "geronimo-spec-j2ee" }, artifacts, 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of the spec
if ( version == null )
@@ -267,9 +268,9 @@
private static String findServletVersionInDependencies( IdeDependency[] artifacts )
{
- String[] artifactIds = new String[] { "servlet-api", "servletapi", "geronimo-spec-servlet" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- String version = IdeUtils.getArtifactVersion( artifactIds, artifacts, 3 );
+ String version =
+ IdeUtils.getArtifactVersion( new String[] { "servlet-api", "servletapi", "geronimo-spec-servlet" },
+ artifacts, 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of the spec
if ( version == null )