# HG changeset patch
# User one
# Date 1285316257 -32400
# Node ID e7eeb8be0de1348af95514baea1d87b072c9fcf0
# Parent  ef70109af810cc1b0fc8b9e23159acaa5262c704
clean up (correct synchronization, but some dead lock, result error remains)

diff -r ef70109af810 -r e7eeb8be0de1 rep/ServerMainLoop.java
--- a/rep/ServerMainLoop.java	Fri Sep 24 17:05:19 2010 +0900
+++ b/rep/ServerMainLoop.java	Fri Sep 24 17:17:37 2010 +0900
@@ -17,7 +17,6 @@
 import rep.channel.REPSocketChannel;
 import rep.gui.SessionManagerEvent;
 import rep.gui.SessionManagerGUI;
-import rep.handler.Editor;
 import rep.handler.FirstConnector;
 import rep.handler.REPNode;
 
diff -r ef70109af810 -r e7eeb8be0de1 rep/SessionManager.java
--- a/rep/SessionManager.java	Fri Sep 24 17:05:19 2010 +0900
+++ b/rep/SessionManager.java	Fri Sep 24 17:17:37 2010 +0900
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.channels.ClosedChannelException;
-import java.util.Collection;
 import java.util.LinkedList;
 
 import org.xml.sax.SAXException;
diff -r ef70109af810 -r e7eeb8be0de1 rep/handler/Editor.java
--- a/rep/handler/Editor.java	Fri Sep 24 17:05:19 2010 +0900
+++ b/rep/handler/Editor.java	Fri Sep 24 17:17:37 2010 +0900
@@ -4,7 +4,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import rep.PacketSet;
 import rep.REP;
 import rep.REPCommand;
 import rep.ServerMainLoop;
@@ -25,7 +24,6 @@
 	private REPCommand mergeMark = new REPCommand(REP.SMCMD_START_MERGE, 0,0, 0, 0, "");
 	public static boolean noMergeMode=false;
 	static final boolean doOptimize = false;
-	private Forwarder toEditor;
 	private LinkedList<REPCommand> writeQueue = new LinkedList<REPCommand>(); 
 
 	public Editor(SessionManager manager,int editorNo){
@@ -37,7 +35,6 @@
 		super(editorNo,manager,channel);
 		eid = editorNo;
 		sentList.add(mergeMark);  // merge mark
-		toEditor = new Forwarder(eid, manager, channel);   // no wait forwarder for my editor
 		REPCommandOptimizer optimizer;
 		if (doOptimize) optimizer = new DeleteInsertOptimizer(); //タカノがつくったおぷてぃまいざ
 		else            optimizer = new NullOptimizer();         //なにもしないけどOptimizer.