org.madlonkay.supertmxmerge

Class MergeController

java.lang.Object

org.madlonkay.supertmxmerge.MergeController

All Implemented Interfaces:

java.awt.event.ActionListener, java.io.Serializable, java.util.EventListener

public class MergeController
extends java.lang.Object
implements java.io.Serializable, java.awt.event.ActionListener

See Also:

Serialized Form

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	MergeController.ConflictInfo

Field Summary

Fields

Modifier and Type	Field and Description
static java.util.logging.Logger	LOGGER
static java.lang.String	PROP_BASETMX
static java.lang.String	PROP_CONFLICTCOUNT
static java.lang.String	PROP_CONFLICTSARERESOLVED
static java.lang.String	PROP_LEFTTMX
static java.lang.String	PROP_RIGHTTMX

Constructor Summary

Constructors

Constructor and Description
MergeController()

Method Summary

Modifier and Type	Method and Description
void	actionPerformed(java.awt.event.ActionEvent ae)
void	addPropertyChangeListener(java.beans.PropertyChangeListener listener)
void	addSelection(Key key, javax.swing.AbstractButton[] buttons)
MergeAnalysis	analyze(ITmx baseTmx, ITmx leftTmx, ITmx rightTmx)
ITmx	apply(ResolutionSet resolution)
void	clearSelections()
ITmx	getBaseTmx()
int	getConflictCount()
java.util.List<MergeController.ConflictInfo>	getConflicts()
ITmx	getLeftTmx()
int	getListViewThreshold()
ITmx	getRightTmx()
java.util.Map<Key,javax.swing.AbstractButton[]>	getSelections()
boolean	isCanCancel()
boolean	isConflictsAreResolved()
boolean	isQuiet()
boolean	isTwoWayMerge()
ITmx	merge(ITmx leftTmx, ITmx rightTmx)
ITmx	merge(ITmx baseTmx, ITmx leftTmx, ITmx rightTmx)
ITmx	merge(ITmx baseTmx, ITmx leftTmx, ITmx rightTmx, ResolutionStrategy strategy)
void	removePropertyChangeListener(java.beans.PropertyChangeListener listener)
ResolutionSet	resolve(ResolutionStrategy strategy)
void	setBaseTmx(ITmx baseTmx)
void	setCanCancel(boolean canCancel)
void	setIsTwoWayMerge(boolean isTwoWayMerge)
void	setLeftTmx(ITmx leftTmx)
void	setListViewThreshold(int conflicts)
void	setParentWindow(java.awt.Window window)
void	setQuiet(boolean quiet)
void	setRightTmx(ITmx rightTmx)

Methods inherited from class java.lang.Object

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

Field Detail

LOGGER

public static final java.util.logging.Logger LOGGER

PROP_BASETMX

public static final java.lang.String PROP_BASETMX

See Also:

Constant Field Values

PROP_LEFTTMX

public static final java.lang.String PROP_LEFTTMX

See Also:

Constant Field Values

PROP_RIGHTTMX

public static final java.lang.String PROP_RIGHTTMX

See Also:

Constant Field Values

PROP_CONFLICTCOUNT

public static final java.lang.String PROP_CONFLICTCOUNT

See Also:

Constant Field Values

PROP_CONFLICTSARERESOLVED

public static final java.lang.String PROP_CONFLICTSARERESOLVED

See Also:

Constant Field Values

Constructor Detail

MergeController

public MergeController()

Method Detail

addPropertyChangeListener

public void addPropertyChangeListener(java.beans.PropertyChangeListener listener)

removePropertyChangeListener

public void removePropertyChangeListener(java.beans.PropertyChangeListener listener)

merge

public ITmx merge(ITmx leftTmx,
                  ITmx rightTmx)

merge

public ITmx merge(ITmx baseTmx,
                  ITmx leftTmx,
                  ITmx rightTmx)

merge

public ITmx merge(ITmx baseTmx,
                  ITmx leftTmx,
                  ITmx rightTmx,
                  ResolutionStrategy strategy)

analyze

public MergeAnalysis analyze(ITmx baseTmx,
                             ITmx leftTmx,
                             ITmx rightTmx)

resolve

public ResolutionSet resolve(ResolutionStrategy strategy)

apply

public ITmx apply(ResolutionSet resolution)

isConflictsAreResolved

public boolean isConflictsAreResolved()

addSelection

public void addSelection(Key key,
                         javax.swing.AbstractButton[] buttons)

clearSelections

public void clearSelections()

getSelections

public java.util.Map<Key,javax.swing.AbstractButton[]> getSelections()

getConflicts

public java.util.List<MergeController.ConflictInfo> getConflicts()

getBaseTmx

public ITmx getBaseTmx()

setBaseTmx

public void setBaseTmx(ITmx baseTmx)

getLeftTmx

public ITmx getLeftTmx()

setLeftTmx

public void setLeftTmx(ITmx leftTmx)

getRightTmx

public ITmx getRightTmx()

setRightTmx

public void setRightTmx(ITmx rightTmx)

getConflictCount

public int getConflictCount()

setCanCancel

public void setCanCancel(boolean canCancel)

isCanCancel

public boolean isCanCancel()

setQuiet

public void setQuiet(boolean quiet)

isQuiet

public boolean isQuiet()

setIsTwoWayMerge

public void setIsTwoWayMerge(boolean isTwoWayMerge)

isTwoWayMerge

public boolean isTwoWayMerge()

setListViewThreshold

public void setListViewThreshold(int conflicts)

getListViewThreshold

public int getListViewThreshold()

setParentWindow

public void setParentWindow(java.awt.Window window)

actionPerformed

public void actionPerformed(java.awt.event.ActionEvent ae)

Specified by:

actionPerformed in interface java.awt.event.ActionListener