Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-07-05 16:56:04 +0000
committerHenrik Rentz-Reichert2011-07-05 16:56:04 +0000
commit1ce48ea0301a772423198ac02d41de86c6b60ffd (patch)
tree300978aa5b7b263ef8878c3e22bbaec069d00595
parent08739406f0927b71bad9c6ec98bd599f1a59cb20 (diff)
downloadorg.eclipse.etrice-1ce48ea0301a772423198ac02d41de86c6b60ffd.tar.gz
org.eclipse.etrice-1ce48ea0301a772423198ac02d41de86c6b60ffd.tar.xz
org.eclipse.etrice-1ce48ea0301a772423198ac02d41de86c6b60ffd.zip
[ui.behavior] fix in save method of diagram editor
and removed redundant code (was incomplete and is implemented with a listener in the base class)
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java5
-rw-r--r--plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java2
2 files changed, 1 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java
index 151df5056..025b4b31c 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.etrice.core.room.ActorClass;
@@ -51,10 +50,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
protected void initializeGraphicalViewer() {
super.initializeGraphicalViewer();
- ResourceSet rs = getEditingDomain().getResourceSet();
- if (rs.getResources().size()>1)
- rs.getResources().get(1).setTrackingModification(true);
-
Command cmd = new RecordingCommand(getEditingDomain()) {
@Override
protected void doExecute() {
diff --git a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java
index afa3532c3..5779a4b92 100644
--- a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java
+++ b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java
@@ -89,7 +89,7 @@ public class RoomDiagramEditor extends DiagramEditor {
XtextResource xres = (XtextResource) res;
ISerializer serializer = xres.getSerializer();
- if (!xres.getContents().isEmpty()) {
+ if (xres.getContents().isEmpty()) {
MessageDialog.openError(Display.getDefault().getActiveShell(), "ERROR", "Internal error: part of textual model is empty, can't save");
return;
}

Back to the top