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

Class N2oConfigConflictParser

java.lang.Object

net.n2oapp.framework.config.register.audit.util.N2oConfigConflictParser

public class N2oConfigConflictParser
extends java.lang.Object

Since:

12.08.2015

Author:

dfirstov

Field Summary

Fields

Modifier and Type	Field	Description
static java.lang.String	FINISH_LINE_CONFLICT
static java.lang.String	MIDDLE_LINE_CONFLICT
static java.lang.String	REGEX_LINE_END
static java.lang.String	START_LINE_CONFLICT

Constructor Summary

Constructors

Constructor	Description
N2oConfigConflictParser()

Method Summary

Modifier and Type	Method	Description
static N2oConfigConflict	restoreContentsByConflict(N2oConfigConflict configConflict)

Methods inherited from class java.lang.Object

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

Field Detail

REGEX_LINE_END

public static final java.lang.String REGEX_LINE_END

See Also:

Constant Field Values

START_LINE_CONFLICT

public static final java.lang.String START_LINE_CONFLICT

See Also:

Constant Field Values

MIDDLE_LINE_CONFLICT

public static final java.lang.String MIDDLE_LINE_CONFLICT

See Also:

Constant Field Values

FINISH_LINE_CONFLICT

public static final java.lang.String FINISH_LINE_CONFLICT

See Also:

Constant Field Values

Constructor Detail

N2oConfigConflictParser

public N2oConfigConflictParser()

Method Detail

restoreContentsByConflict

public static N2oConfigConflict restoreContentsByConflict(N2oConfigConflict configConflict)