# HG changeset patch
# User kono
# Date 1222494482 -32400
# Node ID e58695b5118dee0d632579594245c4d4628a7eac
# Parent  708de056af1f5788e1a70076633bd1474a3834de
*** empty log message ***

diff -r 708de056af1f -r e58695b5118d rep/RPanel.java
--- a/rep/RPanel.java	Sat Sep 27 12:45:19 2008 +0900
+++ b/rep/RPanel.java	Sat Sep 27 14:48:02 2008 +0900
@@ -39,7 +39,7 @@
 	private String[] editor_column = {"EID", "SOCKET_CHANNEL"};
 	private DefaultTableModel s_tableModel = new DefaultTableModel(session_column, 0);
 	private DefaultTableModel e_tableModel = new DefaultTableModel(editor_column, 0);
-	LinkedList<SessionPlus> s_list = new LinkedList<SessionPlus>();
+	//LinkedList<SessionPlus> s_list = new LinkedList<SessionPlus>();
 	LinkedList<EditorPlus<REPCommand>> e_list = new LinkedList<EditorPlus<REPCommand>>();
 	private String s_host;
 	private String s_port;
@@ -122,8 +122,8 @@
 	}
 	
 	public void setTableSession(int sessionID, String string) {
-		SessionPlus sp = new SessionPlus(sessionID, string);
-		s_list.add(sp);
+		//SessionPlus sp = new SessionPlus(sessionID, string);
+		//s_list.add(sp);
 		Vector<String> session = new Vector<String>();
 		s_host = " ";
 		s_port = " ";
diff -r 708de056af1f -r e58695b5118d rep/SessionManager.java
--- a/rep/SessionManager.java	Sat Sep 27 12:45:19 2008 +0900
+++ b/rep/SessionManager.java	Sat Sep 27 14:48:02 2008 +0900
@@ -12,7 +12,6 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import javax.swing.SwingUtilities;
 
 import rep.channel.REPServerSocketChannel;
 import rep.channel.REPSocketChannel;
@@ -44,7 +43,7 @@
 public class SessionManager implements SessionManagerEventListener{
 	
 	private LinkedList<Session> sessionList;
-	private SessionManagerGUI gui;
+	private SessionManagerGUIimpl gui;
 	private REPSelector<REPCommand> selector;
 	private SessionManagerList smList;
 	private String myHost;
@@ -331,7 +330,7 @@
 			LinkedList<Editor> eList = new LinkedList<Editor>(editorList);
 			//GUIに反映
 			Runnable doRun = new DoGUIUpdate(sList, eList, gui);
-			SwingUtilities.invokeLater(doRun);
+			gui.invokeLater(doRun);
 		}
 			break;
 
@@ -351,7 +350,7 @@
 				LinkedList<Editor> eList = new LinkedList<Editor>(editorList);
 				//GUIに反映
 				Runnable doRun = new DoGUIUpdate(sList, eList, gui);
-				SwingUtilities.invokeLater(doRun);
+				gui.invokeLater(doRun);
 			}
 			smList.sendToSlave(receivedCommand);
 		}
@@ -412,7 +411,7 @@
 		
 		//GUIに反映
 		Runnable doRun = new DoGUIUpdate(sList, eList, gui);
-		SwingUtilities.invokeLater(doRun);
+		gui.invokeLater(doRun);
 	}
 
 	private void setNormalState(REPSocketChannel<REPCommand> channel, int sid) {
@@ -496,7 +495,7 @@
 	}
 
 	public void startGUI(SessionManager sm) {
-		gui = new SessionManagerGUI();
+		gui = new SessionManagerGUIimpl();
 		Thread th = new Thread( gui ); 
 		th.start();
 		gui.addREPActionListener(this);
diff -r 708de056af1f -r e58695b5118d rep/SessionManagerGUI.java
--- a/rep/SessionManagerGUI.java	Sat Sep 27 12:45:19 2008 +0900
+++ b/rep/SessionManagerGUI.java	Sat Sep 27 14:48:02 2008 +0900
@@ -1,43 +1,12 @@
 package rep;
 
-import java.awt.Container;
 import java.util.LinkedList;
-import javax.swing.JFrame;
-
 
-public class SessionManagerGUI implements Runnable{
-	
-	public static void main(String[] args){
-		SessionManagerGUI gui = new SessionManagerGUI();
-		Thread th = new Thread( gui ); 
-		th.start();
-	}
-
-	public SessionManagerGUI() {
-		rp = new RPanel();
-	}
-
-	private RPanel rp;
-	private JFrame frame;
+public interface SessionManagerGUI {
 
-	public void run() {
-		frame = new JFrame("SessionManager");
-		frame.setBounds(100, 100, 600, 300);
-		Container cont = frame.getContentPane();
-		cont.add(rp);
-
-		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		frame.setVisible(true);
-		
-	}
+	public void update(LinkedList<Session> slist, LinkedList<Editor> elist);
 
-	public void update(LinkedList<Session> slist, LinkedList<Editor> elist) {
-		rp.setTableSession(slist);
-		rp.setTableEditor(elist);
-	}
+	public void addREPActionListener(SessionManager manager);
 
-	public void addREPActionListener(SessionManager manager) {
-		rp.addREPActionListener(manager);
-	}
-
+	void invokeLater(Runnable doRun) ;
 }
\ No newline at end of file
diff -r 708de056af1f -r e58695b5118d rep/SessionManagerGUIimpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rep/SessionManagerGUIimpl.java	Sat Sep 27 14:48:02 2008 +0900
@@ -0,0 +1,54 @@
+package rep;
+
+import java.awt.Container;
+import java.util.LinkedList;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+
+public class SessionManagerGUIimpl implements Runnable, SessionManagerGUI {
+	
+	public static void main(String[] args){
+		SessionManagerGUIimpl gui = new SessionManagerGUIimpl();
+		Thread th = new Thread( gui ); 
+		th.start();
+	}
+
+	public SessionManagerGUIimpl() {
+		rp = new RPanel();
+	}
+
+	private RPanel rp;
+	private JFrame frame;
+
+	public void run() {
+		frame = new JFrame("SessionManager");
+		frame.setBounds(100, 100, 600, 300);
+		Container cont = frame.getContentPane();
+		cont.add(rp);
+
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		frame.setVisible(true);
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see rep.SessionManagerGUIint#update(java.util.LinkedList, java.util.LinkedList)
+	 */
+	public void update(LinkedList<Session> slist, LinkedList<Editor> elist) {
+		rp.setTableSession(slist);
+		rp.setTableEditor(elist);
+	}
+
+	/* (non-Javadoc)
+	 * @see rep.SessionManagerGUIint#addREPActionListener(rep.SessionManager)
+	 */
+	public void addREPActionListener(SessionManager manager) {
+		rp.addREPActionListener(manager);
+	}
+
+	public void invokeLater(Runnable doRun) {
+		SwingUtilities.invokeLater(doRun);
+	}
+
+}
\ No newline at end of file
diff -r 708de056af1f -r e58695b5118d rep/SessionManagerSample.java
--- a/rep/SessionManagerSample.java	Sat Sep 27 12:45:19 2008 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-package rep;
-
-public class SessionManagerSample {
-	
-}
diff -r 708de056af1f -r e58695b5118d rep/SessionPlus.java
--- a/rep/SessionPlus.java	Sat Sep 27 12:45:19 2008 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-package rep;
-
-public class SessionPlus {
-
-	private String string;
-	private int sid;
-	public SessionPlus(int sessionID, String string) {
-		this.string = string;
-		this.sid = sessionID;
-		this.string = string;
-	}
-	public String toString(){
-		return sid + ":" + string;
-	}
-	public int getSID(){
-		return sid;
-	}
-}