1 files changed, 81 insertions, 0 deletions
diff --git a/Swiften/Whiteboard/WhiteboardTransformer.cpp b/Swiften/Whiteboard/WhiteboardTransformer.cpp
index 32b1183..60963fd 100644
--- a/Swiften/Whiteboard/WhiteboardTransformer.cpp
+++ b/Swiften/Whiteboard/WhiteboardTransformer.cpp
@@ -13,6 +13,8 @@ namespace Swift {
 		WhiteboardInsertOperation::ref serverInsert = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(serverOp);
 		WhiteboardUpdateOperation::ref clientUpdate = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(clientOp);
 		WhiteboardUpdateOperation::ref serverUpdate = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(serverOp);
+		WhiteboardDeleteOperation::ref clientDelete = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(clientOp);
+		WhiteboardDeleteOperation::ref serverDelete = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(serverOp);
 		if (clientInsert && serverInsert) {
 			return transform(clientInsert, serverInsert);
 		} else if (clientUpdate && serverUpdate) {
@@ -21,6 +23,16 @@ namespace Swift {
 			return transform(clientInsert, serverUpdate);
 		} else if (clientUpdate && serverInsert) {
 			return transform(clientUpdate, serverInsert);
+		} else if (clientDelete && serverDelete) {
+			return transform(clientDelete, serverDelete);
+		} else if (clientInsert && serverDelete) {
+			return transform(clientInsert, serverDelete);
+		} else if (clientDelete && serverInsert) {
+			return transform(clientDelete, serverInsert);
+		} else if (clientUpdate && serverDelete) {
+			return transform(clientUpdate, serverDelete);
+		} else if (clientDelete && serverUpdate) {
+			return transform(clientDelete, serverUpdate);
 		} else {
 			return std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref>();
 		}
@@ -75,4 +87,73 @@ namespace Swift {
 		}
 		return result;
 	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp) {
+		std::pair<WhiteboardDeleteOperation::ref, WhiteboardDeleteOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardDeleteOperation>(*serverOp.get());
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardDeleteOperation>(*clientOp.get());
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() < serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()-1);
+		} else if (clientOp->getPos() < serverOp->getPos()) {
+			result.second->setPos(result.second->getPos()-1);
+		}
+//TODO: situation with deletion of the same item
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardInsertOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp) {
+		std::pair<WhiteboardDeleteOperation::ref, WhiteboardInsertOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardDeleteOperation>(*serverOp.get());
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardInsertOperation>(*clientOp.get());
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() <= serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()+1);
+		} else {
+			result.second->setPos(result.second->getPos()-1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardInsertOperation::ref serverOp) {
+		std::pair<WhiteboardInsertOperation::ref, WhiteboardDeleteOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardInsertOperation>(*serverOp.get());
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardDeleteOperation>(*clientOp.get());
+		result.second->setParentID(serverOp->getID());
+		if (serverOp->getPos() <= clientOp->getPos()) {
+			result.second->setPos(result.second->getPos()+1);
+		} else {
+			result.first->setPos(result.first->getPos()-1);
+		}
+		return result;
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardUpdateOperation::ref clientOp, WhiteboardDeleteOperation::ref serverOp) {
+		std::pair<WhiteboardDeleteOperation::ref, WhiteboardUpdateOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardDeleteOperation>(*serverOp.get());
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardUpdateOperation>(*clientOp.get());
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() > serverOp->getPos()) {
+			result.second->setPos(result.second->getPos()-1);
+		}
+		return result;
+//TODO: situation with the same pos
+	}
+
+	std::pair<WhiteboardOperation::ref, WhiteboardOperation::ref> WhiteboardTransformer::transform(WhiteboardDeleteOperation::ref clientOp, WhiteboardUpdateOperation::ref serverOp) {
+		std::pair<WhiteboardUpdateOperation::ref, WhiteboardDeleteOperation::ref> result;
+		result.first = boost::make_shared<WhiteboardUpdateOperation>(*serverOp.get());
+		result.first->setParentID(clientOp->getID());
+		result.second = boost::make_shared<WhiteboardDeleteOperation>(*clientOp.get());
+		result.second->setParentID(serverOp->getID());
+		if (clientOp->getPos() < serverOp->getPos()) {
+			result.first->setPos(result.first->getPos()-1);
+		}
+		return result;
+//TODO: situation with the same pos
+	}
 }