Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 359590 - Some improvements
Summary: Some improvements
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: 1.3   Edit
Hardware: PC Windows 7
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-30 12:40 EDT by Cedric Notot CLA
Modified: 2011-10-06 11:17 EDT (History)
1 user (show)

See Also:

Attachments
The patch (234.18 KB, patch)
2011-09-30 12:40 EDT, Cedric Notot CLA 		laurent.goubet: iplog+
Details | Diff
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 Cedric Notot CLA 2011-09-30 12:40:19 EDT 
Created attachment 204398 [details]
The patch

Some improvements have to be contributed:

+ In org.eclipse.emf.compare.ui plugin:
- The method getInputObject(TypedElementWrapper) of ModelContentMergeViewer becomes protected.

+ In org.eclipse.emf.compare.uml2 plugin:
- Delete of the bundle-version specification for org.eclipse.uml2.uml and org.eclipse.emf.compare plugin dependencies.
- Depreciation of getMatched(EObject, int), getRightSide(), getLeftSide() and getAncestorSide() in UML2DiffEngine. They are replaced by getMatched(EObject, MatchSide). Use of IMatchManager instead of CrossReferencer.
- Use of a local reference in createSubTreeOfDiffGroup(DiffGroup, List<EObject>), in AbstractDiffExtensionFactory, instead of the reference of the method parameter.
- Use of MatchSide in the extensions factories instead of the deprecated methods of UML2DiffEngine.
- Use of UML2Util instead of UMLUtil.

+ Happy checkstyle for EMF Compare UML2 plugins

The patch is in attachments.
Comment 1 Laurent Goubet CLA 2011-10-06 11:15:16 EDT 
Thanks, this has now been committed on master