cpee 1.3.214 → 1.3.215

data/cockpit/themes/default/symbols/call.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill cline stand"/>
   <path class="normal" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
 </svg>

data/cockpit/themes/default/symbols/callcorrelationreceive.svg

@@ -1,6 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
-  <circle cx="15" cy="15" r="11" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="cline rfill stand"/>
   <rect x="9" y="11" width="12" height="8" class="black" style="fill: none"/>
   <path d="m 9,11 6,4 6,-4" class="black" style="fill: none"/>
 </svg>

data/cockpit/themes/default/symbols/callcorrelationsend.svg

@@ -1,6 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
-  <circle cx="15" cy="15" r="11" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="cline rfill stand"/>
   <rect x="9" y="11" width="12" height="8" class="black"/>
   <path d="m 9,11 6,3 6,-3" class="white" style="fill: none;"/>
 </svg>

data/cockpit/themes/default/symbols/callinstantiation.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand" style="stroke-dasharray: 1, 3;"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand" style="stroke-dasharray: 1, 3;"/>
 </svg>

data/cockpit/themes/default/symbols/callmanipulate.svg

@@ -1,6 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand"/>
   <path class="normal" transform="translate(-2,-2)" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
-  <circle cx="28" cy="27" r="9" class="rfill stand"/>
+  <circle cx="28" cy="27" r="9" class="cline rfill stand"/>
   <text transform="translate(28,31)" class="small">s</text>
 </svg>

data/cockpit/themes/default/symbols/callmanipulateworklist.svg

@@ -1,6 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand"/>
   <path transform="translate(-2,-2)" class="normal" style="fill:#000000;" d="m 15,6.5 a 3.9999995,4 0 0 0 -4,4 3.9999995,4 0 0 0 4,4 3.9999995,4 0 0 0 4,-4 3.9999995,4 0 0 0 -4,-4 z m 0,8 -3.5,0 c -1.108,0 -2,0.892 -2,2 l 0,5 c 0,1.108 0.892,2 2,2 l 7,0 c 1.108,0 2,-0.892 2,-2 l 0,-5 c 0,-1.108 -0.892,-2 -2,-2 l -3.5,0 z"/>
-  <circle cx="28" cy="27" r="9" class="rfill stand"/>
+  <circle cx="28" cy="27" r="9" class="cline rfill stand"/>
   <text transform="translate(28,31)" class="small">s</text>
 </svg>

data/cockpit/themes/default/symbols/callworklist.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="cline rfill stand"/>
   <path class="normal" style="fill:#000000;" d="m 15,6.5 a 3.9999995,4 0 0 0 -4,4 3.9999995,4 0 0 0 4,4 3.9999995,4 0 0 0 4,-4 3.9999995,4 0 0 0 -4,-4 z m 0,8 -3.5,0 c -1.108,0 -2,0.892 -2,2 l 0,5 c 0,1.108 0.892,2 2,2 l 7,0 c 1.108,0 2,-0.892 2,-2 l 0,-5 c 0,-1.108 -0.892,-2 -2,-2 l -3.5,0 z"/>
 </svg>

data/cockpit/themes/default/symbols/choose.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline stand"/>
   <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
   <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
 </svg>

data/cockpit/themes/default/symbols/choose_exclusive.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline stand"/>
   <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
   <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
 </svg>

data/cockpit/themes/default/symbols/choose_inclusive.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline stand"/>
   <circle cx="15.5" cy="15.5" r="7" class="stand"/>
 </svg>

data/cockpit/themes/default/symbols/critical.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
   <text transform="translate(15,21)" class="normal">⚠</text>
 </svg>

data/cockpit/themes/default/symbols/escape.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
-  <circle cx="15" cy="15" r="11" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="stand cline"/>
+  <circle cx="15" cy="15" r="11" class="stand cline"/>
   <polygon points="10.5,20.5 15,8.5 20.5,20.5 15,15.5 10.5,20.5" class="black"/>
 </svg>

data/cockpit/themes/default/symbols/loop.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline stand"/>
   <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
   <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
 </svg>

data/cockpit/themes/default/symbols/manipulate.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill cline stand"/>
   <text transform="translate(15,21)" class="normal">s</text>
 </svg>

data/cockpit/themes/default/symbols/otherwise.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <circle cx="15" cy="15" r="9" class="standtrans"/>
-  <line x1="9" y1="21" x2="21" y2="9" class="stand"/>
+  <line x1="9" y1="21" x2="21" y2="9" class="stand cline"/>
 </svg>

data/cockpit/themes/default/symbols/parallel.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline stand"/>
   <text transform="translate(15,25)" class="normallarge">+</text>
 </svg>
 

data/cockpit/themes/default/symbols/parallel_branch.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="stand"/>
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline stand"/>
   <text transform="translate(15,20)" class="small">|||</text>
 </svg>

data/cockpit/themes/default/symbols/scripts.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
+  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill cline stand"/>
   <text transform="translate(15,21)" class="normal">s</text>
 </svg>

data/cockpit/themes/default/theme.js

@@ -17,6 +17,15 @@ function WFAdaptorManifestation(adaptor) {
 
     return($X(ntxt));
   };
+  this.clicked = function(){
+    var svgid = 'unknown';
+    _.each(self.adaptor.illustrator.get_elements(),function(value,key) {
+      if ($(value).hasClass('clicked')) {
+        svgid = $(value).attr('element-id');
+      }
+    });
+    return svgid;
+  };
 
   // Events
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
@@ -68,11 +77,11 @@ function WFAdaptorManifestation(adaptor) {
     if (self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
       return;
     }
-    self.adaptor.illustrator.get_nodes().removeClass('clicked');
+    self.adaptor.illustrator.get_elements().removeClass('clicked');
 
     var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
     if (vtarget.length > 0) {
-      vtarget.addClass('clicked');
+      vtarget.parents('g.element[element-id]').addClass('clicked');
     }
 
     if ($('#state').text() != 'finished')
@@ -110,8 +119,9 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.call = { /*{{{*/
     'type': 'primitive',
     'illustrator': {//{{{
-      'endnodes' : 'this',
-      'resolve_symbol' : function(node) {
+      'endnodes': 'this',
+      'label': function(node){return $('label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
+      'resolve_symbol': function(node) {
         if($(node).attr('endpoint').match(/^instantiation/)) {
           return 'callinstantiation';
         } else if($(node).attr('endpoint').match(/^correlation_send/)) {
@@ -143,7 +153,7 @@ function WFAdaptorManifestation(adaptor) {
         ];
       return [];
     }, //}}}
-  'adaptor' : {//{{{
+  'adaptor': {//{{{
     'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
     'click': self.events.click,
     'dragstart': self.events.dragstart,
@@ -152,14 +162,14 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.manipulate = { /*{{{*/
     'type': 'primitive',
     'illustrator': {//{{{
-      'endnodes' : 'this',
+      'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/manipulate.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/manipulate.rng',
     'permissible_children': function(node) { //{{{
       return [];
     }, //}}}
-  'adaptor' : {//{{{
+  'adaptor': {//{{{
     'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
     'click': self.events.click,
    }//}}}
@@ -167,14 +177,14 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.escape = { /*{{{*/
     'type': 'primitive',
     'illustrator': {//{{{
-      'endnodes' : 'this',
+      'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/escape.svg'
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/escape.rng',
     'permissible_children': function(node) { //{{{
       return [];
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
       'click': self.events.click,
     }//}}}
@@ -184,19 +194,20 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.choose = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'aggregate',
+      'label': function(node){return $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' },
+      'endnodes': 'aggregate',
       'closeblock': false,
-      'expansion' : function(node) {
+      'expansion': function(node) {
         return 'horizontal';
       },
-      'resolve_symbol' : function(node) {
+      'resolve_symbol': function(node) {
         if($(node).attr('mode') == 'exclusive') {
           return 'choose_exclusive';
         } else {
           return 'choose_inclusive';
         }
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return false;
       },
       'svg': self.adaptor.theme_dir + 'symbols/choose.svg'
@@ -228,7 +239,7 @@ function WFAdaptorManifestation(adaptor) {
          'params': [self.adaptor.description.elements.parallel_branch, node]});
       return childs;
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,true);
       },
@@ -241,12 +252,12 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.otherwise = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'passthrough',
+      'endnodes': 'passthrough',
       'closeblock': false,
-      'expansion' : function(node) {
+      'expansion': function(node) {
         return 'vertical';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return false;
       },
       'svg': self.adaptor.theme_dir + 'symbols/otherwise.svg'
@@ -289,7 +300,7 @@ function WFAdaptorManifestation(adaptor) {
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,false);
       },
@@ -302,12 +313,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.alternative = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'passthrough',
+      'label': function(node){return $(node).attr('condition')},
+      'endnodes': 'passthrough',
       'closeblock':false,
-      'expansion' : function(node) {
+      'expansion': function(node) {
         return 'vertical';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return false;
       },
       'svg': self.adaptor.theme_dir + 'symbols/alternative.svg'
@@ -353,7 +365,7 @@ function WFAdaptorManifestation(adaptor) {
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,false);
       },
@@ -366,12 +378,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'this',
-      'closeblock' : true,
-      'expansion' : function(node) {
+      'label': function(node){return  $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') },
+      'endnodes': 'this',
+      'closeblock': true,
+      'expansion': function(node) {
         return 'vertical';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return true;
       },
       'svg': self.adaptor.theme_dir + 'symbols/loop.svg'
@@ -422,7 +435,7 @@ function WFAdaptorManifestation(adaptor) {
       }
       return childs;
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,true);
       },
@@ -435,15 +448,15 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'this',
-      'closeblock' : false,
+      'endnodes': 'this',
+      'closeblock': false,
       'border': true,
-      'expansion' : function(node) {
+      'expansion': function(node) {
         // check if any sibling other than 'parallel_branch' is present
         if($(node).children(':not(parallel_branch)').length > 0) return 'vertical';
         return 'horizontal';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return true;
       },
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
@@ -487,7 +500,7 @@ function WFAdaptorManifestation(adaptor) {
            'params': [self.adaptor.description.elements.parallel, node]});
       return childs;
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,true);
       },
@@ -500,12 +513,12 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_branch = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'this',
-      'closeblock' : false,
-      'expansion' : function(node) {
+      'endnodes': 'this',
+      'closeblock': false,
+      'expansion': function(node) {
         return 'vertical';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         if(node.parentNode.tagName == 'choose') return false;
         if($(node).parents('parallel').first().children(':not(parallel_branch)').length > 0) return true;
         return false;
@@ -556,7 +569,7 @@ function WFAdaptorManifestation(adaptor) {
       }
       return childs;
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,false);
       },
@@ -569,13 +582,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.critical = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'aggregate',
-      'closeblock' : false,
+      'endnodes': 'aggregate',
+      'closeblock': false,
       'border': true,
-      'expansion' : function(node) {
+      'expansion': function(node) {
         return 'vertical';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return true;
       },
       'svg': self.adaptor.theme_dir + 'symbols/critical.svg'
@@ -616,7 +629,7 @@ function WFAdaptorManifestation(adaptor) {
          'params': [self.adaptor.description.elements.critical, node]},
       ];
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,true);
       },
@@ -629,13 +642,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.group = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes' : 'aggregate',
-      'closeblock' : false,
+      'endnodes': 'aggregate',
+      'closeblock': false,
       'border': 'injectiongroup', // other value than true,false inidcates the used class for the svg-object
-      'expansion' : function(node) {
+      'expansion': function(node) {
         return 'vertical';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return true;
       },
       'svg': null
@@ -648,7 +661,7 @@ function WFAdaptorManifestation(adaptor) {
       return [
       ];
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,true);
       },
@@ -661,12 +674,12 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.start = this.elements.description = { /*{{{*/
     'type': 'description',
     'illustrator': {//{{{
-      'endnodes' : 'passthrough',
-      'closeblock' : false,
-      'expansion' : function(node) {
+      'endnodes': 'passthrough',
+      'closeblock': false,
+      'expansion': function(node) {
         return 'vertical';
       },
-      'col_shift' : function(node) {
+      'col_shift': function(node) {
         return true;
       },
       'svg': self.adaptor.theme_dir + 'symbols/start.svg'
@@ -707,7 +720,7 @@ function WFAdaptorManifestation(adaptor) {
          'params': [self.adaptor.description.elements.critical, node]}
       ];
     }, //}}}
-    'adaptor' : {//{{{
+    'adaptor': {//{{{
       'mousedown': function (node,e) {
         self.events.mousedown(node,e,true,false);
       },
@@ -726,6 +739,7 @@ function WFAdaptorManifestation(adaptor) {
     'parent': 'call',
     'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
     'illustrator': {//{{{
+      'label': function(node){return $('label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/