UnstableChanges

Summary

  1. [505994] Fix cascading filter on refined diffs (details)
  2. [505983] Pseudo-conflicts should be real on ADD/ADD (details)
  3. [505950] Fix filter not hiding directly pseudo-conflicting diffs (details)
  4. [505986] Fix decorator on conflicting refined diffs (details)
  5. Refactor OverlayImageProvider to use StringBuilders (details)
Commit fcdec72a8076a82bb99a3e24a295ac7446864b7a by Laurent Delaigue
[505994] Fix cascading filter on refined diffs

Refined diffs that are not in direct conflict but have at least on
refining diff in REAL conflict should not be filtered out by the
cascading filter.

bug: 505994
Change-Id: Ife2ccc3d6319e381c16d5d2a5a68295e7a73ac6a
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/data/cascading/ancestor.ecore
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/data/cascading/left.ecore
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/data/cascading/right.ecore
The file was modifiedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/AbstractTestTreeNodeItemProviderAdapter.java
The file was modifiedplugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/CascadingDiffFilterTest.java
Commit cd75f7c48dafd01d6dd2e28ebd353867d73f008b by Laurent Delaigue
[505983] Pseudo-conflicts should be real on ADD/ADD

When adding matching objects in differents indices in a list, all the
diffs were marked as pseudo-conflicts. At least some of them should be
real conflicts.

This patch fixes the issue by marking all such diffs as real conflicts
but it should be possible to improve it to have some of them marked as
pseudo where it would make sense.

Code shared by default conflict detector and match-based conflict
detector is extracted into MatchUtil to reduce duplication.

Bug: 505983
Change-Id: Icca55a1fcccc08cd5d858639d4c6dd8734f327a9
Also-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
The file was modifiedplugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/AdditiveMergeTests.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/MatchUtil.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AbstractConflictSearch.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ContainmentRefChangeConflictSearch.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AttributeChangeConflictSearch.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/FeatureMapChangeConflictSearch.java
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/NonContainmentRefChangeConflictSearch.java
The file was modifiedplugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/AdditiveMergeDiagramTests.java
Commit 79a106f3eb0ed4dd7cd00c2cefa5cbf59104fde8 by Mathieu Cartaud
[505950] Fix filter not hiding directly pseudo-conflicting diffs

Bug: 505950
Change-Id: I21b12daa33ec8b536bf49da2337c54e2890be1fe
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
The file was modifiedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.java
The file was modifiedplugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/TechnicalitiesFilter.java
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/TechnicalitiesFilterTests.java
The file was modifiedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/ConflictsGroupTest.java
The file was modifiedplugins/org.eclipse.emf.compare.rcp.ui.tests/META-INF/MANIFEST.MF
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/data/predicates/technicalities/directPseudoConflict/right.ecore
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/data/predicates/technicalities/directPseudoConflict/ancestor.ecore
The file was modifiedplugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java
The file was addedplugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/data/predicates/technicalities/directPseudoConflict/left.ecore
Commit 437f8b87681504931f33a4952283625215266ccb by Mathieu Cartaud
[505986] Fix decorator on conflicting refined diffs

Refined diffs that are not in a conflict but have at least one of their
refining diffs (recursively) in a real conflict should have the
conflicting decorator.
They should have the pseudo conflict decorator if all their atomic
refining diffs are in pseudo-conflict.

Bug: 505986
Change-Id: I6957e28f05d98ae9c327c0f65fbd5dc29a24d8ec
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
The file was modifiedplugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java
Commit d8af5faeb2bff1a0658af54957deb7012c7e4b0c by Mathieu Cartaud
Refactor OverlayImageProvider to use StringBuilders

Change-Id: I3f2bbc0c86579b8f614349c9f566afa2e466e384
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
The file was modifiedplugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java