[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/update UpdateUtilImpl.java, 1.31, 1.32

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/update
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26367/app/src/net/sourceforge/squirrel_sql/client/update

Modified Files:
	UpdateUtilImpl.java 
Log Message:
Fixed test; reduce dup code.

Index: UpdateUtilImpl.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** UpdateUtilImpl.java	21 Mar 2009 16:40:36 -0000	1.31
--- UpdateUtilImpl.java	21 Mar 2009 18:34:17 -0000	1.32
***************
*** 332,341 ****
  	public void copyDir(FileWrapper fromDir, FileWrapper toDir) throws FileNotFoundException, IOException
  	{
! 		if (!fromDir.isDirectory()) { throw new IllegalArgumentException("Expected fromDir("
! 			+ fromDir.getAbsolutePath() + ") to be a directory."); }
  		FileWrapper[] files = fromDir.listFiles();
  		copyFiles(Arrays.asList(files), toDir);
  	}
  
  	/**
  	 * @see net.sourceforge.squirrel_sql.client.update.UpdateUtil#copyDir(
--- 332,347 ----
  	public void copyDir(FileWrapper fromDir, FileWrapper toDir) throws FileNotFoundException, IOException
  	{
! 		verifyDirectory(fromDir, toDir);
  		FileWrapper[] files = fromDir.listFiles();
  		copyFiles(Arrays.asList(files), toDir);
  	}
  
+ 	private void verifyDirectory(FileWrapper fromDir, FileWrapper toDir) {
+ 		if (!fromDir.isDirectory()) { throw new IllegalArgumentException("Expected fromDir("
+ 			+ fromDir.getAbsolutePath() + ") to be a directory."); }
+ 		if (!toDir.isDirectory()) { throw new IllegalArgumentException("Expected toDir("
+ 			+ toDir.getAbsolutePath() + ") to be a directory."); }		
+ 	}
+ 	
  	/**
  	 * @see net.sourceforge.squirrel_sql.client.update.UpdateUtil#copyDir(
***************
*** 350,356 ****
  			throw new IllegalArgumentException("filePattern arg cannot be empty or null");
  		}
! 		if (!fromDir.isDirectory()) { throw new IllegalArgumentException("Expected fromDir("
! 			+ fromDir.getAbsolutePath() + ") to be a directory."); }
! 		
  		List<FileWrapper> filesToCopy = getFilterFileList(fromDir, filePattern, matchPattern);		
  		copyFiles(filesToCopy, toDir);
--- 356,360 ----
  			throw new IllegalArgumentException("filePattern arg cannot be empty or null");
  		}
! 		verifyDirectory(fromDir, toDir);
  		List<FileWrapper> filesToCopy = getFilterFileList(fromDir, filePattern, matchPattern);		
  		copyFiles(filesToCopy, toDir);
***************
*** 390,400 ****
  	}
  	
! 	
  	private void copyFiles(List<FileWrapper> files, FileWrapper toDir) 
  		throws FileNotFoundException, IOException 
! 	{
! 		if (!toDir.isDirectory()) { throw new IllegalArgumentException("Expected toDir("
! 			+ toDir.getAbsolutePath() + ") to be a directory."); }
! 		
  		for (FileWrapper sourceFile : files)
  		{
--- 394,407 ----
  	}
  	
! 	/**
! 	 * Expects the toDir to be a directory.  This check should be made in the public method.
! 	 * @param files
! 	 * @param toDir
! 	 * @throws FileNotFoundException
! 	 * @throws IOException
! 	 */
  	private void copyFiles(List<FileWrapper> files, FileWrapper toDir) 
  		throws FileNotFoundException, IOException 
! 	{		
  		for (FileWrapper sourceFile : files)
  		{