Class N2oConfigConflict
- java.lang.Object
-
- net.n2oapp.framework.config.register.audit.model.N2oConfigCommit
-
- net.n2oapp.framework.config.register.audit.model.N2oConfigConflict
-
public class N2oConfigConflict extends N2oConfigCommit
- Since:
- 12.08.2015
- Author:
- dfirstov
-
-
Nested Class Summary
-
Nested classes/interfaces inherited from class net.n2oapp.framework.config.register.audit.model.N2oConfigCommit
N2oConfigCommit.State, N2oConfigCommit.Type
-
-
Constructor Summary
Constructors Constructor Description N2oConfigConflict()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description StringgetConflictContent()StringgetMergeContent()StringgetParentContent()voidsetConflictContent(String conflictContent)voidsetMergeContent(String mergeContent)voidsetParentContent(String parentContent)-
Methods inherited from class net.n2oapp.framework.config.register.audit.model.N2oConfigCommit
getAuthor, getContent, getDate, getId, getMessage, getMessagePrefix, getState, getType, isConflict, setAuthor, setConflict, setContent, setDate, setId, setMessage, setMessagePrefix, setState, setType
-
-
-
-
Method Detail
-
getConflictContent
public String getConflictContent()
-
setConflictContent
public void setConflictContent(String conflictContent)
-
getMergeContent
public String getMergeContent()
-
setMergeContent
public void setMergeContent(String mergeContent)
-
getParentContent
public String getParentContent()
-
setParentContent
public void setParentContent(String parentContent)
-
-