# HG changeset patch
# User pin
# Date 1195191361 -32400
# Node ID f8c001e00f9c327f943ded75ae726ad40ddee176
# Parent  18ae3b9fe57a9befe5d9b5645c0273e3efd91f67
*** empty log message ***

diff -r 18ae3b9fe57a -r f8c001e00f9c src/remoteeditor/editors/RemoteEditor.java
--- a/src/remoteeditor/editors/RemoteEditor.java	Fri Nov 16 11:59:50 2007 +0900
+++ b/src/remoteeditor/editors/RemoteEditor.java	Fri Nov 16 14:36:01 2007 +0900
@@ -104,7 +104,8 @@
 		//myeid = temp.eid; mysid = temp.sid;
 		repreceive.addCommandListener(this);
 		//repsend.send(new REPCommand(REP.REPCMD_READ, mysid, myeid, myseq, 0, 0, ""));
-		joinPart();
+		//joinPart();
+		putPart();
 	}
 	
 	private void getSocketString(SocketChannel sc2) {
diff -r 18ae3b9fe57a -r f8c001e00f9c src/sample/merge/Merger.java
--- a/src/sample/merge/Merger.java	Fri Nov 16 11:59:50 2007 +0900
+++ b/src/sample/merge/Merger.java	Fri Nov 16 14:36:01 2007 +0900
@@ -7,11 +7,11 @@
 	private REPPacketReceive receiver;
 	private REPPacketSend sender;
 
-	private RemoteEditor;
+//	private RemoteEditor;
 	private Translater translater;
 
 	public Merger(){
-		translater = new Translater();
+//		translater = new Translater();
 	}
 
 	public void pushRemoteCmd(REPCommand cmd){
@@ -36,7 +36,7 @@
 		else if (cmd.cmd==REP.REPCMD_REPLACE)
 			;
 
-		editor.changeText( , );
+//		editor.changeText( , );
 	}
 }