--- a/rep/EditorList.java	Sun Nov 25 03:21:17 2007 +0900
+++ b/rep/EditorList.java	Tue Dec 04 10:33:06 2007 +0900
@@ -74,4 +74,12 @@
 		send.send(command);
 	}
 
+
+	public void setHost(String myHost) {
+		// TODO Auto-generated method stub
+		for(Editor editor : editorList) {
+			editor.setHost(myHost);
+		}
+	}
+
 }

--- a/rep/SessionManager.java	Sun Nov 25 03:21:17 2007 +0900
+++ b/rep/SessionManager.java	Tue Dec 04 10:33:06 2007 +0900
@@ -37,6 +37,7 @@
 	private String myHost;
 	private boolean isMaster = true;
 	private EditorList  editorList;
+	//private boolean addressIsGlobal;
 	//private SocketChannel sessionchannel;
 	//private boolean co;
 	public SessionManager(int port) {
@@ -203,14 +204,15 @@
 			break;
 			
 		case REP.SMCMD_SM_JOIN:
-			myHost = getLocalHostName(channel);
-			if(myHost.compareTo(receivedCommand.string) < 0)
+			if(myHost == null) setMyHostName(getLocalHostName(channel));
+			if(myHost.compareTo(receivedCommand.string) < 0){
 				setMaster(false);
+			}
 
 			if(isMaster){
 				smList.add(channel);
-				receivedCommand.setCMD(REP.SMCMD_SM_JOIN_ACK);
-				smList.sendSessionList(sessionlist, receivedCommand);
+				sendCommand.setCMD(REP.SMCMD_SM_JOIN_ACK);
+				smList.sendSessionList(sessionlist, sendCommand);
 			}else {
 				
 			}
@@ -272,49 +274,21 @@
 			break;
 		}
 	}
+	
+	private void setMyHostName(String localHostName) {
+		myHost = localHostName;
+		editorList.setHost(myHost);
+	}
 
 //	private void sendJoin(REPCommand repCmd) {
 //		smList.sendJoin(repCmd);
 //	}
 
 	private void setMaster(boolean b) {
-		// TODO Auto-generated method stub
 		isMaster = b;
 		System.out.println("isMaster = " + b);
 	}
 
-	private void sendSessionManagerJoinAck(SocketChannel channel, REPCommand repCmd) {
-		String socketstring = getSocketString(channel);
-		System.out.println(socketstring);
-		smList.add(channel);								//SessionManagerのリストへ追加
-		repCmd.setCMD(REP.SMCMD_SM_JOIN_ACK);
-		repCmd.setString(repCmd.string + ":" + socketstring);
-		REPPacketSend repSend4 = new REPPacketSend(channel);
-		repSend4.send(repCmd);								//ACK
-	}
-	
-	private void sendJoinAck(REPCommand repCmd) {
-		
-	}
-
-	private void sendJoinAck(SocketChannel channel, REPCommand repCmd) {
-		//int eid = sessionlist.getNumberOfEditor();	//eidを取得
-		int eid = editorList.addEditor(channel, repCmd);
-		sessionmanagerGUI.setComboEditor(eid, channel);		//ComboBoxにEditorを追加
-		repCmd.setEID(eid);							//eidを決定して、
-		repCmd.setCMD(REP.SMCMD_JOIN_ACK);
-		repCmd.string = sessionlist.getSessionList();		//Session一覧を
-		
-		String string = getSocketString(channel);
-		StringTokenizer stn = new StringTokenizer(string, ":");
-		String host = stn.nextToken();
-		String port = stn.nextToken();
-		repCmd.setString(repCmd.string + ":" + myHost + ":" + port);
-		
-		REPPacketSend repSend = new REPPacketSend(channel);	//Editor側へ送信
-		repSend.send(repCmd);
-	}
-
 	public static void main(String[] args) throws InterruptedException, IOException {
 		int port = 8766;
 		

--- a/rep/xml/SessionXMLEncoder.java	Sun Nov 25 03:21:17 2007 +0900
+++ b/rep/xml/SessionXMLEncoder.java	Tue Dec 04 10:33:06 2007 +0900
@@ -72,6 +72,7 @@
 						LinkedList <Editor> editorlist = session.getEditorList();
 						for(Editor editor : editorlist){
 							Element elementEditor = doc.createElement("Editor");
+							elementEditor.setAttribute("eid", Integer.toString(editor.getEID()));
 							elementSession.appendChild(elementEditor);
 							
 							Element elementHost = doc.createElement("host");

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sample/graph/Graph.java	Tue Dec 04 10:33:06 2007 +0900
@@ -0,0 +1,439 @@
+package sample.graph;
+
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * -Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ * 
+ * -Redistribution in binary form must reproduct the above copyright
+ *  notice, this list of conditions and the following disclaimer in
+ *  the documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind. ALL
+ * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
+ * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS LICENSORS SHALL NOT
+ * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT
+ * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS
+ * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST
+ * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
+ * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY
+ * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN
+ * IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that Software is not designed, licensed or intended for
+ * use in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+/*
+ * @(#)Graph.java	1.13 03/01/23
+ */
+
+import java.util.*;
+import java.awt.*;
+import java.applet.Applet;
+import java.awt.event.*;
+
+
+class Node {
+    double x;
+    double y;
+
+    double dx;
+    double dy;
+
+    boolean fixed;
+
+    String lbl;
+}
+
+
+class Edge {
+    int from;
+    int to;
+
+    double len;
+}
+
+
+class GraphPanel extends Panel
+    implements Runnable, MouseListener, MouseMotionListener {
+    Graph graph;
+    int nnodes;
+    Node nodes[] = new Node[100];
+
+    int nedges;
+    Edge edges[] = new Edge[200];
+
+    Thread relaxer;
+    boolean stress;
+    boolean random;
+    
+    GraphPanel(Graph graph) {
+	this.graph = graph;
+	addMouseListener(this);
+    }
+
+    int findNode(String lbl) {
+	for (int i = 0 ; i < nnodes ; i++) {
+	    if (nodes[i].lbl.equals(lbl)) {
+		return i;
+	    }
+	}
+	return addNode(lbl);
+    }
+    int addNode(String lbl) {
+	Node n = new Node();
+	n.x = 10 + 380*Math.random();
+	n.y = 10 + 380*Math.random();
+	n.lbl = lbl;
+	nodes[nnodes] = n;
+	return nnodes++;
+    }
+    void addEdge(String from, String to, int len) {
+	Edge e = new Edge();
+	e.from = findNode(from);
+	e.to = findNode(to);
+	e.len = len;
+	edges[nedges++] = e;
+    }
+
+    public void run() {
+        Thread me = Thread.currentThread();
+	while (relaxer == me) {
+	    relax();
+	    if (random && (Math.random() < 0.03)) {
+		Node n = nodes[(int)(Math.random() * nnodes)];
+		if (!n.fixed) {
+		    n.x += 100*Math.random() - 50;
+		    n.y += 100*Math.random() - 50;
+		}
+		graph.play(graph.getCodeBase(), "audio/drip.au");
+	    }
+	    try {
+		Thread.sleep(100);
+	    } catch (InterruptedException e) {
+		break;
+	    }
+	}
+    }
+
+    synchronized void relax() {
+	for (int i = 0 ; i < nedges ; i++) {
+	    Edge e = edges[i];
+	    double vx = nodes[e.to].x - nodes[e.from].x;
+	    double vy = nodes[e.to].y - nodes[e.from].y;
+	    double len = Math.sqrt(vx * vx + vy * vy);
+            len = (len == 0) ? .0001 : len;
+	    double f = (edges[i].len - len) / (len * 3);
+	    double dx = f * vx;
+	    double dy = f * vy;
+
+	    nodes[e.to].dx += dx;
+	    nodes[e.to].dy += dy;
+	    nodes[e.from].dx += -dx;
+	    nodes[e.from].dy += -dy;
+	}
+
+	for (int i = 0 ; i < nnodes ; i++) {
+	    Node n1 = nodes[i];
+	    double dx = 0;
+	    double dy = 0;
+
+	    for (int j = 0 ; j < nnodes ; j++) {
+		if (i == j) {
+		    continue;
+		}
+		Node n2 = nodes[j];
+		double vx = n1.x - n2.x;
+		double vy = n1.y - n2.y;
+		double len = vx * vx + vy * vy;
+		if (len == 0) {
+		    dx += Math.random();
+		    dy += Math.random();
+		} else if (len < 100*100) {
+		    dx += vx / len;
+		    dy += vy / len;
+		}
+	    }
+	    double dlen = dx * dx + dy * dy;
+	    if (dlen > 0) {
+		dlen = Math.sqrt(dlen) / 2;
+		n1.dx += dx / dlen;
+		n1.dy += dy / dlen;
+	    }
+	}
+
+	Dimension d = getSize();
+	for (int i = 0 ; i < nnodes ; i++) {
+	    Node n = nodes[i];
+	    if (!n.fixed) {
+		n.x += Math.max(-5, Math.min(5, n.dx));
+		n.y += Math.max(-5, Math.min(5, n.dy));
+            }
+            if (n.x < 0) {
+                n.x = 0;
+            } else if (n.x > d.width) {
+                n.x = d.width;
+            }
+            if (n.y < 0) {
+                n.y = 0;
+            } else if (n.y > d.height) {
+                n.y = d.height;
+            }
+	    n.dx /= 2;
+	    n.dy /= 2;
+	}
+	repaint();
+    }
+
+    Node pick;
+    boolean pickfixed;
+    Image offscreen;
+    Dimension offscreensize;
+    Graphics offgraphics;
+
+    final Color fixedColor = Color.red;
+    final Color selectColor = Color.pink;
+    final Color edgeColor = Color.black;
+    final Color nodeColor = new Color(250, 220, 100);
+    final Color stressColor = Color.darkGray;
+    final Color arcColor1 = Color.black;
+    final Color arcColor2 = Color.pink;
+    final Color arcColor3 = Color.red;
+
+    public void paintNode(Graphics g, Node n, FontMetrics fm) {
+	int x = (int)n.x;
+	int y = (int)n.y;
+	g.setColor((n == pick) ? selectColor : (n.fixed ? fixedColor : nodeColor));
+	int w = fm.stringWidth(n.lbl) + 10;
+	int h = fm.getHeight() + 4;
+	g.fillRect(x - w/2, y - h / 2, w, h);
+	g.setColor(Color.black);
+	g.drawRect(x - w/2, y - h / 2, w-1, h-1);
+	g.drawString(n.lbl, x - (w-10)/2, (y - (h-4)/2) + fm.getAscent());
+    }
+
+    public synchronized void update(Graphics g) {
+	Dimension d = getSize();
+	if ((offscreen == null) || (d.width != offscreensize.width) || (d.height != offscreensize.height)) {
+	    offscreen = createImage(d.width, d.height);
+	    offscreensize = d;
+	    if (offgraphics != null) {
+	        offgraphics.dispose();
+	    }
+	    offgraphics = offscreen.getGraphics();
+	    offgraphics.setFont(getFont());
+	}
+
+	offgraphics.setColor(getBackground());
+	offgraphics.fillRect(0, 0, d.width, d.height);
+	for (int i = 0 ; i < nedges ; i++) {
+	    Edge e = edges[i];
+	    int x1 = (int)nodes[e.from].x;
+	    int y1 = (int)nodes[e.from].y;
+	    int x2 = (int)nodes[e.to].x;
+	    int y2 = (int)nodes[e.to].y;
+	    int len = (int)Math.abs(Math.sqrt((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2)) - e.len);
+	    offgraphics.setColor((len < 10) ? arcColor1 : (len < 20 ? arcColor2 : arcColor3)) ;
+	    offgraphics.drawLine(x1, y1, x2, y2);
+	    if (stress) {
+		String lbl = String.valueOf(len);
+		offgraphics.setColor(stressColor);
+		offgraphics.drawString(lbl, x1 + (x2-x1)/2, y1 + (y2-y1)/2);
+		offgraphics.setColor(edgeColor);
+	    }
+	}
+
+	FontMetrics fm = offgraphics.getFontMetrics();
+	for (int i = 0 ; i < nnodes ; i++) {
+	    paintNode(offgraphics, nodes[i], fm);
+	}
+	g.drawImage(offscreen, 0, 0, null);
+    }
+
+    //1.1 event handling
+    public void mouseClicked(MouseEvent e) {
+    }
+
+    public void mousePressed(MouseEvent e) {
+        addMouseMotionListener(this);
+	double bestdist = Double.MAX_VALUE;
+	int x = e.getX();
+	int y = e.getY();
+	for (int i = 0 ; i < nnodes ; i++) {
+	    Node n = nodes[i];
+	    double dist = (n.x - x) * (n.x - x) + (n.y - y) * (n.y - y);
+	    if (dist < bestdist) {
+		pick = n;
+		bestdist = dist;
+	    }
+	}
+	pickfixed = pick.fixed;
+	pick.fixed = true;
+	pick.x = x;
+	pick.y = y;
+	repaint();
+	e.consume();
+    }
+
+    public void mouseReleased(MouseEvent e) {
+        removeMouseMotionListener(this);
+        if (pick != null) {
+            pick.x = e.getX();
+            pick.y = e.getY();
+            pick.fixed = pickfixed;
+            pick = null;
+        }
+	repaint();
+	e.consume();
+    }
+
+    public void mouseEntered(MouseEvent e) {
+    }
+
+    public void mouseExited(MouseEvent e) {
+    }
+
+    public void mouseDragged(MouseEvent e) {
+	pick.x = e.getX();
+	pick.y = e.getY();
+	repaint();
+	e.consume();
+    }
+
+    public void mouseMoved(MouseEvent e) {
+    }
+
+    public void start() {
+	relaxer = new Thread(this);
+	relaxer.start();
+    }
+
+    public void stop() {
+	relaxer = null;
+    }
+
+}
+
+
+public class Graph extends Applet implements ActionListener, ItemListener {
+
+    GraphPanel panel;
+    Panel controlPanel;
+
+    Button scramble = new Button("Scramble");
+    Button shake = new Button("Shake");
+    Checkbox stress = new Checkbox("Stress");
+    Checkbox random = new Checkbox("Random");
+
+    public void init() {
+	setLayout(new BorderLayout());
+
+	panel = new GraphPanel(this);
+	add("Center", panel);
+	controlPanel = new Panel();
+	add("South", controlPanel);
+
+	controlPanel.add(scramble); scramble.addActionListener(this);
+	controlPanel.add(shake); shake.addActionListener(this);
+	controlPanel.add(stress); stress.addItemListener(this);
+	controlPanel.add(random); random.addItemListener(this);
+
+	String edges = getParameter("edges");
+	for (StringTokenizer t = new StringTokenizer(edges, ",") ; t.hasMoreTokens() ; ) {
+	    String str = t.nextToken();
+	    int i = str.indexOf('-');
+	    if (i > 0) {
+		int len = 50;
+		int j = str.indexOf('/');
+		if (j > 0) {
+		    len = Integer.valueOf(str.substring(j+1)).intValue();
+		    str = str.substring(0, j);
+		}
+		panel.addEdge(str.substring(0,i), str.substring(i+1), len);
+	    }
+	}
+	Dimension d = getSize();
+	String center = getParameter("center");
+	if (center != null){
+	    Node n = panel.nodes[panel.findNode(center)];
+	    n.x = d.width / 2;
+	    n.y = d.height / 2;
+	    n.fixed = true;
+	}
+    }
+
+    public void destroy() {
+        remove(panel);
+        remove(controlPanel);
+    }
+
+    public void start() {
+	panel.start();
+    }
+
+    public void stop() {
+	panel.stop();
+    }
+
+    public void actionPerformed(ActionEvent e) {
+	Object src = e.getSource();
+
+	if (src == scramble) {
+	    play(getCodeBase(), "audio/computer.au");
+	    Dimension d = getSize();
+	    for (int i = 0 ; i < panel.nnodes ; i++) {
+		Node n = panel.nodes[i];
+		if (!n.fixed) {
+		    n.x = 10 + (d.width-20)*Math.random();
+		    n.y = 10 + (d.height-20)*Math.random();
+		}
+	    }
+	    return;
+	}
+
+	if (src == shake) {
+	    play(getCodeBase(), "audio/gong.au");
+	    Dimension d = getSize();
+	    for (int i = 0 ; i < panel.nnodes ; i++) {
+		Node n = panel.nodes[i];
+		if (!n.fixed) {
+		    n.x += 80*Math.random() - 40;
+		    n.y += 80*Math.random() - 40;
+		}
+	    }
+	}
+
+    }
+
+    public void itemStateChanged(ItemEvent e) {
+	Object src = e.getSource();
+	boolean on = e.getStateChange() == ItemEvent.SELECTED;
+	if (src == stress) panel.stress = on;
+	else if (src == random) panel.random = on;
+    }
+
+    public String getAppletInfo() {
+	return "Title: GraphLayout \nAuthor: <unknown>";
+    }
+
+    public String[][] getParameterInfo() {
+	String[][] info = {
+	    {"edges", "delimited string", "A comma-delimited list of all the edges.  It takes the form of 'C-N1,C-N2,C-N3,C-NX,N1-N2/M12,N2-N3/M23,N3-NX/M3X,...' where C is the name of center node (see 'center' parameter) and NX is a node attached to the center node.  For the edges connecting nodes to eachother (and not to the center node) you may (optionally) specify a length MXY separated from the edge name by a forward slash."},
+	    {"center", "string", "The name of the center node."}
+	};
+	return info;
+    }
+
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/SessionXMLDecoder2.java	Tue Dec 04 10:33:06 2007 +0900
@@ -0,0 +1,31 @@
+package test;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+public class SessionXMLDecoder2 {
+	void parse(String string){
+		try {
+			SAXParserFactory spfactory = SAXParserFactory.newInstance();
+			SAXParser parser = spfactory.newSAXParser();
+			InputSource source = new InputSource(new StringReader(string));
+			parser.parse(source, new SessionXMLParser());
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/SessionXMLParser.java	Tue Dec 04 10:33:06 2007 +0900
@@ -0,0 +1,55 @@
+package test;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import rep.Editor;
+import rep.Session;
+import rep.SessionList;
+
+public class SessionXMLParser extends DefaultHandler{
+	
+	private SessionList sessionlist;
+	private Editor editor;
+
+	public void startDocument() {
+		System.out.println("Start Document.");
+	}
+	
+	public void startElement(String uri, String localName, String qName, Attributes attributes){
+
+	}
+	
+
+	public static void main(String[] args) {
+		String string = null;
+		if(args.length > 0) {
+			string = args[0];
+		}
+		try {
+			SAXParserFactory spfactory = SAXParserFactory.newInstance();
+			SAXParser parser = spfactory.newSAXParser();
+			InputSource source = new InputSource(new StringReader(string));
+			parser.parse(source, new SessionXMLParser());
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/TestSax.java	Tue Dec 04 10:33:06 2007 +0900
@@ -0,0 +1,47 @@
+package test;
+
+import java.io.StringReader;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class TestSax extends DefaultHandler{
+	
+	public static void main(String[] argv){
+		String string = null;
+		if(argv.length == 1){
+			string = argv[0];
+		}
+		try {
+			SAXParserFactory spfactory = SAXParserFactory.newInstance();
+			SAXParser parser = spfactory.newSAXParser();
+			InputSource source = new InputSource(new StringReader(string));
+			parser.parse(source, new TestSax());
+		} catch (Exception e) {		}
+	}
+	
+	public void startDocument() {
+		System.out.println("Start Document.");
+	}
+	
+	public void startElement(String uri, String loccalName, String qName, Attributes attributes) {
+		System.out.println("Start Element:" + qName);
+	}
+	
+	public void characters(char[] ch, int offset, int length) {
+		System.out.println("Text Data:" + new String(ch, offset, length));
+	}
+	
+	public void endElement(String uri, String localName, String qName) {
+		System.out.println("End Element:" + qName);
+	}
+	
+	public void endDocument() {
+		System.out.println("End Document");
+	}
+
+}

--- a/test/XMLTest.java	Sun Nov 25 03:21:17 2007 +0900
+++ b/test/XMLTest.java	Tue Dec 04 10:33:06 2007 +0900
@@ -11,11 +11,13 @@
 	public static void main(String[] args){
 		
 		Editor editor = new Editor(0, null);
+		editor.setEID(1);
 		editor.setHost("firefly.cr.ie.u-ryukyu.ac.jp");
 		editor.setPort("56789");
 		editor.setName("Test.java");
 		
 		Editor editor2 = new Editor(1, null);
+		editor2.setEID(2);
 		editor2.setHost("teto.cr.ie.u-ryukyu.ac.jp");
 		editor2.setPort("45678");
 		
@@ -37,6 +39,9 @@
 		/*** SessionList から XML へ ***/
 		SessionXMLEncoder encoder2 = new SessionXMLEncoder(sessionlist2.getList());
 		System.out.println(encoder2.sessionListToXML());
-
+		
+		/*** TestSAX ***/
+		String[] string = {encoder2.sessionListToXML(),};
+		TestSax.main(string);
 	}
 }