ruper2/src/java/core/org/krysalis/ruper2/api/tool FileUpdater.java,1.4,1.5

Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/api/tool
In directory sc8-pr-cvs1:/tmp/cvs-serv25339/src/java/core/org/krysalis/ruper2/api/tool

Modified Files:
	FileUpdater.java 
Log Message:
Opps, did it for HTTP input but not File input. Added that.

Index: FileUpdater.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/api/tool/FileUpdater.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileUpdater.java	8 Oct 2003 13:23:24 -0000	1.4
--- FileUpdater.java	9 Oct 2003 21:15:02 -0000	1.5
***************
*** 18,23 ****
  import org.krysalis.ruper2.query.ResourceResult;
  import org.krysalis.ruper2.query.ResourceResultHelper;
- import org.krysalis.ruper2.repository.Repository;
  import org.krysalis.ruper2.repository.IRepository;
  import org.krysalis.ruper2.repository.RepositoryAttribute;
  import org.krysalis.ruper2.repository.RepositoryConstants;
--- 18,23 ----
  import org.krysalis.ruper2.query.ResourceResult;
  import org.krysalis.ruper2.query.ResourceResultHelper;
  import org.krysalis.ruper2.repository.IRepository;
+ import org.krysalis.ruper2.repository.Repository;
  import org.krysalis.ruper2.repository.RepositoryAttribute;
  import org.krysalis.ruper2.repository.RepositoryConstants;
***************
*** 29,32 ****
--- 29,33 ----
  import org.krysalis.ruper2.repository.select.RemoteRepositorySelector;
  import org.krysalis.ruper2.util.RuperConstants;
+ import org.krysalis.ruper2.util.io.ResolvedFile;
  import org.krysalis.ruper2.util.text.MessageConstants;
  import org.krysalis.ruper2.util.text.Messages;
***************
*** 135,146 ****
  
  	public void updateFiles(File file) throws RuperException {
  		//All files in a folder...
  
! 		if (!file.isDirectory()) {
! 			updateFile(file);
  		}
  		else {
  			// We have a folder of files...
! 			File folder = file;
  
  			File[] files = folder.listFiles();
--- 136,150 ----
  
  	public void updateFiles(File file) throws RuperException {
+ 
+ 		ResolvedFile resolved = m_api.resolveFile(file);
+ 
  		//All files in a folder...
  
! 		if (!resolved.isDirectory()) {
! 			updateFile(resolved);
  		}
  		else {
  			// We have a folder of files...
! 			ResolvedFile folder = resolved;
  
  			File[] files = folder.listFiles();
***************
*** 162,167 ****
  
  	public void updateFile(File file) throws RuperException {
! 
! 		File parentFolder =
  			m_api.resolveFile(m_api.resolveFile(file).getParent());
  
--- 166,170 ----
  
  	public void updateFile(File file) throws RuperException {
! 		ResolvedFile parentFolder =
  			m_api.resolveFile(m_api.resolveFile(file).getParent());
  
***************
*** 170,177 ****
  		// 
  		IRepository target =
! 			new Repository(
! 				parentFolder.getAbsolutePath(),
! 				parentFolder,
! 				false);
  
  		updateFile(file, target);
--- 173,177 ----
  		// 
  		IRepository target =
! 			new Repository(parentFolder.getAbsolutePath(), parentFolder, false);
  
  		updateFile(file, target);
***************
*** 296,305 ****
  		ResourceResult result = null;
  
! 		if (!file.isDirectory()) {
! 			result = determineFileUpdates(file);
  		}
  		else {
  			// We have a folder of files...
! 			File folder = file;
  			File[] files = folder.listFiles();
  
--- 296,307 ----
  		ResourceResult result = null;
  
! 		ResolvedFile resolved = m_api.resolveFile(file);
! 
! 		if (!resolved.isDirectory()) {
! 			result = determineFileUpdates(resolved);
  		}
  		else {
  			// We have a folder of files...
! 			File folder = resolved;
  			File[] files = folder.listFiles();
  
***************
*** 321,335 ****
  	public ResourceResult determineFileUpdates(File file)
  		throws RuperException {
  		ResourceRequest request =
  			new ResourceRequest(
  				ResourceQueryHelper.getResourceSpecifierQuery(
  					m_api.getResourceSpecifierForFile(file)));
! 					
! 		if (!file.isDirectory()) {
  			updateFile(file);
  		}
  		else {
  			// We have a folder of files...
! 			File folder = file;
  
  			File[] files = folder.listFiles();
--- 323,340 ----
  	public ResourceResult determineFileUpdates(File file)
  		throws RuperException {
+ 
+ 		ResolvedFile resolved = m_api.resolveFile(file);
+ 
  		ResourceRequest request =
  			new ResourceRequest(
  				ResourceQueryHelper.getResourceSpecifierQuery(
  					m_api.getResourceSpecifierForFile(file)));
! 
! 		if (!resolved.isDirectory()) {
  			updateFile(file);
  		}
  		else {
  			// We have a folder of files...
! 			ResolvedFile folder = resolved;
  
  			File[] files = folder.listFiles();




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php