Interface MergeResolver

    • Method Summary

      All Methods Instance Methods Abstract Methods 
      Modifier and Type Method Description
      void apply()
      Notification that the apply button was hit.
      void cancel()
      Notification that the merge process was canceled.
      java.lang.String getDescription()
      Get the description of what this MergeResolver does.
      java.lang.String getName()
      Get the name of this MergeResolver.
      java.lang.String[][] getPhases()
      Gets identifiers for the merge phases handled by this MergeResolver.
      void merge​(TaskMonitor monitor)
      Perform the merge process.
    • Method Detail

      • getName

        java.lang.String getName()
        Get the name of this MergeResolver.
      • getDescription

        java.lang.String getDescription()
        Get the description of what this MergeResolver does.
      • apply

        void apply()
        Notification that the apply button was hit.
      • cancel

        void cancel()
        Notification that the merge process was canceled.
      • merge

        void merge​(TaskMonitor monitor)
            throws java.lang.Exception
        Perform the merge process.
        Parameters:
        monitor - monitor that allows the user to cancel the merge operation
        Throws:
        java.lang.Exception - if the merge encounters an error and the merge process should not continue.
      • getPhases

        java.lang.String[][] getPhases()
        Gets identifiers for the merge phases handled by this MergeResolver. If the merge has no sub-phases then return an array with a single string array. Each inner String array indicates a path for a single merge phase. Each outer array element represents a phase whose progress we wish to indicate.
        Examples:
        So for a simple phase which has no sub-phases return new String[][] {new String[] {"Phase A"}}
        So for a phase with 2 sub-phases return new String[][] { new String[] {"Phase A"}, new String[] {"Phase A", "Sub-Phase 1}, new String[] {"Phase A", "Sub-Phase 2} } .
        Returns:
        an array of phases.