Class Conflict


  • public class Conflict
    extends BaseElement
    Represents a conflict displayed in a diff view.
    Since:
    11.8RC1
    Version:
    $Id: e30fc355494a1fb6ca3ce508b2f7d83e45670c07 $
    • Constructor Detail

      • Conflict

        public Conflict​(String conflictReference)
        Default constructor. A conflict is defined by its reference.
        Parameters:
        conflictReference - the reference of the conflict.
    • Method Detail

      • getDecisionChange

        public String getDecisionChange()
        Returns:
        the current decision value, i.e. what will be submitted to fix the conflict.
      • isDecisionChangeEmpty

        public boolean isDecisionChangeEmpty()
        Returns:
        true if the current decision value is empty, i.e. it announces that the inserted value will be removed.
      • setDecision

        public void setDecision​(Conflict.DecisionType type)
        Change the decision with the given type.
        Parameters:
        type - the decision to be taken.
      • getCurrentDecision

        public Conflict.DecisionType getCurrentDecision()
        Returns:
        the current decision type.
      • setCustomValue

        public void setCustomValue​(String customValue)
        Take a custom decision with a default value.
        Parameters:
        customValue - the value for the custom decision.