diff options
| author | Juergen Haug | 2018-02-23 16:35:19 +0000 |
|---|---|---|
| committer | Juergen Haug | 2018-02-23 16:38:45 +0000 |
| commit | 439717d1e1aa0ad7cf05fa07bdde0138c93da9a7 (patch) | |
| tree | 1fcef9b07f6515cd8c112dc50835035350f709de | |
| parent | fe07944317dad2aa762f0802b89ba9e9165b409d (diff) | |
| download | org.eclipse.etrice-439717d1e1aa0ad7cf05fa07bdde0138c93da9a7.tar.gz org.eclipse.etrice-439717d1e1aa0ad7cf05fa07bdde0138c93da9a7.tar.xz org.eclipse.etrice-439717d1e1aa0ad7cf05fa07bdde0138c93da9a7.zip | |
[ui] enums in guards
2 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DetailExpressionProvider.xtend b/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DetailExpressionProvider.xtend index 19ec969a1..e6c6ab3f8 100644 --- a/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DetailExpressionProvider.xtend +++ b/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DetailExpressionProvider.xtend @@ -135,8 +135,9 @@ class DetailExpressionProvider implements IDetailExpressionProvider { switch reference { case CP_BRANCH_TRANSITION__CONDITION, case GUARDED_TRANSITION__GUARD, - case GUARD__GUARD: { - ImmutableList.of // no types + case GUARD__GUARD: { + // enums only + createAndSetSharedCache.filter[data instanceof EnumerationType] } default: createAndSetSharedCache } diff --git a/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/IDetailExpressionProvider.xtend b/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/IDetailExpressionProvider.xtend index d2f139d1f..b08b098e5 100644 --- a/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/IDetailExpressionProvider.xtend +++ b/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/IDetailExpressionProvider.xtend @@ -15,6 +15,7 @@ package org.eclipse.etrice.expressions.detailcode import com.google.common.collect.ImmutableList import java.util.List import org.eclipse.xtend.lib.annotations.Accessors +import org.eclipse.emf.ecore.EObject /** * Defines abstract syntax of detail expressions = <i>ExpressionFeature ('.' ExpressionFeature)* </i> @@ -44,6 +45,14 @@ interface IDetailExpressionProvider { val String id // name val ExpressionPostfix postfix // follows name Object data // business object + + override toString() { + id + switch postfix { + case PARENTHESES: '()' + case BRACKETS: '[]' + default: '' + } + ' - ' + if(data instanceof EObject) data.eClass.name else data + } } enum ExpressionPostfix { |