cpee 1.5.16 → 1.5.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/js/instance.js +1 -1
  3. data/cockpit/js/wfadaptor.js +1 -1
  4. data/cockpit/testsets/BCO.xml +2 -2
  5. data/cockpit/testsets/BCS.xml +2 -2
  6. data/cockpit/testsets/Lego Full.xml +142 -0
  7. data/cockpit/testsets/Lego Liddy.xml +40 -0
  8. data/cockpit/testsets/Lego_Part_1.xml +85 -0
  9. data/cockpit/testsets/Linear.xml +2 -2
  10. data/cockpit/testsets/Syncing P34 1.xml +2 -2
  11. data/cockpit/testsets/Syncing P34 2.xml +2 -2
  12. data/cockpit/testsets/Syncing P34 3.xml +2 -2
  13. data/cockpit/testsets/Syncing P34.xml +2 -2
  14. data/cockpit/testsets/testsets.xml +3 -1
  15. data/cockpit/themes/compact/theme.js +73 -45
  16. data/cockpit/themes/extended/theme.js +73 -45
  17. data/cockpit/themes/packed/theme.js +73 -45
  18. data/cockpit/themes/preset/theme.js +73 -45
  19. data/cpee.gemspec +1 -1
  20. data/lib/cpee/instantiation.rb +22 -5
  21. data/lib/instantiation.xml +9 -0
  22. data/log/azure.rb +10 -0
  23. data/log/azure_logger.rb +136 -0
  24. data/server/handlerwrappers/default.rb +8 -8
  25. data/server/resources/transformation_dslx.xsl +24 -5
  26. data/server/server.pid +1 -0
  27. metadata +8 -2
data/cockpit/themes/extended/theme.js CHANGED
@@ -152,7 +152,7 @@ function WFAdaptorManifestation(adaptor) {
152
152
  'params': [null, xml_node]
153
153
  }];
154
154
  }
155
- if($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
155
+ if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
156
156
  var icon = self.elements.callmanipulate.illustrator.svg.clone();
157
157
  icon.children('.rfill:last').addClass('menu');
158
158
  menu['Delete'].push({
@@ -160,7 +160,7 @@ function WFAdaptorManifestation(adaptor) {
160
160
  'function_call': self.adaptor.description.remove,
161
161
  'menu_icon': icon,
162
162
  'type': undefined,
163
- 'params': ['> finalize, > update', xml_node]
163
+ 'params': ['> code', xml_node]
164
164
  });
165
165
  }
166
166
  if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
@@ -282,7 +282,7 @@ function WFAdaptorManifestation(adaptor) {
282
282
  },
283
283
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
284
284
  'resolve_symbol': function(node) {
285
- if($('finalize,update', node).length > 0) {
285
+ if($('code', node).length > 0) {
286
286
  return 'callmanipulate';
287
287
  } else {
288
288
  return 'call';
@@ -292,7 +292,7 @@ function WFAdaptorManifestation(adaptor) {
292
292
  },//}}}
293
293
  'description': self.adaptor.theme_dir + 'rngs/call.rng',
294
294
  'permissible_children': function(node,mode) { //{{{
295
- if(node.children('finalize,update').length < 1)
295
+ if(node.children('code').length < 1)
296
296
  return [
297
297
  {'label': 'Scripts',
298
298
  'function_call': self.adaptor.description.insert_last_into,
@@ -578,7 +578,7 @@ function WFAdaptorManifestation(adaptor) {
578
578
  var childs = null;
579
579
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
580
580
  else { func = self.adaptor.description.insert_after }
581
- return [
581
+ var childs = [
582
582
  {'label': 'Service Call with Scripts',
583
583
  'function_call': func,
584
584
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -618,13 +618,18 @@ function WFAdaptorManifestation(adaptor) {
618
618
  'function_call': func,
619
619
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
620
620
  'type': 'stop',
621
- 'params': [self.adaptor.description.elements.stop, node]},
622
- {'label': 'Critical',
623
- 'function_call': func,
624
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
625
- 'type': 'critical',
626
- 'params': [self.adaptor.description.elements.critical, node]}
621
+ 'params': [self.adaptor.description.elements.stop, node]}
627
622
  ];
623
+ if(node.parent('parallel_branch').length > 0) {
624
+ childs.push({
625
+ 'label': 'Critical',
626
+ 'function_call': func,
627
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
628
+ 'type': 'critical',
629
+ 'params': [self.adaptor.description.elements.critical, node]
630
+ });
631
+ }
632
+ return childs;
628
633
  }, //}}}
629
634
  'adaptor': {//{{{
630
635
  'mousedown': function (node,e) {
@@ -669,7 +674,7 @@ function WFAdaptorManifestation(adaptor) {
669
674
  'type': 'parallel_branch',
670
675
  'params': [self.adaptor.description.elements.parallel_branch, node]}];
671
676
  }
672
- return [
677
+ var childs = [
673
678
  {'label': 'Service Call with Scripts',
674
679
  'function_call': func,
675
680
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -709,13 +714,18 @@ function WFAdaptorManifestation(adaptor) {
709
714
  'function_call': func,
710
715
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
711
716
  'type': 'stop',
712
- 'params': [self.adaptor.description.elements.stop, node]},
713
- {'label': 'Critical',
714
- 'function_call': func,
715
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
716
- 'type': 'critical',
717
- 'params': [self.adaptor.description.elements.critical, node]}
717
+ 'params': [self.adaptor.description.elements.stop, node]}
718
718
  ];
719
+ if(node.parent('parallel_branch').length > 0) {
720
+ childs.push({
721
+ 'label': 'Critical',
722
+ 'function_call': func,
723
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
724
+ 'type': 'critical',
725
+ 'params': [self.adaptor.description.elements.critical, node]
726
+ });
727
+ }
728
+ return childs;
719
729
  }, //}}}
720
730
  'adaptor': {//{{{
721
731
  'mousedown': function (node,e) {
@@ -761,7 +771,7 @@ function WFAdaptorManifestation(adaptor) {
761
771
  'menu_icon': self.elements.call.illustrator.svg.clone(),
762
772
  'type': 'call',
763
773
  'params': [self.adaptor.description.elements.call, node]},
764
- {'label': 'Manipulate',
774
+ {'label': 'Script',
765
775
  'function_call': func,
766
776
  'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
767
777
  'type': 'manipulate',
@@ -785,13 +795,17 @@ function WFAdaptorManifestation(adaptor) {
785
795
  'function_call': func,
786
796
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
787
797
  'type': 'stop',
788
- 'params': [self.adaptor.description.elements.stop, node]},
789
- {'label': 'Critical',
790
- 'function_call': func,
791
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
792
- 'type': 'critical',
793
- 'params': [self.adaptor.description.elements.critical, node]}
798
+ 'params': [self.adaptor.description.elements.stop, node]}
794
799
  ];
800
+ if(node.parent('parallel_branch').length > 0) {
801
+ childs.push({
802
+ 'label': 'Critical',
803
+ 'function_call': func,
804
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
805
+ 'type': 'critical',
806
+ 'params': [self.adaptor.description.elements.critical, node]
807
+ });
808
+ }
795
809
  if(node.parent('parallel').length > node.parent('parallel_branch').length) {
796
810
  childs.push({'label': 'Parallel Branch',
797
811
  'function_call': func,
@@ -851,7 +865,7 @@ function WFAdaptorManifestation(adaptor) {
851
865
  'menu_icon': self.elements.call.illustrator.svg.clone(),
852
866
  'type': 'call',
853
867
  'params': [self.adaptor.description.elements.call, node]},
854
- {'label': 'Manipulate',
868
+ {'label': 'Script',
855
869
  'function_call': func,
856
870
  'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
857
871
  'type': 'manipulate',
@@ -870,7 +884,12 @@ function WFAdaptorManifestation(adaptor) {
870
884
  'function_call': func,
871
885
  'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
872
886
  'type': 'parallel_branch',
873
- 'params': [self.adaptor.description.elements.parallel_branch, node]}
887
+ 'params': [self.adaptor.description.elements.parallel_branch, node]},
888
+ {'label': 'Stop',
889
+ 'function_call': func,
890
+ 'menu_icon': self.elements.stop.illustrator.svg.clone(),
891
+ 'type': 'stop',
892
+ 'params': [self.adaptor.description.elements.stop, node]}
874
893
  ];
875
894
  if(node.get(0).tagName != 'parallel')
876
895
  childs.push({'label': 'Parallel',
@@ -916,10 +935,9 @@ function WFAdaptorManifestation(adaptor) {
916
935
  'description': self.adaptor.theme_dir + 'rngs/parallel_branch.rng',
917
936
  'permissible_children': function(node,mode) { //{{{
918
937
  var func = null;
919
- var childs = null;
920
938
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
921
939
  else { func = self.adaptor.description.insert_after }
922
- childs = [
940
+ var childs = [
923
941
  {'label': 'Service Call with Scripts',
924
942
  'function_call': func,
925
943
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -964,7 +982,7 @@ function WFAdaptorManifestation(adaptor) {
964
982
  'function_call': func,
965
983
  'menu_icon': self.elements.critical.illustrator.svg.clone(),
966
984
  'type': 'critical',
967
- 'params': [self.adaptor.description.elements.critical, node]},
985
+ 'params': [self.adaptor.description.elements.critical, node]}
968
986
  ];
969
987
  if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
970
988
  return [{'label': 'Alternative',
@@ -1009,7 +1027,7 @@ function WFAdaptorManifestation(adaptor) {
1009
1027
  var func = null;
1010
1028
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
1011
1029
  else { func = self.adaptor.description.insert_after }
1012
- return [
1030
+ var childs = [
1013
1031
  {'label': 'Service Call with Scripts',
1014
1032
  'function_call': func,
1015
1033
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1049,13 +1067,18 @@ function WFAdaptorManifestation(adaptor) {
1049
1067
  'function_call': func,
1050
1068
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
1051
1069
  'type': 'stop',
1052
- 'params': [self.adaptor.description.elements.stop, node]},
1053
- {'label': 'Critical',
1054
- 'function_call': func,
1055
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1056
- 'type': 'critical',
1057
- 'params': [self.adaptor.description.elements.critical, node]},
1070
+ 'params': [self.adaptor.description.elements.stop, node]}
1058
1071
  ];
1072
+ if(node.parent('parallel_branch').length > 0) {
1073
+ childs.push({
1074
+ 'label': 'Critical',
1075
+ 'function_call': func,
1076
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1077
+ 'type': 'critical',
1078
+ 'params': [self.adaptor.description.elements.critical, node]
1079
+ });
1080
+ }
1081
+ return childs;
1059
1082
  }, //}}}
1060
1083
  'adaptor': {//{{{
1061
1084
  'mousedown': function (node,e) {
@@ -1120,7 +1143,7 @@ function WFAdaptorManifestation(adaptor) {
1120
1143
  var func = null;
1121
1144
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
1122
1145
  else { func = self.adaptor.description.insert_after }
1123
- return [
1146
+ var childs = [
1124
1147
  {'label': 'Service Call with Scripts',
1125
1148
  'function_call': func,
1126
1149
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1131,7 +1154,7 @@ function WFAdaptorManifestation(adaptor) {
1131
1154
  'menu_icon': self.elements.call.illustrator.svg.clone(),
1132
1155
  'type': 'call',
1133
1156
  'params': [self.adaptor.description.elements.call, node]},
1134
- {'label': 'Script Task',
1157
+ {'label': 'Script',
1135
1158
  'function_call': func,
1136
1159
  'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
1137
1160
  'type': 'manipulate',
@@ -1160,13 +1183,18 @@ function WFAdaptorManifestation(adaptor) {
1160
1183
  'function_call': func,
1161
1184
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
1162
1185
  'type': 'stop',
1163
- 'params': [self.adaptor.description.elements.stop, node]},
1164
- {'label': 'Critical',
1165
- 'function_call': func,
1166
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1167
- 'type': 'critical',
1168
- 'params': [self.adaptor.description.elements.critical, node]}
1186
+ 'params': [self.adaptor.description.elements.stop, node]}
1169
1187
  ];
1188
+ if(node.parent('parallel_branch').length > 0) {
1189
+ childs.push({
1190
+ 'label': 'Critical',
1191
+ 'function_call': func,
1192
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1193
+ 'type': 'critical',
1194
+ 'params': [self.adaptor.description.elements.critical, node]
1195
+ });
1196
+ }
1197
+ return childs;
1170
1198
  }, //}}}
1171
1199
  'adaptor': {//{{{
1172
1200
  'mousedown': function (node,e) {
data/cockpit/themes/packed/theme.js CHANGED
@@ -152,7 +152,7 @@ function WFAdaptorManifestation(adaptor) {
152
152
  'params': [null, xml_node]
153
153
  }];
154
154
  }
155
- if($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
155
+ if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
156
156
  var icon = self.elements.callmanipulate.illustrator.svg.clone();
157
157
  icon.children('.rfill:last').addClass('menu');
158
158
  menu['Delete'].push({
@@ -160,7 +160,7 @@ function WFAdaptorManifestation(adaptor) {
160
160
  'function_call': self.adaptor.description.remove,
161
161
  'menu_icon': icon,
162
162
  'type': undefined,
163
- 'params': ['> finalize, > update', xml_node]
163
+ 'params': ['> code', xml_node]
164
164
  });
165
165
  }
166
166
  if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
@@ -253,7 +253,7 @@ function WFAdaptorManifestation(adaptor) {
253
253
  },
254
254
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
255
255
  'resolve_symbol': function(node) {
256
- if($('finalize,update', node).length > 0) {
256
+ if($('code', node).length > 0) {
257
257
  return 'callmanipulate';
258
258
  } else {
259
259
  return 'call';
@@ -263,7 +263,7 @@ function WFAdaptorManifestation(adaptor) {
263
263
  },//}}}
264
264
  'description': self.adaptor.theme_dir + 'rngs/call.rng',
265
265
  'permissible_children': function(node,mode) { //{{{
266
- if(node.children('finalize,update').length < 1)
266
+ if(node.children('code').length < 1)
267
267
  return [
268
268
  {'label': 'Scripts',
269
269
  'function_call': self.adaptor.description.insert_last_into,
@@ -537,7 +537,7 @@ function WFAdaptorManifestation(adaptor) {
537
537
  var childs = null;
538
538
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
539
539
  else { func = self.adaptor.description.insert_after }
540
- return [
540
+ var childs = [
541
541
  {'label': 'Service Call with Scripts',
542
542
  'function_call': func,
543
543
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -577,13 +577,18 @@ function WFAdaptorManifestation(adaptor) {
577
577
  'function_call': func,
578
578
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
579
579
  'type': 'stop',
580
- 'params': [self.adaptor.description.elements.stop, node]},
581
- {'label': 'Critical',
582
- 'function_call': func,
583
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
584
- 'type': 'critical',
585
- 'params': [self.adaptor.description.elements.critical, node]}
580
+ 'params': [self.adaptor.description.elements.stop, node]}
586
581
  ];
582
+ if(node.parent('parallel_branch').length > 0) {
583
+ childs.push({
584
+ 'label': 'Critical',
585
+ 'function_call': func,
586
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
587
+ 'type': 'critical',
588
+ 'params': [self.adaptor.description.elements.critical, node]
589
+ });
590
+ }
591
+ return childs;
587
592
  }, //}}}
588
593
  'adaptor': {//{{{
589
594
  'mousedown': function (node,e) {
@@ -624,7 +629,7 @@ function WFAdaptorManifestation(adaptor) {
624
629
  'type': 'parallel_branch',
625
630
  'params': [self.adaptor.description.elements.parallel_branch, node]}];
626
631
  }
627
- return [
632
+ var childs = [
628
633
  {'label': 'Service Call with Scripts',
629
634
  'function_call': func,
630
635
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -664,13 +669,18 @@ function WFAdaptorManifestation(adaptor) {
664
669
  'function_call': func,
665
670
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
666
671
  'type': 'stop',
667
- 'params': [self.adaptor.description.elements.stop, node]},
668
- {'label': 'Critical',
669
- 'function_call': func,
670
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
671
- 'type': 'critical',
672
- 'params': [self.adaptor.description.elements.critical, node]}
672
+ 'params': [self.adaptor.description.elements.stop, node]}
673
673
  ];
674
+ if(node.parent('parallel_branch').length > 0) {
675
+ childs.push({
676
+ 'label': 'Critical',
677
+ 'function_call': func,
678
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
679
+ 'type': 'critical',
680
+ 'params': [self.adaptor.description.elements.critical, node]
681
+ });
682
+ }
683
+ return childs;
674
684
  }, //}}}
675
685
  'adaptor': {//{{{
676
686
  'mousedown': function (node,e) {
@@ -716,7 +726,7 @@ function WFAdaptorManifestation(adaptor) {
716
726
  'menu_icon': self.elements.call.illustrator.svg.clone(),
717
727
  'type': 'call',
718
728
  'params': [self.adaptor.description.elements.call, node]},
719
- {'label': 'Manipulate',
729
+ {'label': 'Script',
720
730
  'function_call': func,
721
731
  'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
722
732
  'type': 'manipulate',
@@ -740,13 +750,17 @@ function WFAdaptorManifestation(adaptor) {
740
750
  'function_call': func,
741
751
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
742
752
  'type': 'stop',
743
- 'params': [self.adaptor.description.elements.stop, node]},
744
- {'label': 'Critical',
745
- 'function_call': func,
746
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
747
- 'type': 'critical',
748
- 'params': [self.adaptor.description.elements.critical, node]}
753
+ 'params': [self.adaptor.description.elements.stop, node]}
749
754
  ];
755
+ if(node.parent('parallel_branch').length > 0) {
756
+ childs.push({
757
+ 'label': 'Critical',
758
+ 'function_call': func,
759
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
760
+ 'type': 'critical',
761
+ 'params': [self.adaptor.description.elements.critical, node]
762
+ });
763
+ }
750
764
  if(node.parent('parallel').length > node.parent('parallel_branch').length) {
751
765
  childs.push({'label': 'Parallel Branch',
752
766
  'function_call': func,
@@ -806,7 +820,7 @@ function WFAdaptorManifestation(adaptor) {
806
820
  'menu_icon': self.elements.call.illustrator.svg.clone(),
807
821
  'type': 'call',
808
822
  'params': [self.adaptor.description.elements.call, node]},
809
- {'label': 'Manipulate',
823
+ {'label': 'Script',
810
824
  'function_call': func,
811
825
  'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
812
826
  'type': 'manipulate',
@@ -825,7 +839,12 @@ function WFAdaptorManifestation(adaptor) {
825
839
  'function_call': func,
826
840
  'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
827
841
  'type': 'parallel_branch',
828
- 'params': [self.adaptor.description.elements.parallel_branch, node]}
842
+ 'params': [self.adaptor.description.elements.parallel_branch, node]},
843
+ {'label': 'Stop',
844
+ 'function_call': func,
845
+ 'menu_icon': self.elements.stop.illustrator.svg.clone(),
846
+ 'type': 'stop',
847
+ 'params': [self.adaptor.description.elements.stop, node]}
829
848
  ];
830
849
  if(node.get(0).tagName != 'parallel')
831
850
  childs.push({'label': 'Parallel',
@@ -871,10 +890,9 @@ function WFAdaptorManifestation(adaptor) {
871
890
  'description': self.adaptor.theme_dir + 'rngs/parallel_branch.rng',
872
891
  'permissible_children': function(node,mode) { //{{{
873
892
  var func = null;
874
- var childs = null;
875
893
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
876
894
  else { func = self.adaptor.description.insert_after }
877
- childs = [
895
+ var childs = [
878
896
  {'label': 'Service Call with Scripts',
879
897
  'function_call': func,
880
898
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -919,7 +937,7 @@ function WFAdaptorManifestation(adaptor) {
919
937
  'function_call': func,
920
938
  'menu_icon': self.elements.critical.illustrator.svg.clone(),
921
939
  'type': 'critical',
922
- 'params': [self.adaptor.description.elements.critical, node]},
940
+ 'params': [self.adaptor.description.elements.critical, node]}
923
941
  ];
924
942
  if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
925
943
  return [{'label': 'Alternative',
@@ -964,7 +982,7 @@ function WFAdaptorManifestation(adaptor) {
964
982
  var func = null;
965
983
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
966
984
  else { func = self.adaptor.description.insert_after }
967
- return [
985
+ var childs = [
968
986
  {'label': 'Service Call with Scripts',
969
987
  'function_call': func,
970
988
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1004,13 +1022,18 @@ function WFAdaptorManifestation(adaptor) {
1004
1022
  'function_call': func,
1005
1023
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
1006
1024
  'type': 'stop',
1007
- 'params': [self.adaptor.description.elements.stop, node]},
1008
- {'label': 'Critical',
1009
- 'function_call': func,
1010
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1011
- 'type': 'critical',
1012
- 'params': [self.adaptor.description.elements.critical, node]},
1025
+ 'params': [self.adaptor.description.elements.stop, node]}
1013
1026
  ];
1027
+ if(node.parent('parallel_branch').length > 0) {
1028
+ childs.push({
1029
+ 'label': 'Critical',
1030
+ 'function_call': func,
1031
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1032
+ 'type': 'critical',
1033
+ 'params': [self.adaptor.description.elements.critical, node]
1034
+ });
1035
+ }
1036
+ return childs;
1014
1037
  }, //}}}
1015
1038
  'adaptor': {//{{{
1016
1039
  'mousedown': function (node,e) {
@@ -1074,7 +1097,7 @@ function WFAdaptorManifestation(adaptor) {
1074
1097
  var func = null;
1075
1098
  if (mode == 'into') { func = self.adaptor.description.insert_first_into }
1076
1099
  else { func = self.adaptor.description.insert_after }
1077
- return [
1100
+ var childs = [
1078
1101
  {'label': 'Service Call with Scripts',
1079
1102
  'function_call': func,
1080
1103
  'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1085,7 +1108,7 @@ function WFAdaptorManifestation(adaptor) {
1085
1108
  'menu_icon': self.elements.call.illustrator.svg.clone(),
1086
1109
  'type': 'call',
1087
1110
  'params': [self.adaptor.description.elements.call, node]},
1088
- {'label': 'Script Task',
1111
+ {'label': 'Script',
1089
1112
  'function_call': func,
1090
1113
  'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
1091
1114
  'type': 'manipulate',
@@ -1114,13 +1137,18 @@ function WFAdaptorManifestation(adaptor) {
1114
1137
  'function_call': func,
1115
1138
  'menu_icon': self.elements.stop.illustrator.svg.clone(),
1116
1139
  'type': 'stop',
1117
- 'params': [self.adaptor.description.elements.stop, node]},
1118
- {'label': 'Critical',
1119
- 'function_call': func,
1120
- 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1121
- 'type': 'critical',
1122
- 'params': [self.adaptor.description.elements.critical, node]}
1140
+ 'params': [self.adaptor.description.elements.stop, node]}
1123
1141
  ];
1142
+ if(node.parent('parallel_branch').length > 0) {
1143
+ childs.push({
1144
+ 'label': 'Critical',
1145
+ 'function_call': func,
1146
+ 'menu_icon': self.elements.critical.illustrator.svg.clone(),
1147
+ 'type': 'critical',
1148
+ 'params': [self.adaptor.description.elements.critical, node]
1149
+ });
1150
+ }
1151
+ return childs;
1124
1152
  }, //}}}
1125
1153
  'adaptor': {//{{{
1126
1154
  'mousedown': function (node,e) {