Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Chen2012-04-09 15:25:12 +0000
committerWilliam Chen2012-04-09 15:25:12 +0000
commit62bf542e21b5cf46f6c4c1b89d0d0631becafb9e (patch)
treeca4ca326d0b29bc4c3859b0deec58b9336005bed /target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core
parent1a4b7b02460ce19d408f2bb5a12e02152702cec3 (diff)
downloadorg.eclipse.tcf-62bf542e21b5cf46f6c4c1b89d0d0631becafb9e.tar.gz
org.eclipse.tcf-62bf542e21b5cf46f6c4c1b89d0d0631becafb9e.tar.xz
org.eclipse.tcf-62bf542e21b5cf46f6c4c1b89d0d0631becafb9e.zip
Target Explorer: Don't close the editor when its target file is closed
(Let the end user decide what to do with it).
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java7
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java14
2 files changed, 2 insertions, 19 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java
index ccc0d7432..3b4f9b6f6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/OpRename.java
@@ -100,11 +100,8 @@ public class OpRename extends Operation {
}
else {
final File file = CacheManager.getInstance().getCacheFile(node);
- if (file.exists()) {
- if (node.isFile()) {
- closeEditor(file);
- PersistenceManager.getInstance().removeBaseTimestamp(node.getLocationURI());
- }
+ if (node.isFile() && file.exists()) {
+ PersistenceManager.getInstance().removeBaseTimestamp(node.getLocationURI());
}
deleteFileChecked(file);
node.setName(newName);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java
index 7ed2bc3e3..aada39980 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.core/src/org/eclipse/tcf/te/tcf/filesystem/core/internal/operations/Operation.java
@@ -135,26 +135,12 @@ public class Operation implements IOperation {
}
/**
- * Close the editor that opens the specified file.
- * <p>
- * <b>Note:</b> The method must be called within the UI thread.
- *
- * @param file The file that is opened.
- */
- protected void closeEditor(File file) {
- // TODO Adding code to close editor.
- }
-
- /**
* Clean up the file node after moving, deleting or copying.
*
* @param node the file node that is to be cleaned.
*/
protected void cleanUpFile(FSTreeNode node) {
final File file = CacheManager.getInstance().getCacheFile(node);
- if (file.exists()) {
- closeEditor(file);
- }
deleteFileChecked(file);
PersistenceManager.getInstance().removeBaseTimestamp(node.getLocationURI());
FSTreeNode parent = node.parent;

Back to the top