# HG changeset patch # User Nozomi Teruya # Date 1447052956 -32400 # Node ID 57ca704f86a309eb7a1ad186e237ded0930cc812 # Parent b46758a2b56ea423e03444884e757ec3da8a6124 back version Alice tag:work-compressedDSM diff -r b46758a2b56e -r 57ca704f86a3 .idea/libraries/Gradle__com_glavsoft_viewer_tightvnc_jviewer_2_7_3.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.idea/libraries/Gradle__com_glavsoft_viewer_tightvnc_jviewer_2_7_3.xml Mon Nov 09 16:09:16 2015 +0900 @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff -r b46758a2b56e -r 57ca704f86a3 .idea/libraries/Gradle__cr_ie_u_ryukyu_ac_jp_Alice_1_1.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.idea/libraries/Gradle__cr_ie_u_ryukyu_ac_jp_Alice_1_1.xml Mon Nov 09 16:09:16 2015 +0900 @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff -r b46758a2b56e -r 57ca704f86a3 build.gradle --- a/build.gradle Tue Oct 20 17:03:19 2015 +0900 +++ b/build.gradle Mon Nov 09 16:09:16 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/d8b84701a5d2/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/23130e4d6e71/' } } diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Mon Nov 09 16:09:16 2015 +0900 @@ -14,8 +14,8 @@ public void run() { System.out.println(); ods.put("AliceVNCConfig", conf); - new ReceiveMeasurement(new AliceDaemon(conf)); - new CheckMyName(this); + new ReceiveMeasurement(); + new CheckMyName(); } diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Mon Nov 09 16:09:16 2015 +0900 @@ -12,9 +12,8 @@ private Receiver info = ids.create(CommandType.TAKE); // current Server Info private AliceVNCMessage order; - public CheckCurrentInfo(AliceVNCMessage order, CodeSegment cs){ - this.aliceDaemon = cs.aliceDaemon; - info.setKey("currentServer", this); + public CheckCurrentInfo(AliceVNCMessage order){ + info.setKey("currentServer"); this.order = order; } @@ -51,6 +50,6 @@ ods.update("currentServer", current); } } - new ReceiveAliceVNCMessage(this); + new ReceiveAliceVNCMessage(); } } diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Mon Nov 09 16:09:16 2015 +0900 @@ -8,22 +8,21 @@ private Receiver info = ids.create(CommandType.PEEK); - public CheckMyName(CodeSegment cs){ - this.aliceDaemon = cs.aliceDaemon; - info.setKey("host", this); + public CheckMyName(){ + info.setKey("host"); } @Override public void run() { if ("node0".equals(info.asString())) { - new CreateWindow("local", this); - new NegotiateVNCServer(this); + new CreateWindow("local"); + new NegotiateVNCServer(); } else { - new CreateWindow("parent", this); + new CreateWindow("parent"); } - new ReceiveAliceVNCMessage(this); - new SendChangeRequest(this); + new ReceiveAliceVNCMessage(); + new SendChangeRequest(); } } diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java Mon Nov 09 16:09:16 2015 +0900 @@ -21,9 +21,8 @@ private Receiver info = ids.create(CommandType.PEEK); - public CreateWindow(String key, CodeSegment cs){ - this.aliceDaemon = cs.aliceDaemon; - info.setKey(key, "initMessage", this); + public CreateWindow(String key){ + info.setKey(key, "initMessage"); } public void run() { diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Mon Nov 09 16:09:16 2015 +0900 @@ -14,10 +14,9 @@ private Receiver info = ids.create(CommandType.PEEK); private Receiver info1 = ids.create(CommandType.PEEK); - public NegotiateVNCServer(CodeSegment cs){ - this.aliceDaemon = cs.aliceDaemon; - info.setKey("host", this); - info1.setKey("AliceVNCConfig", this); + public NegotiateVNCServer(){ + info.setKey("host"); + info1.setKey("AliceVNCConfig"); } @Override diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Mon Nov 09 16:09:16 2015 +0900 @@ -11,10 +11,9 @@ private Receiver info = ids.create(CommandType.TAKE); private Receiver info1 = ids.create(CommandType.PEEK); // connection list - public ReceiveAliceVNCMessage(CodeSegment cs) { - this.aliceDaemon = cs.aliceDaemon; - info.setKey("AliceVNCMessage", this); - info1.setKey("_CLIST", this); + public ReceiveAliceVNCMessage() { + info.setKey("AliceVNCMessage"); + info1.setKey("_CLIST"); } @Override @@ -28,14 +27,14 @@ if (clist.contains("parent")){ order.route.add(info.from); ods.put("parent", "AliceVNCMessage", order); - new ReceiveAliceVNCMessage(this); + new ReceiveAliceVNCMessage(); } else { // this node is root. order.route.add(info.from); if (order.messageID == MessageType.CurrentVNCInfo.getId()) { ods.put("currentServer", order); - new ReceiveAliceVNCMessage(this); + new ReceiveAliceVNCMessage(); } else { - new CheckCurrentInfo(order, this); // check change Server flag. + new CheckCurrentInfo(order); // check change Server flag. } } } else if (order.messageID == MessageType.StartNegotiate.getId()|| @@ -46,8 +45,8 @@ if (order.messageID == MessageType.StartNegotiate.getId()){ // negotiate VNCServer by Viewer ods.put("vncRight", true); - new NegotiateVNCServer(this); - new ReceiveAliceVNCMessage(this); + new NegotiateVNCServer(); + new ReceiveAliceVNCMessage(); } else if(order.messageID == MessageType.StopProxy.getId()) { new StopProxy(); } else if (order.messageID == MessageType.DeniedRequest.getId()) { @@ -56,7 +55,7 @@ } else { String address = order.getNextAddress(); ods.put(address, "AliceVNCMessage", order); - new ReceiveAliceVNCMessage(this); + new ReceiveAliceVNCMessage(); } } } diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Mon Nov 09 16:09:16 2015 +0900 @@ -19,11 +19,10 @@ private Receiver info1 = ids.create(CommandType.PEEK); private Receiver info2 = ids.create(CommandType.PEEK); - public ReceiveMeasurement(AliceDaemon aliceDaemon) { - this.aliceDaemon = aliceDaemon; - info.setKey("measurement", this); - info1.setKey("_CLIST", this); - info2.setKey("AliceVNCConfig", this); + public ReceiveMeasurement() { + info.setKey("measurement"); + info1.setKey("_CLIST"); + info2.setKey("AliceVNCConfig"); } @SuppressWarnings("unchecked") diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Mon Nov 09 16:09:16 2015 +0900 @@ -23,10 +23,10 @@ private Receiver info3 = ids.create(CommandType.PEEK); public ReceiveUpdateRectangle(){ - info.setKey("holder", this); - info1.setKey("updateRectangle", this); - info2.setKey("pixelData", this); - info3.setKey("_CLIST", this); + info.setKey("holder"); + info1.setKey("updateRectangle"); + info2.setKey("pixelData"); + info3.setKey("_CLIST"); } @SuppressWarnings("unchecked") diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Mon Nov 09 16:09:16 2015 +0900 @@ -15,12 +15,11 @@ private Receiver info2 = ids.create(CommandType.PEEK); // AliceVNCConfig private Receiver info3 = ids.create(CommandType.TAKE); // request - public SendChangeRequest(CodeSegment cs){ - this.aliceDaemon = cs.aliceDaemon; - info.setKey("host", this); - info1.setKey("_CLIST", this); - info2.setKey("AliceVNCConfig", this); - info3.setKey("Request", this); + public SendChangeRequest(){ + info.setKey("host"); + info1.setKey("_CLIST"); + info2.setKey("AliceVNCConfig"); + info3.setKey("Request"); } @Override @@ -42,7 +41,7 @@ } ods.put(address, "AliceVNCMessage", mes); - new SendChangeRequest(this); + new SendChangeRequest(); } } diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Mon Nov 09 16:09:16 2015 +0900 @@ -19,7 +19,7 @@ if (conf.debugMode()) { cs.ods.put("_CLIST", new ArrayList()); cs.ods.put("host", "node0"); - cs.execute(aliceDaemon); + cs.execute(); return; } @@ -30,5 +30,4 @@ new TopologyNode(conf, cs); } - } diff -r b46758a2b56e -r 57ca704f86a3 src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Tue Oct 20 17:03:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Mon Nov 09 16:09:16 2015 +0900 @@ -11,14 +11,14 @@ private Receiver info = ids.create(CommandType.TAKE); public StopProxy() { - info.setKey("viewer", this); + info.setKey("viewer"); } @Override public void run() { System.out.println("call clean up session"); Viewer v = info.asClass(Viewer.class); v.closeApp(); - new ReceiveAliceVNCMessage(this); + new ReceiveAliceVNCMessage(); } }