com.microsoft.tfs.core.clients.versioncontrol.soapextensions
Class Resolution

java.lang.Object
  extended by com.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper
      extended by com.microsoft.tfs.core.internal.wrappers.EnumerationWrapper
          extended by com.microsoft.tfs.core.clients.versioncontrol.soapextensions.Resolution

public class Resolution
extends com.microsoft.tfs.core.internal.wrappers.EnumerationWrapper

Enumerates the types of conflict resolutions that can happen.

Since:
TEE-SDK-10.1

Field Summary
static Resolution ACCEPT_MERGE
           
static Resolution ACCEPT_THEIRS
           
static Resolution ACCEPT_YOURS
           
static Resolution ACCEPT_YOURS_RENAME_THEIRS
           
static Resolution DELETE_CONFLICT
           
static Resolution NONE
           
static Resolution OVERWRITE_LOCAL
           
 
Fields inherited from class com.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper
webServiceObject
 
Method Summary
 boolean equals(java.lang.Object o)
           
static Resolution fromWebServiceObject(ms.tfs.versioncontrol.clientservices._03._Resolution webServiceObject)
          Gets the correct wrapper type for the given web service object.
 ms.tfs.versioncontrol.clientservices._03._Resolution getWebServiceObject()
          Gets the web service object this class wraps.
 int hashCode()
           
 
Methods inherited from class com.microsoft.tfs.core.internal.wrappers.EnumerationWrapper
fromWebServiceObject
 
Methods inherited from class com.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper
toString
 
Methods inherited from class java.lang.Object
clone, finalize, getClass, notify, notifyAll, wait, wait, wait
 

Field Detail

NONE

public static final Resolution NONE

ACCEPT_MERGE

public static final Resolution ACCEPT_MERGE

ACCEPT_YOURS

public static final Resolution ACCEPT_YOURS

ACCEPT_THEIRS

public static final Resolution ACCEPT_THEIRS

DELETE_CONFLICT

public static final Resolution DELETE_CONFLICT

ACCEPT_YOURS_RENAME_THEIRS

public static final Resolution ACCEPT_YOURS_RENAME_THEIRS

OVERWRITE_LOCAL

public static final Resolution OVERWRITE_LOCAL
Method Detail

fromWebServiceObject

public static Resolution fromWebServiceObject(ms.tfs.versioncontrol.clientservices._03._Resolution webServiceObject)
Gets the correct wrapper type for the given web service object.

Parameters:
webServiceObject - the web service object (must not be null)
Returns:
the correct wrapper type for the given web service object
Throws:
java.lang.RuntimeException - if no wrapper type is known for the given web service object

getWebServiceObject

public ms.tfs.versioncontrol.clientservices._03._Resolution getWebServiceObject()
Gets the web service object this class wraps. The returned object should not be modified.

Returns:
the web service object this class wraps.

equals

public boolean equals(java.lang.Object o)
Overrides:
equals in class com.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper

hashCode

public int hashCode()
Overrides:
hashCode in class com.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper


© 2015 Microsoft. All rights reserved.