Populate Logical Model View when synchronization button is pushed.

Change-Id: If30cc1676c62cb438b6058a65ee6f27d7d72205e
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Logical Model View: handle models with errors

If synchronization model has errors, 
 - launch an error message dialog.
 - clean the logical model view.

Change-Id: Ia10f65eacaf6e6a2e035707f97d4627d7cec2efa
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Fix javadoc of the EMFModelProvider to reflect current behavior

Change-Id: I86cdd141e75bb3f4f87332d86e593ccbc432f0a9
Logical Model View: recomputes after resolution scope change

When the user changes the logical model's resolution scope, the logical
model view has to be refreshed.

Change-Id: Ie1b14ae679101c87b3562b33da332ba6a43b5866
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Logical Model View: new UI test cases

- synchro activation
- models with errors
- scope change

Change-Id: Id7d025fc9706ade59be579b59d1a266e656b04cd
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Add new Logical Model View section in User guide.

Change-Id: I98ac4fb50741d2fd285235c20277f78e10a44e06
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Fixed some spelling mistakes and tried to improve readability.

Change-Id: I5d493f88fc5e42b7e6fb2641c01285d551152f9f
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Improved developer guide and fixed typos.

- Added a class diagram of compare's metamodel overview
- Replaced " === " in code extracts by " = "
- Tried to improve some sentences for readability

Change-Id: I3bb856100d37886d8721965663ff05b629dcb8c1
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
[EMF Compare CLI] Documentation of the 'logicalcherry-pick command'

Change-Id: Ib7eb8efbba63892fc372cc058febf73f6c0d3436
[EMF Compage CLI] Adds a "Known issues" section.

Adds a new "Known issues".
Adds reference to bug 451159.

Change-Id: Ie198e0ec75becc0aeb191ba0cc6e7cceb99e1c2f
Corrects an error in the 'logicalcherry-pick'documentation.

Change-Id: If9865ba5dd5cac75988e959a2311372d2bebdcf2
Fixes minor typo in docs

Change-Id: Ie99ae9936b845544b1cff8265063b6e5a91acead
Signed-off-by: Philip Langer <planger@eclipsesource.com>
[EMF Compare CLI] Documentation of the 'logicalrebase' command

Change-Id: I41c8abc12a31f8765f4c662c6c933ec3cedcba4c
[453749] Fix NullPointer when handling Non-Containment FeatureMaps

When handling FeatureMaps whose entries consists of references instead
of containments, NullPointer exceptions occur when removing those
entries. This patch fixes the NullPointer and edits the
FeatureMapChangeMerger to only modify matches if the removed
FeatureMapEntry was a containment.

Includes Testcase.

Bug: 453749
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: I540f983942fcc4c1633a42003b9babb6cb78e580
[453214] Specify anchor in the doc generation

- The parameter "-anchorid" is interpreted as now.
- The value (path to the id of the anchor) is used to set the "link_to"
attribute of the primary generated TOC.

Bug: 453214
Change-Id: Ibbdcfadded3c45cad3b6c7359a50605036b67f70
Signed-off-by: Cedric Notot <cedric.notot@obeo.fr>
[442897] Pseudo conflicts under Real Add conflicts

Pseudo conflicts under Real Add conflicts must be detected as Real
conflicts, because pseudo conflicts are equivalent. But under a real add
conflict, we must have the possibility to merge a diff separately.

Bug: 442897
Change-Id: Id72634cdefa65698e82fc0aab9f227bb88915e24
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
[EMF Compare CLI] Add git logicalpull section in doc

Change-Id: Ic4806e0d121391783f18e58dd3a1aa3821225000
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Merge "[EMF Compare CLI] Add git logicalpull section in doc"
[442898] Add conflict: content merge viewer displays wrong data

Also add ui tests to validate the fix

Bug: 442898
Change-Id: I3ee41983a355faca979bd1ec7153e09fc91aeda7
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
[451365] Adds specific handling of opaque action, behavior & expression

Opaque actions, behaviors, and expressions all have a multi-valued
language and multi-valued body attribute. Their indices have to be kept
in sync, because the language value at the index n denotes the language
of the body value at the index n. Moreover, if concurrent changes to the
same body value are applied, they should be merged using a line-based
three-way merge algorithm. If they are not mergeable with such an
algorithm, a specific conflict should be raised.

This commit contributes support for the aforementioned requirements by
introducing a new UML-specific change type, specific conflict detection,
and a specific merger.

Bug: 451365
Change-Id: I6bf5c786e72a10c56eff7f0faaedd67b77528b4b
Signed-off-by: Philip Langer <planger@eclipsesource.com>