Package com.atlassian.bitbucket.scm.git.command.merge.conflict

Class AbstractGitMergeConflict

java.lang.Object

com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

All Implemented Interfaces:

GitMergeConflict

Direct Known Subclasses:

AbstractPathGitMergeConflict, DivergentRenameGitMergeConflict, UnknownGitMergeConflict

public abstract class AbstractGitMergeConflict
extends Object
implements GitMergeConflict

Constructor Summary

Constructors

Modifier	Constructor	Description
protected	AbstractGitMergeConflict(GitMergeConflictType type, String message, com.atlassian.bitbucket.content.ChangeType change)
protected	AbstractGitMergeConflict(GitMergeConflictType type, String message, com.atlassian.bitbucket.content.ChangeType ourChange, com.atlassian.bitbucket.content.ChangeType theirChange)

Method Summary

Modifier and Type	Method	Description
String	getMessage()
com.atlassian.bitbucket.content.ChangeType	getOurChange()
com.atlassian.bitbucket.content.ChangeType	getTheirChange()
GitMergeConflictType	getType()

Methods inherited from class java.lang.Object

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

Methods inherited from interface com.atlassian.bitbucket.scm.git.command.merge.conflict.GitMergeConflict

accept

Constructor Details

AbstractGitMergeConflict

protected AbstractGitMergeConflict(@Nonnull
 GitMergeConflictType type,
 @Nonnull
 String message,
 @Nonnull
 com.atlassian.bitbucket.content.ChangeType change)

AbstractGitMergeConflict

protected AbstractGitMergeConflict(@Nonnull
 GitMergeConflictType type,
 @Nonnull
 String message,
 @Nonnull
 com.atlassian.bitbucket.content.ChangeType ourChange,
 @Nonnull
 com.atlassian.bitbucket.content.ChangeType theirChange)

Method Details

getMessage

@Nonnull
public String getMessage()

Specified by:

getMessage in interface GitMergeConflict

getOurChange

@Nonnull
public com.atlassian.bitbucket.content.ChangeType getOurChange()

Specified by:

getOurChange in interface GitMergeConflict

getTheirChange

@Nonnull
public com.atlassian.bitbucket.content.ChangeType getTheirChange()

Specified by:

getTheirChange in interface GitMergeConflict

getType

@Nonnull
public GitMergeConflictType getType()

Specified by:

getType in interface GitMergeConflict