Modifier and Type | Class and Description |
---|---|
static class |
ProcessObjectMerger.Destiny |
static class |
ProcessObjectMerger.SpecificConflictDescription |
Modifier and Type | Field and Description |
---|---|
static java.awt.Color |
ColorChanged |
static java.awt.Color |
ColorConflict |
static java.awt.Color |
ColorEqual |
static java.awt.Color |
ColorKeep |
static java.awt.Color |
ColorNew |
static java.awt.Color |
ColorRemoved |
Constructor and Description |
---|
ProcessObjectMerger(ProcessObjectDiff sourceRelation,
ProcessObjectDiff targetRelation) |
public static final java.awt.Color ColorNew
public static final java.awt.Color ColorRemoved
public static final java.awt.Color ColorChanged
public static final java.awt.Color ColorConflict
public static final java.awt.Color ColorKeep
public static final java.awt.Color ColorEqual
public ProcessObjectMerger(ProcessObjectDiff sourceRelation, ProcessObjectDiff targetRelation)
public static void createActionMatrix()
public ProcessObjectDiff.ProcessObjectState getSourceState()
public ProcessObjectDiff.ProcessObjectState getTargetState()
public ProcessObject getSourceObject()
public ProcessObject getTargetObject()
public ProcessModel getSourceModel()
public ProcessModel getTargetModel()
public ProcessObject getOriginalObject()
public java.util.HashMap<java.lang.String,ProcessObjectPropertyMerger> getResolvedPropertyConflicts()
public boolean isDestinyCommit()
public boolean isDestinyKeep()
public boolean isDestinyEqual()
public boolean isDestinyConflict()
public boolean isDestinyRemove()
public boolean isDestinyNew()
public boolean isDestinyChanged()
public boolean isDestinySolved()
public void setRemoveConflictResolved()
public ProcessObjectMerger.SpecificConflictDescription getConflictDescription()
public ProcessObject getUnmarkedMergedObject()
public ProcessObject getMergedObject()
public void setMergedObject(ProcessObject o)
public ProcessObject getAnimateTo()
public ProcessObject getAnimateFrom()
public ProcessObject getSourceAlternative()
public ProcessObject getTargetAlternative()
public java.util.List<ProcessObjectPropertyMerger> getConflictingProperties()
public java.util.List<ProcessObjectPropertyMerger> getChangedProperties()
public java.lang.String toString()
toString
in class java.lang.Object
public java.awt.Color getStateColor()
public void setSolved()