Mercurial > hg > RemoteEditor > REPSessionManager

changeset 43:24829e1969a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author pin
date Sat, 10 Nov 2007 23:48:20 +0900
parents 7bf547c009ed
children 618d76c06b9e
files rep/SessionList.java rep/xml/SessionXMLEncoder.java test/XMLTest.java
diffstat 3 files changed, 26 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/rep/SessionList.java	Sat Nov 10 22:11:07 2007 +0900
+++ b/rep/SessionList.java	Sat Nov 10 23:48:20 2007 +0900
@@ -52,7 +52,7 @@
 	
 	public void makeDefaultSession(){
 //		session3.put(0, new Session(0, null, null));
-		session4.add(0, new Session(0, null, null));
+//		session4.add(0, new Session(0, null, null));
 	}
 
 	public int getEditorNumber() {
@@ -262,7 +262,6 @@
 		sessionID++;
 //		session3.put(sessionID, session);
 		session4.add(session);
-		session4.add(session);
 		return sessionID;
 	}
 
--- a/rep/xml/SessionXMLEncoder.java	Sat Nov 10 22:11:07 2007 +0900
+++ b/rep/xml/SessionXMLEncoder.java	Sat Nov 10 23:48:20 2007 +0900
@@ -34,20 +34,20 @@
 		/* SessionListをXMLに書き出す。ときの形式
 		 * 	<Session>
 		 * 		<editor>
-		 * 			<sid/>
-		 * 			<host/>
-		 * 			<port/>
-		 * 			<filename/>
+		 * 			<sid> 1 </sid>
+		 * 			<host> firefly </host>
+		 * 			<port> 5555 </port>
+		 * 			<filename> text.java </filename>
 		 * 		</editor>
 		 * 		<editor>
-		 * 			<sid/>
-		 * 			<host/>
-		 * 			<port/>
+		 * 			<sid> 2 </sid>
+		 * 			<host> asbel </host>
+		 * 			<port> 6666 </port>
 		 * 		</editor>
 		 * 	</Session>
 		 * 	<SessionManager>
-		 * 		<host/>
-		 * 		<port/>
+		 * 		<host> karateka </host>
+		 * 		<port> 7777 </port>
 		 * 	</SessionManager>
 		 * <Session>
 		 * </Session>
@@ -60,44 +60,37 @@
 					Document doc = builder.newDocument();
 					Element root = doc.getDocumentElement();
 					root = doc.createElement("SessionList");
+
 					for(Session session : list){
 						Element elementSession = doc.createElement("Session");
 						root.appendChild(elementSession);
-//						Element elementeditor = doc.createElement("editor");
-//						elementSession.appendChild(elementeditor);
-//						Editor editor = session.getMaster();
-//						Element element3 = doc.createElement(editor.getHost());
-//						Element element4 = doc.createElement(editor.getPort());
-//						Element element5 = doc.createElement(editor.getName());
-						//element5 = doc.createElement(session.getName());
-//						elementeditor.appendChild(element3);
-//						elementeditor.appendChild(element4);
-//						elementeditor.appendChild(element5);
+
 						LinkedList <Editor> editorlist = session.getEditorList();
 						for(Editor editor : editorlist){
 							Element elementEditor = doc.createElement("Editor");
-							Element elementHost = doc.createElement(editor.getHost());
-							Element elementPort = doc.createElement(editor.getPort());
-							Element elementName = null;
-							if(editor.getName() != null) {
-								elementName = doc.createElement(editor.getName());
+							elementSession.appendChild(elementEditor);
+							
+							Element elementHost = doc.createElement("host");
+							elementEditor.appendChild(elementHost);
+							elementHost.setTextContent(editor.getHost());
+							
+							Element elementPort = doc.createElement("port");
+							elementEditor.appendChild(elementPort);
+							elementPort.setTextContent(editor.getPort());
+							
+							if(editor.getName() != null){
+								Element elementName = doc.createElement("file");
 								elementEditor.appendChild(elementName);
+								elementName.setTextContent(editor.getName());
 							}
-							elementEditor.appendChild(elementHost);
-							elementEditor.appendChild(elementPort);
-//							elementEditor.appendChild(elementName);
-							elementSession.appendChild(elementEditor);
 						}
-						
 					}
 					doc.appendChild(root);
 					
 					TransformerFactory tfactory = TransformerFactory.newInstance(); 
 					Transformer transformer = tfactory.newTransformer(); 
 					StreamResult result = new StreamResult(str);
-					//transformer.transform(new DOMSource(doc), new StreamResult(System.out)); 
 					transformer.transform(new DOMSource(doc), result); 
-					System.out.println(str);
 
 				}catch (Exception e){
 					e.printStackTrace();
--- a/test/XMLTest.java	Sat Nov 10 22:11:07 2007 +0900
+++ b/test/XMLTest.java	Sat Nov 10 23:48:20 2007 +0900
@@ -26,7 +26,7 @@
 		sessionlist.addSession(session);
 		
 		SessionXMLEncoder encoder = new SessionXMLEncoder(sessionlist.getList());
-		encoder.sessionListToXML();
+		System.out.println(encoder.sessionListToXML());
 		//list.getXML();
 	}
 }