# HG changeset patch
# User ichikitakahiro <e165713@ie.u-ryukyu.ac.jp>
# Date 1579603990 -32400
# Node ID 90d463bfe7344a87b767441740428a14427be584
# Parent  ae1139c05a5b764cb6a67e489004edc283df0583
add renew

diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/CheckCommand.java
--- a/src/main/java/christie/remoteTextEditor/CheckCommand.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.annotation.Peek;
-import christie.codegear.CodeGear;
-import christie.codegear.CodeGearManager;
-import christie.textEditor.NewTextEditor;
-import christie.topology.Message;
-import christie.topology.TopologyDataGear;
-import christie.remoteTextEditor.Insert;
-import christie.remoteTextEditor.Command;
-
-public class CheckCommand extends CodeGear {
-    @Peek
-    TopologyDataGear topoDG;
-
-    @Peek
-    NewTextEditor myEditor;
-
-    @Override
-    protected void run(CodeGearManager cgm) {
-        int sendOffset;
-        String sendString;
-        if(myEditor.checkPermission() == true) {
-            Command cmd = new Insert(myEditor.returnOffset(), myEditor.returnString());
-            myEditor.changeToFalseSendPermmision();
-            put("opponent", "cmd", new Message());
-            System.out.println(topoDG.getNodeName() + " :catch,offset = " + myEditor.returnOffset());
-
-//            opponentは単語として不適切。
-//            insert,deleteなどの命令を飛ばす。その中にoffset,stringが含まれる。コマンドパターン。
-//            get,setの単語は紛らわしいのでよくない。
-            cgm.setup(new CheckCommand());
-        }else{
-            cgm.setup(new CheckCommand());
-        }
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/CheckMyName.java
--- a/src/main/java/christie/remoteTextEditor/CheckMyName.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.annotation.Peek;
-import christie.codegear.CodeGear;
-import christie.codegear.CodeGearManager;
-import christie.topology.TopologyDataGear;
-
-public class CheckMyName extends CodeGear {
-    @Peek
-    TopologyDataGear topoDG;
-
-    protected void run(CodeGearManager cgm) {
-        if(topoDG.getNodeName().equals("node3")){
-            cgm.setup(new StartServer());
-        }else{
-            cgm.setup(new MakeInstance());
-        }
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/Command.java
--- a/src/main/java/christie/remoteTextEditor/Command.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.textEditor.NewTextEditor;
-
-public interface Command {
-    public abstract void execute(NewTextEditor myEditor);
-
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/Insert.java
--- a/src/main/java/christie/remoteTextEditor/Insert.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.textEditor.NewTextEditor;
-import christie.remoteTextEditor.Command;
-
-public class Insert implements Command {
-    String string;
-
-    int fastOffset;
-
-    int endOffset;
-
-    NewTextEditor myEditor;
-
-    public Insert(int fastOffset, String string){
-        this.string = string;
-        this.fastOffset = fastOffset;
-    }
-
-
-    @Override
-    public void execute(NewTextEditor myEditor) {
-        this.myEditor = myEditor;
-        myEditor.insertMessage(this.fastOffset, this.string);
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/MakeInstance.java
--- a/src/main/java/christie/remoteTextEditor/MakeInstance.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.annotation.Peek;
-import christie.codegear.CodeGear;
-import christie.codegear.CodeGearManager;
-import christie.textEditor.NewTextEditor;
-import christie.topology.Message;
-import christie.topology.TopologyDataGear;
-
-public class MakeInstance extends CodeGear {
-    @Peek
-    TopologyDataGear topoDG;
-
-    protected void run(CodeGearManager cgm) {
-        NewTextEditor Editor = new NewTextEditor();
-        Editor.StartEditor(topoDG.getNodeName());
-        cgm.setup(new CheckCommand());
-        cgm.getLocalDGM().put("myEditor", Editor);
-        cgm.setup(new receiveCommand());
-
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/RemoteNodeConfig.java
--- a/src/main/java/christie/remoteTextEditor/RemoteNodeConfig.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.topology.node.TopologyNodeConfig;
-
-public class RemoteNodeConfig extends TopologyNodeConfig {
-
-    public RemoteNodeConfig(String[] args) {
-        super(args);
-
-
-        for (int j = 0; j < args.length; j++) {
-            if ("--totalNodeNum".equals(args[j])) {
-
-            }
-
-        }
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/RemoteNodeStart.java
--- a/src/main/java/christie/remoteTextEditor/RemoteNodeStart.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-package christie.remoteTextEditor;
-
-
-import christie.topology.node.StartTopologyNode;
-import christie.topology.node.TopologyNodeConfig;
-
-public class RemoteNodeStart {
-    public static void main(String[] args){
-        RemoteNodeConfig remoteNodeConfig = new RemoteNodeConfig(args);
-
-        StartTopologyNode startTopologyNode = new StartTopologyNode((TopologyNodeConfig) remoteNodeConfig, new CheckMyName());
-
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/StartRemotingTextEditor.java
--- a/src/main/java/christie/remoteTextEditor/StartRemotingTextEditor.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.codegear.CodeGearManager;
-import christie.codegear.StartCodeGear;
-import christie.topology.manager.StartTopologyManager;
-import christie.topology.manager.TopologyManagerConfig;
-
-public class StartRemotingTextEditor extends StartCodeGear {
-
-    public StartRemotingTextEditor(CodeGearManager cgm) {
-        super(cgm);
-    }
-
-    public static void main(String[] args){
-        int TopologyManagerPort = 10000;
-        int TopologyNodePort = 10001;
-
-        String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/star.dot"};
-
-        TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(managerArg);
-        new StartTopologyManager(topologyManagerConfig);
-
-
-        for (int i = 0; i <= 1; i++){
-            String[] nodeArg = {"--managerPort", String.valueOf(TopologyManagerPort),
-                    "--managerHost", "localhost",
-                    "--localPort", String.valueOf(TopologyNodePort + i),
-            };
-
-            RemoteNodeStart.main(nodeArg);
-        }
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/StartServer.java
--- a/src/main/java/christie/remoteTextEditor/StartServer.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.annotation.Peek;
-import christie.codegear.CodeGear;
-import christie.codegear.CodeGearManager;
-import christie.topology.TopologyDataGear;
-
-public class StartServer extends CodeGear {
-    @Peek
-    TopologyDataGear topoDG;
-
-    @Override
-    protected void run(CodeGearManager cgm) {
-        System.out.println("Server");
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor/receiveCommand.java
--- a/src/main/java/christie/remoteTextEditor/receiveCommand.java	Tue Jan 21 19:45:20 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-package christie.remoteTextEditor;
-
-import christie.annotation.Peek;
-import christie.annotation.Take;
-import christie.codegear.CodeGear;
-import christie.codegear.CodeGearManager;
-import christie.textEditor.NewTextEditor;
-import christie.remoteTextEditor.Insert;
-import christie.remoteTextEditor.Command;
-import org.msgpack.annotation.Message;
-
-public class receiveCommand extends CodeGear {
-    @Take
-    Message cmd;
-
-    @Peek
-    NewTextEditor myEditor;
-
-    @Override
-    protected void run(CodeGearManager cgm) {
-//        cmd.execute(myEditor);
-        System.out.println("キャッチ");
-    }
-}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/CheckCommand.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/CheckCommand.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,35 @@
+package christie.remoteTextEditor2;
+
+import christie.annotation.Peek;
+import christie.codegear.CodeGear;
+import christie.codegear.CodeGearManager;
+import christie.textEditor.NewTextEditor;
+import christie.topology.Message;
+import christie.topology.TopologyDataGear;
+
+public class CheckCommand extends CodeGear {
+    @Peek
+    TopologyDataGear topoDG;
+
+    @Peek
+    NewTextEditor myEditor;
+
+    @Override
+    protected void run(CodeGearManager cgm) {
+        int sendOffset;
+        String sendString;
+        if(myEditor.checkPermission() == true) {
+            Command cmd = new Insert(myEditor.returnOffset(), myEditor.returnString());
+            myEditor.changeToFalseSendPermmision();
+            put("opponent", "cmd", new Message());
+            System.out.println(topoDG.getNodeName() + " :catch,offset = " + myEditor.returnOffset());
+
+//            opponentは単語として不適切。
+//            insert,deleteなどの命令を飛ばす。その中にoffset,stringが含まれる。コマンドパターン。
+//            get,setの単語は紛らわしいのでよくない。
+            cgm.setup(new CheckCommand());
+        }else{
+            cgm.setup(new CheckCommand());
+        }
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/CheckMyName.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/CheckMyName.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,19 @@
+package christie.remoteTextEditor2;
+
+import christie.annotation.Peek;
+import christie.codegear.CodeGear;
+import christie.codegear.CodeGearManager;
+import christie.topology.TopologyDataGear;
+
+public class CheckMyName extends CodeGear {
+    @Peek
+    TopologyDataGear topoDG;
+
+    protected void run(CodeGearManager cgm) {
+        if(topoDG.getNodeName().equals("node3")){
+            cgm.setup(new StartServer());
+        }else{
+            cgm.setup(new MakeInstance());
+        }
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/Command.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/Command.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,8 @@
+package christie.remoteTextEditor2;
+
+import christie.textEditor.NewTextEditor;
+
+public interface Command {
+    public abstract void execute(NewTextEditor myEditor);
+
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/Insert.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/Insert.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,25 @@
+package christie.remoteTextEditor2;
+
+import christie.textEditor.NewTextEditor;
+
+public class Insert implements Command {
+    String string;
+
+    int fastOffset;
+
+    int endOffset;
+
+    NewTextEditor myEditor;
+
+    public Insert(int fastOffset, String string){
+        this.string = string;
+        this.fastOffset = fastOffset;
+    }
+
+
+    @Override
+    public void execute(NewTextEditor myEditor) {
+        this.myEditor = myEditor;
+        myEditor.insertMessage(this.fastOffset, this.string);
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/MakeInstance.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/MakeInstance.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,21 @@
+package christie.remoteTextEditor2;
+
+import christie.annotation.Peek;
+import christie.codegear.CodeGear;
+import christie.codegear.CodeGearManager;
+import christie.textEditor.NewTextEditor;
+import christie.topology.TopologyDataGear;
+
+public class MakeInstance extends CodeGear {
+    @Peek
+    TopologyDataGear topoDG;
+
+    protected void run(CodeGearManager cgm) {
+        NewTextEditor Editor = new NewTextEditor();
+        Editor.StartEditor(topoDG.getNodeName());
+        cgm.setup(new CheckCommand());
+        cgm.getLocalDGM().put("myEditor", Editor);
+        cgm.setup(new receiveCommand());
+
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/RemoteNodeConfig.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/RemoteNodeConfig.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,18 @@
+package christie.remoteTextEditor2;
+
+import christie.topology.node.TopologyNodeConfig;
+
+public class RemoteNodeConfig extends TopologyNodeConfig {
+
+    public RemoteNodeConfig(String[] args) {
+        super(args);
+
+
+        for (int j = 0; j < args.length; j++) {
+            if ("--totalNodeNum".equals(args[j])) {
+
+            }
+
+        }
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/RemoteNodeStart.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/RemoteNodeStart.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,14 @@
+package christie.remoteTextEditor2;
+
+
+import christie.topology.node.StartTopologyNode;
+import christie.topology.node.TopologyNodeConfig;
+
+public class RemoteNodeStart {
+    public static void main(String[] args){
+        RemoteNodeConfig remoteNodeConfig = new RemoteNodeConfig(args);
+
+        StartTopologyNode startTopologyNode = new StartTopologyNode((TopologyNodeConfig) remoteNodeConfig, new CheckMyName());
+
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/StartRemotingTextEditor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/StartRemotingTextEditor.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,33 @@
+package christie.remoteTextEditor2;
+
+import christie.codegear.CodeGearManager;
+import christie.codegear.StartCodeGear;
+import christie.topology.manager.StartTopologyManager;
+import christie.topology.manager.TopologyManagerConfig;
+
+public class StartRemotingTextEditor extends StartCodeGear {
+
+    public StartRemotingTextEditor(CodeGearManager cgm) {
+        super(cgm);
+    }
+
+    public static void main(String[] args){
+        int TopologyManagerPort = 10000;
+        int TopologyNodePort = 10001;
+
+        String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/star.dot"};
+
+        TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(managerArg);
+        new StartTopologyManager(topologyManagerConfig);
+
+
+        for (int i = 0; i <= 1; i++){
+            String[] nodeArg = {"--managerPort", String.valueOf(TopologyManagerPort),
+                    "--managerHost", "localhost",
+                    "--localPort", String.valueOf(TopologyNodePort + i),
+            };
+
+            RemoteNodeStart.main(nodeArg);
+        }
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/StartServer.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/StartServer.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,16 @@
+package christie.remoteTextEditor2;
+
+import christie.annotation.Peek;
+import christie.codegear.CodeGear;
+import christie.codegear.CodeGearManager;
+import christie.topology.TopologyDataGear;
+
+public class StartServer extends CodeGear {
+    @Peek
+    TopologyDataGear topoDG;
+
+    @Override
+    protected void run(CodeGearManager cgm) {
+        System.out.println("Server");
+    }
+}
diff -r ae1139c05a5b -r 90d463bfe734 src/main/java/christie/remoteTextEditor2/receiveCommand.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor2/receiveCommand.java	Tue Jan 21 19:53:10 2020 +0900
@@ -0,0 +1,22 @@
+package christie.remoteTextEditor2;
+
+import christie.annotation.Peek;
+import christie.annotation.Take;
+import christie.codegear.CodeGear;
+import christie.codegear.CodeGearManager;
+import christie.textEditor.NewTextEditor;
+import org.msgpack.annotation.Message;
+
+public class receiveCommand extends CodeGear {
+    @Take
+    Message cmd;
+
+    @Peek
+    NewTextEditor myEditor;
+
+    @Override
+    protected void run(CodeGearManager cgm) {
+//        cmd.execute(myEditor);
+        System.out.println("キャッチ");
+    }
+}