Package ro.sync.merge
Class MergeResult
java.lang.Object
ro.sync.merge.MergeResult
Defines the result of a three way merge.
- Since:
- 18.0
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionstatic enum
The way a merge has finalized. -
Constructor Summary
ConstructorsConstructorDescriptionNo arguments constructor.MergeResult
(MergeResult.ResultType resultType, String mergedString) Constructor.MergeResult
(MergeResult.ResultType resultType, String mergedString, Boolean mergingOccurred) Constructor. -
Method Summary
Modifier and TypeMethodDescriptionboolean
void
setMergedString
(String mergedString) Sets the value of the merged string.void
setResultType
(MergeResult.ResultType result) Sets the new value of the result type.
-
Constructor Details
-
MergeResult
Constructor.- Parameters:
resultType
- The type of the merge result.mergedString
- The merged string.
-
MergeResult
Constructor.- Parameters:
resultType
- The type of the merge result.mergedString
- The merged string.mergingOccurred
- Flag telling whether merging occurred or not. If the two left|right files were identicalmergingOccurred
will be false;
-
MergeResult
public MergeResult()No arguments constructor.
-
-
Method Details
-
mergingOccurred
public boolean mergingOccurred()- Returns:
true
if merging happened, orfalse
if no merging happened because the given left|right files were identical.
-
getMergedString
- Returns:
- The merged string.
-
setMergedString
Sets the value of the merged string.- Parameters:
mergedString
- The new merged string.
-
getResultType
- Returns:
- The type of the result.
-
setResultType
Sets the new value of the result type.- Parameters:
result
- The new value of the result type.
-