Mercurial > hg > RemoteEditor > Eclipse

changeset 25:32b28608baa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author pin
date Thu, 16 Nov 2006 08:39:41 +0900
parents e9b015eb1e05
children b5493a5932ac
files bin/remoteeditor/editors/RemoteEditor$1.class bin/remoteeditor/editors/RemoteEditor.class bin/remoteeditor/network/REP.class src/remoteeditor/editors/RemoteEditor.java src/remoteeditor/network/REP.java src/sample/merge/Rep_Cmd.java
diffstat 6 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
Binary file bin/remoteeditor/editors/RemoteEditor$1.class has changed
Binary file bin/remoteeditor/editors/RemoteEditor.class has changed
Binary file bin/remoteeditor/network/REP.class has changed
--- a/src/remoteeditor/editors/RemoteEditor.java	Tue Nov 14 14:31:59 2006 +0900
+++ b/src/remoteeditor/editors/RemoteEditor.java	Thu Nov 16 08:39:41 2006 +0900
@@ -74,10 +74,9 @@
 		}
 		rep.sendCmd(cmd, line, length, lineText);
 		numberOfLinesOld = numberOfLinesNew;
-		System.out.println("numberOfLinesOld : " + numberOfLinesOld + "," + "numberOfLinesNew : " + numberOfLinesNew);
 	}
 	
-	void replaceInsertDelete(int kindOfCmd, int lineNo, int LineLength, String text) throws Exception{
+	void changeText(int kindOfCmd, int lineNo, int LineLength, String text) throws Exception{
 		final int offset = document.getLineOffset(lineNo);
 		final String changedText = text;
 		final int replaceLength = document.getLineLength(lineNo);
@@ -98,7 +97,7 @@
 		final int Linelength = evt.getLength();
 		final String text = evt.getText();
 		try {
-			replaceInsertDelete(evt.getCmd(), lineNo, Linelength, text);
+			changeText(evt.getCmd(), lineNo, Linelength, text);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
--- a/src/remoteeditor/network/REP.java	Tue Nov 14 14:31:59 2006 +0900
+++ b/src/remoteeditor/network/REP.java	Thu Nov 16 08:39:41 2006 +0900
@@ -260,7 +260,7 @@
 	}
 
 	public void sendCmd(int cmd2, int line, int length, String lineText) {
-		cmd = REP_INSERT_CMD;
+		//cmd = REP_INSERT_CMD;
 		rWrite(pack(cmd2, sid, eid, seqid+1, line, lineText));
 		try {
 			myCmdList.add(new Rep_Cmd(cmd2, sid, eid, seqid, line, length, lineText));
--- a/src/sample/merge/Rep_Cmd.java	Tue Nov 14 14:31:59 2006 +0900
+++ b/src/sample/merge/Rep_Cmd.java	Thu Nov 16 08:39:41 2006 +0900
@@ -23,10 +23,10 @@
 	}
 
 	public String toString(){
-		String[] cmdString = new String[14];
+/*		String[] cmdString = new String[14];
 		cmdString[6] = "REP_INSERT_CMD";
 		cmdString[9] = "REP_DELETE_CMD";
-		cmdString[13] = "REP_REPLACE_CMD";
+		cmdString[13] = "REP_REPLACE_CMD";*/
 		String repCmdString = new String(cmd + "," + sid + "," + eid + "," + seq + "," + lineno + "," + textsiz + "," + string);
 		return repCmdString;