dion 2004/01/07 07:33:56
Modified: src/bootstrap/org/apache/maven Tag: MAVEN-1_0-BRANCH
Dependency.java BootstrapTask.java
Log:
Code cleanup
Revision Changes Path
No revision
No revision
1.3.10.1 +2 -2 maven/src/bootstrap/org/apache/maven/Dependency.java
Index: Dependency.java
===================================================================
RCS file: /home/cvs/maven/src/bootstrap/org/apache/maven/Dependency.java,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -r1.3 -r1.3.10.1
--- Dependency.java 12 Jan 2003 06:43:21 -0000 1.3
+++ Dependency.java 7 Jan 2004 15:33:56 -0000 1.3.10.1
@@ -319,7 +319,7 @@
protected boolean isValid( String value )
{
if ( value != null
- && value.trim().equals("") == false )
+ && !value.trim().equals("") )
{
return true;
}
1.20.2.1 +11 -11 maven/src/bootstrap/org/apache/maven/BootstrapTask.java
Index: BootstrapTask.java
===================================================================
RCS file: /home/cvs/maven/src/bootstrap/org/apache/maven/BootstrapTask.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- BootstrapTask.java 24 Nov 2003 20:32:37 -0000 1.20
+++ BootstrapTask.java 7 Jan 2004 15:33:56 -0000 1.20.2.1
@@ -303,7 +303,7 @@
List list = new ArrayList();
- for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+ for ( Iterator i = dependencies.iterator(); i.hasNext();)
{
Dependency d = (Dependency) i.next();
@@ -312,7 +312,7 @@
setFiles( list );
// if offline is not set, download dependencies
- if ( "-o".equals( getOnline() ) == false )
+ if ( !"-o".equals( getOnline() ) )
{
downloadDependencies();
}
@@ -355,7 +355,7 @@
batch.print( "if \"%1\"==\"\" goto usage\r\n" );
batch.print( "set REPO_DIR=%1\r\n" );
batch.print( "if \"%MAVEN_HOME%\"==\"\" goto MHusage\r\n" );
- for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+ for ( Iterator i = dependencies.iterator(); i.hasNext();)
{
Dependency d = (Dependency) i.next();
String path = getArtifactPath( d, "/" );
@@ -365,8 +365,8 @@
+ " ]; then mkdir -p $REPO_DIR/"
+ d.getArtifactDirectory()
+ "/jars; cp $MAVEN_HOME/lib/" );
- if ( d.getArtifactDirectory().equals( "xml-apis" ) ||
- d.getArtifactDirectory().equals( "xerces" ) )
+ if ( d.getArtifactDirectory().equals( "xml-apis" )
+ || d.getArtifactDirectory().equals( "xerces" ) )
{
shell.print( "endorsed/" );
}
@@ -378,8 +378,8 @@
"if not exist \"%REPO_DIR%\\"
+ path
+ "\" copy \"%MAVEN_HOME%\\lib\\" );
- if ( d.getArtifactDirectory().equals( "xml-apis" ) ||
- d.getArtifactDirectory().equals( "xerces" ) )
+ if ( d.getArtifactDirectory().equals( "xml-apis" )
+ || d.getArtifactDirectory().equals( "xerces" ) )
{
batch.print( "endorsed\\" );
}
@@ -413,7 +413,7 @@
public void downloadDependencies()
throws BuildException
{
- for ( Iterator j = getFiles().iterator(); j.hasNext(); )
+ for ( Iterator j = getFiles().iterator(); j.hasNext();)
{
try
{
@@ -425,7 +425,7 @@
// not exists so create it if missing.
File directory = destinationFile.getParentFile();
- if ( directory.exists() == false )
+ if ( !directory.exists() )
{
directory.mkdirs();
}
@@ -491,7 +491,7 @@
{
Path classpath = new Path( project );
- for ( Iterator i = list.iterator(); i.hasNext(); )
+ for ( Iterator i = list.iterator(); i.hasNext();)
{
String jar = (String) i.next();
Path p = new Path( project );
@@ -519,7 +519,7 @@
StringBuffer excludesSb = new StringBuffer();
PatternSet patternSet = new PatternSet();
- for ( Iterator i = list.iterator(); i.hasNext(); )
+ for ( Iterator i = list.iterator(); i.hasNext();)
{
String line = (String) i.next();
line = line.trim();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
