# HG changeset patch
# User one
# Date 1227076289 -32400
# Node ID 1d5b608f39dad5640693189adaf65d26217d9b16
# Parent  18cacd0b3ccf67e55f662fca5b61f2ebabf78915
checkMerge fix

diff -r 18cacd0b3ccf -r 1d5b608f39da .classpath
--- a/.classpath	Mon Nov 10 22:26:43 2008 +0900
+++ b/.classpath	Wed Nov 19 15:31:29 2008 +0900
@@ -2,5 +2,6 @@
 <classpath>
 	<classpathentry excluding="rep/EditorChannel.java" kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path=""/>
 </classpath>
diff -r 18cacd0b3ccf -r 1d5b608f39da rep/Session.java
--- a/rep/Session.java	Mon Nov 10 22:26:43 2008 +0900
+++ b/rep/Session.java	Wed Nov 19 15:31:29 2008 +0900
@@ -136,9 +136,10 @@
 	
 	public void closeSession() {
 		REPNode f = first;
-		REPCommand command = new REPCommand(REP.REPCMD_CLOSE, sessionID, REP.SM_EID.id, 0, 0, "");
-		if (f!=null)
+		if (f!=null) {
+			REPCommand command = new REPCommand(REP.REPCMD_CLOSE, sessionID, REP.SM_EID.id, 0, 0, "");
 			f.send(command);
+		}
 	}
 	
 	public REPNode getForwarder(REPSocketChannel<REPCommand> channel) {
diff -r 18cacd0b3ccf -r 1d5b608f39da rep/SessionList.java
--- a/rep/SessionList.java	Mon Nov 10 22:26:43 2008 +0900
+++ b/rep/SessionList.java	Wed Nov 19 15:31:29 2008 +0900
@@ -3,7 +3,6 @@
 
 
 import java.util.HashMap;
-import rep.channel.REPSocketChannel;
 
 public class SessionList extends HashMap<Integer,Session>{
 	/**
@@ -12,10 +11,6 @@
 	private static final long serialVersionUID = 1L;
 	private int sid_root = 0;
 
-	public void sendSelect(int sid) {
-		REPSocketChannel<REPCommand> channel = get(sid-1).getOwner().getChannel();
-		channel.write(new REPCommand(REP.SMCMD_SELECT, sid, 0, 0, 0, ""));
-	}
 
 //	public String getXML() {
 ///* SessionListをXMLに書き出す。ときの形式
diff -r 18cacd0b3ccf -r 1d5b608f39da rep/handler/Editor.java
--- a/rep/handler/Editor.java	Mon Nov 10 22:26:43 2008 +0900
+++ b/rep/handler/Editor.java	Wed Nov 19 15:31:29 2008 +0900
@@ -142,7 +142,7 @@
 	void checkEndMerge() {
 		if (merging) {
 			if(translator.isMerging()) return;
-			REPCommand mergeEnd = new REPCommand(REP.SMCMD_END_MERGE,eid,sid,seq(),0,"");
+			REPCommand mergeEnd = new REPCommand(REP.SMCMD_END_MERGE,sid,eid,seq(),0,"");
 			send(mergeEnd);
 			merging = false;
 		}