Package com.nomagic.magicdraw.merge

Class ProjectDifference

  • @OpenApi
public final class ProjectDifference
extends java.lang.Object
    Project difference data.
    See Also:
    MergeUtil

    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method Description
      java.util.Set<? extends Change> getChanges()
      Get all changes - changes between both contributors and the ancestor project.
      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.
      java.util.Set<Change> getTargetChanges()
      Get target changes - changes between ancestor and target.

      • Methods inherited from class java.lang.Object

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

    • Method Detail

      • 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.