diff options
author | Dani Megert | 2008-08-28 15:55:21 +0000 |
---|---|---|
committer | Dani Megert | 2008-08-28 15:55:21 +0000 |
commit | d932cf173c9f6a76f1186969fba7ce93c5c17d31 (patch) | |
tree | 3cb9e7e5ba88d130a7d4f9f630a39fb35553d463 | |
parent | c674e6f0c989f762962141b0cec261eb579e7ddd (diff) | |
download | eclipse.platform.text-R3_2_maintenance.tar.gz eclipse.platform.text-R3_2_maintenance.tar.xz eclipse.platform.text-R3_2_maintenance.zip |
Backported fix for bug 184860.ies_v20080828R3_2_maintenance
-rw-r--r-- | org.eclipse.core.filebuffers/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF b/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF index 28e14151153..810e7e4d344 100644 --- a/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF +++ b/org.eclipse.core.filebuffers/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.filebuffers; singleton:=true -Bundle-Version: 3.2.1.qualifier +Bundle-Version: 3.2.2.qualifier Bundle-Activator: org.eclipse.core.internal.filebuffers.FileBuffersPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java index edcf50bc0ed..a664e5e9e0a 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java @@ -128,9 +128,10 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { if (delta != null && fIsInstalled) { SafeFileChange fileChange= null; + final int flags= delta.getFlags(); switch (delta.getKind()) { case IResourceDelta.CHANGED: - if ((IResourceDelta.ENCODING & delta.getFlags()) != 0) { + if ((IResourceDelta.ENCODING & flags) != 0) { if (!isDisconnected() && !fCanBeSaved && isSynchronized()) { fileChange= new SafeFileChange() { protected void execute() throws Exception { @@ -139,8 +140,8 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { }; } } - if (fileChange == null && (IResourceDelta.CONTENT & delta.getFlags()) != 0) { - if (!isDisconnected() && !fCanBeSaved && !isSynchronized()) { + if (fileChange == null && (IResourceDelta.CONTENT & flags) != 0) { + if (!isDisconnected() && !fCanBeSaved && (!isSynchronized() || (IResourceDelta.REPLACED & flags) != 0)) { fileChange= new SafeFileChange() { protected void execute() throws Exception { handleFileContentChanged(false); @@ -150,7 +151,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer { } break; case IResourceDelta.REMOVED: - if ((IResourceDelta.MOVED_TO & delta.getFlags()) != 0) { + if ((IResourceDelta.MOVED_TO & flags) != 0) { final IPath path= delta.getMovedToPath(); fileChange= new SafeFileChange() { protected void execute() throws Exception { |