Package com.xpn.xwiki.doc.merge

Class MergeResult

  • @Deprecated
public class MergeResult
extends Object
    Deprecated.
    Since 11.8RC1, prefer using MergeManagerResult.
    Report of what happen during merge.
    Since:
    3.2M1
    Version:
    $Id: e8740a45984d5bdc4291535b9d03f465fdeee5b1 $

    • Constructor Detail

      • MergeResult

        public MergeResult()
        Deprecated.

    • Method Detail

      • setModified

        public void setModified​(boolean modified)
        Deprecated.
        Parameters:
        modified - indicate that something has been modified during the merge

      • isModified

        public boolean isModified()
        Deprecated.
        Returns:
        true if something has been modified during the merge

      • getLog

        public org.xwiki.logging.LogQueue getLog()
        Deprecated.
        Returns:
        the log associated to the merge
        Since:
        4.1RC1

      • getErrors

        @Deprecated
public List<Exception> getErrors()
        Deprecated.
        since 4.1RC1 use getLog() instead
        Error raised during the merge.

        Generally collision for which we don't know what do to at all.

        Returns:
        the merge errors

      • getWarnings

        @Deprecated
public List<Exception> getWarnings()
        Deprecated.
        since 4.1RC1 use getLog() instead
        Warning raised during the merge.

        The difference with error is that in that case a decision which should be good (or at least safe enough) for most of the case has been made.

        Returns:
        the merge warning

      • warn

        @Deprecated
public void warn​(Exception e)
        Deprecated.
        since 4.1RC1 use getLog() instead
        Add warning.
        Parameters:
        e - the warning