Mercurial > hg > Database > Christie

changeset 244:e6632043c58a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tweak
author ichikitakahiro <e165713@ie.u-ryukyu.ac.jp>
date Fri, 24 Jan 2020 16:53:04 +0900
parents 9d0b932ad84f
children aad654568598
files src/main/java/christie/remoteTextEditor/CheckCommand.java src/main/java/christie/remoteTextEditor/DecrialiseInsertCommand.java src/main/java/christie/remoteTextEditor/Insert.java src/main/java/christie/remoteTextEditor/SerializeInsert.java src/main/java/christie/remoteTextEditor/receiveCommand.java src/main/java/christie/remotingTextEditor/GetOpponentMessage.java src/main/java/christie/remotingTextEditor/SetEditorCommunication.java src/main/java/christie/remotingTextEditor/SetInstance.java src/main/java/christie/remotingTextEditor/StartManToManSession.java.rej
diffstat 9 files changed, 53 insertions(+), 150 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/remoteTextEditor/CheckCommand.java	Thu Jan 23 02:10:00 2020 +0900
+++ b/src/main/java/christie/remoteTextEditor/CheckCommand.java	Fri Jan 24 16:53:04 2020 +0900
@@ -19,8 +19,12 @@
         int sendOffset;
         String sendString;
         if(myEditor.checkPermission() == true) {
-            Insert ins = new Insert(myEditor.returnOffset(), myEditor.returnString());
+            sendOffset = myEditor.returnOffset();
+            sendString = myEditor.returnString();
+            Insert ins = new Insert(sendOffset, sendString);
+//            String cmd = "file";
             myEditor.changeToFalseSendPermmision();
+//            SerializeInsert serializeInsert = new SerializeInsert(ins, cmd);
             put("partner", "cmd", ins);
             System.out.println(topoDG.getNodeName() + " :catch,offset = " + myEditor.returnOffset());
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor/DecrialiseInsertCommand.java	Fri Jan 24 16:53:04 2020 +0900
@@ -0,0 +1,20 @@
+package christie.remoteTextEditor;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+
+public class DecrialiseInsertCommand {
+    public static Insert DecrialiseInsertCommand(String fileName) throws IOException, ClassNotFoundException {
+        FileInputStream fileInputStream = new FileInputStream(fileName);
+        ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream);
+
+
+        Insert ins = (Insert) objectInputStream.readObject();
+
+        objectInputStream.close();
+
+        return ins;
+
+    }
+}
--- a/src/main/java/christie/remoteTextEditor/Insert.java	Thu Jan 23 02:10:00 2020 +0900
+++ b/src/main/java/christie/remoteTextEditor/Insert.java	Fri Jan 24 16:53:04 2020 +0900
@@ -2,25 +2,24 @@
 
 import christie.textEditor.NewTextEditor;
 
-import java.io.Serializable;
+import org.msgpack.annotation.Message;
 
-@org.msgpack.annotation.Message
+
+@Message
 public class Insert {
 
     String string;
 
     int fastOffset;
-//
 //    int endOffset;
-//
-//
-    public Insert(int fastOffset, String string){
+
+    public Insert(int fastOffset, String string) {
         this.string = string;
         this.fastOffset = fastOffset;
     }
-//
-//
+}
+
+
 //    public void execute(NewTextEditor myEditor) {
 //        System.out.println("used insert");
 //    }
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/christie/remoteTextEditor/SerializeInsert.java	Fri Jan 24 16:53:04 2020 +0900
@@ -0,0 +1,19 @@
+package christie.remoteTextEditor;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import christie.remoteTextEditor.Insert;
+
+public class SerializeInsert {
+    public static void SerializeInsert(Insert ins, String fileName) throws IOException {
+        FileOutputStream fileOutputStream = new FileOutputStream(fileName);
+        ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream);
+
+        objectOutputStream.writeObject(ins);
+        objectOutputStream.flush();
+        objectOutputStream.close();
+
+    }
+}
--- a/src/main/java/christie/remoteTextEditor/receiveCommand.java	Thu Jan 23 02:10:00 2020 +0900
+++ b/src/main/java/christie/remoteTextEditor/receiveCommand.java	Fri Jan 24 16:53:04 2020 +0900
@@ -8,7 +8,7 @@
 
 public class receiveCommand extends CodeGear {
     @Take
-    Insert cmd;
+    Class cmd;
 
     @Peek
     NewTextEditor myEditor;
--- a/src/main/java/christie/remotingTextEditor/GetOpponentMessage.java	Thu Jan 23 02:10:00 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-package christie.remotingTextEditor;
-
-import christie.annotation.Peek;
-import christie.annotation.Take;
-import christie.codegear.CodeGear;
-import christie.codegear.CodeGearManager;
-import christie.textEditor.NewTextEditor;
-import christie.topology.Message;
-import christie.topology.TopologyDataGear;
-
-public class GetOpponentMessage extends CodeGear {
-    @Take
-    int offset;
-
-    @Take
-    String string;
-
-    @Peek
-    NewTextEditor myEditor;
-
-    @Peek
-    TopologyDataGear topoDG;
-
-
-    @Override
-    protected void run(CodeGearManager cgm) {
-        System.out.println( topoDG.getNodeName() + " catch Offest:" + offset);
-        cgm.setup(new GetOpponentMessage());
-    }
-}
--- a/src/main/java/christie/remotingTextEditor/SetEditorCommunication.java	Thu Jan 23 02:10:00 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-package christie.remotingTextEditor;
-
-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 SetEditorCommunication extends CodeGear {
-    @Peek
-    TopologyDataGear topoDG;
-
-    @Peek
-    NewTextEditor myEditor;
-
-    @Override
-    protected void run(CodeGearManager cgm) {
-//        System.out.println(topoDG.getNodeName());
-//        while(myEditor.checkPermission() == false){
-//            try{
-//                Thread.sleep(1);
-//            }catch(InterruptedException e){
-//
-//            }
-//        }
-//        int sendOffset = myEditor.getOffset();
-//        System.out.println(topoDG.getNodeName()+ ":catchoffset=: " + sendOffset);
-////        put("opponent", "offset", new Message());
-//        myEditor.changeToFalseSendPermmision();
-//        cgm.setup(new SetEditorCommunication());
-
-    }
-
-}
--- a/src/main/java/christie/remotingTextEditor/SetInstance.java	Thu Jan 23 02:10:00 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-package christie.remotingTextEditor;
-
-import christie.annotation.Peek;
-import christie.annotation.Take;
-import christie.codegear.CodeGear;
-import christie.codegear.CodeGearManager;
-
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.*;
-import christie.textEditor.*;
-import christie.topology.Message;
-import christie.topology.TopologyDataGear;
-
-import java.io.FileWriter;
-
-
-public class SetInstance extends CodeGear {
-
-    @Peek
-    TopologyDataGear topoDG;
-
-    protected void run(CodeGearManager cgm) {
-
-        System.out.println("I am " + topoDG.getNodeName());
-        if(topoDG.getNodeName().equals("node0")) {
-            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);
-
-        }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 CatchDG());
-
-
-        /*
-        while(myEditor.SendPermission() == false){
-            try{
-                Thread.sleep(1);
-            }catch(InterruptedException e){
-
-            }
-        }
-        System.out.println("catch");
-        */
-    }
-}
--- a/src/main/java/christie/remotingTextEditor/StartManToManSession.java.rej	Thu Jan 23 02:10:00 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-***************
-*** 12,17 ****
-      }
-  
-      public static void main(String[] args){
-          //ポート番号10000~1000xはone上では他のライブラリに使われている。(Net.javaにつかわれている？)
-          int TopologyManagerPort = 10100;
-          int TopologyNodePort = 10101;
---- 12,19 ----
-      }
-  
-      public static void main(String[] args){
-+         int TopologyManagerPort = 10000;
-+         int TopologyNodePort = 10001;
-          //ポート番号10000~1000xはone上では他のライブラリに使われている。(Net.javaにつかわれている？)
-          int TopologyManagerPort = 10100;
-          int TopologyNodePort = 10101;