Package ro.sync.diff.merge.api

Interface MergedFileState

@API(type=NOT_EXTENDABLE,
     src=PUBLIC)
public interface MergedFileState

The state of a merged file contains information about the file location and the merge status (deleted, added, modified).

The file location is child of the the directory containing the personal changes (the directory specified in the personalModifiedFilesDir parameter of DiffAndMergeTools.openMergeApplication(java.io.File, java.io.File, java.io.File, java.util.Map)) .

Nested Class Summary

Nested Classes

Modifier and Type	Interface	Description
static enum	MergedFileState.MergeStatus	The merge state

Method Summary

Modifier and Type	Method	Description
File	getFile()	Get the path to the altered file.
MergedFileState.MergeStatus	getFileModifiedStatus()	Get the type of change done to the altered file.

Method Details

getFile

File getFile()

Get the path to the altered file.

Returns:

The file from the personal changes directory that was altered. (the directory specified in the personalModifiedFilesDir parameter of DiffAndMergeTools.openMergeApplication(java.io.File, java.io.File, java.io.File, java.util.Map)) .

getFileModifiedStatus

MergedFileState.MergeStatus getFileModifiedStatus()

Get the type of change done to the altered file.

Returns:

The current merge file state.