com.atlassian.confluence.util.diffs

Class SimpleMergeResult

java.lang.Object

com.atlassian.confluence.util.diffs.SimpleMergeResult

All Implemented Interfaces:

MergeResult

public class SimpleMergeResult
extends java.lang.Object
implements MergeResult

Field Summary

Fields

Modifier and Type	Field and Description
static MergeResult	FAIL_MERGE_RESULT

Constructor Summary

Constructors

Constructor and Description
SimpleMergeResult(boolean conflicts, java.lang.String mergedContent)

Method Summary

Methods

Modifier and Type	Method and Description
java.lang.String	getMergedContent() Returns the result of the merge.
boolean	hasConflicts() True if the merge failed.

Methods inherited from class java.lang.Object

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

Field Detail

FAIL_MERGE_RESULT

public static final MergeResult FAIL_MERGE_RESULT

Constructor Detail

SimpleMergeResult

public SimpleMergeResult(boolean conflicts,
                 java.lang.String mergedContent)

Method Detail

getMergedContent

public java.lang.String getMergedContent()

Description copied from interface: MergeResult

Returns the result of the merge. If the merge resulted in a conflict this method may return null, or a partially merged string. Implementers should return the data in the same format as the one that was passed in.

Specified by:

getMergedContent in interface MergeResult

Returns:

result of merge if merge was successful, if the merge had conflicts the return value is undefined.

hasConflicts

public boolean hasConflicts()

Description copied from interface: MergeResult

True if the merge failed. If true is returned here the return value of getMergedContent() is undefined (likely null).

Specified by:

hasConflicts in interface MergeResult

Returns:

true if the merge failed, otherwise false