[ui.behavior, ui.behavior.fsm, ui.commands] moved ExportDiagramsHandler to FSM part

Change-Id: I547a278a55aede52143f9ac76b4ea1182f014fc9

4 files changed, 178 insertions, 177 deletions

diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMEditor.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMEditor.java
index 14e14628e..6d55067b8 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMEditor.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/AbstractFSMEditor.java
@@ -12,10 +12,33 @@
 
 package org.eclipse.etrice.ui.behavior.fsm.editor;
 
+import java.util.ArrayList;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.etrice.core.fsm.fSM.FSMFactory;
+import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
+import org.eclipse.etrice.core.fsm.fSM.RefinedState;
+import org.eclipse.etrice.core.fsm.fSM.State;
+import org.eclipse.etrice.core.fsm.fSM.StateGraph;
+import org.eclipse.etrice.core.fsm.util.FSMHelpers;
 import org.eclipse.etrice.ui.behavior.fsm.support.ContextSwitcher;
+import org.eclipse.etrice.ui.behavior.fsm.support.FSMSupportUtil;
 import org.eclipse.etrice.ui.common.base.editor.DiagramEditorBase;
+import org.eclipse.graphiti.dt.IDiagramTypeProvider;
+import org.eclipse.graphiti.features.IFeatureProvider;
+import org.eclipse.graphiti.features.context.IUpdateContext;
+import org.eclipse.graphiti.features.context.impl.UpdateContext;
+import org.eclipse.graphiti.mm.pictograms.Diagram;
+import org.eclipse.graphiti.mm.pictograms.Shape;
+import org.eclipse.graphiti.services.Graphiti;
+
+import com.google.common.base.Function;
 
 /**
  * @author Henrik Rentz-Reichert
@@ -53,4 +76,145 @@ public abstract class AbstractFSMEditor extends DiagramEditorBase {
 		getEditingDomain().getCommandStack().execute(cmd);
 		getEditingDomain().getCommandStack().flush();
 	}
+
+	public boolean showStateGraph(StateGraph sg) {
+		URI boUri = EcoreUtil.getURI(sg);
+		final StateGraph mySG = (StateGraph) getEditingDomain().getResourceSet().getEObject(boUri, true);
+		if (mySG==null)
+			return false;
+		
+		Command cmd = new RecordingCommand(getEditingDomain()) {
+			@Override
+			protected void doExecute() {
+				ContextSwitcher.switchTo(getDiagramTypeProvider().getDiagram(), mySG);
+			}
+		};
+		getEditingDomain().getCommandStack().execute(cmd);
+		getEditingDomain().getCommandStack().flush();
+		
+		return true;
+	}
+
+	@Override
+	public void dispose() {
+		// Stop observing the Room Model
+		diagnosingModelObserver.removeObserver();
+		super.dispose();
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		getEditingDomain().getCommandStack().execute(new RecordingCommand(getEditingDomain()) {
+			protected void doExecute() {
+				removeEmptySubgraphs();
+				rebaseRefinedStates();
+				removeUnusedRefinedStates();
+			}
+		});
+		
+		super.doSave(monitor);
+	}
+
+	/**
+	 * 
+	 */
+	protected void removeUnusedRefinedStates() {
+		Diagram diagram = getDiagramTypeProvider().getDiagram();
+		ModelComponent ac = FSMSupportUtil.getInstance().getModelComponent(diagram);
+		
+		if (ac.getStateMachine()!=null) {
+			ArrayList<RefinedState> toBeRemoved = new ArrayList<RefinedState>();
+			for (State s : ac.getStateMachine().getStates()) {
+				if (s instanceof RefinedState) {
+					if (isUnused((RefinedState)s))
+						toBeRemoved.add((RefinedState) s);
+				}
+			}
+			
+			ac.getStateMachine().getStates().removeAll(toBeRemoved);
+		}
+	}
+
+	/**
+	 * @param s
+	 * @return
+	 */
+	private boolean isUnused(RefinedState s) {
+		FSMHelpers fsmHelpers = FSMSupportUtil.getInstance().getFSMHelpers();
+		if (fsmHelpers.hasDirectSubStructure(s))
+			return false;
+		if (fsmHelpers.hasDetailCode(s.getEntryCode()))
+			return false;
+		if (fsmHelpers.hasDetailCode(s.getExitCode()))
+			return false;
+		
+		return true;
+	}
+
+	protected void removeEmptySubgraphs() {
+		Diagram diagram = getDiagramTypeProvider().getDiagram();
+		FSMHelpers fsmHelpers = FSMSupportUtil.getInstance().getFSMHelpers();
+	
+		// if our current context is an empty state graph we go one level up
+		StateGraph current = ContextSwitcher.getCurrentStateGraph(diagram);
+		if (current!=null && current.eContainer() instanceof State) {
+			State s = (State) current.eContainer();
+			if (!fsmHelpers.hasDirectSubStructure(s)) {
+				ContextSwitcher.goUp(diagram, current);
+			}
+		}
+		
+		ArrayList<Shape> toBeRemoved = new ArrayList<Shape>();
+		for (Shape ctxShape : diagram.getChildren()) {
+			EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(ctxShape);
+			if (bo.eIsProxy()) {
+				toBeRemoved.add(ctxShape);
+				continue;
+			}
+			
+			assert(bo instanceof StateGraph): "expected state graph";
+			
+			StateGraph sg = (StateGraph) bo;
+			if (sg.eContainer() instanceof State) {
+				State s = (State) sg.eContainer();
+				if (!fsmHelpers.hasDirectSubStructure(s)) {
+					EcoreUtil.delete(sg);
+					toBeRemoved.add(ctxShape);
+				}
+			}
+		}
+		
+		// need to recursively delete the shapes to avoid dangling HREFs
+		for (Shape shape : toBeRemoved) {
+			EcoreUtil.delete(shape, true);
+		}
+	}
+
+	protected void rebaseRefinedStates() {
+		ModelComponent ac = getModelComponent();
+	
+		if (ac.getStateMachine()==null)
+			return;
+		
+		Function<RefinedState, String> nameProvider = FSMSupportUtil.getInstance().getFSMNameProvider().getRefinedStateNameProvider();
+		Map<RefinedState, RefinedState> rs2parent = FSMSupportUtil.getInstance().getFSMHelpers().getRefinedStatesToRelocate(ac, nameProvider);
+		
+		// move all to the new context
+		for (RefinedState rs : rs2parent.keySet()) {
+			RefinedState parent = rs2parent.get(rs);
+			if (parent.getSubgraph()==null)
+				parent.setSubgraph(FSMFactory.eINSTANCE.createStateGraph());
+			parent.getSubgraph().getStates().add(rs);
+		}
+	}
+
+	@Override
+	protected void superClassChanged() {
+		IDiagramTypeProvider diagramTypeProvider = getDiagramTypeProvider();
+		Diagram diagram = diagramTypeProvider.getDiagram();
+		IFeatureProvider featureProvider = diagramTypeProvider.getFeatureProvider();
+		IUpdateContext updateCtx = new UpdateContext(diagram);
+		featureProvider.updateIfPossible(updateCtx);
+		diagramTypeProvider.getDiagramBehavior().refresh();
+	}
 }
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorExporter.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/BehaviorExporter.java
index 135abdd1f..ce6af1b7a 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorExporter.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/editor/BehaviorExporter.java
@@ -10,31 +10,35 @@
  * 
  *******************************************************************************/
 
-package org.eclipse.etrice.ui.behavior.editor;
+package org.eclipse.etrice.ui.behavior.fsm.editor;
 
 import java.io.File;
 
 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.DiagramAccess;
 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.support.DiagramAccessBase;
 import org.eclipse.ui.PlatformUI;
 
+import com.google.inject.Inject;
+
 public class BehaviorExporter {
 
 	private static final String SUFFIX = "_behavior";
+	
+	@Inject
+	private DiagramAccessBase da;
 
-	public static void export(ModelComponent ac, String folder) {
-		DiagramAccess da = new DiagramAccess();
+	public void export(ModelComponent ac, String folder) {
 
 		boolean wasOpen = false;
-		BehaviorEditor editor = (BehaviorEditor) da.findDiagramEditor(ac);
+		AbstractFSMEditor editor = (AbstractFSMEditor) da.findDiagramEditor(ac);
 		if (editor!=null)
 			wasOpen = true;
 		else
-			editor = (BehaviorEditor) da.openDiagramEditor(ac);
+			editor = (AbstractFSMEditor) da.openDiagramEditor(ac);
 
 		if (editor!=null) {
 			String filename = folder+File.separatorChar+ac.getComponentName()+SUFFIX;
@@ -47,7 +51,7 @@ public class BehaviorExporter {
 		}
 	}
 
-	private static void exportSubGraphsRecursively(StateGraph sg, BehaviorEditor editor, String basename) {
+	private void exportSubGraphsRecursively(StateGraph sg, AbstractFSMEditor editor, String basename) {
 		if (sg==null)
 			return;
 		
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 7f00da588..ebe0cd987 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
@@ -9,42 +9,18 @@
 package org.eclipse.etrice.ui.behavior.editor;
 
 
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.etrice.core.fsm.fSM.FSMFactory;
-import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
-import org.eclipse.etrice.core.fsm.fSM.RefinedState;
-import org.eclipse.etrice.core.fsm.fSM.State;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.core.fsm.util.FSMHelpers;
 import org.eclipse.etrice.core.room.ActorClass;
 import org.eclipse.etrice.core.room.StructureClass;
 import org.eclipse.etrice.core.ui.editor.RoomEditor;
 import org.eclipse.etrice.ui.behavior.Activator;
 import org.eclipse.etrice.ui.behavior.fsm.editor.AbstractFSMEditor;
-import org.eclipse.etrice.ui.behavior.fsm.support.ContextSwitcher;
-import org.eclipse.etrice.ui.behavior.fsm.support.FSMSupportUtil;
-import org.eclipse.etrice.ui.behavior.support.SupportUtil;
 import org.eclipse.etrice.ui.common.commands.ChangeDiagramInputJob;
-import org.eclipse.graphiti.dt.IDiagramTypeProvider;
-import org.eclipse.graphiti.features.IFeatureProvider;
-import org.eclipse.graphiti.features.context.IUpdateContext;
-import org.eclipse.graphiti.features.context.impl.UpdateContext;
 import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.Shape;
 import org.eclipse.graphiti.services.Graphiti;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.graphics.Image;
 
-import com.google.common.base.Function;
-
 
 public class BehaviorEditor extends AbstractFSMEditor {
 
@@ -60,31 +36,6 @@ public class BehaviorEditor extends AbstractFSMEditor {
 		return Activator.getImage("icons/Behavior.gif");
 	}
 
-	@Override
-	public void dispose() {
-		// Stop observing the Room Model
-		diagnosingModelObserver.removeObserver();
-		super.dispose();
-	}
-	
-	public boolean showStateGraph(StateGraph sg) {
-		URI boUri = EcoreUtil.getURI(sg);
-		final StateGraph mySG = (StateGraph) getEditingDomain().getResourceSet().getEObject(boUri, true);
-		if (mySG==null)
-			return false;
-		
-		Command cmd = new RecordingCommand(getEditingDomain()) {
-			@Override
-			protected void doExecute() {
-				ContextSwitcher.switchTo(getDiagramTypeProvider().getDiagram(), mySG);
-			}
-		};
-		getEditingDomain().getCommandStack().execute(cmd);
-		getEditingDomain().getCommandStack().flush();
-		
-		return true;
-	}
-
 	/**
 	 * @return the actor class of this editor
 	 */
@@ -97,125 +48,6 @@ public class BehaviorEditor extends AbstractFSMEditor {
 		return null;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		getEditingDomain().getCommandStack().execute(new RecordingCommand(getEditingDomain()) {
-			protected void doExecute() {
-				removeEmptySubgraphs();
-				rebaseRefinedStates();
-				removeUnusedRefinedStates();
-			}
-		});
-		
-		super.doSave(monitor);
-	}
-
-	/**
-	 * 
-	 */
-	protected void removeUnusedRefinedStates() {
-		Diagram diagram = getDiagramTypeProvider().getDiagram();
-		ModelComponent ac = FSMSupportUtil.getInstance().getModelComponent(diagram);
-		
-		if (ac.getStateMachine()!=null) {
-			ArrayList<RefinedState> toBeRemoved = new ArrayList<RefinedState>();
-			for (State s : ac.getStateMachine().getStates()) {
-				if (s instanceof RefinedState) {
-					if (isUnused((RefinedState)s))
-						toBeRemoved.add((RefinedState) s);
-				}
-			}
-			
-			ac.getStateMachine().getStates().removeAll(toBeRemoved);
-		}
-	}
-
-	/**
-	 * @param s
-	 * @return
-	 */
-	private boolean isUnused(RefinedState s) {
-		FSMHelpers fsmHelpers = SupportUtil.getInstance().getFSMHelpers();
-		if (fsmHelpers.hasDirectSubStructure(s))
-			return false;
-		if (fsmHelpers.hasDetailCode(s.getEntryCode()))
-			return false;
-		if (fsmHelpers.hasDetailCode(s.getExitCode()))
-			return false;
-		
-		return true;
-	}
-
-	protected void removeEmptySubgraphs() {
-		Diagram diagram = getDiagramTypeProvider().getDiagram();
-		FSMHelpers fsmHelpers = SupportUtil.getInstance().getFSMHelpers();
-
-		// if our current context is an empty state graph we go one level up
-		StateGraph current = ContextSwitcher.getCurrentStateGraph(diagram);
-		if (current!=null && current.eContainer() instanceof State) {
-			State s = (State) current.eContainer();
-			if (!fsmHelpers.hasDirectSubStructure(s)) {
-				ContextSwitcher.goUp(diagram, current);
-			}
-		}
-		
-		ArrayList<Shape> toBeRemoved = new ArrayList<Shape>();
-		for (Shape ctxShape : diagram.getChildren()) {
-			EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(ctxShape);
-			if (bo.eIsProxy()) {
-				toBeRemoved.add(ctxShape);
-				continue;
-			}
-			
-			assert(bo instanceof StateGraph): "expected state graph";
-			
-			StateGraph sg = (StateGraph) bo;
-			if (sg.eContainer() instanceof State) {
-				State s = (State) sg.eContainer();
-				if (!fsmHelpers.hasDirectSubStructure(s)) {
-					EcoreUtil.delete(sg);
-					toBeRemoved.add(ctxShape);
-				}
-			}
-		}
-		
-		// need to recursively delete the shapes to avoid dangling HREFs
-		for (Shape shape : toBeRemoved) {
-			EcoreUtil.delete(shape, true);
-		}
-	}
-	
-	protected void rebaseRefinedStates() {
-		ModelComponent ac = getModelComponent();
-
-		if (ac.getStateMachine()==null)
-			return;
-		
-		Function<RefinedState, String> nameProvider = SupportUtil.getInstance().getFSMNameProvider().getRefinedStateNameProvider();
-		Map<RefinedState, RefinedState> rs2parent = SupportUtil.getInstance().getFSMHelpers().getRefinedStatesToRelocate(ac, nameProvider);
-		
-		// move all to the new context
-		for (RefinedState rs : rs2parent.keySet()) {
-			RefinedState parent = rs2parent.get(rs);
-			if (parent.getSubgraph()==null)
-				parent.setSubgraph(FSMFactory.eINSTANCE.createStateGraph());
-			parent.getSubgraph().getStates().add(rs);
-		}
-	}
-
-	@Override
-	protected void superClassChanged() {
-		IDiagramTypeProvider diagramTypeProvider = getDiagramTypeProvider();
-		Diagram diagram = diagramTypeProvider.getDiagram();
-		IFeatureProvider featureProvider = diagramTypeProvider.getFeatureProvider();
-		IUpdateContext updateCtx = new UpdateContext(diagram);
-		featureProvider.updateIfPossible(updateCtx);
-		diagramTypeProvider.getDiagramBehavior().refresh();
-	}
-
 	protected StructureClass getStructureClass() {
 		return (StructureClass) getModelComponent();
 	}
diff --git a/plugins/org.eclipse.etrice.ui.commands/src/org/eclipse/etrice/ui/commands/handlers/ExportDiagramsHandler.java b/plugins/org.eclipse.etrice.ui.commands/src/org/eclipse/etrice/ui/commands/handlers/ExportDiagramsHandler.java
index 8ca831837..ea0ee2350 100644
--- a/plugins/org.eclipse.etrice.ui.commands/src/org/eclipse/etrice/ui/commands/handlers/ExportDiagramsHandler.java
+++ b/plugins/org.eclipse.etrice.ui.commands/src/org/eclipse/etrice/ui/commands/handlers/ExportDiagramsHandler.java
@@ -34,7 +34,7 @@ import org.eclipse.etrice.core.room.ActorClass;
 import org.eclipse.etrice.core.room.RoomModel;
 import org.eclipse.etrice.core.room.SubSystemClass;
 import org.eclipse.etrice.core.ui.RoomUiModule;
-import org.eclipse.etrice.ui.behavior.editor.BehaviorExporter;
+import org.eclipse.etrice.ui.behavior.fsm.editor.BehaviorExporter;
 import org.eclipse.etrice.ui.common.base.UIBaseActivator;
 import org.eclipse.etrice.ui.common.base.preferences.UIBasePreferenceConstants;
 import org.eclipse.etrice.ui.structure.editor.StructureExporter;
@@ -143,9 +143,10 @@ public class ExportDiagramsHandler extends AbstractHandler {
 			if (folder.exists()) {
 				String folderPath = folder.getLocation().toOSString();
 				
+				BehaviorExporter exporter = org.eclipse.etrice.ui.behavior.Activator.getDefault().getInjector().getInstance(BehaviorExporter.class);
 				for (ActorClass ac : model.getActorClasses()) {
 					if (ac.getStateMachine()!=null)
-						BehaviorExporter.export(ac, folderPath);
+						exporter.export(ac, folderPath);
 					
 					StructureExporter.export(ac, folderPath);
 				}