Mercurial > hg > RemoteEditor > Eclipse

changeset 55:0a50e7234201

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author pin
date Fri, 27 Apr 2007 17:26:49 +0900
parents 520bf354a2ac
children 679491395f8f
files bin/remoteeditor/editors/RemoteEditor$1.class bin/remoteeditor/editors/RemoteEditor.class src/remoteeditor/editors/RemoteEditor.java src/sample/merge/Translate.java
diffstat 4 files changed, 10 insertions(+), 3 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
--- a/src/remoteeditor/editors/RemoteEditor.java	Fri Apr 06 05:49:51 2007 +0900
+++ b/src/remoteeditor/editors/RemoteEditor.java	Fri Apr 27 17:26:49 2007 +0900
@@ -49,6 +49,7 @@
 	private int mysid = 0;
 	private String filename = "afro";
 	protected boolean lock;
+	private Translate translate;
 	
 	public RemoteEditor() {
 		super();
@@ -137,7 +138,11 @@
 			cmd = REP.REP_DELETE_CMD;
 		}
 		//rep.sendCmd(cmd, line, length, lineText);
-		if(!lock) repsend.send(new REPCommand(cmd, mysid, myeid, myseq, line, lineText.length(), lineText));
+		if(!lock){
+			REPCommand usercmd = new REPCommand(cmd, mysid, myeid, myseq, line, lineText.length(), lineText);
+			repsend.send(usercmd);
+			translate.addUserList(usercmd);
+		}
 		numberOfLinesOld = numberOfLinesNew;
 	}
 	
--- a/src/sample/merge/Translate.java	Fri Apr 06 05:49:51 2007 +0900
+++ b/src/sample/merge/Translate.java	Fri Apr 27 17:26:49 2007 +0900
@@ -1,6 +1,8 @@
 package sample.merge;
 
 import java.util.List;
+
+import remoteeditor.command.REPCommand;
 import remoteeditor.network.REP;
 
 public class Translate {
@@ -18,8 +20,8 @@
 		//merge();
 	}
 
-	void addUserList(){}
-	void addTokenList(){}
+	public void addUserList(REPCommand usercmd){}
+	public void addTokenList(){}
 
 	void merge(){
 		Rep_Cmd h_pricmd;