dlr 2002/10/11 16:15:29
Modified: src/java/org/apache/maven CreateDependencyClasspath.java
Log:
Simplified and optimized execute():
o Moved check of the maven.jar.override property outside of the loop.
o Refactored two lines appending a path to classpath in an "if" tree
into one by moving the append() call outside of the tree.
Revision Changes Path
1.8 +7 -6
jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java
Index: CreateDependencyClasspath.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- CreateDependencyClasspath.java 11 Oct 2002 22:57:08 -0000 1.7
+++ CreateDependencyClasspath.java 11 Oct 2002 23:15:29 -0000 1.8
@@ -167,7 +167,9 @@
mavenProject = (Project) context.getVariable("pom");
}
- Object mavenJarOverride = context.getVariable("maven.jar.override");
+ Object b = context.getVariable("maven.jar.override");
+ boolean mavenJarOverride = (b != null && b instanceof Boolean &&
+ ((Boolean) b).booleanValue());
String mavenRepoLocal =
(String) context.getVariable("maven.repo.local");
org.apache.tools.ant.Project antProject =
@@ -191,8 +193,7 @@
(String) context.getVariable("maven.jar." + d.getId());
Path path = new Path(antProject);
- if ((mavenJarOverride instanceof Boolean
- && ((Boolean) mavenJarOverride).booleanValue())
+ if (mavenJarOverride
&& (mavenJarProperty != null)
&& (mavenJarProperty.length() > 0))
{
@@ -200,15 +201,15 @@
// for the this dependency so override the path with the user
// specified value.
path.setPath(new File(mavenJarProperty).getAbsolutePath());
- classpath.append(path);
}
else
{
Artifact artifact = DefaultArtifactFactory.createArtifact(d);
// Use the jar in the local repository.
path.setPath(mavenRepoLocal + artifact.getPath());
- classpath.append(path);
}
+
+ classpath.append(path);
mavenProject.setDependencyPath(d.getId(), path.toString());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
