1 files changed, 12 insertions, 44 deletions
diff --git a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
index 39eb435..1904457 100644
--- a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
+++ b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
@@ -29,57 +29,25 @@ namespace Swift {
 	}
 
 	void IncomingWhiteboardSession::handleIncomingOperation(WhiteboardOperation::ref operation) {
-//		std::cout << "incoming pos: " << operation->getPos() << std::endl;
-//		WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
-		WhiteboardOperation::ref op = server.handleClientOperationReceived(operation);
-/*		server.print();
-		std::cout << "in1: " << operation->getID() << " " << operation->getPos() <<  " " << operation->getParentID() << std::endl;
-//		std::cout << "sin2: " << op->getID() << " " << op->getPos() <<  " " << op->getParentID() << std::endl;
-		//std::cout << "in1: " << operation->getID() << " " << operation->getPos() <<  " " << operation->getParentID() << std::endl;
-
-		WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(op);
-		if (insertOp) {
-			std::cout << "iin2: " << insertOp->getID() << " " << insertOp->getPos() <<  " " << insertOp->getParentID() << std::endl;
+		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(operation);
+		if (pairResult.client) {
+			onOperationReceived(pairResult.client);
 		}
 
-		WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(op);
-		if (updateOp) {
-			std::cout << "uin2: " << updateOp->getID() << " " << updateOp->getPos() <<  " " << updateOp->getParentID() << std::endl;
+		if (pairResult.server) {
+			WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+			payload->setOperation(pairResult.server);
+			sendPayload(payload);
 		}
-
-		WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(op);
-		if (deleteOp) {
-			std::cout << "din2: " << deleteOp->getID() << " " << deleteOp->getPos() <<  " " << deleteOp->getParentID() << std::endl;
-		}*/
-
-		onOperationReceived(op);
-
-		WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
-		payload->setOperation(op);
-		sendPayload(payload);
 	}
 
 	void IncomingWhiteboardSession::sendOperation(WhiteboardOperation::ref operation) {
-//		std::cout << "out: " << operation->getID() << " " << operation->getPos() << " " << operation->getParentID()<< std::endl;
-
-/*		WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(operation);
-		if (insertOp) {
-			std::cout << "iout: " << insertOp->getID() << " " << insertOp->getPos() <<  " " << insertOp->getParentID() << std::endl;
-		}
-
-		WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(operation);
-		if (updateOp) {
-			std::cout << "uout: " << updateOp->getID() << " " << updateOp->getPos() <<  " " << updateOp->getParentID() << std::endl;
-		}
+		WhiteboardOperation::ref result = client.handleLocalOperationReceived(operation);
 
-		WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(operation);
-		if (deleteOp) {
-			std::cout << "dout: " << deleteOp->getID() << " " << deleteOp->getPos() <<  " " << deleteOp->getParentID() << std::endl;
+		if (result) {
+			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);
 	}
 }