# HG changeset patch # User Nozomi Teruya # Date 1447992877 -32400 # Node ID 3d2b82127a3c1b50337a10090d1d5e8c23ee061a # Parent 66f95be0daabe7edc55eb009ca2d70b16da055f3 resolve nullpo diff -r 66f95be0daab -r 3d2b82127a3c .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r 66f95be0daab -r 3d2b82127a3c .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r 66f95be0daab -r 3d2b82127a3c .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r 66f95be0daab -r 3d2b82127a3c .gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary file .gradle/2.2.1/taskArtifacts/outputFileStates.bin has changed diff -r 66f95be0daab -r 3d2b82127a3c .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r 66f95be0daab -r 3d2b82127a3c .idea/workspace.xml --- a/.idea/workspace.xml Thu Nov 19 03:25:54 2015 +0900 +++ b/.idea/workspace.xml Fri Nov 20 13:14:37 2015 +0900 @@ -8,7 +8,6 @@ - @@ -45,12 +44,12 @@ - + - - + + @@ -60,7 +59,37 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -317,6 +346,8 @@ @@ -329,9 +360,10 @@ - @@ -358,6 +390,7 @@ + @@ -406,7 +439,6 @@ - @@ -665,6 +697,9 @@ + + + @@ -675,34 +710,42 @@ - + - + - - - - - - - - - - + + + + + + + + - - + + - + + + + + + + @@ -715,21 +758,10 @@ - + - - - - - - - - - - - - - + + @@ -742,16 +774,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + \ No newline at end of file diff -r 66f95be0daab -r 3d2b82127a3c build.gradle --- a/build.gradle Thu Nov 19 03:25:54 2015 +0900 +++ b/build.gradle Fri Nov 20 13:14:37 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/9805e2f8823e/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/424ac97dd4a4/' } } diff -r 66f95be0daab -r 3d2b82127a3c src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Thu Nov 19 03:25:54 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Fri Nov 20 13:14:37 2015 +0900 @@ -56,7 +56,7 @@ } } else { ReceiveData r = info.getReceiveData(); - ReceiveData rData = new ReceiveData(null); + ReceiveData rData = new ReceiveData("measurement"); rData.setZippedDataSize(r.getZippedDataSize()); rData.setTimes(r.getTime(), r.getSetTime(), r.getDepth()); diff -r 66f95be0daab -r 3d2b82127a3c src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Thu Nov 19 03:25:54 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Fri Nov 20 13:14:37 2015 +0900 @@ -37,7 +37,13 @@ ArrayList clist = info3.asClass(ArrayList.class); // for measurement if (info2.getReceiveData().getSetTime()) { - ods.flip("parent", "measurement", info2); + ReceiveData r = info2.getReceiveData(); + ReceiveData rData = new ReceiveData("measurement"); + + rData.setZippedDataSize(r.getZippedDataSize()); + rData.setTimes(r.getTime(), r.getSetTime(), r.getDepth()); + + ods.put("parent", "measurement", rData); } for (String node : clist){ if (!info1.from.equals(node)) {