Mercurial > hg > RemoteEditor > REPSessionManager

changeset 252:526ee0354067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author pin
date Thu, 04 Sep 2008 19:27:54 +0900
parents 774c66db4939
children 450abb5576bb
files rep/EditorList.java rep/REPCommandPacker.java rep/SelectButtonEvent.java rep/SessionList.java rep/SessionManager.java rep/SessionViewer.java rep/handler/PacketSet.java rep/handler/REPHandler.java rep/handler/REPHandlerInMerge.java test/sematest/TestSessionManager.java
diffstat 10 files changed, 19 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/rep/EditorList.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/EditorList.java	Thu Sep 04 19:27:54 2008 +0900
@@ -1,6 +1,5 @@
 package rep;
 
-import java.nio.channels.SocketChannel;
 import java.util.LinkedList;
 
 import rep.channel.REPSocketChannel;
--- a/rep/REPCommandPacker.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/REPCommandPacker.java	Thu Sep 04 19:27:54 2008 +0900
@@ -79,7 +79,6 @@
 
 	public REPCommand unpackUConv(SocketChannel sc) throws IOException {
 		ByteBuffer header = ByteBuffer.allocateDirect(HEADER_SIZE);
-		long len = 0;
 		header.clear();
 		/* 
 		len = sc.read(header);
--- a/rep/SelectButtonEvent.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/SelectButtonEvent.java	Thu Sep 04 19:27:54 2008 +0900
@@ -7,13 +7,13 @@
 	private REPSocketChannel<REPCommand> editorChannel;
 	private int sid;
 	private int eid;
-	private SessionManagerEventListener manager;
+	private SessionManager manager;
 
-	public SelectButtonEvent(EditorPlus<REPCommand> editor, SessionPlus session, SessionManagerEventListener listener) {
+	public SelectButtonEvent(Editor editor, Session session, SessionManagerEventListener listener) {
 		this.editorChannel = editor.getChannel();
 		this.eid = editor.getEID();
 		this.sid = session.getSID();
-		this.manager = listener;
+		this.manager = (SessionManager)listener;
 	}
 
 	public REPSocketChannel<REPCommand> getEditorChannel() {
--- a/rep/SessionList.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/SessionList.java	Thu Sep 04 19:27:54 2008 +0900
@@ -15,7 +15,6 @@
 	private int editorCount = 0;
 
 	private boolean channelequals = false;
-	private LinkedList<Session> tmpSessionList = new LinkedList<Session>();
 	private String maxHost;
 	//private TranslaterImp1 translater;
 	
--- a/rep/SessionManager.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/SessionManager.java	Thu Sep 04 19:27:54 2008 +0900
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -45,7 +44,6 @@
 	private REPSelector<REPCommand> selector;
 	private SessionManagerList smList;
 	private String myHost;
-	private boolean isMaster = true;
 	private List<Editor> editorList;
 	private String maxHost;
 	private List<PacketSet> waitingCommandInMerge;
@@ -559,7 +557,6 @@
 		int eid = event.getEID();
 		Session session = getSession(sid);
 		
-		//Editor editor = getEditor(channel);
 		Editor editor = editorList.get(eid);
 		if(editor == null){
 			System.out.println("SessionManager.selectSession():editor = " + editor);
--- a/rep/SessionViewer.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/SessionViewer.java	Thu Sep 04 19:27:54 2008 +0900
@@ -2,7 +2,6 @@
 
 import java.awt.Component;
 
-import javax.swing.JFrame;
 import javax.swing.JTree;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
--- a/rep/handler/PacketSet.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/handler/PacketSet.java	Thu Sep 04 19:27:54 2008 +0900
@@ -2,7 +2,6 @@
 
 import rep.Editor;
 import rep.REPCommand;
-import rep.channel.ChannelSimulator;
 import rep.channel.REPSocketChannel;
 
 public class PacketSet {
--- a/rep/handler/REPHandler.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/handler/REPHandler.java	Thu Sep 04 19:27:54 2008 +0900
@@ -1,8 +1,6 @@
 package rep.handler;
 
 import java.io.IOException;
-import java.nio.channels.SelectionKey;
-
 import rep.REPCommand;
 import rep.channel.REPSelectionKey;
 
--- a/rep/handler/REPHandlerInMerge.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/rep/handler/REPHandlerInMerge.java	Thu Sep 04 19:27:54 2008 +0900
@@ -1,16 +1,12 @@
 package rep.handler;
 
 import java.io.IOException;
-import java.nio.channels.SelectionKey;
-
 import rep.Editor;
 import rep.REPCommand;
 import rep.REPCommandPacker;
 import rep.SessionManager;
-import rep.channel.ChannelSimulator;
 import rep.channel.REPSelectionKey;
 import rep.channel.REPSocketChannel;
-import rep.channel.SelectionKeySimulator;
 
 public class REPHandlerInMerge implements REPHandler {
 
--- a/test/sematest/TestSessionManager.java	Thu Sep 04 19:18:57 2008 +0900
+++ b/test/sematest/TestSessionManager.java	Thu Sep 04 19:27:54 2008 +0900
@@ -34,11 +34,23 @@
 		logger.writeLog("TestSessionManager.startTest()", 1);
 		
 		putTest();
-		putTest();
-		putTest();
+		joinTest();
+		joinTest();
 		
 	}
 
+	private void joinTest() {
+		REPCommand command = new REPCommand();
+		command.setCMD(REP.SMCMD_JOIN);
+		command.setString("JoinTest");
+		LinkedList<REPCommand> commands = new LinkedList<REPCommand>();
+		commands.add(command);
+		
+		Tester tester = new Tester("JoinTester", "localhost", 8766);
+		tester.setCommands(commands);
+		tester.start();
+	}
+
 	private void putTest() {
 		REPCommand command = new REPCommand();
 		command.setCMD(REP.SMCMD_PUT);
@@ -46,7 +58,7 @@
 		LinkedList<REPCommand> commands = new LinkedList<REPCommand>();
 		commands.add(command);
 		
-		Tester tester = new PutTester("PutTester", "localhost", 8766);
+		Tester tester = new Tester("PutTester", "localhost", 8766);
 		tester.setCommands(commands);
 		tester.start();
 	}
@@ -66,6 +78,7 @@
 					SessionManager sm = new SessionManager(port);
 					sm.openSelector();
 					sm.init(port);
+					sm.startGUI(sm);
 					logger.writeLog("TestSessionManager.startSessionManager() : start SessionManager");
 					isStart = true;
 					sm.mainLoop();