[eclipse-jbosstools/f19: 26/36] Rebase as-archives.webtools-4.0.0.patch

[Gerard Ryan]

commit 74fff47d0933c068c077ccb68eac24247e3d227a
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Jul 27 01:11:11 2013 +0100

    Rebase as-archives.webtools-4.0.0.patch

 ...pse-jbosstools-as-archives.webtools-4.0.0.patch |   35 ++++++++++++++++---
 1 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/eclipse-jbosstools-as-archives.webtools-4.0.0.patch b/eclipse-jbosstools-as-archives.webtools-4.0.0.patch
index 2ee030e..2f57b06 100644
--- a/eclipse-jbosstools-as-archives.webtools-4.0.0.patch
+++ b/eclipse-jbosstools-as-archives.webtools-4.0.0.patch
@@ -1,5 +1,5 @@
---- jbosstools-server/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java.orig	2013-06-03 11:14:45.000000000 +0100
-+++ jbosstools-server/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java	2013-06-08 21:13:01.977200918 +0100
+--- jbosstools-server/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java.orig	2013-07-27 01:04:45.410224030 +0100
++++ jbosstools-server/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java	2013-07-27 01:07:28.152252086 +0100
 @@ -11,6 +11,8 @@
   ******************************************************************************/ 
  package org.jboss.ide.eclipse.archives.webtools.modules;
@@ -28,6 +28,15 @@
  			IModuleResource[] resources = getResources(last, new NullProgressMonitor());
  			results.addAll(Arrays.asList(copy(root, resources)));
  			TrueZipUtil.umount();
+@@ -253,7 +256,7 @@
+ 			if( module.length == 1 )
+ 				FileUtil.safeDelete(path.toFile(), null);
+ 			
+-			de.schlichtherle.io.File moduleRoot = null;
++			TFile moduleRoot = null;
+ 			if( parent == null ) {
+ 				boolean createWorked = TrueZipUtil.createArchive(path);
+ 				moduleRoot = TrueZipUtil.getFile(path, TrueZipUtil.getJarArchiveDetector());
 @@ -299,7 +302,7 @@
  	
  	protected IStatus[] publishChanges(IServer server, String deployRoot, IModule[] module) {
@@ -64,7 +73,7 @@
  				if( !b )
  					results.add(generateDeleteFailedStatus(f));
  				hasBeenChanged = true;
-@@ -347,7 +355,7 @@
+@@ -347,21 +355,26 @@
  	}
  
  	
@@ -73,7 +82,9 @@
  		ArrayList<IStatus> results = new ArrayList<IStatus>();
  		for( int i = 0; i < children.length; i++ ) {
  			if( children[i] instanceof IModuleFile ) {
-@@ -356,12 +364,17 @@
+ 				IModuleFile mf = (IModuleFile)children[i];
+-				java.io.File source = getFile(mf);
++				File source = getFile(mf);
  				if( source == null )
  					// Can do nothing here. The source doesn't exist.
  					continue;
@@ -82,7 +93,7 @@
 +				TFile destination = getFileInArchive(root, mf.getModuleRelativePath().append(mf.getName()));
 +				boolean b = true;
 +				try {
-+				    TFile tf = new TFile(source, ArchiveDetector.NULL).cp_rp(destination);
++				    TFile tf = new TFile(source, TArchiveDetector.NULL).cp_rp(destination);
 +				    if (!tf.exists()) { b = false; }
 +				} catch (IOException e) { b = false; }
 +
@@ -94,7 +105,19 @@
  				destination.mkdirs();
  				IModuleFolder mf = (IModuleFolder)children[i];
  				results.addAll(Arrays.asList(copy(root, mf.members())));
-@@ -381,7 +394,7 @@
+@@ -371,17 +384,17 @@
+ 		return (IStatus[]) results.toArray(new IStatus[results.size()]);
+ 	}
+ 	
+-	protected IStatus generateDeleteFailedStatus(java.io.File file) {
++	protected IStatus generateDeleteFailedStatus(File file) {
+ 		return new Status(IStatus.ERROR, IntegrationPlugin.PLUGIN_ID, "Could not delete file " + file); //$NON-NLS-1$
+ 	}
+ 	protected IStatus generateCoreExceptionStatus(CoreException ce) {
+ 		return new Status(IStatus.ERROR, IntegrationPlugin.PLUGIN_ID, ce.getMessage(), ce);
+ 	}
+-	protected IStatus generateCopyFailStatus(java.io.File source, java.io.File destination) {
++	protected IStatus generateCopyFailStatus(File source, File destination) {
  		return new Status(IStatus.ERROR, IntegrationPlugin.PLUGIN_ID, "Copy of " + source + " to " + destination + " has failed");//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
  	}