changeset 183:eb89a73976fa

*** empty log message ***
author kent
date Fri, 29 Aug 2008 13:40:29 +0900
parents e5a7aad3fbc0
children 3c82100cdadd
files rep/SessionManagerList.java rep/channel/REPPack.java rep/channel/REPServerSocketChannel.java
diffstat 3 files changed, 16 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/rep/SessionManagerList.java	Fri Aug 29 13:35:49 2008 +0900
+++ b/rep/SessionManagerList.java	Fri Aug 29 13:40:29 2008 +0900
@@ -1,6 +1,5 @@
 package rep;
 
-import java.nio.channels.SocketChannel;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -19,30 +18,13 @@
 
 	public void sendUpdate(int sessionID, String string) {
 		for(REPSocketChannel<REPCommand> channel : list){
-			REPPacketSend send = new REPPacketSend(channel);
-			send.send(new REPCommand(REP.SMCMD_UPDATE, 0, mySMID, 0, 0, string.length(), string));
+			channel.write(new REPCommand(REP.SMCMD_UPDATE, 0, mySMID, 0, 0, string.length(), string));
 		}
 	}
 
 	public void sendJoin(REPCommand command) {
 		for(REPSocketChannel<REPCommand> channel : list){
-			REPPacketSend send = new REPPacketSend(channel);
-			send.send(command);
-		}
-	}
-	
-	public void sendUpdateUp(REPCommand command){
-		REPPacketSend send = new REPPacketSend(master);
-		command.setCMD(REP.SMCMD_UPDATE_UP);
-		send.send(command);
-	}
-	
-	public void sendUpdateDown(REPCommand command){
-		command.setCMD(REP.SMCMD_UPDATE_DOWN);
-		for(REPSocketChannel<REPCommand> channel : list){
-			if(channel == master) continue;
-			REPPacketSend send = new REPPacketSend(channel);
-			send.send(command);
+			channel.write(command);
 		}
 	}
 	
@@ -55,8 +37,7 @@
 		command.setString(encoder.sessionListToXML());
 		
 		for(REPSocketChannel<REPCommand> channel : list){
-			REPPacketSend send = new REPPacketSend(channel);
-			send.send(command);
+			channel.write(command);
 		}
 	}
 
@@ -65,23 +46,20 @@
 	}
 
 	public void sendToMaster(REPCommand repCmd) {
-		REPPacketSend send = new REPPacketSend(master);
-		send.send(repCmd);
+		master.write(repCmd);
 	}
 
 	public void sendToSlave(REPCommand repCmd) {
 		for(REPSocketChannel<REPCommand> channel : list){
 			if(channel.equals(master)) continue;
-			REPPacketSend send = new REPPacketSend(channel);
-			send.send(repCmd);
+			channel.write(repCmd);
 		}
 	}
 
 	public void sendExcept(REPSocketChannel<REPCommand> channel2, REPCommand command) {
 		for(REPSocketChannel<REPCommand> channel : list){
 			if(channel.equals(channel2)) continue;
-			REPPacketSend send = new REPPacketSend(channel);
-			send.send(command);
+			channel.write(command);
 		}
 	}
 
--- a/rep/channel/REPPack.java	Fri Aug 29 13:35:49 2008 +0900
+++ b/rep/channel/REPPack.java	Fri Aug 29 13:40:29 2008 +0900
@@ -6,6 +6,4 @@
 
 	public abstract ByteBuffer packUConv(P command);
 
-	public abstract void send(P command);
-
 }
\ No newline at end of file
--- a/rep/channel/REPServerSocketChannel.java	Fri Aug 29 13:35:49 2008 +0900
+++ b/rep/channel/REPServerSocketChannel.java	Fri Aug 29 13:40:29 2008 +0900
@@ -59,17 +59,20 @@
 		ss.configureBlocking(block);
 	}
 
+
+	public SelectionKey register(REPSelector sel, int ops, Object att) throws ClosedChannelException {
+		assert(!isSimulation);
+		REPSelector selector = sel;
+		if(sel!=null)
+			return selector.register(ss, ops, att);
+		else
+			return null;
+	}
+
 	@Override
 	public SocketChannel accept() throws IOException {
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
-
-	public SelectionKey register(REPSelector sel, int ops, Object att) throws ClosedChannelException {
-		assert(!isSimulation);
-		REPSelector selector = sel;
-		return selector.register(ss, ops, att);
-	}
 
 }