Package org.eclipse.team.core.mapping

Interface IMergeStatus

All Superinterfaces:

IStatus

All Known Implementing Classes:

MergeStatus

public interface IMergeStatus
extends IStatus

A special status that is returned when the return code of the merge method is CONFLICTS. It is possible that there were problems that caused the auto-merge to fail. In that case, the implementor of IResourceMappingMerger can return a multi-status in which one of the children is a MergeStatus and the others describe other problems that were encountered.

Since:

3.2

See Also:

• IResourceMappingMerger
• MergeStatus

Restriction:

This interface is not intended to be implemented by clients.

Field Summary

Fields

Modifier and Type	Field	Description
static final int	CONFLICTS	Indicates that a change conflict prevented some or all of the resource mappings to be merged (value 1).
static final int	INTERNAL_ERROR	Status code describing an internal error (value 2).

Fields inherited from interface org.eclipse.core.runtime.IStatus

CANCEL, ERROR, INFO, OK, WARNING

Method Summary

Modifier and Type	Method	Description
IFile[]	getConflictingFiles()	Returns the set of file for which an auto-merge was not performed.
ResourceMapping[]	getConflictingMappings()	Returns the set of resource mappings for which an auto-merge was not performed.

Methods inherited from interface org.eclipse.core.runtime.IStatus

getChildren, getCode, getException, getMessage, getPlugin, getSeverity, isMultiStatus, isOK, matches

Field Details

CONFLICTS

static final int CONFLICTS

Indicates that a change conflict prevented some or all of the resource mappings to be merged (value 1). When this code is returned, the status must be of type MergeStatus and must contain the list of all resource mappings for which a manual merge is required.

See Also:

• Constant Field Values

INTERNAL_ERROR

static final int INTERNAL_ERROR

Status code describing an internal error (value 2). The status return is not required to be of type MergeStatus for internal errors.

See Also:

• Constant Field Values

Method Details

getConflictingMappings

ResourceMapping[] getConflictingMappings()

Returns the set of resource mappings for which an auto-merge was not performed. If the code of the status is CONFLICTS the status may contain a set of mappings or files depending on what method returned the status.

Returns:

the set of resource mappings for which an auto-merge was not performed.

getConflictingFiles

IFile[] getConflictingFiles()

Returns the set of file for which an auto-merge was not performed. If the code of the status is CONFLICTS the status may contain a set of mappings or files depending on what method returned the status.

Returns:

the set of files for which an auto-merge was not performed.