Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-05-26Bug 466454 - Corrected mapping to properly handle "stub"Ed Seidewitz1-1/+1
classifierBehaviors. Change-Id: Ibf1b4893a8aeaabd4de518c256be96f6e59d8ae2 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com> Reviewed-on: https://git.eclipse.org/r/48471 Tested-by: Hudson CI Reviewed-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr> Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
2015-05-21Fix incorrect refresh of the ALF editor a compilation.jeremie.tatibouet1-1/+18
Fix unecessary creation of textual representation comments. Fix automated population of error log with debug messages Change-Id: If5d01a83c90935a848377bf5f0ea8654a32526a5 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/48342 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-18Bug 466448 - Changed the unit definition mapping to not set visibilityEd Seidewitz1-2/+6
and then to maintain the target visiblility during model merge. Change-Id: Icef9e1833f432b0e5901af6c44165039d9aeff87 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-05-18Bug 466443, bug 466446: Corrected InternalElementReference::activeClassEd Seidewitz1-1/+2
to handle a classifier behavior subunit. Change-Id: Ic22033efdd8d91e7e355d3cfb37d1385de1ea82f Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-05-17Bug 466428: Updated the ActivityDefinition::toActivity() mapping toEd Seidewitz1-15/+9
properly map a method specification reference. Change-Id: I7059b181963fcec74fb25fd6a28ea14b3297af62 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-05-17Bug 466424: Modified ModelMerge for activities to only set the nodes andEd Seidewitz1-7/+9
edges of the target activity if the source activity is not a stub. Change-Id: Ia4b13c937de811b54c78ce274accdb7af89eb4cc Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-05-16Corrected several return type compatibility issues that are now beingEd Seidewitz1-13/+0
flagged by the OCL in Ecore editor. Change-Id: I638697bf031aa10c69751cf8110a934af45837e7 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-05-13Merge branch 'bugs/462954-alf' ofEd Seidewitz8-36/+393
git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git into bugs/462954-alf Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-05-05Clean-up: delete overriden method getDefaultRulejeremie.tatibouet1-29/+14
Override doReparse in order to handle error occurence. It avoids XtextReconcilierJob to freeze the editor if reparse fails. Change-Id: I1d78b5cc46f5fbbe076f337683c27b308b69074d Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/47158 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-05Temporarily fix the model merge strategy to avoid systematic deletion ofjeremie.tatibouet1-4/+44
an activity referenced as a method of an Operation. Change-Id: I055f25c1b8936b935be89b6ef0105b9d247dd039 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/47156 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-05Enables the ALF editor when an operation is selected. Still some mergejeremie.tatibouet1-0/+3
problem at this step (e.g. the implementation of an operation not referenced in the "method" list after a compilation). Change-Id: I6cd85e10180d9b113fd5a77d23ac572c9426000c Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/47155 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-05Fix model merge strategy to support the update of activity nodes andjeremie.tatibouet1-0/+7
edges issued from the compilation. Change-Id: Ibc8a31a933d53364c6bade9fa2371a4cc13cf739 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/47154 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-05Proposal to solve https://bugs.eclipse.org/bugs/show_bug.cgi?id=465111jeremie.tatibouet3-2/+306
Validation context changes correctly when switching between ALF specifications edited in a Papyrus UML model and ALF specifications edited through the raw editor. Change-Id: I521321cdb439b9336d1c9ac244f9883ef472c5bd Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/46801 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-04Preserved textual representation comments when updating an element fromEd Seidewitz1-1/+34
a stub. Change-Id: Id667c40a00ebbb7389063427d66fdd039b05c207 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com> Reviewed-on: https://git.eclipse.org/r/46943 Tested-by: Hudson CI Reviewed-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr> Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-04Fixed mapping of stubs definitions.Ed Seidewitz2-30/+55
Change-Id: I114ea1382e904103464451bcb271876f72317678 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com> Reviewed-on: https://git.eclipse.org/r/46924 Tested-by: Hudson CI Reviewed-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr> Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-05-01Preserved textual representation comments when updating an element fromEd Seidewitz1-1/+34
a stub. Change-Id: Id667c40a00ebbb7389063427d66fdd039b05c207 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-04-30Fixed mapping of stubs definitions.Ed Seidewitz2-30/+55
Change-Id: I114ea1382e904103464451bcb271876f72317678 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-04-30Class, Signal, Enumeration, Datatype and package follows automaticallyjeremie.tatibouet2-1/+6
the evolution of the semantic model. ElementImport, Generalization, PackageImport impacts are also supported. Change-Id: I0178e33f270d8c542d8a6df68cc11b153732d6f2 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/46748 Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Reviewed-on: https://git.eclipse.org/r/46799 Tested-by: Hudson CI
2015-04-29- Revised caching diagnostician to clear cache before validation andEd Seidewitz1-1/+1
leave cached values in place after validation. - Revised mapping test to validate before mapping, so as to populate cache and avoid system crashes during mapping. Change-Id: Ide2f1dcf5d60c7cacea059f9d61a4bdcc2e140c9 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com> Reviewed-on: https://git.eclipse.org/r/46651 Tested-by: Hudson CI Reviewed-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr> Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-04-28- Revised caching diagnostician to clear cache before validation andEd Seidewitz1-1/+1
leave cached values in place after validation. - Revised mapping test to validate before mapping, so as to populate cache and avoid system crashes during mapping. Change-Id: Ide2f1dcf5d60c7cacea059f9d61a4bdcc2e140c9 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
2015-04-08Proposal to solve https://bugs.eclipse.org/bugs/show_bug.cgi?id=464076jeremie.tatibouet3-16967/+1
Change-Id: I5dd1997008be08f01174d8de80566490ad196b56 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/45409 Tested-by: Hudson CI Reviewed-by: Ed Seidewitz <ed-s@modeldriven.com> Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-04-07- Corrected OCL return type errors.Ed Seidewitz1-3/+3
- Corrected switch statement constraint checking bug. Change-Id: Ibee09bd710d4cc8b40a223cbae802fe2aba5ebc1 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com> Change-Id: If06739bd12f643c6f852344eefe5f9678b019c73 Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com> Reviewed-on: https://git.eclipse.org/r/45181 Reviewed-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr> Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2015-03-25Bug 462954: [ALF] Integrate the new ALF grammar & toolingChristian W. Damus1-3/+2
https://bugs.eclipse.org/bugs/show_bug.cgi?id=462954 Remove CDO dependency from ALF syntax model. The next re-generation of the code will not re-introduce the dependency. Also removed the EMF CDO repository from the top POMs for main product and tests. Change-Id: I49e98f6b5f3ab13b0c0215218d275e32c6088e07
2015-03-24462954: [ALF] Integrate the new ALF grammar & toolingJeremie Tatibouet165-17081/+19739
https://bugs.eclipse.org/bugs/show_bug.cgi?id=462954 - Squash the committers/cletavernie/alf-integration branch Also-by: Ed Seidewitz <ed-s@modeldriven.com> Also-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Signed-off-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr>
2014-08-25[Code style] Apply clean-up profile to Papyrus Main plug-insCamille Letavernier144-2188/+2490
2014-05-17[434594] Enable Model (Library/Metamodel/Profile) Registrations to beDavid Akehurst1-7/+7
added to via code Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=43459 Change-Id: Ib4eb7db3f1e82664a8c15a0c2ea2c06797d4b39e Signed-off-by: David Akehurst <dave@akehurst.net>
2013-09-02Applied patch from ItemisArnaud Cuccuru2-40/+6
Signed-off-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
2012-11-23391945: [Refactoring] Part 2: Refactoring on Kepler (0.10)cletavernie1-922/+876
https://bugs.eclipse.org/bugs/show_bug.cgi?id=391945
2012-09-17380517: [Papyrus] We should use explicit plug-in dependencies whenever possiblecletavernie7-47/+1
https://bugs.eclipse.org/bugs/show_bug.cgi?id=380517 + removed some unused dependencies and imports
2012-03-21329865: [ALF editor] Papyrus shall provide a specific textual editor for ALF.ptessier2-2/+2
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329865
2012-03-20329865: [ALF editor] Papyrus shall provide a specific textual editor for ALF.ptessier122-1/+1574
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329865
2012-03-20329865: [ALF editor] Papyrus shall provide a specific textual editor for ALF.ptessier153-582/+585
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329865
2012-03-20329865: [ALF editor] Papyrus shall provide a specific textual editor for ALF.ptessier149-0/+15386
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329865

    Back to the top