com.xpn.xwiki.doc.merge

Class MergeResult

java.lang.Object

com.xpn.xwiki.doc.merge.MergeResult

Deprecated.

Since 11.8RC1, prefer using MergeManagerResult.

@Deprecated
public class MergeResult
extends Object

Report of what happen during merge.

Since:

3.2M1

Version:

$Id: e8740a45984d5bdc4291535b9d03f465fdeee5b1 $

Constructor Summary

Constructors

Constructor and Description
MergeResult() Deprecated.

Method Summary

Modifier and Type	Method and Description
void	error(Exception e) Deprecated. since 4.1RC1 use getLog() instead
List<Exception>	getErrors() Deprecated. since 4.1RC1 use getLog() instead
org.xwiki.logging.LogQueue	getLog() Deprecated.
List<Exception>	getWarnings() Deprecated. since 4.1RC1 use getLog() instead
boolean	isModified() Deprecated.
void	setModified(boolean modified) Deprecated.
void	warn(Exception e) Deprecated. since 4.1RC1 use getLog() instead

Methods inherited from class java.lang.Object

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

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

error

@Deprecated
public void error(Exception e)

Deprecated. since 4.1RC1 use getLog() instead

Add error.

Parameters:

e - the error

warn

@Deprecated
public void warn(Exception e)

Deprecated. since 4.1RC1 use getLog() instead

Add warning.

Parameters:

e - the warning