org.openl.rules.repository.api

Class ConflictResolveData

java.lang.Object

org.openl.rules.repository.api.ConflictResolveData

All Implemented Interfaces:

AdditionalData<ConflictResolveData>

public class ConflictResolveData
extends Object
implements AdditionalData<ConflictResolveData>

Constructor Summary

Constructors

Constructor and Description
ConflictResolveData(String commitToMerge, Iterable<FileItem> resolvedFiles, String mergeMessage)

Method Summary

Modifier and Type	Method and Description
ConflictResolveData	convertPaths(PathConverter converter)
String	getCommitToMerge()
String	getMergeMessage()
Iterable<FileItem>	getResolvedFiles()

Methods inherited from class java.lang.Object

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

Constructor Detail

ConflictResolveData

public ConflictResolveData(String commitToMerge,
                           Iterable<FileItem> resolvedFiles,
                           String mergeMessage)

Method Detail

getCommitToMerge

public String getCommitToMerge()

getResolvedFiles

public Iterable<FileItem> getResolvedFiles()

getMergeMessage

public String getMergeMessage()

convertPaths

public ConflictResolveData convertPaths(PathConverter converter)

Specified by:

convertPaths in interface AdditionalData<ConflictResolveData>