Simias::Sync::Conflict Class Reference

class to assist in conflict resolution More...

Collaboration diagram for Simias::Sync::Conflict:

[legend]

List of all members.

Public Member Functions
	Conflict (Collection collection, Node node)
	constructor -- Conflict looks a lot like a Node. Perhaps it should be derived from Node.
void	DeleteConflictFile ()
	Delete the temporary conflict file.
void	SaveToExternalConflictBin (bool localChangesWin, string conflictBinPath)
	resolve update conflict and commit
void	Resolve (bool localChangesWin)
	resolve update conflict and commit
void	Resolve (bool localChangesWin, string conflictBinPath)
	resolve update conflict and commit
void	Resolve (string newNodeName)
	resolve file name conflict and commit
void	RenameConflictingFile (string newName)
	Rename the file that is in the way of the node with the name conflict.
Static Public Member Functions
static Node	CreateNameConflict (Collection collection, Node node)
	Create a name conflict on the node.
static Node	CreateNameConflict (Collection collection, Node node, string path)
	Create a name conflict on the node.
static Node	RemoveNameConflict (Collection collection, Node node)
	Remove the name conflict.
static string	GetUpdateConflictPath (Collection collection, BaseFileNode bfn)
	Gets the file name for an update conflict.
static string	GetFileConflictPath (Collection collection, Node node)
	Gets the file name for a File name conflict.
static void	SetFileConflictPath (Node node, string path)
static void	LinkConflictingNodes (Node node, Node cNode)
	Link the two conflicting nodes together.
static FileNode	GetConflictingNode (Collection collection, FileNode node)
	Get the conflicting node.
static void	Resolve (Collection collection, bool localChangesWin)
	Automatically resolve all update conflicts in a collection. This method does not resolve file name conflicts.
static void	Resolve (Collection collection, bool localChangesWin, string conflictBinPath)
	Automatically resolve all update conflicts in a collection. This method does not resolve file name conflicts.
Properties
bool	IsUpdateConflict [get]
	determines if this Node has an Update conflict
bool	IsFileNameConflict [get]
	constructor, looks a lot like a Node
string	NonconflictedPath [get]
	gets the file name of the non-conflicted file for the node
string	FileNameConflictPath [get]
	gets the file name of the temporary file for a node whose name conflicts with something in the local file system.
string	UpdateConflictPath [get]
	gets the full path of the file contents of the update that conflict with the local file for this node
Node	UpdateConflictNode [get]
	gets the contents of the node that conflicts with this node

---

Detailed Description

class to assist in conflict resolution

---

Constructor & Destructor Documentation

Simias::Sync::Conflict::Conflict	(	Collection	collection,
		Node	node
	)			[inline]

constructor -- Conflict looks a lot like a Node. Perhaps it should be derived from Node.

---

Member Function Documentation

void Simias::Sync::Conflict::DeleteConflictFile

(

)

[inline]

Delete the temporary conflict file.

static Node Simias::Sync::Conflict::CreateNameConflict	(	Collection	collection,
		Node	node
	)			[inline, static]

Create a name conflict on the node.

Parameters:

	collection
	node

Returns:

static Node Simias::Sync::Conflict::CreateNameConflict	(	Collection	collection,
		Node	node,
		string	path
	)			[inline, static]

Create a name conflict on the node.

Parameters:

	collection
	node
	path	The path where the file resides.

Returns:

static Node Simias::Sync::Conflict::RemoveNameConflict	(	Collection	collection,
		Node	node
	)			[inline, static]

Remove the name conflict.

Parameters:

	collection
	node

Returns:

static string Simias::Sync::Conflict::GetUpdateConflictPath	(	Collection	collection,
		BaseFileNode	bfn
	)			[inline, static]

Gets the file name for an update conflict.

Parameters:

	collection	The collection the node belongs to.
	bfn	The BaseFile Node.

Returns:

The path for the conflict file.

static string Simias::Sync::Conflict::GetFileConflictPath	(	Collection	collection,
		Node	node
	)			[inline, static]

Gets the file name for a File name conflict.

Parameters:

	collection	The collection the node belongs to.
	node	The Node.

Returns:

The path for the conflict file.

static void Simias::Sync::Conflict::SetFileConflictPath	(	Node	node,
		string	path
	)			[inline, static]

Parameters:

	node
	path

static void Simias::Sync::Conflict::LinkConflictingNodes	(	Node	node,
		Node	cNode
	)			[inline, static]

Link the two conflicting nodes together.

Parameters:

	node
	cNode

static FileNode Simias::Sync::Conflict::GetConflictingNode	(	Collection	collection,
		FileNode	node
	)			[inline, static]

Get the conflicting node.

Parameters:

	collection
	node

Returns:

void Simias::Sync::Conflict::SaveToExternalConflictBin	(	bool	localChangesWin,
		string	conflictBinPath
	)			[inline]

resolve update conflict and commit

void Simias::Sync::Conflict::Resolve

(

bool

localChangesWin

)

[inline]

resolve update conflict and commit

void Simias::Sync::Conflict::Resolve	(	bool	localChangesWin,
		string	conflictBinPath
	)			[inline]

resolve update conflict and commit

void Simias::Sync::Conflict::Resolve

(

string

newNodeName

)

[inline]

resolve file name conflict and commit

static void Simias::Sync::Conflict::Resolve	(	Collection	collection,
		bool	localChangesWin
	)			[inline, static]

Automatically resolve all update conflicts in a collection. This method does not resolve file name conflicts.

static void Simias::Sync::Conflict::Resolve	(	Collection	collection,
		bool	localChangesWin,
		string	conflictBinPath
	)			[inline, static]

Automatically resolve all update conflicts in a collection. This method does not resolve file name conflicts.

void Simias::Sync::Conflict::RenameConflictingFile

(

string

newName

)

[inline]

Rename the file that is in the way of the node with the name conflict.

Parameters:

newName

The new name of the file.

---

Property Documentation

bool Simias::Sync::Conflict::IsUpdateConflict [get]

determines if this Node has an Update conflict

bool Simias::Sync::Conflict::IsFileNameConflict [get]

constructor, looks a lot like a Node

string Simias::Sync::Conflict::NonconflictedPath [get]

gets the file name of the non-conflicted file for the node

string Simias::Sync::Conflict::FileNameConflictPath [get]

gets the file name of the temporary file for a node whose name conflicts with something in the local file system.

string Simias::Sync::Conflict::UpdateConflictPath [get]

gets the full path of the file contents of the update that conflict with the local file for this node

Node Simias::Sync::Conflict::UpdateConflictNode [get]

gets the contents of the node that conflicts with this node

---

The documentation for this class was generated from the following file:

• src/core/Sync/Conflict.cs