[ui] refactored ui.commands, added RoomOpeningHelper

Change-Id: Icba25981896a4fa1909888c728adaeaba3b25ebb

2 files changed, 14 insertions, 10 deletions

diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramTypeProvider.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramTypeProvider.java
index 73c0ee1e4..fa38f2706 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramTypeProvider.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMDiagramTypeProvider.java
@@ -12,7 +12,7 @@
 
 package org.eclipse.etrice.ui.behavior.fsm.editor;
 
-import org.eclipse.graphiti.dt.AbstractDiagramTypeProvider;
+import org.eclipse.etrice.ui.common.base.editor.AbstractBaseDiagramTypeProvider;
 import org.eclipse.graphiti.mm.pictograms.Diagram;
 import org.eclipse.graphiti.platform.IDiagramContainer;
 
@@ -21,7 +21,7 @@ import org.eclipse.graphiti.platform.IDiagramContainer;
  * functionality provided by {@link AbstractFSMEditor}. Diagram editor plugins 
  * that extend {@link AbstractFSMEditor} should also extend and use this class.
  */
-public abstract class AbstractFSMDiagramTypeProvider extends AbstractDiagramTypeProvider {
+public abstract class AbstractFSMDiagramTypeProvider extends AbstractBaseDiagramTypeProvider {
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.graphiti.dt.AbstractDiagramTypeProvider#resourceReloaded(org.eclipse.graphiti.mm.pictograms.Diagram)
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/BehaviorExporter.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/BehaviorExporter.java
index 26e08296e..782b7a916 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/BehaviorExporter.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/BehaviorExporter.java
@@ -14,31 +14,35 @@ package org.eclipse.etrice.ui.behavior.fsm.editor;
 
 import java.io.File;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
 import org.eclipse.etrice.core.fsm.fSM.State;
 import org.eclipse.etrice.core.fsm.fSM.StateGraph;
 import org.eclipse.etrice.ui.behavior.fsm.support.FSMSupportUtil;
-import org.eclipse.etrice.ui.common.base.editor.DiagramExporter;
+import org.eclipse.etrice.ui.common.base.export.DiagramExporter;
+import org.eclipse.etrice.ui.common.base.export.IBulkDiagramExporter;
 import org.eclipse.etrice.ui.common.base.support.DiagramAccessBase;
 import org.eclipse.ui.PlatformUI;
 
-import com.google.inject.Inject;
-
-public class BehaviorExporter {
+public class BehaviorExporter implements IBulkDiagramExporter {
 
 	private static final String SUFFIX = "_behavior";
 	
-	@Inject
 	private DiagramAccessBase da;
+	
+	public BehaviorExporter(DiagramAccessBase da) {
+		this.da = da;
+	}
 
-	public void export(ModelComponent mc, String folder) {
+	public void export(EObject roomClass, String folder) {
 
 		boolean wasOpen = false;
-		AbstractFSMEditor editor = (AbstractFSMEditor) da.findDiagramEditor(mc);
+		AbstractFSMEditor editor = (AbstractFSMEditor) da.findDiagramEditor(roomClass);
 		if (editor!=null)
 			wasOpen = true;
 		else
-			editor = (AbstractFSMEditor) da.openDiagramEditor(mc);
+			editor = (AbstractFSMEditor) da.openDiagramEditor(roomClass);
+		ModelComponent mc = editor.getModelComponent();
 
 		if (editor!=null) {
 			String filename = folder+File.separatorChar+mc.getComponentName()+SUFFIX;