20 files changed, 207 insertions, 21 deletions

diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java
index 89cd0833..7d5c8f8e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/AbstractCftLanguageProposalProvider.java
@@ -54,19 +54,37 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void completeBasicEventDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeBasicEventDefinition_Rate(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeBasicEventDefinition_Distribution(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeAndGate_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeConstantDistribution_P(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeAndGate_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeExponentialDistribution_Lambda(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeAndGateDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeAndGateDefinition_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeOrGateDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeOrGateDefinition_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
         }
-        public void completeOrGate_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeKOfMGateDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeKOfMGateDefinition_K(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
         }
-        public void completeOrGate_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void completeKOfMGateDefinition_M(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+        }
+        public void completeKOfMGateDefinition_InputEvents(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
         }
         public void completeTransformationDefinition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -136,9 +154,6 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void complete_ComponentDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_EventDeclaration(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-                // subclasses may override
-        }
         public void complete_InputEvent(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
@@ -148,13 +163,25 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void complete_BasicEventDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
+        public void complete_Distribution(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ConstantDistribution(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_ExponentialDistribution(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
         public void complete_GateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_AndGate(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_AndGateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_OrGateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_OrGate(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_KOfMGateDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
         public void complete_TransformationDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -187,7 +214,16 @@ public abstract class AbstractCftLanguageProposalProvider extends TerminalsPropo
         public void complete_QualifiedNameWithWildcard(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
-        public void complete_DOULBE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+        public void complete_ValidId(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_Double(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_OF_INT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+                // subclasses may override
+        }
+        public void complete_T_DOUBLE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
                 // subclasses may override
         }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend
index 9aa9ba9c..6558d759 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.xtend
@@ -3,11 +3,22 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui
 
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageSemanticHighlightingCalculator
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageTokenToAttributeIdMapper
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+import org.eclipse.xtext.ide.editor.syntaxcoloring.AbstractAntlrTokenToAttributeIdMapper
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator
 
 /**
  * Use this class to register components to be used within the Eclipse IDE.
  */
 @FinalFieldsConstructor
 class CftLanguageUiModule extends AbstractCftLanguageUiModule {
+        def Class<? extends AbstractAntlrTokenToAttributeIdMapper> bindAbstractAntlrTokenToAttributeIdMapper() {
+                CftLanguageTokenToAttributeIdMapper
+        }
+        
+        def Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+                CftLanguageSemanticHighlightingCalculator
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend
index a6ea8f90..f111c553 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.xtend
@@ -4,6 +4,7 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.labeling
 
 import com.google.inject.Inject
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
 import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider
 
@@ -19,13 +20,7 @@ class CftLanguageLabelProvider extends DefaultEObjectLabelProvider {
                 super(delegate);
         }
 
-        // Labels and icons can be computed like this:
-        
-//      def text(Greeting ele) {
-//              'A greeting to ' + ele.name
-//      }
-//
-//      def image(Greeting ele) {
-//              'Greeting.gif'
-//      }
+        def text(MappingDefinition mappingDefinition) {
+                mappingDefinition.pattern?.name
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend
index 5ffa82ad..3a75a639 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.xtend
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.outline
 
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition
 import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider
 
 /**
@@ -11,5 +13,11 @@ import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider
  * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#outline
  */
 class CftLanguageOutlineTreeProvider extends DefaultOutlineTreeProvider {
-
+        def _isLeaf(EventDefinition eventDefinition) {
+                true
+        }
+        
+        def _isLeaf(MappingDefinition mappingDefinition) {
+                true
+        }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.xtend
new file mode 100644
index 00000000..47c9ebdf
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.xtend
@@ -0,0 +1,24 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor
+import org.eclipse.xtext.util.CancelIndicator
+
+import static hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage.Literals.*
+import static org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration.*
+
+class CftLanguageSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
+        protected dispatch def highlightElement(KOfMGateDefinition gate, IHighlightedPositionAcceptor acceptor,
+                CancelIndicator cancelIndicator) {
+                acceptor.highlightFeature(gate, KOF_MGATE_DEFINITION__K, KEYWORD_ID)
+                acceptor.highlightFeature(gate, KOF_MGATE_DEFINITION__M, KEYWORD_ID)
+                false
+        }
+        
+        protected dispatch def highlightElement(EObject eObject, IHighlightedPositionAcceptor acceptor,
+                CancelIndicator cancelIndicator) {
+                super.highlightElement(eObject, acceptor, cancelIndicator)
+        }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.xtend b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.xtend
new file mode 100644
index 00000000..4656d0a0
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/src/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.xtend
@@ -0,0 +1,15 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring
+
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultAntlrTokenToAttributeIdMapper
+import org.eclipse.xtext.ide.editor.syntaxcoloring.HighlightingStyles
+
+class CftLanguageTokenToAttributeIdMapper extends DefaultAntlrTokenToAttributeIdMapper {
+        override protected calculateId(String tokenName, int tokenType) {
+                switch (tokenName) {
+                        case "RULE_T_DOUBLE":
+                                HighlightingStyles.NUMBER_ID
+                        default:
+                                super.calculateId(tokenName, tokenType) 
+                }
+        }
+}
\ No newline at end of file
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
index 7eb6190d..ff2238f7 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/.CftLanguageUiModule.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java
index 4f1409d9..be796ba2 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/CftLanguageUiModule.java
@@ -4,8 +4,12 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui;
 
 import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.AbstractCftLanguageUiModule;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageSemanticHighlightingCalculator;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring.CftLanguageTokenToAttributeIdMapper;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.AbstractAntlrTokenToAttributeIdMapper;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator;
 
 /**
  * Use this class to register components to be used within the Eclipse IDE.
@@ -13,6 +17,14 @@ import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
 @FinalFieldsConstructor
 @SuppressWarnings("all")
 public class CftLanguageUiModule extends AbstractCftLanguageUiModule {
+  public Class<? extends AbstractAntlrTokenToAttributeIdMapper> bindAbstractAntlrTokenToAttributeIdMapper() {
+    return CftLanguageTokenToAttributeIdMapper.class;
+  }
+  
+  public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+    return CftLanguageSemanticHighlightingCalculator.class;
+  }
+  
   public CftLanguageUiModule(final AbstractUIPlugin plugin) {
     super(plugin);
   }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
index a6a68b91..c62e6652 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/contentassist/.CftLanguageProposalProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
index e2a540db..21bd15b6 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageDescriptionLabelProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
index 58dd1f71..ae92f324 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/.CftLanguageLabelProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java
index 3a03868d..103bb114 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/labeling/CftLanguageLabelProvider.java
@@ -4,7 +4,9 @@
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.labeling;
 
 import com.google.inject.Inject;
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern;
 import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;
 
 /**
@@ -18,4 +20,13 @@ public class CftLanguageLabelProvider extends DefaultEObjectLabelProvider {
   public CftLanguageLabelProvider(final AdapterFactoryLabelProvider delegate) {
     super(delegate);
   }
+  
+  public String text(final MappingDefinition mappingDefinition) {
+    Pattern _pattern = mappingDefinition.getPattern();
+    String _name = null;
+    if (_pattern!=null) {
+      _name=_pattern.getName();
+    }
+    return _name;
+  }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
index b785c6e2..91137ae1 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/.CftLanguageOutlineTreeProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java
index 76ea64c4..b8da3d93 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/outline/CftLanguageOutlineTreeProvider.java
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.outline;
 
+import hu.bme.mit.inf.dslreasoner.faulttree.components.cftLanguage.MappingDefinition;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.EventDefinition;
 import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
 
 /**
@@ -12,4 +14,11 @@ import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
  */
 @SuppressWarnings("all")
 public class CftLanguageOutlineTreeProvider extends DefaultOutlineTreeProvider {
+  public boolean _isLeaf(final EventDefinition eventDefinition) {
+    return true;
+  }
+  
+  public boolean _isLeaf(final MappingDefinition mappingDefinition) {
+    return true;
+  }
 }
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
index d199f277..637b4e7e 100644
--- a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/quickfix/.CftLanguageQuickfixProvider.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin
new file mode 100644
index 00000000..81585f8b
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageSemanticHighlightingCalculator.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin
new file mode 100644
index 00000000..d8af5320
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.CftLanguageTokenToAttributeIdMapper.xtendbin
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore
new file mode 100644
index 00000000..3fdf4894
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/.gitignore
@@ -0,0 +1,2 @@
+/.CftLanguageSemanticHighlightingCalculator.java._trace
+/.CftLanguageTokenToAttributeIdMapper.java._trace
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.java
new file mode 100644
index 00000000..268faba3
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageSemanticHighlightingCalculator.java
@@ -0,0 +1,38 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring;
+
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.CftPackage;
+import hu.bme.mit.inf.dslreasoner.faulttree.model.cft.KOfMGateDefinition;
+import java.util.Arrays;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
+import org.eclipse.xtext.ui.editor.syntaxcoloring.DefaultHighlightingConfiguration;
+import org.eclipse.xtext.util.CancelIndicator;
+
+@SuppressWarnings("all")
+public class CftLanguageSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
+  protected boolean _highlightElement(final KOfMGateDefinition gate, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
+    boolean _xblockexpression = false;
+    {
+      this.highlightFeature(acceptor, gate, CftPackage.Literals.KOF_MGATE_DEFINITION__K, DefaultHighlightingConfiguration.KEYWORD_ID);
+      this.highlightFeature(acceptor, gate, CftPackage.Literals.KOF_MGATE_DEFINITION__M, DefaultHighlightingConfiguration.KEYWORD_ID);
+      _xblockexpression = false;
+    }
+    return _xblockexpression;
+  }
+  
+  protected boolean _highlightElement(final EObject eObject, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
+    return super.highlightElement(eObject, acceptor, cancelIndicator);
+  }
+  
+  protected boolean highlightElement(final EObject gate, final IHighlightedPositionAcceptor acceptor, final CancelIndicator cancelIndicator) {
+    if (gate instanceof KOfMGateDefinition) {
+      return _highlightElement((KOfMGateDefinition)gate, acceptor, cancelIndicator);
+    } else if (gate != null) {
+      return _highlightElement(gate, acceptor, cancelIndicator);
+    } else {
+      throw new IllegalArgumentException("Unhandled parameter types: " +
+        Arrays.<Object>asList(gate, acceptor, cancelIndicator).toString());
+    }
+  }
+}
diff --git a/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.java b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.java
new file mode 100644
index 00000000..9ad4afda
--- /dev/null
+++ b/Stochastic/hu.bme.mit.inf.dslreasoner.faulttree.components.ui/xtend-gen/hu/bme/mit/inf/dslreasoner/faulttree/components/ui/syntaxcoloring/CftLanguageTokenToAttributeIdMapper.java
@@ -0,0 +1,25 @@
+package hu.bme.mit.inf.dslreasoner.faulttree.components.ui.syntaxcoloring;
+
+import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultAntlrTokenToAttributeIdMapper;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.HighlightingStyles;
+
+@SuppressWarnings("all")
+public class CftLanguageTokenToAttributeIdMapper extends DefaultAntlrTokenToAttributeIdMapper {
+  @Override
+  protected String calculateId(final String tokenName, final int tokenType) {
+    String _switchResult = null;
+    if (tokenName != null) {
+      switch (tokenName) {
+        case "RULE_T_DOUBLE":
+          _switchResult = HighlightingStyles.NUMBER_ID;
+          break;
+        default:
+          _switchResult = super.calculateId(tokenName, tokenType);
+          break;
+      }
+    } else {
+      _switchResult = super.calculateId(tokenName, tokenType);
+    }
+    return _switchResult;
+  }
+}