# HG changeset patch # User Nozomi Teruya # Date 1447671973 -32400 # Node ID fe627049e289aa57a34dc15ed55cb1376507ec06 # Parent 4c0b06abd840ad69a514f0b553ff9a48bb1f7ae2 update maven added compressed to DSM name diff -r 4c0b06abd840 -r fe627049e289 .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r 4c0b06abd840 -r fe627049e289 .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r 4c0b06abd840 -r fe627049e289 .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r 4c0b06abd840 -r fe627049e289 .gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary file .gradle/2.2.1/taskArtifacts/outputFileStates.bin has changed diff -r 4c0b06abd840 -r fe627049e289 .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r 4c0b06abd840 -r fe627049e289 .idea/gradle.xml --- a/.idea/gradle.xml Mon Nov 16 15:41:01 2015 +0900 +++ b/.idea/gradle.xml Mon Nov 16 20:06:13 2015 +0900 @@ -11,11 +11,6 @@ - diff -r 4c0b06abd840 -r fe627049e289 .idea/workspace.xml --- a/.idea/workspace.xml Mon Nov 16 15:41:01 2015 +0900 +++ b/.idea/workspace.xml Mon Nov 16 20:06:13 2015 +0900 @@ -3,11 +3,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + - - - + @@ -26,6 +47,9 @@ + + + @@ -41,22 +65,22 @@ - + - - + + - - + + - - + + @@ -65,9 +89,12 @@ - - - + + + + + + @@ -75,8 +102,20 @@ - - + + + + + + + + + + + + + + @@ -85,18 +124,8 @@ - - - - - - - - - - - - + + @@ -105,38 +134,38 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -411,11 +440,11 @@ @@ -537,8 +566,8 @@ @@ -561,12 +590,10 @@ - - + - @@ -681,7 +708,7 @@ - + @@ -693,6 +720,7 @@ + @@ -701,33 +729,13 @@ - + - @@ -749,38 +757,19 @@ - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +

- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +

@@ -1053,6 +1067,11 @@ + + +

@@ -1120,17 +1139,24 @@

+ + + + + + + + - + - - + @@ -1138,7 +1164,7 @@ - + @@ -1146,23 +1172,28 @@ - + - + + + + - + - + + + - + @@ -1170,15 +1201,14 @@ - + - - + @@ -1186,7 +1216,7 @@ - + @@ -1194,7 +1224,7 @@ - + @@ -1202,106 +1232,98 @@ - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - - + @@ -1309,47 +1331,42 @@ - + - - + - - + - - + - - + - - + @@ -1357,135 +1374,173 @@ - + - - + - - - + + - + - - + + - + - + + + + + + + + + - - + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + - - - - - - - - - + - - - - - - - - - - + + - - + + - + - - + + - - + + - + - - + + - diff -r 4c0b06abd840 -r fe627049e289 build.gradle --- a/build.gradle Mon Nov 16 15:41:01 2015 +0900 +++ b/build.gradle Mon Nov 16 20:06:13 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/23130e4d6e71/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/276fc89ee8e4/' } } diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckMyName.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckMyName.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/CreateWindow.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/CreateWindow.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/classes/main/jp/ac/u_ryukyu/alicevnc/StopProxy.class Binary file build/classes/main/jp/ac/u_ryukyu/alicevnc/StopProxy.class has changed diff -r 4c0b06abd840 -r fe627049e289 build/libs/AliceVNC.jar Binary file build/libs/AliceVNC.jar has changed diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Mon Nov 16 20:06:13 2015 +0900 @@ -13,7 +13,7 @@ private AliceVNCMessage order; public CheckCurrentInfo(AliceVNCMessage order){ - info.setKey("currentServer"); + info.setKey("compressedLocal","currentServer"); this.order = order; } @@ -23,13 +23,13 @@ if (order.name.equals(current.name)) { // need check route and node name - ods.update("currentServer", current); + ods.update("compressedcurrentServer", current); } else { if (current.allowChange) { // send Stop message to current current.messageID = MessageType.StopProxy.getId(); String address = current.getNextAddress(); - ods.put(address, "AliceVNCMessage", current); + ods.put("compressed" + address, "AliceVNCMessage", current); AliceVNCMessage mes = new AliceVNCMessage(MessageType.StartNegotiate); mes.route = new ArrayList(); @@ -38,13 +38,13 @@ } mes.name = "node0"; address = mes.getNextAddress(); - ods.put(address, "AliceVNCMessage", mes); + ods.put("compressed" + address, "AliceVNCMessage", mes); } else { // not allow to change order.messageID = MessageType.DeniedRequest.getId(); order.name = "node0"; String address = order.getNextAddress(); - ods.put(address, "AliceVNCMessage", order); + ods.put("compressed" + address, "AliceVNCMessage", order); // update current server info ods.update("currentServer", current); diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Mon Nov 16 20:06:13 2015 +0900 @@ -9,7 +9,7 @@ private Receiver info = ids.create(CommandType.PEEK); public CheckMyName(){ - info.setKey("host"); + info.setKey("compressedLocal", "host"); } @Override diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java Mon Nov 16 20:06:13 2015 +0900 @@ -48,7 +48,7 @@ width = message.width; height = message.height; name = message.name; - ods.update("initMessage", message); + ods.update("compressedinitMessage", message); context.setPixelFormat(pixelFormat); context.setFbWidth(width); diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Mon Nov 16 20:06:13 2015 +0900 @@ -15,8 +15,8 @@ private Receiver info1 = ids.create(CommandType.PEEK); public NegotiateVNCServer(){ - info.setKey("host"); - info1.setKey("AliceVNCConfig"); + info.setKey("compressedLocal","host"); + info1.setKey("compressedLocal","AliceVNCConfig"); } @Override diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Mon Nov 16 20:06:13 2015 +0900 @@ -12,8 +12,8 @@ private Receiver info1 = ids.create(CommandType.PEEK); // connection list public ReceiveAliceVNCMessage() { - info.setKey("AliceVNCMessage"); - info1.setKey("_CLIST"); + info.setKey("compressedLocal","AliceVNCMessage"); + info1.setKey("compressedLocal","_CLIST"); } @Override @@ -26,7 +26,7 @@ order.messageID == MessageType.CurrentVNCInfo.getId()) { if (clist.contains("parent")){ order.route.add(info.from); - ods.put("parent", "AliceVNCMessage", order); + ods.put("compressedparent", "AliceVNCMessage", order); new ReceiveAliceVNCMessage(); } else { // this node is root. order.route.add(info.from); @@ -54,7 +54,7 @@ } } else { String address = order.getNextAddress(); - ods.put(address, "AliceVNCMessage", order); + ods.put("compressed" + address, "AliceVNCMessage", order); new ReceiveAliceVNCMessage(); } } diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Mon Nov 16 20:06:13 2015 +0900 @@ -20,9 +20,9 @@ private Receiver info2 = ids.create(CommandType.PEEK); public ReceiveMeasurement() { - info.setKey("measurement"); - info1.setKey("_CLIST"); - info2.setKey("AliceVNCConfig"); + info.setKey("compressedLocal","measurement"); + info1.setKey("compressedLocal","_CLIST"); + info2.setKey("compressedLocal","AliceVNCConfig"); } @SuppressWarnings("unchecked") diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Mon Nov 16 20:06:13 2015 +0900 @@ -23,10 +23,10 @@ private Receiver info3 = ids.create(CommandType.PEEK); public ReceiveUpdateRectangle(){ - info.setKey("holder"); - info1.setKey("updateRectangle"); - info2.setKey("pixelData"); - info3.setKey("_CLIST"); + info.setKey("compressedLocal","holder"); + info1.setKey("compressedLocal","updateRectangle"); + info2.setKey("compressedLocal","pixelData"); + info3.setKey("compressedLocal","_CLIST"); } @SuppressWarnings("unchecked") diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Mon Nov 16 20:06:13 2015 +0900 @@ -16,10 +16,10 @@ private Receiver info3 = ids.create(CommandType.TAKE); // request public SendChangeRequest(){ - info.setKey("host"); - info1.setKey("_CLIST"); - info2.setKey("AliceVNCConfig"); - info3.setKey("Request"); + info.setKey("compressedLocal","host"); + info1.setKey("compressedLocal","_CLIST"); + info2.setKey("compressedLocal","AliceVNCConfig"); + info3.setKey("compressedLocal","Request"); } @Override @@ -40,7 +40,7 @@ address = "parent"; } - ods.put(address, "AliceVNCMessage", mes); + ods.put("compressed" + address, "AliceVNCMessage", mes); new SendChangeRequest(); } diff -r 4c0b06abd840 -r fe627049e289 src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Mon Nov 16 20:06:13 2015 +0900 @@ -11,7 +11,7 @@ private Receiver info = ids.create(CommandType.TAKE); public StopProxy() { - info.setKey("viewer"); + info.setKey("compressedLocal","viewer"); } @Override public void run() {