gui jupiter test modified.

de.fu_berlin.inf.dpp.test/src/de/fu_berlin/inf/dpp/test/jupiter/DOptPuzzleTest.java

@@ -3,6 +3,7 @@ package de.fu_berlin.inf.dpp.test.jupiter;
 import de.fu_berlin.inf.dpp.concurrent.jupiter.internal.text.DeleteOperation;
 import de.fu_berlin.inf.dpp.concurrent.jupiter.internal.text.InsertOperation;
 import de.fu_berlin.inf.dpp.net.JID;
+import de.fu_berlin.inf.dpp.test.jupiter.server.impl.ConcurrentManager;
 import de.fu_berlin.inf.dpp.test.jupiter.text.ClientSynchronizedDocument;
 import de.fu_berlin.inf.dpp.test.jupiter.text.JupiterTestCase;
 import de.fu_berlin.inf.dpp.test.jupiter.text.ServerSynchronizedDocument;
@@ -42,7 +43,9 @@ public class DOptPuzzleTest extends JupiterTestCase{
 				network,jid_c2);
 		ClientSynchronizedDocument c3 = new ClientSynchronizedDocument("abcd",
 				network,jid_c3);
-		ServerSynchronizedDocument s1 = new ServerSynchronizedDocument(
+//		ServerSynchronizedDocument s1 = new ServerSynchronizedDocument(
+//				network,jid_server);
+		ConcurrentManager s1 = new ConcurrentManager(
 				network,jid_server);
 
 		/* connect all with simulated network. */

de.fu_berlin.inf.dpp.test/src/de/fu_berlin/inf/dpp/test/jupiter/ui/JupiterTestUI.java

@@ -12,6 +12,7 @@ import de.fu_berlin.inf.dpp.concurrent.jupiter.Operation;
 import de.fu_berlin.inf.dpp.concurrent.jupiter.internal.text.DeleteOperation;
 import de.fu_berlin.inf.dpp.concurrent.jupiter.internal.text.InsertOperation;
 import de.fu_berlin.inf.dpp.net.JID;
+import de.fu_berlin.inf.dpp.test.jupiter.server.impl.ConcurrentManager;
 import de.fu_berlin.inf.dpp.test.jupiter.text.ClientSynchronizedDocument;
 import de.fu_berlin.inf.dpp.test.jupiter.text.JupiterDocumentListener;
 import de.fu_berlin.inf.dpp.test.jupiter.text.ServerSynchronizedDocument;
@@ -41,7 +42,7 @@ public class JupiterTestUI extends javax.swing.JPanel {
 		initListener();
 		jupiter = new JupiterSimulater();
 		
-		jupiter.deactiveSide3();
+//		jupiter.deactiveSide3();
 	}
 
 	public void update() {
@@ -942,7 +943,8 @@ public class JupiterTestUI extends javax.swing.JPanel {
 		protected ClientSynchronizedDocument c1;
 		protected ClientSynchronizedDocument c2;
 		protected ClientSynchronizedDocument c3;
-		protected ServerSynchronizedDocument s1;
+//		protected ServerSynchronizedDocument s1;
+		protected ConcurrentManager s1;
 
 		JID jid_c1;
 		JID jid_c2;
@@ -953,12 +955,12 @@ public class JupiterTestUI extends javax.swing.JPanel {
 			// deactiveSide3();
 		}
 
-		public void deactiveSide3() {
-			network.removeClient(c3);
-			s1.removeProxyClient(jid_c3);
-			jPanel3.setVisible(false);
-			update();
-		}
+//		public void deactiveSide3() {
+//			network.removeClient(c3);
+//			s1.removeProxyClient(jid_c3);
+//			jPanel3.setVisible(false);
+//			update();
+//		}
 
 		private void init() {
 
@@ -978,8 +980,9 @@ public class JupiterTestUI extends javax.swing.JPanel {
 			c3 = new ClientSynchronizedDocument(jTextFieldInitialState
 					.getText(), network, jid_c3);
 			c3.addJupiterDocumentListener(this);
-			s1 = new ServerSynchronizedDocument(jTextFieldInitialState
-					.getText(), network, jid_server);
+//			s1 = new ServerSynchronizedDocument(jTextFieldInitialState
+//					.getText(), network, jid_server);
+			s1 = new ConcurrentManager( network, jid_server);
 
 			network.addClient(c1);
 			network.addClient(c2);