centipede2/src/java/org/krysalis/centipede2/ant ImportAntletTask.java,1.5,1.6

Update of /cvsroot/metamorphosis/centipede2/src/java/org/krysalis/centipede2/ant
In directory sc8-pr-cvs1:/tmp/cvs-serv4477/src/java/org/krysalis/centipede2/ant

Modified Files:
	ImportAntletTask.java 
Log Message:
Format

Index: ImportAntletTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/centipede2/src/java/org/krysalis/centipede2/ant/ImportAntletTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ImportAntletTask.java	22 Jan 2004 07:55:41 -0000	1.5
--- ImportAntletTask.java	22 Jan 2004 07:55:58 -0000	1.6
***************
*** 54,59 ****
  		try {
  			antlet = getAntletFile();
! 		}
! 		catch (IOException ioe) {
  			throw new BuildException(
  				"Failed to get antlet [" + name + "]",
--- 54,58 ----
  		try {
  			antlet = getAntletFile();
! 		} catch (IOException ioe) {
  			throw new BuildException(
  				"Failed to get antlet [" + name + "]",
***************
*** 77,84 ****
  		File localAntlet = getLocalAntletFile();
  
! 		if (!localAntlet.exists()){
! 		downloadAntlet(localAntlet);
  		}
! 		if (!localAntlet.exists()){
  			throw new BuildException(
  				"Failed to locate (or download) antlet: ["
--- 76,83 ----
  		File localAntlet = getLocalAntletFile();
  
! 		if (!localAntlet.exists()) {
! 			downloadAntlet(localAntlet);
  		}
! 		if (!localAntlet.exists()) {
  			throw new BuildException(
  				"Failed to locate (or download) antlet: ["
***************
*** 86,90 ****
  					+ "]"
  					+ localAntlet.getAbsolutePath());
! 			}
  		return localAntlet;
  	}
--- 85,89 ----
  					+ "]"
  					+ localAntlet.getAbsolutePath());
! 		}
  		return localAntlet;
  	}
***************
*** 106,115 ****
  			getTask.setIgnoreErrors(true);
  			getTask.execute();
! 		}
! 		else if (null != file) {
  			// :TODO: Do we want to copy (from network share maybe)
! 			// or just use where is? Latter might be nice if 
! 			// disconnected from network 
! 			
  			//	Transfer to copy the antlet..
  			copyTask.setLocation(getLocation());
--- 105,113 ----
  			getTask.setIgnoreErrors(true);
  			getTask.execute();
! 		} else if (null != file) {
  			// :TODO: Do we want to copy (from network share maybe)
! 			// or just use where is? Latter might be nice if
! 			// disconnected from network
! 
  			//	Transfer to copy the antlet..
  			copyTask.setLocation(getLocation());
***************
*** 193,198 ****
  			if (!antletDir.exists())
  				antletDir.mkdirs();
! 		}
! 		else
  			throw new BuildException("Property ${ant.home} needs to be set.");
  
--- 191,195 ----
  			if (!antletDir.exists())
  				antletDir.mkdirs();
! 		} else
  			throw new BuildException("Property ${ant.home} needs to be set.");
  




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn