# HG changeset patch
# User kono
# Date 1222075295 -32400
# Node ID d6a33e295d471406d098c36d4c89f149762dfc4d
# Parent  4d9058761c900565542838a2df478479254ec0cc
*** empty log message ***

diff -r 4d9058761c90 -r d6a33e295d47 rep/channel/REPSelectionKey.java
--- a/rep/channel/REPSelectionKey.java	Thu Sep 11 17:24:44 2008 +0900
+++ b/rep/channel/REPSelectionKey.java	Mon Sep 22 18:21:35 2008 +0900
@@ -44,24 +44,24 @@
 		return null;
 
 	}
-
-	public SelectableChannel channel(REPPack<P>packer) {
-		if (REPServerSocketChannel.isSimulation) return key.channel();
-		if (key.isAcceptable()) {
-			//System.err.println("AcceptP selectionKey.channel = "+key.channel());
-			SelectableChannel sc = key.channel();
-			SelectableChannel rsc = REPSocketChannel.channels.get(sc);
-			if (rsc!=null) return rsc;
-			return new REPServerSocketChannel<P>(key.channel(),packer);
-		} else if (key.isReadable()) {
-			//System.err.println("ReadP selectionKey.channel = "+key.channel());
-			SelectableChannel sc = key.channel();
-			SelectableChannel rsc = REPSocketChannel.channels.get(sc);
-			if (rsc!=null) return rsc;
-			return new REPSocketChannel<P>(key.channel(),packer);
-		}
-		return null;
-	}
+//
+//	public SelectableChannel channel(REPPack<P>packer) {
+//		if (REPServerSocketChannel.isSimulation) return key.channel();
+//		if (key.isAcceptable()) {
+//			//System.err.println("AcceptP selectionKey.channel = "+key.channel());
+//			SelectableChannel sc = key.channel();
+//			SelectableChannel rsc = REPSocketChannel.channels.get(sc);
+//			if (rsc!=null) return rsc;
+//			return new REPServerSocketChannel<P>(key.channel(),packer);
+//		} else if (key.isReadable()) {
+//			//System.err.println("ReadP selectionKey.channel = "+key.channel());
+//			SelectableChannel sc = key.channel();
+//			SelectableChannel rsc = REPSocketChannel.channels.get(sc);
+//			if (rsc!=null) return rsc;
+//			return new REPSocketChannel<P>(key.channel(),packer);
+//		}
+//		return null;
+//	}
 
 	@Override
 	public int interestOps() {
diff -r 4d9058761c90 -r d6a33e295d47 rep/handler/REPHandlerInMerge.java
--- a/rep/handler/REPHandlerInMerge.java	Thu Sep 11 17:24:44 2008 +0900
+++ b/rep/handler/REPHandlerInMerge.java	Mon Sep 22 18:21:35 2008 +0900
@@ -22,17 +22,11 @@
 		this.sid = sid;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void handle(REPSelectionKey<REPCommand> key) throws IOException {
 		//マージ中のエディタの前のエディタのコマンドをWaitingListに追加する
-		REPSocketChannel<REPCommand> channel = (REPSocketChannel<REPCommand>) key.accept(new REPCommandPacker());
-		REPCommand command = null;
-		
-		try {
-			command = channel.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		
+		REPSocketChannel<REPCommand> channel = (REPSocketChannel<REPCommand>) key.channel();
+		REPCommand command = channel.read();
 		if(command.sid == sid){
 			Editor editor = manager.getEditor(channel);
 			manager.addWaitingCommand(new PacketSet(channel, editor, command));
diff -r 4d9058761c90 -r d6a33e295d47 test/channeltest/testSeMa.java
--- a/test/channeltest/testSeMa.java	Thu Sep 11 17:24:44 2008 +0900
+++ b/test/channeltest/testSeMa.java	Mon Sep 22 18:21:35 2008 +0900
@@ -71,7 +71,7 @@
 
 					}else if(key.isReadable()){
 						try {
-							REPSocketChannel<String> channel = (REPSocketChannel<String>) key.channel(pack);
+							REPSocketChannel<String> channel = (REPSocketChannel<String>) key.channel();
 							String packet;
 							packet = channel.read();
 							if (packet==null) continue;
diff -r 4d9058761c90 -r d6a33e295d47 test/channeltest/testSeMaSlave.java
--- a/test/channeltest/testSeMaSlave.java	Thu Sep 11 17:24:44 2008 +0900
+++ b/test/channeltest/testSeMaSlave.java	Mon Sep 22 18:21:35 2008 +0900
@@ -68,7 +68,7 @@
 
 					}else if(key.isReadable()){
 						try {
-							REPSocketChannel<String> channel = (REPSocketChannel<String>) key.channel(pack);
+							REPSocketChannel<String> channel = (REPSocketChannel<String>) key.channel();
 							String packet = channel.read();
 							if (packet==null) continue;
 							//if (channel==masterCH){