Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Jongman2012-12-10 15:24:14 +0000
committerWim Jongman2012-12-10 15:24:14 +0000
commite8bb11ef0187ff969cc323a222b7fd9a86c0f15b (patch)
tree4ec183e0d0edba9788fae9006abe4932d6b9058e
parentda4bd0b707b9fe341d5e38cb2f9b18c02e591436 (diff)
downloadorg.eclipse.e4.tools-e8bb11ef0187ff969cc323a222b7fd9a86c0f15b.tar.gz
org.eclipse.e4.tools-e8bb11ef0187ff969cc323a222b7fd9a86c0f15b.tar.xz
org.eclipse.e4.tools-e8bb11ef0187ff969cc323a222b7fd9a86c0f15b.zip
Undo model reload after change. This caused the tree to collapse when
save was pressed in the model editor. bug 396159: CTRL+S closes the model tree https://bugs.eclipse.org/bugs/show_bug.cgi?id=396159
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java31
1 files changed, 15 insertions, 16 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index 136d751f..bb9600d5 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -13,7 +13,6 @@
******************************************************************************/
package org.eclipse.e4.tools.emf.ui.internal.wbm;
-import java.io.IOException;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
@@ -110,21 +109,21 @@ public class ApplicationModelEditor extends ModelEditor {
hidePart(true);
}
- if (delta.getKind() == IResourceDelta.CHANGED) {
- try {
- resource.unload();
- resource.load(null);
- // must be done in ui thread because of databinding
- sync.syncExec(new Runnable() {
- public void run() {
- getModelProvider().replaceRoot(resource.getContents().get(0));
- getModelProvider().save(); // avoids dirty state
- }
- });
- } catch (IOException e) {
- statusDialog(e);
- }
- }
+ // if (delta.getKind() == IResourceDelta.CHANGED) {
+ // try {
+ // resource.unload();
+ // resource.load(null);
+ // // must be done in ui thread because of databinding
+ // sync.syncExec(new Runnable() {
+ // public void run() {
+ // getModelProvider().replaceRoot(resource.getContents().get(0));
+ // // getModelProvider().save(); // avoids dirty state
+ // }
+ // });
+ // } catch (IOException e) {
+ // statusDialog(e);
+ // }
+ // }
}
private void hidePart(boolean force) {

Back to the top