com.ibm.xtools.comparemerge.emf.viewers

Class EmfStructureMergeViewer

java.lang.Object

AbstractStructureMergeViewer

com.ibm.xtools.comparemerge.emf.viewers.EmfStructureMergeViewer

public class EmfStructureMergeViewer
extends AbstractStructureMergeViewer

The Merge Viewer used to compare/merge the EMF-based artifacts.
It is hosted inside the EmfContentMergeViewer, and consists of two parts: the Structure Viewer (to show structured Differences/Conflicts) and the content Viewer (to show the content relevant to the selected Diff/Confl).

Constructor Summary

Constructors

Constructor and Description
EmfStructureMergeViewer(org.eclipse.swt.widgets.Composite parentComposite, AbstractContentMergeViewer parentContentMergeViewer) Constructor, normally called from the EmfContentMergeViewer

Method Summary

Modifier and Type	Method and Description
protected ICompareMergeController	createCompareMergeController() Called ONCE from constructor to create a proper instance of the C/M controller.
protected IMergeViewerPane	createContentPane(org.eclipse.swt.widgets.Composite parent) Instantiate and return the Content Pane to be placed in the lower part of the Structure Merge Viewer Called from createControls().
protected IMergeViewerPane	createMergedPane(org.eclipse.swt.widgets.Composite parent) Instantiate and return the Merged Result Pane to be placed in the Structure Merge Viewer to the right of the Structure Pane.
protected IMergeViewerPane	createStructurePane(org.eclipse.swt.widgets.Composite parent) Instantiate and return the Structure Pane (holding Diffs/Conflicts) to be placed in the upper-left part of the Structure Merge Viewer.
protected org.eclipse.swt.widgets.Composite	getContentPaneComposite()
org.eclipse.jface.viewers.ISelection	getSelection() Returns the current selection for this structure merge viewer.
void	refresh() Refreshes this structure merge viewer.
void	setInput(java.lang.Object input)
void	setSelection(org.eclipse.jface.viewers.ISelection selection, boolean reveal) Sets a new selection for this viewer and optionally makes it visible.

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

EmfStructureMergeViewer

public EmfStructureMergeViewer(org.eclipse.swt.widgets.Composite parentComposite,
                               AbstractContentMergeViewer parentContentMergeViewer)

Constructor, normally called from the EmfContentMergeViewer

Parameters:

parentComposite -

parentContentMergeViewer -

Method Detail

createStructurePane

protected IMergeViewerPane createStructurePane(org.eclipse.swt.widgets.Composite parent)

Instantiate and return the Structure Pane (holding Diffs/Conflicts) to be placed in the upper-left part of the Structure Merge Viewer. Called from createControls().

Parameters:

parent - Composite for the new pane

Returns:

the new instance of the pane

See Also:

com.ibm.xtools.comparemerge.ui.viewers.AbstractStructureMergeViewer#createStructurePane(org.eclipse.swt.widgets.Composite)

createMergedPane

protected IMergeViewerPane createMergedPane(org.eclipse.swt.widgets.Composite parent)

Instantiate and return the Merged Result Pane to be placed in the Structure Merge Viewer to the right of the Structure Pane. Called from createControls().

Parameters:

parent - Composite for the new viewer

Returns:

the new instance of the pane

See Also:

com.ibm.xtools.comparemerge.ui.viewers.AbstractStructureMergeViewer#createMergedPane(org.eclipse.swt.widgets.Composite)

createContentPane

protected IMergeViewerPane createContentPane(org.eclipse.swt.widgets.Composite parent)

Instantiate and return the Content Pane to be placed in the lower part of the Structure Merge Viewer Called from createControls().

Parameters:

parent - Composite for the new pane

Returns:

the new instance of the pane

See Also:

com.ibm.xtools.comparemerge.ui.viewers.AbstractStructureMergeViewer#createContentPane(org.eclipse.swt.widgets.Composite)

getContentPaneComposite

protected org.eclipse.swt.widgets.Composite getContentPaneComposite()

createCompareMergeController

protected ICompareMergeController createCompareMergeController()

Called ONCE from constructor to create a proper instance of the C/M controller. To be customized by the sub-classes.

Returns:

Returns new instance of the C/M controller.

See Also:

com.ibm.xtools.comparemerge.ui.viewers.AbstractStructureMergeViewer#createCompareMergeController()

setSelection

public void setSelection(org.eclipse.jface.viewers.ISelection selection,
                         boolean reveal)

Sets a new selection for this viewer and optionally makes it visible.

Parameters:

selection - the new selection

reveal - true if the selection is to be made visible, and false otherwise

See Also:

Viewer.setSelection(org.eclipse.jface.viewers.ISelection, boolean)

getSelection

public org.eclipse.jface.viewers.ISelection getSelection()

Returns the current selection for this structure merge viewer.

Returns:

the current selection

See Also:

ISelectionProvider.getSelection()

refresh

public void refresh()

Refreshes this structure merge viewer.

See Also:

Viewer.refresh()

setInput

public void setInput(java.lang.Object input)

See Also:

Viewer.setInput(java.lang.Object)