Merge remote-tracking branch 'origin/dev'

deemount · Mar 15, 2024 · 76e2d81 · 76e2d81
2 parents bc92a2d + d6434d8
commit 76e2d81
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/pkg/flow/Interfaces.go b/pkg/flow/Interfaces.go
@@ -21,7 +21,7 @@ type FlowBaseReferences interface {
 // FlowSequenceFlow ...
 type FlowSequenceFlow interface {
 	SetSequenceFlow(num int)
-	GetSequenceFlow(num int) SEQUENCE_FLOW_PTR
+	GetSequenceFlow(num int) *SequenceFlow
 }
 
 // FlowBase ...

diff --git a/pkg/marker/Types.go b/pkg/marker/Types.go
@@ -17,6 +17,5 @@ type TCATEGORY_SLC []TCategory
 
 type CATEGORY_PTR *Category
 type CATEGORY_VALUE_PTR *CategoryValue
-
-//type INCOMING_PTR *Incoming
-//type OUTGOING_PTR *Outgoing
+type INCOMING_PTR *Incoming
+type OUTGOING_PTR *Outgoing
diff --git a/pkg/process/Process.go b/pkg/process/Process.go
@@ -361,7 +361,7 @@ func (process Process) GetAssociation(num int) flow.ASSOCIATION_PTR {
 }
 
 // GetSequenceFlow ...
-func (process Process) GetSequenceFlow(num int) flow.SEQUENCE_FLOW_PTR {
+func (process Process) GetSequenceFlow(num int) *flow.SequenceFlow {
 	return &process.SequenceFlow[num]
 }
 

diff --git a/pkg/subprocesses/AdHocSubProcess.go b/pkg/subprocesses/AdHocSubProcess.go
@@ -319,6 +319,6 @@ func (adhoc AdHocSubProcess) GetEventBasedGateway(num int) gateways.EVENT_BASED_
 /*** Marker ***/
 
 // GetSequenceFlow ...
-func (adhoc AdHocSubProcess) GetSequenceFlow(num int) flow.SEQUENCE_FLOW_PTR {
+func (adhoc AdHocSubProcess) GetSequenceFlow(num int) *flow.SequenceFlow {
 	return &adhoc.SequenceFlow[num]
 }
diff --git a/pkg/subprocesses/SubProcess.go b/pkg/subprocesses/SubProcess.go
@@ -365,6 +365,6 @@ func (subprocess SubProcess) GetOutgoing(num int) *marker.Outgoing {
 }
 
 // GetSequenceFlow ...
-func (subprocess SubProcess) GetSequenceFlow(num int) flow.SEQUENCE_FLOW_PTR {
+func (subprocess SubProcess) GetSequenceFlow(num int) *flow.SequenceFlow {
 	return &subprocess.SequenceFlow[num]
 }
diff --git a/pkg/subprocesses/Transaction.go b/pkg/subprocesses/Transaction.go
@@ -102,6 +102,6 @@ func (transaction Transaction) GetOutgoing(num int) *marker.Outgoing {
 }
 
 // GetSequenceFlow ...
-func (transaction Transaction) GetSequenceFlow(num int) flow.SEQUENCE_FLOW_PTR {
+func (transaction Transaction) GetSequenceFlow(num int) *flow.SequenceFlow {
 	return &transaction.SequenceFlow[num]
 }