Package net.n2oapp.framework.config.register.audit.model

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

Modifier and Type	Method	Description
java.lang.String	getConflictContent()
java.lang.String	getMergeContent()
java.lang.String	getParentContent()
void	setConflictContent(java.lang.String conflictContent)
void	setMergeContent(java.lang.String mergeContent)
void	setParentContent(java.lang.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

Methods inherited from class java.lang.Object

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

Constructor Detail

N2oConfigConflict

public N2oConfigConflict()

Method Detail

getConflictContent

public java.lang.String getConflictContent()

setConflictContent

public void setConflictContent(java.lang.String conflictContent)

getMergeContent

public java.lang.String getMergeContent()

setMergeContent

public void setMergeContent(java.lang.String mergeContent)

getParentContent

public java.lang.String getParentContent()

setParentContent

public void setParentContent(java.lang.String parentContent)