Package com.nomagic.magicdraw.merge

Class ProjectDifference

java.lang.Object

com.nomagic.magicdraw.merge.ProjectDifference

@OpenApi
public final class ProjectDifference
extends java.lang.Object

Project difference data.

See Also:

MergeUtil

Field Summary

Fields

Modifier and Type	Field	Description
private java.lang.String	mActiveDiagramId
private com.nomagic.magicdraw.diff.DiffRunner	mDiffRunner
private boolean	mLastVersion
private com.nomagic.magicdraw.merge.LockRunner	mLockRunner
private boolean	mMerge
private java.util.List<java.lang.String>	mOpenedDiagramsIds
private ProjectDescriptor	mTargetAbsolute
private Project	mTargetProject

Constructor Summary

Constructors

Constructor	Description
ProjectDifference(Project targetProject, ProjectDescriptor targetAbsolute, boolean lastVersion, com.nomagic.magicdraw.merge.LockRunner lockRunner, com.nomagic.magicdraw.diff.DiffRunner diffRunner, java.util.List<java.lang.String> openedDiagramsIds, java.lang.String activeDiagramId, boolean merge)

Method Summary

Modifier and Type	Method	Description
(package private) java.lang.String	getActiveDiagramId()
java.util.Set<? extends Change>	getChanges()	Get all changes - changes between both contributors and the ancestor project.
com.nomagic.magicdraw.diff.DiffRunner	getDiffRunner()
(package private) com.nomagic.magicdraw.merge.LockRunner	getLockRunner()
(package private) java.util.List<java.lang.String>	getOpenedDiagramsIds()
java.util.Map<ModuleInfo,java.util.Set<RwMergeModeConstraint>>	getRejectedModules()	Gets modules that were requested but did not qualify for read-write merge mode.
java.util.Set<Change>	getSourceChanges()	Get source changes - changes between ancestor and source.
(package private) ProjectDescriptor	getTargetAbsolute()
java.util.Set<Change>	getTargetChanges()	Get target changes - changes between ancestor and target.
(package private) Project	getTargetProject()
(package private) boolean	isLastVersion()
(package private) boolean	isMerge()

Methods inherited from class java.lang.Object

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

Field Detail

mTargetProject

private final Project mTargetProject

mTargetAbsolute

private final ProjectDescriptor mTargetAbsolute

mLockRunner

private final com.nomagic.magicdraw.merge.LockRunner mLockRunner

mLastVersion

private final boolean mLastVersion

mDiffRunner

private final com.nomagic.magicdraw.diff.DiffRunner mDiffRunner

mOpenedDiagramsIds

private final java.util.List<java.lang.String> mOpenedDiagramsIds

mActiveDiagramId

private final java.lang.String mActiveDiagramId

mMerge

private final boolean mMerge

Constructor Detail

ProjectDifference

ProjectDifference(Project targetProject,
                  ProjectDescriptor targetAbsolute,
                  boolean lastVersion,
                  @CheckForNull
                  com.nomagic.magicdraw.merge.LockRunner lockRunner,
                  com.nomagic.magicdraw.diff.DiffRunner diffRunner,
                  java.util.List<java.lang.String> openedDiagramsIds,
                  @CheckForNull
                  java.lang.String activeDiagramId,
                  boolean merge)

Method Detail

getTargetProject

Project getTargetProject()

getTargetAbsolute

ProjectDescriptor getTargetAbsolute()

isLastVersion

boolean isLastVersion()

getLockRunner

@CheckForNull
com.nomagic.magicdraw.merge.LockRunner getLockRunner()

getDiffRunner

public com.nomagic.magicdraw.diff.DiffRunner getDiffRunner()

getOpenedDiagramsIds

java.util.List<java.lang.String> getOpenedDiagramsIds()

isMerge

boolean isMerge()

getActiveDiagramId

@CheckForNull
java.lang.String getActiveDiagramId()

getSourceChanges

@OpenApi
public java.util.Set<Change> getSourceChanges()

Get source changes - changes between ancestor and source.

Returns:

source changes.

getTargetChanges

@OpenApi
public java.util.Set<Change> getTargetChanges()

Get target changes - changes between ancestor and target. There are changes nn the case of 2-way merge, as ancestor and target are the same.

Returns:

target changes.

getChanges

@OpenApi
public java.util.Set<? extends Change> getChanges()

Get all changes - changes between both contributors and the ancestor project.

Returns:

all changes.

getRejectedModules

@OpenApi
public java.util.Map<ModuleInfo,java.util.Set<RwMergeModeConstraint>> getRejectedModules()

Gets modules that were requested but did not qualify for read-write merge mode.

Returns:

target project ModuleInfo to RwMergeModeConstraint map