Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsgibly2006-08-01 07:54:17 -0400
committersgibly2006-08-01 07:54:17 -0400
commitac34fca79cd558d634d3a716d09f5e4707fb849b (patch)
tree63bec38ae312bd8e6e34757c2a47454ad73fdfdb
parent0081be8221c1748d3358e242b64619956967d00b (diff)
downloadorg.eclipse.pdt-ac34fca79cd558d634d3a716d09f5e4707fb849b.tar.gz
org.eclipse.pdt-ac34fca79cd558d634d3a716d09f5e4707fb849b.tar.xz
org.eclipse.pdt-ac34fca79cd558d634d3a716d09f5e4707fb849b.zip
Fix a deploy issue - Inner folders copied resource that should be ignored (such as .svn).PHP_IDE_0_2_2_20060801
-rw-r--r--plugins/org.eclipse.php.server.core/src/org/eclipse/php/server/core/deploy/FileUtil.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.php.server.core/src/org/eclipse/php/server/core/deploy/FileUtil.java b/plugins/org.eclipse.php.server.core/src/org/eclipse/php/server/core/deploy/FileUtil.java
index 109bb8fd3..d3d4a686a 100644
--- a/plugins/org.eclipse.php.server.core/src/org/eclipse/php/server/core/deploy/FileUtil.java
+++ b/plugins/org.eclipse.php.server.core/src/org/eclipse/php/server/core/deploy/FileUtil.java
@@ -322,7 +322,8 @@ public class FileUtil {
monitor.done();
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- ErrorDialog.openError(Display.getDefault().getActiveShell(), PHPServerCoreMessages.getString("FileUtil.publishError"), PHPServerCoreMessages.getString("FileUtil.serverPublishError"), new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, PHPServerCoreMessages.getString("FileUtil.writePermissionError"), null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ ErrorDialog.openError(Display.getDefault().getActiveShell(),
+ PHPServerCoreMessages.getString("FileUtil.publishError"), PHPServerCoreMessages.getString("FileUtil.serverPublishError"), new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, PHPServerCoreMessages.getString("FileUtil.writePermissionError"), null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
});
return false;
@@ -370,7 +371,7 @@ public class FileUtil {
monitor.worked(dw);
} else if (current.isDirectory()) {
monitor.subTask(NLS.bind(PHPServerCoreMessages.getString("FileUtil.copying"), new String[] { fromFile, toFile })); //$NON-NLS-1$
- if (!smartCopyDirectory(fromFile, toFile, ProgressUtil.getSubMonitorFor(monitor, dw))) {
+ if (!smartCopyDirectory(fromFile, toFile, ignoredResources, timeDifference, ProgressUtil.getSubMonitorFor(monitor, dw))) {
monitor.done();
return false;
}

Back to the top