# HG changeset patch # User ichikitakahiro # Date 1579603780 -32400 # Node ID 68b5958179d0a2e162e93a3f08211a63e043f2fd # Parent fddd6f6e7693ffe35218dcfe14684ad6abdac481# Parent b312656c7ec0b4b5ace47170a1f597fb30751686 tsts diff -r fddd6f6e7693 -r 68b5958179d0 src/main/java/christie/remotingTextEditor/GetOpponentMessage.java --- a/src/main/java/christie/remotingTextEditor/GetOpponentMessage.java Tue Jan 21 19:36:20 2020 +0900 +++ b/src/main/java/christie/remotingTextEditor/GetOpponentMessage.java Tue Jan 21 19:49:40 2020 +0900 @@ -10,10 +10,7 @@ public class GetOpponentMessage extends CodeGear { @Take - int offset; - - @Take - String string; + Message offset; @Peek NewTextEditor myEditor; @@ -24,9 +21,7 @@ @Override protected void run(CodeGearManager cgm) { - System.out.println( topoDG.getNodeName() + " gave:" + string + " on " + offset); - myEditor.prohibitDL(); - myEditor.insertMessage(offset, string); + System.out.println( topoDG.getNodeName() + " catch Offest:" + offset); cgm.setup(new GetOpponentMessage()); } } diff -r fddd6f6e7693 -r 68b5958179d0 src/main/java/christie/remotingTextEditor/SetEditorCommunication.java --- a/src/main/java/christie/remotingTextEditor/SetEditorCommunication.java Tue Jan 21 19:36:20 2020 +0900 +++ b/src/main/java/christie/remotingTextEditor/SetEditorCommunication.java Tue Jan 21 19:49:40 2020 +0900 @@ -25,11 +25,9 @@ } } int sendOffset = myEditor.getOffset(); - String sendString = myEditor.getString(); System.out.println(topoDG.getNodeName()+ ":catchoffset=: " + sendOffset); +// put("opponent", "offset", new Message()); myEditor.changeToFalseSendPermmision(); - put("opponent", "offset", sendOffset); - put("opponent", "string", sendString); cgm.setup(new SetEditorCommunication()); } diff -r fddd6f6e7693 -r 68b5958179d0 src/main/java/christie/remotingTextEditor/SetInstance.java --- a/src/main/java/christie/remotingTextEditor/SetInstance.java Tue Jan 21 19:36:20 2020 +0900 +++ b/src/main/java/christie/remotingTextEditor/SetInstance.java Tue Jan 21 19:49:40 2020 +0900 @@ -15,8 +15,6 @@ import java.io.FileWriter; -import static christie.codegear.StartCodeGear.createCGM; - public class SetInstance extends CodeGear { @@ -30,17 +28,17 @@ NewTextEditor Editor0 = new NewTextEditor(); Editor0.StartEditor(topoDG.getNodeName()); System.out.println("node0"); + //cgm.setup(new GetOpponentMessage()); cgm.setup(new SetEditorCommunication()); cgm.getLocalDGM().put("myEditor", Editor0); - cgm.setup(new GetOpponentMessage()); }else if(topoDG.getNodeName().equals("node1")){ NewTextEditor Editor1 = new NewTextEditor(); Editor1.StartEditor(topoDG.getNodeName()); System.out.println("node1"); + //cgm.setup(new GetOpponentMessage()); cgm.setup(new SetEditorCommunication()); cgm.getLocalDGM().put("myEditor", Editor1); - cgm.setup(new GetOpponentMessage()); } //cgm.setup(new CatchDG()); diff -r fddd6f6e7693 -r 68b5958179d0 src/main/java/christie/textEditor/NewTextEditor.java --- a/src/main/java/christie/textEditor/NewTextEditor.java Tue Jan 21 19:36:20 2020 +0900 +++ b/src/main/java/christie/textEditor/NewTextEditor.java Tue Jan 21 19:49:40 2020 +0900 @@ -14,6 +14,11 @@ TextFrame textFrame = new TextFrame(); static JTextArea textArea = new JTextArea(); + + public void callInner(){ + textFrame.insertText(); + } + public boolean checkPermission(){ return textFrame.SendPermission(); } @@ -22,16 +27,10 @@ return textFrame.returnOffset(); } - public String getString(){return textFrame.returnString();} - - public void prohibitDL(){textFrame.prohibitDL();} - public void changeToFalseSendPermmision(){ textFrame.changeToFalseSend(); } - public void insertMessage(int offset, String str){textFrame.insertText(offset, str);} - // public static void main(String[] args){ // NewTextEditor editor = new NewTextEditor(); //