Skip to content

Commit a91f45e

Browse files
seidewitzseidewitz
committed
Changed use of SignalInstance to EventOccurrence (OMG Issue FUML13-23).
1 parent 03999dc commit a91f45e

4 files changed

Lines changed: 17 additions & 45 deletions

File tree

‎org.modeldriven.fuml/src/main/java/fUML/Semantics/Actions/BasicActions/SendSignalActionActivation.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Initial version copyright 2008 Lockheed Martin Corporation, except
44
* as stated in the file entitled Licensing-Information.
55
*
6-
* All modifications copyright 2009-2012 Data Access Technologies, Inc.
6+
* All modifications copyright 2009-2017 Data Access Technologies, Inc.
77
*
88
* Licensed under the Academic Free License version 3.0
99
* (http://www.opensource.org/licenses/afl-3.0.php), except as stated
@@ -12,21 +12,12 @@
1212

1313
package fUML.Semantics.Actions.BasicActions;
1414

15-
import fUML.Debug;
16-
import UMLPrimitiveTypes.*;
17-
18-
import fUML.Syntax.*;
1915
import fUML.Syntax.Classes.Kernel.*;
20-
import fUML.Syntax.CommonBehaviors.BasicBehaviors.*;
2116
import fUML.Syntax.CommonBehaviors.Communications.*;
22-
import fUML.Syntax.Activities.IntermediateActivities.*;
2317
import fUML.Syntax.Actions.BasicActions.*;
2418

25-
import fUML.Semantics.*;
2619
import fUML.Semantics.Classes.Kernel.*;
27-
import fUML.Semantics.CommonBehaviors.BasicBehaviors.*;
2820
import fUML.Semantics.CommonBehaviors.Communications.*;
29-
import fUML.Semantics.Loci.*;
3021

3122
public class SendSignalActionActivation extends
3223
fUML.Semantics.Actions.BasicActions.InvocationActionActivation {
@@ -55,7 +46,9 @@ public void doAction() {
5546
signalInstance.setFeatureValue(attribute, values, 0);
5647
}
5748

58-
((Reference) target).send(signalInstance);
49+
SignalEventOccurrence signalEventOccurrence = new SignalEventOccurrence();
50+
signalEventOccurrence.signalInstance = (SignalInstance) signalInstance.copy();
51+
((Reference) target).send(signalEventOccurrence);
5952
}
6053
} // doAction
6154

‎org.modeldriven.fuml/src/main/java/fUML/Semantics/Classes/Kernel/Object_.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Initial version copyright 2008 Lockheed Martin Corporation, except
44
* as stated in the file entitled Licensing-Information.
55
*
6-
* All modifications copyright 2009-2015 Data Access Technologies, Inc.
6+
* All modifications copyright 2009-2017 Data Access Technologies, Inc.
77
*
88
* Licensed under the Academic Free License version 3.0
99
* (http://www.opensource.org/licenses/afl-3.0.php), except as stated
@@ -13,14 +13,9 @@
1313
package fUML.Semantics.Classes.Kernel;
1414

1515
import fUML.Debug;
16-
import UMLPrimitiveTypes.*;
17-
18-
import fUML.Syntax.*;
1916
import fUML.Syntax.Classes.Kernel.*;
2017

21-
import fUML.Semantics.*;
2218
import fUML.Semantics.CommonBehaviors.Communications.*;
23-
import fUML.Semantics.Loci.*;
2419

2520
public class Object_ extends fUML.Semantics.Classes.Kernel.ExtensionalValue {
2621

@@ -56,12 +51,12 @@ public fUML.Semantics.CommonBehaviors.BasicBehaviors.Execution dispatch(
5651
} // dispatch
5752

5853
public void send(
59-
fUML.Semantics.CommonBehaviors.Communications.SignalInstance signalInstance) {
60-
// If the object is active, add the given signal instance to the event
61-
// pool and signal that a new signal instance has arrived.
54+
fUML.Semantics.CommonBehaviors.Communications.EventOccurrence eventOccurrence) {
55+
// If the object is active, add the given event occurrence to the event
56+
// pool and signal that a new event occurrence has arrived.
6257

6358
if (this.objectActivation != null) {
64-
this.objectActivation.send(signalInstance);
59+
this.objectActivation.send(eventOccurrence);
6560
}
6661

6762
} // send

‎org.modeldriven.fuml/src/main/java/fUML/Semantics/Classes/Kernel/Reference.java‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Initial version copyright 2008 Lockheed Martin Corporation, except
44
* as stated in the file entitled Licensing-Information.
55
*
6-
* All modifications copyright 2009-2012 Data Access Technologies, Inc.
6+
* All modifications copyright 2009-2017 Data Access Technologies, Inc.
77
*
88
* Licensed under the Academic Free License version 3.0
99
* (http://www.opensource.org/licenses/afl-3.0.php), except as stated
@@ -12,15 +12,6 @@
1212

1313
package fUML.Semantics.Classes.Kernel;
1414

15-
import fUML.Debug;
16-
import UMLPrimitiveTypes.*;
17-
18-
import fUML.Syntax.*;
19-
import fUML.Syntax.Classes.Kernel.*;
20-
21-
import fUML.Semantics.*;
22-
import fUML.Semantics.Loci.*;
23-
2415
public class Reference extends fUML.Semantics.Classes.Kernel.StructuredValue {
2516

2617
public fUML.Semantics.Classes.Kernel.Object_ referent = null;
@@ -42,10 +33,10 @@ public fUML.Semantics.CommonBehaviors.BasicBehaviors.Execution dispatch(
4233
} // dispatch
4334

4435
public void send(
45-
fUML.Semantics.CommonBehaviors.Communications.SignalInstance signalInstance) {
46-
// Send the given signal instance to the referent object.
36+
fUML.Semantics.CommonBehaviors.Communications.EventOccurrence eventOccurrence) {
37+
// Send the given event occurrence to the referent object.
4738

48-
this.referent.send(signalInstance);
39+
this.referent.send(eventOccurrence);
4940
} // send
5041

5142
public void destroy() {

‎org.modeldriven.fuml/src/main/java/fUML/Semantics/CommonBehaviors/Communications/ObjectActivation.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Initial version copyright 2008 Lockheed Martin Corporation, except
44
* as stated in the file entitled Licensing-Information.
55
*
6-
* All modifications copyright 2009-2015 Data Access Technologies, Inc.
6+
* All modifications copyright 2009-2017 Data Access Technologies, Inc.
77
*
88
* Licensed under the Academic Free License version 3.0
99
* (http://www.opensource.org/licenses/afl-3.0.php), except as stated
@@ -17,13 +17,8 @@
1717

1818
import java.util.Iterator;
1919

20-
import fUML.Syntax.*;
2120
import fUML.Syntax.Classes.Kernel.*;
2221
import fUML.Syntax.CommonBehaviors.BasicBehaviors.*;
23-
import fUML.Syntax.CommonBehaviors.Communications.*;
24-
25-
import fUML.Semantics.*;
26-
import fUML.Semantics.Classes.Kernel.*;
2722
import fUML.Semantics.CommonBehaviors.BasicBehaviors.*;
2823
import fUML.Semantics.Loci.LociL1.*;
2924

@@ -121,12 +116,10 @@ public fUML.Semantics.CommonBehaviors.Communications.EventOccurrence getNextEven
121116
} // getNextEvent
122117

123118
public void send(
124-
fUML.Semantics.CommonBehaviors.Communications.SignalInstance signalInstance) {
125-
// Add a signal event occurrence for the given signal instance to the event pool
126-
// and signal that a new event occurrence has arrived.
119+
fUML.Semantics.CommonBehaviors.Communications.EventOccurrence eventOccurrence) {
120+
// Add an event occurrence to the event pool and signal that a
121+
// new event occurrence has arrived.
127122

128-
SignalEventOccurrence eventOccurrence = new SignalEventOccurrence();
129-
eventOccurrence.signalInstance = (SignalInstance) signalInstance.copy();
130123
this.eventPool.addValue(eventOccurrence);
131124
_send(new ArrivalSignal());
132125
} // send

0 commit comments

Comments
 (0)