Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1094 conditional error flows error model v2 #1238

Merged
merged 18 commits into from May 11, 2018
Merged

1094 conditional error flows error model v2 #1238

merged 18 commits into from May 11, 2018

Conversation

reteprelief
Copy link
Contributor

Fixes #1094

reteprelief and others added 18 commits March 8, 2018 17:18
@reteprelief
Added 'if' condition to error sinks and error paths.
893acba
@reteprelief
added 'if' condoition to all flows. renamed the reference to
1eaae3d 
flowcondition as condition caused Xtext to do non-sense.
@reteprelief
added calling of 'if' condition.
e8780b1 
renamed Util to PropagationPathsUtil
@reteprelief
moved condition processing to PropagationPathsUtil
120d396
@reteprelief
Removed old FTA stuff.
ce03394
@reteprelief
removed System.out call.
dd66e9e
@reteprelief
Latest update to executeResolute
c9ce3c6
@reteprelief
copy of ExecuteResoluteUtil in propagationpath
a5c861a 
same for ExecuteJavaUtil
Merge remote-tracking branch 'origin/develop' into osate/osate2-core#…
9e612ee 
…1094_Conditional_Error_Flows
@reteprelief
Merge branch 'develop' into osate/osate2-core#1094_Conditional_Error_…
ab0315c 
…Flows
@reteprelief
Updated from Issue to Diagnostic
3bdf6f3
@reteprelief
renamed attribute flowcondition to eventcondition for errorevent.
573360f 
moved the condition check to each flow type in backward traversal.
@reteprelief
more files as part of the last commit
4234659
@reteprelief
impact analysis calls on conditionHolds
badc9dd
@reteprelief
Updated ExecuteResoluteUtil from the original in Assure.
7de3f1a 
updated conditionHolds to accept instanceObject as second parameter.
@lwrage
[Project] Merge branch 1094_Conditional_Error_Flows__ErrorModelV2 of …
4a8b383 
…ErrorModelV2 into refs/heads/1094_Conditional_Error_Flows__ErrorModelV2
@reteprelief
Merge remote-tracking branch 'origin/develop' into 1094_Conditional_E…
6563c31 
…rror_Flows__ErrorModelV2
@reteprelief
Merge remote-tracking branch 'origin/develop' into 1094_Conditional_E…
3cb1345 
…rror_Flows__ErrorModelV2
@ghost ghost assigned reteprelief May 11, 2018
@ghost ghost added the review label May 11, 2018
@reteprelief reteprelief merged commit 48cffe5 into develop May 11, 2018
@reteprelief reteprelief deleted the 1094_Conditional_Error_Flows__ErrorModelV2 branch May 11, 2018 02:41
@ghost ghost removed the review label May 11, 2018
@reteprelief reteprelief added this to the 2.3.4 milestone May 11, 2018
@lwrage lwrage restored the 1094_Conditional_Error_Flows__ErrorModelV2 branch May 15, 2018 12:41
@lwrage lwrage mentioned this pull request May 15, 2018
Merged
@lwrage lwrage removed this from the 2.3.4 milestone May 15, 2018
@reteprelief reteprelief deleted the 1094_Conditional_Error_Flows__ErrorModelV2 branch May 17, 2018 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@reteprelief reteprelief

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@reteprelief @lwrage