Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 302698 - MergeFactory should return provided IMerger of AbstractDiffExtensions
Summary: MergeFactory should return provided IMerger of AbstractDiffExtensions
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 303976
Blocks:
  Show dependency tree
 
Reported: 2010-02-12 07:33 EST by Alexander Nyßen CLA
Modified: 2013-04-24 07:31 EDT (History)
1 user (show)

See Also:

Attachments
Patch to fix IMerger provided by AbstractDiffExtension is not evaluated by MergeFactory (1.61 KB, patch)
2010-02-12 07:34 EST, Alexander Nyßen CLA 		no flags Details | Diff
Fixed IMerger provided by AbstractDiffExtension was not provided with DiffElement (2.35 KB, patch)
2010-02-12 08:16 EST, Alexander Nyßen CLA 		no flags Details | Diff
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Alexander Nyßen CLA 2010-02-12 07:33:26 EST 
Build Identifier: M20090917-0800

Up to now, the IMerger provided by an AbstractDiffExtension (provideMerger) is not taken into account when applying changes. I thus propose to change the createMerger method in MergeFactory to behave differently in case an AbstractDiffExtension is passed in. 

Reproducible: Always
Comment 1 Alexander Nyßen CLA 2010-02-12 07:34:15 EST 
Created attachment 158971 [details]
Patch to fix IMerger provided by AbstractDiffExtension is not evaluated by MergeFactory
Comment 2 Alexander Nyßen CLA 2010-02-12 08:16:35 EST 
Created attachment 158974 [details]
Fixed IMerger provided by AbstractDiffExtension was not provided with DiffElement
Comment 3 Laurent Goubet CLA 2010-02-17 04:15:10 EST 
Hi Alexander,

Sorry for the delay, we're currently trying to integrate a lengthy patch to EMF Compare, I'll take a look at both your patches later this week for inclusion : these features are things we were looking forward to yet hadn't taken enough time to implement.
Comment 4 Alexander Nyßen CLA 2010-05-03 14:48:52 EDT 
Resolved as part of #301112.
Comment 5 Laurent Goubet CLA 2011-08-18 04:06:42 EDT 
Closing our "resolved" and "verified" bugs.