1 files changed, 9 insertions, 50 deletions
diff --git a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
index ae07822..c527942 100644
--- a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
+++ b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
@@ -39,60 +39,19 @@ namespace Swift {
 	}
 
 	void OutgoingWhiteboardSession::handleIncomingOperation(WhiteboardOperation::ref operation) {
-//		std::cout << "incoming pos: " << operation->getPos() << std::endl;
-//		client.print();
+		WhiteboardOperation::ref op = server.handleClientOperationReceived(operation);
 
-		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(operation);
-		if (pairResult.client) {
-/*			WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
-			if (insertOp) {
-				std::cout << "iin1: " << insertOp->getID() << " " << insertOp->getPos() <<  " " << insertOp->getParentID() << std::endl;
-			}
+		onOperationReceived(op);
 
-			WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation);
-			if (updateOp) {
-				std::cout << "uin1: " << updateOp->getID() << " " << updateOp->getPos() <<  " " << updateOp->getParentID() << std::endl;
-			}
-
-			WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(operation);
-			if (deleteOp) {
-				std::cout << "din1: " << deleteOp->getID() << " " << deleteOp->getPos() <<  " " << deleteOp->getParentID() << std::endl;
-			}
-
-			insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(pairResult.client);
-			if (insertOp) {
-				std::cout << "iin1: " << insertOp->getID() << " " << insertOp->getPos() <<  " " << insertOp->getParentID() << std::endl;
-			}
-
-			updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(pairResult.client);
-			if (updateOp) {
-				std::cout << "uin1: " << updateOp->getID() << " " << updateOp->getPos() <<  " " << updateOp->getParentID() << std::endl;
-			}
-
-			deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(pairResult.client);
-			if (deleteOp) {
-				std::cout << "din1: " << deleteOp->getID() << " " << deleteOp->getPos() <<  " " << deleteOp->getParentID() << std::endl;
-			}*/
-			onOperationReceived(pairResult.client);
-		}
-
-		if (pairResult.server) {
-			//std::cout << "outts: " << pairResult.server->getID() << " " << pairResult.server->getPos() << std::endl;
-			WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
-			payload->setOperation(pairResult.server);
-			sendPayload(payload);
-		}
+		WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+		payload->setOperation(op);
+		sendPayload(payload);
 	}
 
 	void OutgoingWhiteboardSession::sendOperation(WhiteboardOperation::ref operation) {
-		//std::cout << "out1: " << operation->getID() << " " << operation->getPos() << " " << operation->getParentID() <<  std::endl;
-		WhiteboardOperation::ref result = client.handleLocalOperationReceived(operation);
-
-		if (result) {
-			//std::cout << "out2: " << result->getID() << " " << result->getPos()<< " " << result->getParentID()<< std::endl;
-			WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
-			payload->setOperation(result);
-			sendPayload(payload);
-		}
+		server.handleLocalOperationReceived(operation);
+		WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+		payload->setOperation(operation);
+		sendPayload(payload);
 	}
 }