Mercurial > hg > RemoteEditor > Eclipse

changeset 8:bf97ccde466d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author fuchita
date Sun, 22 Oct 2006 19:06:59 +0900
parents db9137964f03
children ff7e7833cded
files .classpath bin/remoteeditor/network/REP.class bin/remoteeditor/ui/CommitDialog$TextBox.class src/remoteeditor/network/REP.java src/sample/merge/MergeTest.java src/sample/pack/PackTest.java
diffstat 6 files changed, 118 insertions(+), 75 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Sun Oct 22 18:05:10 2006 +0900
+++ b/.classpath	Sun Oct 22 19:06:59 2006 +0900
@@ -3,6 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="C:/yabiku/eclipse/plugins/org.junit_3.8.1/junit.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Binary file bin/remoteeditor/network/REP.class has changed
Binary file bin/remoteeditor/ui/CommitDialog$TextBox.class has changed
--- a/src/remoteeditor/network/REP.java	Sun Oct 22 18:05:10 2006 +0900
+++ b/src/remoteeditor/network/REP.java	Sun Oct 22 19:06:59 2006 +0900
@@ -14,12 +14,12 @@
 public class REP implements Runnable{
 	
 	SocketChannel sc;
-	private byte cmd;
-	private byte eid;
-	private byte lineno;
-	private byte sid;
-	private byte seqid;
-	private byte textsiz;
+	int cmd;
+	int eid;
+	int lineno;
+	int sid;
+	int seqid;
+	int textsiz;
 	
 	byte REP_INSERT_CMD = 6;
 	byte REP_INSERT_ACK_CMD = 7;
@@ -72,7 +72,7 @@
 			put();
 		}
 		
-		dialog = new InputDialog(shell, "repselect", "read packet:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +", "+ textsiz +", "+ string, Byte.toString(sid), null);
+		dialog = new InputDialog(shell, "repselect", "read packet:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +", "+ textsiz +", "+ string ,Integer.toString(sid), null);
 		if(dialog.open() == Window.OK){
 			try {
 				sid = (byte) Integer.parseInt(dialog.getValue());
@@ -83,31 +83,77 @@
 	}
 	
 	public void join() throws IOException{
-		sc.write(pack(REP_JOIN_CMD, sid, eid, seqid, lineno, "afro"));
-		unpack();
+		sc.write(pack(buffer, REP_JOIN_CMD, sid, eid, seqid, lineno, "afro"));
+		unpack(buffer);
 		System.out.println("read packet:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +", "+ textsiz +", "+ string);
 	}
 	
 	public void put() throws Exception {
-		sc.write(pack(REP_PUT_CMD, sid, eid, seqid, lineno, "filename"));
-		unpack();
+		sc.write(pack(buffer, REP_PUT_CMD, sid, eid, seqid, lineno, "filename"));
+		unpack(buffer);
 		System.out.println("read packet:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +", "+ textsiz +", "+ string);
 	}
 	
 	public void select() throws Exception {
-		sc.write(pack(REP_SELECT_CMD, sid, eid, seqid, lineno, "afro"));
-		unpack();
+		sc.write(pack(buffer, REP_SELECT_CMD, sid, eid, seqid, lineno, "afro"));
+		unpack(buffer);
 		System.out.println("read packet:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +", "+ textsiz +", "+ string);
 	}
 	
 	public void insert(int offset, int length, String text) throws IOException {
 		seqid = (byte)offset;
-		sc.write(pack(REP_INSERT_CMD, sid, eid, seqid, lineno, text));
+		sc.write(pack(buffer, REP_INSERT_CMD, sid, eid, seqid, lineno, text));
 		//unpack();
 		//System.out.println("read packet:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +", "+ textsiz +", "+ string);
 	}
 	
-	public ByteBuffer pack(byte REP_CMD, byte sid, byte eid, byte seqid, byte lineno, String text) {
+    public ByteBuffer pack(ByteBuffer buffer,int cmd, int sid, int eid, int seqid, int lineno, String text ) {	
+
+
+    	//System.out.println("pack:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno);
+    
+    	//ByteBuffer buffer = ByteBuffer.allocateDirect(24+textsiz);
+    	
+    	buffer.putInt(cmd); buffer.putInt(sid); buffer.putInt(eid);
+    	buffer.putInt(seqid); buffer.putInt(lineno); 
+    	buffer.putInt(text.length()); 
+    	//buffer.putString(text);
+    	
+    	for(int i=0;i<text.length();i++) {
+			buffer.putChar(text.charAt(i));
+		}	
+    	System.out.println("pack:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno);
+    	
+    	return buffer;
+    }
+
+
+/*    public void unpack() {
+    	int cmd,  sid,  eid,  seqid,  lineno; String text = "";
+    	int textsiz = 0;
+
+    	buffer.rewind();
+    	
+    	cmd = buffer.getInt(); sid = buffer.getInt(); eid = buffer.getInt();
+    	seqid = buffer.getInt(); lineno = buffer.getInt(); textsiz = buffer.getInt();
+    	
+
+    	for(int i=0;i<textsiz;i++) {
+			text +=buffer.getChar();
+		}
+
+    	System.out.println("unpack:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +"," + text);
+    	//byte[] readbyte = new byte[textsiz];
+    	//for(int i = 0; i < textsiz; i++){
+			//readbyte[i] = buffer.get();
+			//System.out.println(readbyte[i]);
+		//}
+    	//text = new String(readbyte, 0, textsiz);
+    	
+    }
+
+	
+*/	/*public ByteBuffer pack(byte REP_CMD, byte sid, byte eid, byte seqid, byte lineno, String text) {
 		byte[] REP_PACK = new byte[24];
 		REP_PACK = new byte[24+text.length()];
 		REP_PACK[3] = REP_CMD;
@@ -133,27 +179,33 @@
 		 * 
 		 */
 		
-		return buffer;
-	}
+	/*	return buffer;
+	}*/
 	
-	public void unpack() throws IOException{
+	public void unpack(ByteBuffer buffer) throws IOException{
 		buffer.clear();
 		sc.read(buffer);
-		buffer.flip();
-		for(int i = 0; i < 24; i++){
+		buffer.rewind();
+		/*for(int i = 0; i < 24; i++){
 			readbyte[i] = buffer.get();
 			//System.out.println(readbyte[i]);
+		}*/
+		String text = "";
+		cmd = buffer.getInt();
+		sid = buffer.getInt();
+		eid = buffer.getInt();
+		seqid = buffer.getInt();
+		lineno = buffer.getInt();
+		textsiz = buffer.getInt();
+		for(int i=0;i<textsiz;i++) {
+			text +=buffer.getChar();
 		}
-		cmd = readbyte[3];
-		sid = readbyte[7];
-		eid = readbyte[11];
-		seqid = readbyte[15];
-		lineno = readbyte[19];
-		textsiz = readbyte[23];
-		for(int i = 0; i < textsiz; i++){
+
+		/*for(int i = 0; i < textsiz; i++){
 			readbyte[i] = buffer.get();
 		}
-		string = new String(readbyte, 0, textsiz);
+		string = new String(readbyte, 0, textsiz);*/
+		string = text;
 	}
 	
 	public void addSocketListener(RSocketListener socketListener){
@@ -189,7 +241,7 @@
 			//}
 			//string = new String(readbyte, 0, textsiz);
 			try {
-				unpack();
+				unpack(buffer);
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
--- a/src/sample/merge/MergeTest.java	Sun Oct 22 18:05:10 2006 +0900
+++ b/src/sample/merge/MergeTest.java	Sun Oct 22 19:06:59 2006 +0900
@@ -1,5 +1,5 @@
 package sample.merge;
-
+/*
 import junit.framework.TestCase;
 
 public class MergeTest extends TestCase {
@@ -15,3 +15,4 @@
 		assertEquals("hoge", merge.add(1, 1), 2);
 	}
 }
+*/
\ No newline at end of file
--- a/src/sample/pack/PackTest.java	Sun Oct 22 18:05:10 2006 +0900
+++ b/src/sample/pack/PackTest.java	Sun Oct 22 19:06:59 2006 +0900
@@ -5,12 +5,12 @@
 
 public class PackTest {
 
-    private static int cmd = 47;
-    private static  int eid = 1;
-    private static  int lineno = 100;
-    private static  int sid = 1;
-    private static  int seqid = 32767;
-    private static  int textsiz = 5;
+    static int cmd = 47;
+    static  int eid = 1;
+    static  int lineno = 100;
+    static  int sid = 1;
+    static  int seqid = 32767;
+    static  int textsiz = 5;
     
     /*private static int cmd2;
     private static int eid2;
@@ -20,17 +20,6 @@
     private static int textsiz2;
    */
    
-    byte REP_INSERT_CMD = 6;
-    byte REP_INSERT_ACK_CMD = 7;
-    byte REP_JOIN_CMD = 41;
-    byte REP_JOIN_ACK_CMD = 42;
-    byte REP_PUT_CMD = 45;
-    byte REP_PUT_ACK_CMD = 46;
-    byte REP_SELECT_CMD = 47;
-    byte REP_SELECT_ACK_CMD = 48;
-    byte REP_QUIT_CMD = 53;
-    byte REP_QUIT_ACK_CMD = 54;
-
     static byte[] chgBytes( int i ){
     	byte[] b = new byte[4] ;
         
@@ -42,39 +31,41 @@
     	return b;
     }
 
-    public static ByteBuffer pack(int cmd, int sid, int eid, int seqid, int lineno, String text ) {	
-    	byte[] b_cmd = new byte[4];
-    	byte[] b_sid = new byte[4]; 
-    	byte[] b_eid = new byte[4]; 
-    	byte[] b_seqid = new byte[4]; 
-    	byte[] b_lineno = new byte[4]; 
-    	byte[] b_textsiz = new byte[4];
-    	byte[] textToByte = text.getBytes();
-    	int textsiz = text.length();
+    public static ByteBuffer pack(ByteBuffer buffer,int cmd, int sid, int eid, int seqid, int lineno, String text ) {	
+
 
-    	b_cmd = chgBytes(cmd); b_sid = chgBytes(sid); b_eid = chgBytes(eid);
-    	b_seqid = chgBytes(seqid); b_lineno = chgBytes(lineno); b_textsiz = chgBytes(textsiz);   
-
-    	System.out.println("pack:" + b_cmd[3] +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno);
+    	//System.out.println("pack:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno);
     
-    	ByteBuffer buffer = ByteBuffer.allocateDirect(24+textsiz);
+    	//ByteBuffer buffer = ByteBuffer.allocateDirect(24+textsiz);
     	
-    	buffer.put(b_cmd); buffer.put(b_sid); buffer.put(b_eid);
-    	buffer.put(b_seqid); buffer.put(b_lineno); buffer.put(b_textsiz); 
-    	buffer.put(textToByte);
-    		
+    	buffer.putInt(cmd); buffer.putInt(sid); buffer.putInt(eid);
+    	buffer.putInt(seqid); buffer.putInt(lineno); 
+    	buffer.putInt(text.length()); 
+    	//buffer.putString(text);
+    	
+    	for(int i=0;i<text.length();i++) {
+			buffer.putChar(text.charAt(i));
+		}	
+    	System.out.println("pack:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno);
+    	
     	return buffer;
     }
 
-    public static void unpack(ByteBuffer buffer, int cmd, int sid, int eid, int seqid, int lineno, String text) {
+    public static void unpack(ByteBuffer buffer) {
+    	int cmd,  sid,  eid,  seqid,  lineno; String text = "";
     	int textsiz = 0;
 
-    	buffer.flip();
+    	buffer.rewind();
     	
     	cmd = buffer.getInt(); sid = buffer.getInt(); eid = buffer.getInt();
     	seqid = buffer.getInt(); lineno = buffer.getInt(); textsiz = buffer.getInt();
     	
-    	System.out.println("unpack:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno);
+
+    	for(int i=0;i<textsiz;i++) {
+			text +=buffer.getChar();
+		}
+
+    	System.out.println("unpack:" + cmd +", "+ sid +", "+ eid +", "+ seqid +", "+ lineno +"," + text);
     	//byte[] readbyte = new byte[textsiz];
     	//for(int i = 0; i < textsiz; i++){
 			//readbyte[i] = buffer.get();
@@ -88,14 +79,14 @@
     	ByteBuffer testbuf = ByteBuffer.allocateDirect(1024);
 
     	System.out.println("pack unpack test.");
-    	testbuf = pack(cmd, sid, eid, seqid, lineno, "test");
+    	pack(testbuf, cmd, sid, eid, seqid, lineno, "test");
 
-    	System.out.println("check:" + testbuf.get(0)+ ":" +testbuf.get(1)+ ":" +testbuf.get(2)+ ":" +testbuf.get(3));
-    	System.out.println("check:" + testbuf.get(4)+ ":" +testbuf.get(5)+ ":" +testbuf.get(6)+ ":" +testbuf.get(7));
+    	//System.out.println("check:" + testbuf.get(0)+ ":" +testbuf.get(1)+ ":" +testbuf.get(2)+ ":" +testbuf.get(3));
+    	//System.out.println("check:" + testbuf.get(4)+ ":" +testbuf.get(5)+ ":" +testbuf.get(6)+ ":" +testbuf.get(7));
 
-    	String string = "";
-    	unpack(testbuf,cmd2,sid2,eid2,seqid2,lineno2,string);
+    	//String string = "";
+    	unpack(testbuf);
 
-    	System.out.println("unpack:" + cmd2 +", "+ sid2 +", "+ eid2 +", "+ seqid2 +", "+ lineno2 +", "+ string);
+    	//System.out.println("unpack:" + cmd2 +", "+ sid2 +", "+ eid2 +", "+ seqid2 +", "+ lineno2 +", "+ string);
     }
 }