Package com.nomagic.magicdraw.merge

Enum ConflictResolution

  • All Implemented Interfaces:
    java.io.Serializable, java.lang.Comparable<ConflictResolution>
    @OpenApiAll
public enum ConflictResolution
extends java.lang.Enum<ConflictResolution>
    Conflict resolution for 3-way merge.

    • Enum Constant Summary

      Enum Constants 
      Enum Constant Description
      NOT_ALLOWED
      Do not allow conflicts.
      SOURCE_PREFERRED
      Prefer source changes if conflicts are detected.
      TARGET_PREFERRED
      Prefer target changes if conflicts are detected.

    • Method Summary

      All Methods Static Methods Concrete Methods 
      Modifier and Type Method Description
      static ConflictResolution valueOf​(java.lang.String name)
      Returns the enum constant of this type with the specified name.
      static ConflictResolution[] values()
      Returns an array containing the constants of this enum type, in the order they are declared.

      • Methods inherited from class java.lang.Enum

        clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

      • Methods inherited from class java.lang.Object

        getClass, notify, notifyAll, wait, wait, wait

    • Enum Constant Detail

      • TARGET_PREFERRED

        public static final ConflictResolution TARGET_PREFERRED
        Prefer target changes if conflicts are detected.

      • SOURCE_PREFERRED

        public static final ConflictResolution SOURCE_PREFERRED
        Prefer source changes if conflicts are detected.

    • Method Detail

      • values

        public static ConflictResolution[] values()
        Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows: 
        for (ConflictResolution c : ConflictResolution.values())
    System.out.println(c);
        Returns:
        an array containing the constants of this enum type, in the order they are declared

      • valueOf

        public static ConflictResolution valueOf​(java.lang.String name)
        Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)
        Parameters:
        name - the name of the enum constant to be returned.
        Returns:
        the enum constant with the specified name
        Throws:
        java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
        java.lang.NullPointerException - if the argument is null