-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Nested Executions initial implementation #394
Merged
Merged
Commits on Oct 11, 2018
-
issue_253 - nested execution specification
- new method to get elementAt on execution specification, and access to nested executions - command to create a nested execution, that may be refactored with some commons of the insertExecutionCommand on lifelines - Add some tests - handle destruction of nested executions (and their related messages / nested lifelines in chain) Some points left: - adding a nested execution always nudge parent exec, where it should not if there is enough space - no side is currently handled for the nested execution representation - getNestedExecution() may rely on recently introduced getCovered() for #52 Change-Id: I50589eb0e4ae7b850579d6e1cad5966937dffa4c Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for fb7f086 - Browse repository at this point
Copy the full SHA fb7f086View commit details -
- Check and update model generation for test and model plugin from seqd.ecore - do not update edit plugin (formatting issues with current version on the server) Change-Id: I532032620ae40c29412ef113f183709a4cc25b5c Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for c76c5f7 - Browse repository at this point
Copy the full SHA c76c5f7View commit details -
- update the nudging policy to be similar to the current implementation of standard executions - 2 issues in the tests: 1 is ignored (but not by my dev env) as the test is not implemented yet, and one that can be reproduced by hand: if a lifeline has an execution with a nested execution, it can not be deleted. Change-Id: I4b52b6d0a7248dcfe01365c40d559602d30406c5 Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for 1815cfc - Browse repository at this point
Copy the full SHA 1815cfcView commit details
Commits on Oct 12, 2018
-
issue_253 (nested execution specification)
- update lifeline API with a method to get first level executions to be able to remove only these executions. Nested ones will be remove in chain by the remove execution command - update tests Change-Id: Iae629bd73730a75880ecdb4ff263aaefd7428ac7 Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for eafba71 - Browse repository at this point
Copy the full SHA eafba71View commit details
Commits on Oct 15, 2018
-
Issue 253: nested specification
- Develop additional tests for complex scenarios (dependencies with messages between different lifelines) - 2 tests are failing, but this seems independant from the nested exec spec, as it fails even if they are removed from initial model. Change-Id: I56794a50383e3e4d793ffa62d49089188f2c8f2a Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for 89937b9 - Browse repository at this point
Copy the full SHA 89937b9View commit details
Commits on Oct 31, 2018
-
Merge branch 'master' into rschnekenbu/253_nestedexecution
Conflicts: plugins/org.eclipse.papyrus.uml.interaction.model/model/seqd.ecore plugins/org.eclipse.papyrus.uml.interaction.model/model/seqd.genmodel plugins/org.eclipse.papyrus.uml.interaction.model/src-gen/org/eclipse/papyrus/uml/interaction/internal/model/SequenceDiagramPackage.java plugins/org.eclipse.papyrus.uml.interaction.model/src-gen/org/eclipse/papyrus/uml/interaction/internal/model/impl/MExecutionImpl.java plugins/org.eclipse.papyrus.uml.interaction.model/src-gen/org/eclipse/papyrus/uml/interaction/internal/model/impl/MLifelineImpl.java plugins/org.eclipse.papyrus.uml.interaction.model/src-gen/org/eclipse/papyrus/uml/interaction/internal/model/impl/SequenceDiagramPackageImpl.java plugins/org.eclipse.papyrus.uml.interaction.model/src-gen/org/eclipse/papyrus/uml/interaction/model/MExecution.java plugins/org.eclipse.papyrus.uml.interaction.model/src-gen/org/eclipse/papyrus/uml/interaction/model/MLifeline.java tests/org.eclipse.papyrus.uml.interaction.model.tests/src-gen/org/eclipse/papyrus/uml/interaction/model/tests/MExecutionTest.java tests/org.eclipse.papyrus.uml.interaction.model.tests/src-gen/org/eclipse/papyrus/uml/interaction/model/tests/MLifelineTest.java
Configuration menu - View commit details
-
Copy full SHA for 74dad5c - Browse repository at this point
Copy the full SHA 74dad5cView commit details -
- generate code from ecore model after merge - Add functional test for creation Change-Id: I08bd36736552dbe715c426107c7108a50cd20b20 Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for 767cc4a - Browse repository at this point
Copy the full SHA 767cc4aView commit details
Commits on Nov 6, 2018
-
- avoid issue on nested executions when reparenting the parent execution on another lifeline using start message + add functional test - fix typo on Occur'r'ence variables - use Optionals#as in ExecutionSpecificationCreationEditPolicy - improve code readability in MLifelineImpl - update test in ExecutionSpecificationCreationEditPolicyUITest to avoid issues on Mac. - Fix header in InsertNestedExecutionCommand - restore deleted test after merge Change-Id: Ic08bb70eee73fb235fcb46876628e939deafdf14 Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for 348a8d6 - Browse repository at this point
Copy the full SHA 348a8d6View commit details
Commits on Nov 7, 2018
-
- Remove attempt to fix computation of coordinates in the LifelineBodyFigure (currently, same code as overridden method) Change-Id: I903b3c23925f5f74298119861beaa4ba6e729a2e Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for e65b707 - Browse repository at this point
Copy the full SHA e65b707View commit details -
- Fix test failure on MAC (no assume on y position at the beginning, but compute the initial position and then check element position compared to this initial position) Change-Id: I84df77c862bffa4faa7826b9d341af0ba3b55c81 Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Configuration menu - View commit details
-
Copy full SHA for 4ac2cc3 - Browse repository at this point
Copy the full SHA 4ac2cc3View commit details
Commits on Nov 8, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 2b016f0 - Browse repository at this point
Copy the full SHA 2b016f0View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.