Merge remote branch 'refs/remotes/origin/juno'

Conflicts:
	features/org.eclipse.etrice.feature/feature.xml
	plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
	plugins/org.eclipse.etrice.core.genmodel/model/etricegen.ecore
	plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ETriceGenPackage.java
	plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/ExpandedRefinedState.java
	plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ETriceGenPackageImpl.java
	plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java
	plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedRefinedStateImpl.java
	plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g
	plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.tokens
	plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomLexer.java
	plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.tokens
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomLexer.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InSemanticsRule.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutSemanticsRule.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InSemanticsRuleImpl.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutSemanticsRuleImpl.java
	plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
	plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java
	plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java
	plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
	plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
	plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java
	plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
	plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
	plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java
	plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/SupportUtil.java
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.zip
	tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
	tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java
	tests/org.eclipse.etrice.integration.tests/generate.xml
	tests/org.eclipse.etrice.ui.behavior.tests/org.eclipse.etrice.ui.behavior.tests.launch
	tests/org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch

3 files changed, 5 insertions, 12 deletions

diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java
index f48c176c7..df11f731e 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java
@@ -308,6 +308,9 @@ public class TransitionPropertyDialog extends AbstractMemberAwarePropertyDialog
 		}

 		

 		createMembersAndMessagesButtons(body);

+		

+		if (inherited)

+			disableAll(body);

 	}

 

 	private void disableAll(Composite parent) {

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 5684262cf..47a16eba5 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
@@ -31,7 +31,6 @@ import org.eclipse.etrice.ui.common.editor.RoomDiagramEditor;
 import org.eclipse.graphiti.mm.pictograms.Diagram;

 import org.eclipse.graphiti.mm.pictograms.Shape;

 import org.eclipse.graphiti.services.Graphiti;

-import org.eclipse.graphiti.ui.editor.DiagramEditorInput;

 import org.eclipse.swt.graphics.Image;

 

 

@@ -48,7 +47,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
 		return Activator.getImage("icons/Behavior.gif");

 	}

 

-	@SuppressWarnings("restriction")

 	@Override

 	protected void initializeGraphicalViewer() {

 		super.initializeGraphicalViewer();

@@ -63,7 +61,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
 		getEditingDomain().getCommandStack().flush();

 	}

 	

-	@SuppressWarnings("restriction")

 	public boolean showStateGraph(StateGraph sg) {

 		URI boUri = EcoreUtil.getURI(sg);

 		final StateGraph mySG = (StateGraph) getEditingDomain().getResourceSet().getEObject(boUri, true);

@@ -86,7 +83,7 @@ public class BehaviorEditor extends RoomDiagramEditor {
 	 * @return the actor class of this editor

 	 */

 	public ActorClass getActorClass() {

-		Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();

+		Diagram diagram = getDiagramTypeProvider().getDiagram();

 		EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(diagram);

 		if (bo instanceof ActorClass)

 			return (ActorClass) bo;

@@ -97,7 +94,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
 	/* (non-Javadoc)

 	 * @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#doSave(org.eclipse.core.runtime.IProgressMonitor)

 	 */

-	@SuppressWarnings("restriction")

 	@Override

 	public void doSave(IProgressMonitor monitor) {

 		getEditingDomain().getCommandStack().execute(new RecordingCommand(getEditingDomain()) {

@@ -115,7 +111,7 @@ public class BehaviorEditor extends RoomDiagramEditor {
 	 * 

 	 */

 	protected void removeUnusedRefinedStates() {

-		Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();

+		Diagram diagram = getDiagramTypeProvider().getDiagram();

 		ActorClass ac = SupportUtil.getActorClass(diagram);

 		

 		if (ac.getStateMachine()!=null) {

@@ -147,7 +143,6 @@ public class BehaviorEditor extends RoomDiagramEditor {
 	}

 

 	protected void removeEmptySubgraphs() {

-		@SuppressWarnings("restriction")

 		Diagram diagram = getDiagramTypeProvider().getDiagram();

 

 		// if our current context is an empty state graph we go one level up

diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java
index 0b4355d16..21eaa3cdf 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java
@@ -607,11 +607,6 @@ public class TransitionSupport {
 		        Color fillColor = RoomHelpers.hasDetailCode(trans.getAction())?

 		        		lineColor:manageColor(FILL_COLOR);

 				updateLabel(trans, conn, fillColor);

-

-				if (conn.getConnectionDecorators().size()>=2) {

-					ConnectionDecorator cd = conn.getConnectionDecorators().get(1);

-					getDiagramEditor().refresh(cd);

-				}

 			}

 			

 			@Override