Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-05-15 14:10:27 +0000
committerMichael Valenta2007-05-15 14:10:27 +0000
commitc2047206dc82bf5ae63e95bc0caeaef8cfdafd7d (patch)
tree48a6c4c711fd3addd6b1244624773726b0426052 /examples
parenta8a9bfefc07a47b06943c8cfd0bb61fabbb58b47 (diff)
downloadeclipse.platform.team-c2047206dc82bf5ae63e95bc0caeaef8cfdafd7d.tar.gz
eclipse.platform.team-c2047206dc82bf5ae63e95bc0caeaef8cfdafd7d.tar.xz
eclipse.platform.team-c2047206dc82bf5ae63e95bc0caeaef8cfdafd7d.zip
Bug 181141 [Examples] Team: filesystem provider example can not handle deletions
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java
index 240ca08c1..543ef42f9 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemOperations.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Andreas Voss <av@tonbeller.com> - Bug 181141 [Examples] Team: filesystem provider example can not handle deletions
*******************************************************************************/
package org.eclipse.team.examples.filesystem;
@@ -261,6 +262,7 @@ public class FileSystemOperations {
try {
localFile.delete(false, true, progress);
synchronizer.flush(localFile, IResource.DEPTH_ZERO);
+ return;
} catch (CoreException e) {
throw TeamException.asTeamException(e);
}
@@ -271,6 +273,7 @@ public class FileSystemOperations {
&& comparator.compare(base, remote)) {
// The base and remote are the same and there's no local changes
// so nothing needs to be done
+ return;
}
try {
//Copy from the local file to the remote file:
@@ -316,7 +319,7 @@ public class FileSystemOperations {
/**
* Put the file if the sync state allows it.
* @param localFile the local file
- * @param overrideIncoming whether incoming changs shoudl be overwritten
+ * @param overrideIncoming whether incoming changes should be overwritten
* @param progress a progress monitor
* @return whether the put succeeded (i.e. the local matches the remote)
* @throws TeamException

Back to the top