diff options
| author | cbridgha | 2006-01-20 21:49:35 +0000 |
|---|---|---|
| committer | cbridgha | 2006-01-20 21:49:35 +0000 |
| commit | 7aba3fe11ea7fcb28eb868ac304e0f55782ddc21 (patch) | |
| tree | 4f68cc51b09417661425bed5a36a126e7cea0ad6 /plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration | |
| parent | 5800db329e7b4f02408b3cbd186d43155ed8e67d (diff) | |
| download | webtools.javaee-7aba3fe11ea7fcb28eb868ac304e0f55782ddc21.tar.gz webtools.javaee-7aba3fe11ea7fcb28eb868ac304e0f55782ddc21.tar.xz webtools.javaee-7aba3fe11ea7fcb28eb868ac304e0f55782ddc21.zip | |
[nobug] Synching up 101 Changes to 1.5 stream
Diffstat (limited to 'plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration')
| -rw-r--r-- | plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java index f72f4a351..fa74accfb 100644 --- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java +++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java @@ -22,6 +22,7 @@ import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -144,7 +145,17 @@ public class WTPWorkingCopyManager implements WorkingCopyManager { primDispose(); } }; - runOperation(runnable, null, true); + try { + if (!WTPCommonPlugin.getWorkspace().isTreeLocked()) { + WTPCommonPlugin.getWorkspace().run(runnable,null, IWorkspace.AVOID_UPDATE,null); + } else { + runnable.run(null); + } + } catch (CoreException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //runOperation(runnable, null, true); } public void revert() { |