#307 harmonize element definition

C4.puml

@@ -965,6 +965,17 @@ $elementSkin
   !return $element
 !endfunction
 
+!function $getElementLine($umlShape, $elementType, $alias, $label, $techn, $descr, $sprite, $tags, $link)
+  !$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", $elementType)
+  !$techn=$toElementArg($techn, $tags, "ElementTagTechn", $elementType)
+  !$baseProp = $getElementBase($label, $techn, $descr, $sprite) + $getProps()
+  !$stereo = $toStereos($elementType,$tags)
+  !$calcLink = $getLink($link)
+  
+  !$line = $umlShape + " " + %chr(34) + $baseProp + %chr(34) +" " + $stereo + " as " + $alias + $calcLink
+  !return $line
+!endfunction
+
 ' Element properties
 ' ##################################
 

C4_Component.puml

@@ -58,42 +58,26 @@ endlegend
 ' Elements
 ' ##################################
 
-!function $getComponent($label, $techn, $descr, $sprite)
-  !return $getElementBase($label, $techn, $descr, $sprite)
-!endfunction
-
 !unquoted procedure Component($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "component")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "component")
-rectangle "$getComponent($label, $techn, $descr, $sprite)$getProps()" $toStereos("component",$tags) as $alias $getLink($link)
+  $getElementLine("rectangle", "component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ComponentDb($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "component")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "component")
-database "$getComponent($label, $techn, $descr, $sprite)$getProps()" $toStereos("component",$tags) as $alias $getLink($link)
+  $getElementLine("database", "component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ComponentQueue($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "component")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "component")
-queue "$getComponent($label, $techn, $descr, $sprite)$getProps()" $toStereos("component",$tags) as $alias $getLink($link)
+  $getElementLine("queue", "component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure Component_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_component")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "external_component")
-rectangle "$getComponent($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_component",$tags) as $alias $getLink($link)
+  $getElementLine("rectangle", "external_component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ComponentDb_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_component")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "external_component")
-database "$getComponent($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_component",$tags) as $alias $getLink($link)
+  $getElementLine("database", "external_component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ComponentQueue_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_component")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "external_component")
-queue "$getComponent($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_component",$tags) as $alias $getLink($link)
+  $getElementLine("queue", "external_component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure

C4_Container.puml

@@ -65,44 +65,28 @@ endlegend
 ' Elements
 ' ##################################
 
-!function $getContainer($label, $techn, $descr, $sprite)
-  !return $getElementBase($label, $techn, $descr, $sprite)
-!endfunction
-
 !unquoted procedure Container($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "container")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "container")
-rectangle "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias $getLink($link)
+  $getElementLine("rectangle", "container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ContainerDb($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "container")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "container")
-database "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias $getLink($link)
+  $getElementLine("database", "container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ContainerQueue($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "container")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "container")
-queue "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias $getLink($link)
+  $getElementLine("queue", "container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure Container_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_container")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "external_container")
-rectangle "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias $getLink($link)
+  $getElementLine("rectangle", "external_container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ContainerDb_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_container")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "external_container")
-database "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias $getLink($link)
+  $getElementLine("database", "external_container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure ContainerQueue_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_container")
-!$techn=$toElementArg($techn, $tags, "ElementTagTechn", "external_container")
-queue "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias $getLink($link)
+  $getElementLine("queue", "external_container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
 ' Boundaries

C4_Context.puml

@@ -354,10 +354,6 @@ UpdateElementStyle("external_person")
   !return $getElementBase($label, $type, $descr, $sprite)
 !endfunction
 
-!function $getSystem($label, $type, $descr, $sprite)
-  !return $getElementBase($label, $type, $descr, $sprite)
-!endfunction
-
 !unquoted procedure Person($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
 !$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "person")
 ' $type reuses $techn definition of $tags
@@ -385,45 +381,33 @@ rectangle "$getPerson($label, $type, $descr, $sprite)$getProps()" $toStereos("ex
 !endprocedure
 
 !unquoted procedure System($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "system")
-' $type reuses $techn definition of $tags
-!$type=$toElementArg($type, $tags, "ElementTagTechn", "system")
-rectangle "$getSystem($label, $type, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_system")
-' $type reuses $techn definition of $tags
-!$type=$toElementArg($type, $tags, "ElementTagTechn", "external_system")
-rectangle "$getSystem($label, $type, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
+  ' $type reuses $techn definition of $tags
+  $getElementLine("rectangle", "system", $alias, $label, $type, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure SystemDb($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "system")
-' $type reuses $techn definition of $tags
-!$type=$toElementArg($type, $tags, "ElementTagTechn", "system")
-database "$getSystem($label, $type, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
+  ' $type reuses $techn definition of $tags
+  $getElementLine("database", "system", $alias, $label, $type, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "system")
-' $type reuses $techn definition of $tags
-!$type=$toElementArg($type, $tags, "ElementTagTechn", "system")
-queue "$getSystem($label, $type, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
+  ' $type reuses $techn definition of $tags
+  $getElementLine("queue", "system", $alias, $label, $type, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
+  ' $type reuses $techn definition of $tags
+  $getElementLine("rectangle", "external_system", $alias, $label, $type, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure SystemDb_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_system")
-' $type reuses $techn definition of $tags
-!$type=$toElementArg($type, $tags, "ElementTagTechn", "external_system")
-database "$getSystem($label, $type, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
+  ' $type reuses $techn definition of $tags
+  $getElementLine("database", "external_system", $alias, $label, $type, $descr, $sprite, $tags, $link)
 !endprocedure
 
 !unquoted procedure SystemQueue_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="")
-!$sprite=$toElementArg($sprite, $tags, "ElementTagSprite", "external_system")
-' $type reuses $techn definition of $tags
-!$type=$toElementArg($type, $tags, "ElementTagTechn", "external_system")
-queue "$getSystem($label, $type, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
+  ' $type reuses $techn definition of $tags
+  $getElementLine("queue", "external_system", $alias, $label, $type, $descr, $sprite, $tags, $link)
 !endprocedure
 
 ' Boundaries