Fix isCore issue

ContextMapper · Aug 22, 2024 · 410d343 · 410d343
1 parent 1196298
commit 410d343
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/org.contextmapper.dsl.ui/samples/freemarker/csv-files/value-registers.csv.ftl b/org.contextmapper.dsl.ui/samples/freemarker/csv-files/value-registers.csv.ftl
@@ -32,17 +32,17 @@ ${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueCluste
 <#if stakeholderElicitation.consequences?has_content>
 <#list stakeholderElicitation.consequences as consequence>
 <#if consequence.action?has_content>
-${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore!""!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},${consequence.action.type!""},${consequence.action.action!""}
+${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},${consequence.action.type!""},${consequence.action.action!""}
 <#else>
-${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},,
+${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},,
 </#if>
 </#list>
 <#else>
-${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},,,,
+${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},,,,
 </#if>
 </#list>
 <#else>
-${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},,,,,,,,
+${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueClusterCoreValue},${valueClusterDemonstrators},${valueClusterRelatedValues},${valueClusterOpposingValues},${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},,,,,,,,
 </#if>
 </#list>
 </#list>
@@ -55,17 +55,17 @@ ${valueRegister.name},${valueRegisterContext},${valueCluster.name},${valueCluste
 <#if stakeholderElicitation.consequences?has_content>
 <#list stakeholderElicitation.consequences as consequence>
 <#if consequence.action?has_content>
-${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},${consequence.action.type!""},${consequence.action.action!""}
+${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},${consequence.action.type!""},${consequence.action.action!""}
 <#else>
-${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},,
+${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},${consequence.type!""},${consequence.consequence},,
 </#if>
 </#list>
 <#else>
-${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},,,,
+${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},${stakeholderElicitation.stakeholder.name},${stakeholderElicitation.priority!""},${stakeholderElicitation.impact!""},,,,
 </#if>
 </#list>
 <#else>
-${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore!""},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},,,,,,,,
+${valueRegister.name},${valueRegisterContext},,,,,,${value.name},${value.isCore?string("yes", "no")},${valueDemonstrators},${valueRelatedValues},${valueOpposingValues},,,,,,,,
 </#if>
 </#list>
 </#list>
diff --git a/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext b/org.contextmapper.dsl/src/org/contextmapper/dsl/ContextMappingDSL.xtext
@@ -420,7 +420,7 @@ ValueCluster:
 Value:
 	'Value' name=ID (OPEN
 		(
-			(coreValue ?= 'isCore')? &
+			(isCore ?= 'isCore')? &
 			('demonstrator' ('=')? demonstrators += STRING)* &
 			('relatedValue' ('=')? relatedValues += STRING)* &
 			('opposingValue' ('=')? opposingValues += STRING)* &