# HG changeset patch # User ichikitakahiro # Date 1579607680 -32400 # Node ID c8c8c447b2b398dda650553f1a539e7a0af8bb02 # Parent 68b5958179d0a2e162e93a3f08211a63e043f2fd tweak diff -r 68b5958179d0 -r c8c8c447b2b3 src/main/java/christie/remotingTextEditor/GetOpponentMessage.java --- a/src/main/java/christie/remotingTextEditor/GetOpponentMessage.java Tue Jan 21 19:49:40 2020 +0900 +++ b/src/main/java/christie/remotingTextEditor/GetOpponentMessage.java Tue Jan 21 20:54:40 2020 +0900 @@ -10,6 +10,10 @@ public class GetOpponentMessage extends CodeGear { @Take + int offset; + + @Take + String string; Message offset; @Peek diff -r 68b5958179d0 -r c8c8c447b2b3 src/main/java/christie/remotingTextEditor/StartManToManSession.java --- a/src/main/java/christie/remotingTextEditor/StartManToManSession.java Tue Jan 21 19:49:40 2020 +0900 +++ b/src/main/java/christie/remotingTextEditor/StartManToManSession.java Tue Jan 21 20:54:40 2020 +0900 @@ -12,9 +12,8 @@ } public static void main(String[] args){ - //ポート番号10000~1000xはone上では他のライブラリに使われている。(Net.javaにつかわれている?) - int TopologyManagerPort = 10100; - int TopologyNodePort = 10101; + int TopologyManagerPort = 10000; + int TopologyNodePort = 10001; String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/manToMan.dot"}; diff -r 68b5958179d0 -r c8c8c447b2b3 src/main/java/christie/remotingTextEditor/StartManToManSession.java.orig --- a/src/main/java/christie/remotingTextEditor/StartManToManSession.java.orig Tue Jan 21 19:49:40 2020 +0900 +++ b/src/main/java/christie/remotingTextEditor/StartManToManSession.java.orig Tue Jan 21 20:54:40 2020 +0900 @@ -12,8 +12,8 @@ } public static void main(String[] args){ - int TopologyManagerPort = 10100; - int TopologyNodePort = 10101; + int TopologyManagerPort = 10000; + int TopologyNodePort = 10001; String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/manToMan.dot"}; diff -r 68b5958179d0 -r c8c8c447b2b3 src/main/java/christie/remotingTextEditor/StartManToManSession.java.rej --- a/src/main/java/christie/remotingTextEditor/StartManToManSession.java.rej Tue Jan 21 19:49:40 2020 +0900 +++ b/src/main/java/christie/remotingTextEditor/StartManToManSession.java.rej Tue Jan 21 20:54:40 2020 +0900 @@ -1,16 +1,17 @@ *************** -*** 13,19 **** +*** 12,17 **** + } public static void main(String[] args){ //ポート番号10000~1000xはone上では他のライブラリに使われている。(Net.javaにつかわれている?) -- int TopologyManagerPort = 10100; + int TopologyManagerPort = 10100; int TopologyNodePort = 10101; - - String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/manToMan.dot"}; ---- 13,18 ---- +--- 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; - - String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/manToMan.dot"};