Merge branch 'master' into newfsmgen_finalize

with conflicts...

Change-Id: I4d06be6132abcdfbf53ea078e65373b42b2541f9

2 files changed, 12 insertions, 6 deletions

diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java
index 2b6da574c..5e2a9fe9a 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/RoomUiModule.java
@@ -13,6 +13,7 @@
 package org.eclipse.etrice.core.ui;
 
 import org.eclipse.etrice.core.common.ui.autoedit.BaseAutoEditStrategyProvider;
+import org.eclipse.etrice.core.common.ui.editor.BaseDoubleClickStrategyProvider;
 import org.eclipse.etrice.core.common.ui.editor.model.BaseTokenTypeToPartitionMapper;
 import org.eclipse.etrice.core.common.ui.hover.IKeywordHoverContentProvider;
 import org.eclipse.etrice.core.common.ui.hover.KeywordHoverProvider;
@@ -28,6 +29,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
 import org.eclipse.xtext.ui.editor.autoedit.AbstractEditStrategyProvider;
+import org.eclipse.xtext.ui.editor.doubleClicking.DoubleClickStrategyProvider;
 import org.eclipse.xtext.ui.editor.hover.IEObjectHover;
 import org.eclipse.xtext.ui.editor.hover.IEObjectHoverProvider;
 import org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper;
@@ -93,10 +95,14 @@ public class RoomUiModule extends org.eclipse.etrice.core.ui.AbstractRoomUiModul
 		return BaseAutoEditStrategyProvider.class;
 	}
 	
-	public Class<? extends ITokenTypeToPartitionTypeMapper> bindITokenTypeToPartitionTypeMapper(){
+	public Class<? extends ITokenTypeToPartitionTypeMapper> bindITokenTypeToPartitionTypeMapper() {
 		return BaseTokenTypeToPartitionMapper.class;
 	}
 	
+	public Class<? extends DoubleClickStrategyProvider> bindDoubleClickStrategyProvider() {
+		return BaseDoubleClickStrategyProvider.class;
+	}
+	
 	// auto format for quick fix
 	/*
     public Class<? extends ITextEditComposer> bindITextEditComposer() {
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend
index 9c915fc9d..7f7f71ebc 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/util/UIExpressionUtil.xtend
@@ -47,7 +47,7 @@ class UIExpressionUtil {
 			
 			return cache.get(mc)
 		}
-	
+		
 	}
 	
 	static def IDetailExpressionProvider selectExpressionProvider(EObject it, GenModelAccess genModelAccess) {			
@@ -56,9 +56,9 @@ class UIExpressionUtil {
 		if(transition !== null) {
 			val ac = getContainerOfType(it, ActorClass)
 			if(ac !== null) {
-			val commonData = FsmGenExtensions.getLinkFor(genModelAccess.get(ac), transition)?.commonData
-			if(commonData instanceof MessageData)
-				exprProvider.transitionEventData = commonData	
+				val commonData = FsmGenExtensions.getLinkFor(genModelAccess.get(ac), transition)?.commonData
+				if(commonData instanceof MessageData)
+					exprProvider.transitionEventData = commonData	
 			}
 		}
 		
@@ -72,7 +72,7 @@ class UIExpressionUtil {
 	
 	static def ExpressionFeature findAtOffset(ILeafNode leafNode, int offset) {
 		// work in progress - show eObject for detail code
-		val exprProvider = UIExpressionUtil.selectExpressionProvider(leafNode.semanticElement)
+		val exprProvider = selectExpressionProvider(leafNode.semanticElement)
 		
 		// TODO explicit support for hover info in DetailExpressionAssistParser
 		val text = leafNode.text