Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-08-28Bug 516234 - Improve text comparison by using an external text viewerOlivier Constant14-679/+922
- Model modifications go through model scopes - Tool is unique and located in the Features viewer - Double click is also supported in the Features viewer - Sides and directions are aligned with the model comparison - The "switch left and right view" button is hidden - The overall aspect of the text merge dialog is slightly different - UI strings are externalized Change-Id: I5290e2618c49ebaa8d7be2ed614e29c06f71b43a Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 516234 - Improve text comparison by using an external text viewerOlivier Constant3-0/+617
Change-Id: I503fb0f44c76b4b3530b73b8b89a46182e9fdc8b Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 538331 - Dissociate label provision and diff decorationOlivier Constant2-1/+12
Update for multiline string values Change-Id: I3abfd0b658385baf411dfda4a06bd96cf461939d Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 538331 - Dissociate label provision and diff decorationOlivier Constant1-4/+8
Fixed bug on restart - side inversion Change-Id: I11179a9d22715cf3a2911bbc90b24762747b2da7 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 538331 - Dissociate label provision and diff decorationOlivier Constant16-327/+467
Fixed a few UI bugs (font, impact dialog) Change-Id: Iccd9bb547b1544af1f49d3b2a48e9c42337f3d7c Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 538341 - Support observable viewer-specific propertiesOlivier Constant9-138/+619
"Technical labels" property fully supported with UserProperties Change-Id: I3d75b449ecd2c50f5ba33999a792fc939de7c782 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 536586 - Make technical representation applicable to headerOlivier Constant7-103/+248
Work started, requires completion of work on viewer properties Change-Id: I60fb3b3fdb8efd8883fba61fd9137f191fa7ea41 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 538331 - Dissociate label provision and diff decorationOlivier Constant7-32/+60
Added support for custom diff decorator in comparison method Change-Id: Ibd109a07fdae4d28bea0ab7b1f0bb96347e26c05 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 538331 - Dissociate label provision and diff decorationOlivier Constant4-130/+5
Fix for double display in ValuesViewer Change-Id: I97788f69a6c66614edf7a53870c0ad3c3d121f13 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 538331 - Dissociate label provision and diff decorationOlivier Constant23-730/+1746
Refactoring for IDiffLabelDecorator, selection OK Change-Id: I20c288ac3a2993248141d316cd080696c5b0e21d Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Make "left to right" as default and allow contribs to Synthesis toolbarOlivier Constant6-67/+88
Change-Id: I156b9e725788fe09e9631fb1d91d4a950bff3bd4 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-08-28Bug 537287 - No Show Merge Impact by default and rename its descriptionJeremy Aubry14-40/+50
- disable "Show merge impact" option by default - rename the impact information wizard's description - update RCPTT tests Change-Id: Id2fbf46a6f6e7795548035822a51d3c7bf106d9b Signed-off-by: Jeremy Aubry <jaubry@obeo.fr>
2018-07-20Fix of a few warningsOlivier Constant15-50/+66
Change-Id: Id6b8411cedd66cbc7ca86eeee2678eae5b4922d2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 533972 - Better separate compare time and merge timeOlivier Constant5-194/+424
- Add reaction of GUI to command stack - Add reaction of GUI to operation history Change-Id: I5c7722e04cec00a185c95f9984a8eee3a3b32255 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 533972 - Better separate compare time and merge timeOlivier Constant3-4/+17
- Fix loading issue that breaks undo/redo Change-Id: Ie215303b45019a5b20ea28fa5805f54d8e690591 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 533972 - Better separate compare time and merge timeOlivier Constant17-1207/+1468
- UIComparison now extends IDisposable Change-Id: I16ff0459b4c1c23a5aed87a822ab3025c2a4099c Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 533984 - Update plugin.xml files (strings, deprecations)Olivier Constant15-5/+296
Change-Id: Ie30859a9a6bf9d06bbe7b32dff25c5a7a1c91266 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Made custom scope definitions explicitOlivier Constant4-35/+88
Change-Id: I77a05edaec88061846efc5848faf9364d57017f5 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 533972 - Better separate compare time and merge timeOlivier Constant20-122/+678
- Ability to retrieve the merge policy - Intrinsic IDs for serialization Change-Id: I26b8e4e1cf0fde2481df3fae0154086ce7709448 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 533972 - Better separate compare time and merge timeOlivier Constant15-149/+207
Ability to ignore diffs moved from UI to core Change-Id: I7aa9eebb941a572ea3b8a6023a230e418eab4032 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 533972 - Better separate compare time and merge timeOlivier Constant6-28/+38
Decoupled UIComparison and EComparison by removing the containment ref Change-Id: I3f2d2f3244a924631bf59290eb9d1cc2144ba170 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18Bug 416493 - NotSerializableException while saving EComparisonOlivier Constant44-905/+1364
XMI serialization of comparisons now OK excluding scopes Change-Id: I1c91e0dd8dea056fa4dbc5570a9b2ff5baa2dcec Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18[releng] Update with Sirius 6.1Olivier Constant1-6/+5
Change-Id: Iee35152e32bbc91af1050bfc87ad96c2a1c75f5b Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-31[doc] Doc update for new Synthesis menu itemsv0.10.0Olivier Constant2-2/+6
Change-Id: I7b29d4e31323984ccda5033f3d558f222a1c10f0 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-30Bug 534200 - Switching to text compare has side effectsOlivier Constant1-1/+10
Correct handling of mirror mode and cleaning up of tool bar Change-Id: Id445e475d909697f0ffe04e6bd3f7bee5051eabc Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-30Bug 533324 - Align the GUI and core levels regarding merge directionOlivier Constant20-285/+676
Change-Id: Ie83ea8fa3bb38a785b0bf103af6a0a0420ec0c77 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-30Bug 442141 - Synchronization with Properties view cannot be disabledOlivier Constant5-72/+127
Change-Id: If612c8c4605ad21a080f92aabae7e8210dff9516 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-30Bug 534034 - Support hiding parts of the UIOlivier Constant5-1/+79
Support hiding the contents of the right/left sides Change-Id: I2bcea3a315b5387a300fbe750e2991da6dd2a65b Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-30Bug 532314 - Support customizing comparison implementations through ↵Olivier Constant5-7/+39
extension point Change-Id: Iaaf4787c8e70fdb07161ef7e88905cf86708475a Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-28[doc] Fixed mentions to SVNOlivier Constant1-2/+2
Change-Id: I120d1f0346436b0658ff1cd9ee0e1bb30eccce85 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-28[releng] Added a repo-level LICENSE fileOlivier Constant1-0/+88
Change-Id: I70d874fc796f08dfb02be94678abc1d103d271db Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-28[releng] Update of contribution/notice files and copyright noticesOlivier Constant364-395/+510
Change-Id: I8fce49cd0fbe1bd2a201e7413cf74beb4cf5ca30 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-25[releng] Update for 0.10.0Olivier Constant40-62/+52
Change-Id: I73e1e8dc15eb1326600e0903bd1c2c09d8f4e563 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-25Made Git integration compatible with EGit 5Olivier Constant4-9/+92
Change-Id: I2b04e07ac2ffe0d2c7f6903f2adfa59c0beec2e2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-03-19Reverted version upgradeOlivier Constant4-5/+5
Change-Id: I9c7ff33fb5f5f5192d0637c494dfdb2a3b4ddd66 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-03-19Bug 532614 - Rebase conflicts lead to an NPEOlivier Constant5-8/+11
Change-Id: Ib18ee639207f5970d12f4a85f93b86d899b0fdc2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-02-23[releng] Update Sirius versionOlivier Constant1-8/+8
Change-Id: Ia872c26b693e395baaf7e044f374908878892f44 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-02-23Bug 531591 - Remove special handling of ColorsOlivier Constant2-18/+2
Change-Id: Id0423d9ac55e038928f5459eec6256b305b16114 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-02-23Bug 531577 - Make GMF & Sirius scopes multi-URIOlivier Constant3-5/+44
Change-Id: I266a05080b50a8ab3bc93404f7f372ab74fb3f38 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-31Updated RCPTT versionOlivier Constant1-1/+1
Change-Id: I8b0bceb21d793cbbe4d489a08b2f128f43975b41 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-31Removed SVN integration from the main featureOlivier Constant2-9/+2
Change-Id: I79fcaa950b6bbf28575feb3aa7c3908040fc6225 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-31Updated TPOlivier Constant1-14/+14
Change-Id: Iff105f3c3bbf89c64f3889a125e46bea58288833 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-29Bug 422067 - Use read-only information to increase performanceOlivier Constant1-49/+87
Change-Id: I0b57e74dd62ccb37623164c69a0d4e7bfc25c0c6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-27[releng] update sirius versionv0.9.0Olivier Constant1-6/+6
Change-Id: I25c12bf5b1135daf5e27bd4002eb58c1dc68cceb Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-16[releng] update sirius versionOlivier Constant1-6/+6
Change-Id: I4ed4dbdaf16a5a467216ed4e7847d635af3cc9be Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-16Bug 526051 - Update doc for 0.9.0Olivier Constant2-55/+65
Fixed the TOC and made a few contributions to the contents Change-Id: I07fdb6c19216f27cbaf091387641aaba8cfd032f Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-15Bug 526051 - Update doc for 0.9.0Olivier Constant26-151/+274
Change-Id: I0bde8e71ed1428f57a1a0184d1ce8db1af427bea Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-05Fixed NPE in getWithDetails in the case of empty resultOlivier Constant1-1/+7
Change-Id: I795fd79cbb054cbc28fed5aba8cb8f09d296b750 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-05Bug 525578 - NPE when using structure with empty originsOlivier Constant2-2/+2
Change-Id: I57ee62fbd017e9396a35481e2856fba4f041732b Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-04[releng] update sirius versionOlivier Constant1-6/+6
Change-Id: Ib8d350159c4427abac6536e15894b0b561f18c0d Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>

Back to the top