From ecc96202d41f697201ee7ba49cbf85faf74a62b9 Mon Sep 17 00:00:00 2001
From: Juergen Haug
Date: Mon, 17 Jul 2017 13:51:57 +0200
Subject: [ui] fixed error markers after diagram creation
Change-Id: I51ccdafb4ba4205ff81245700e5efb728fa89d49
---
plugins/org.eclipse.etrice.ui.behavior/plugin.xml | 2 +-
.../META-INF/MANIFEST.MF | 1 +
.../base/editor/CustomPersistencyBehavior.java | 13 -----
.../common/base/editor/CustomUpdateBehavior.java | 3 -
.../ui/common/base/editor/DiagramEditorBase.java | 12 +++-
.../ui/common/base/resource/DiagramResource.java | 65 ++++++++++++++++++++++
.../base/resource/DiagramResourceFactory.java | 25 +++++++++
.../ui/common/base/support/DiagramAccessBase.java | 4 +-
plugins/org.eclipse.etrice.ui.structure/plugin.xml | 2 +-
9 files changed, 103 insertions(+), 24 deletions(-)
create mode 100644 plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/resource/DiagramResource.java
create mode 100644 plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/resource/DiagramResourceFactory.java
diff --git a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
index 9e79ff1bd..b8217ba65 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
@@ -51,7 +51,7 @@
diff --git a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
index 1447e447e..6abca91f9 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
@@ -35,4 +35,5 @@ Export-Package: org.eclipse.etrice.ui.common.base,
org.eclipse.etrice.ui.common.base.editor,
org.eclipse.etrice.ui.common.base.preferences,
org.eclipse.etrice.ui.common.base.quickfix,
+ org.eclipse.etrice.ui.common.base.resource,
org.eclipse.etrice.ui.common.base.support
diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomPersistencyBehavior.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomPersistencyBehavior.java
index 570db9648..c9c9010ed 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomPersistencyBehavior.java
+++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomPersistencyBehavior.java
@@ -15,7 +15,6 @@ package org.eclipse.etrice.ui.common.base.editor;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -26,7 +25,6 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.etrice.core.common.scoping.RelativeFileURIHandler;
import org.eclipse.etrice.ui.common.base.UIBaseActivator;
import org.eclipse.graphiti.mm.pictograms.Diagram;
import org.eclipse.graphiti.ui.editor.DefaultPersistencyBehavior;
@@ -60,17 +58,6 @@ public class CustomPersistencyBehavior extends DefaultPersistencyBehavior {
return super.loadDiagram(uri);
}
- @Override
- protected Map> createSaveOptions() {
- Map> resMap = super.createSaveOptions();
-
- @SuppressWarnings("unchecked")
- Map