Skip to main content

Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

Jump to: navigation, search

EMF Compare/Specifications/ProvideContentMergeViewerForResourceAttachmentChanges

< EMF Compare
Revision as of 06:23, 12 February 2013 by Axel.richard.obeo.fr (Talk | contribs) (User Interface Changes)

Evolution Specification: Provide content merge viewer for resource attachment changes

Current status is DRAFT

Preamble

Provide content merge viewer for resource attachment changes.

_Relevant tickets_ (links to the Bugzilla tickets which are related to the change):

Introduction

Currently there is no content merge viewers for the resource attachment changes. EMF compare will provide a specific one close to the content merge viewer on non containment reference changes, but displaying the direct contents of the changed resource.

Detailed Specification

TODO.

Backward Compatibility and Migration Paths

Metamodel Changes

This evolution doesn't change the metamodel.

API Changes

New interfaces :

  • org.eclipse.emf.compare.rcp.ui
    • /src/org/eclipse/emf/compare/rcp/ui/mergeviewer/accessor/ICompareAccessor.java
public interface ICompareAccessor {
        Comparison getComparison();
 
	IMergeViewerItem getInitialItem();
 
	ImmutableList<? extends IMergeViewerItem> getItems();
}
    • /src/org/eclipse/emf/compare/rcp/ui/mergeviewer/accessor/IResourceContentsAccessor.java
public interface IResourceContentsAccessor extends ICompareAccessor {
 
	Resource getResource(MergeViewerSide side);
}

Interfaces changes :

  • org.eclipse.emf.compare.rcp.ui
    • /src/org/eclipse/emf/compare/rcp/ui/mergeviewer/accessor/IStructuralFeatureAccessor.java : now extends ICompareAccessor

User Interface Changes

Documentation Changes

This documentation will have to be updated:

  • New and Noteworthy
  • User Guide

Tests and Non-regression strategy

TODO. (This part of the document should describe the strategy to use to correctly test the evolution and guarantee the non-regression.)

Implementation choices and tradeoffs

TODO. (Any important tradeoff or choice made during the implementation should be referenced here with pros/cons leading to the final decision.)

Back to the top