Mercurial > hg > Applications > AliceVNC
changeset 77:6295918b8a97
don't using compressed&flip version for mersurement
| author | Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sat, 28 Nov 2015 00:08:42 +0900 |
| parents | 281b667970de |
| children | 72772652143c |
| files | .gradle/2.2.1/taskArtifacts/cache.properties.lock .gradle/2.2.1/taskArtifacts/fileHashes.bin .gradle/2.2.1/taskArtifacts/fileSnapshots.bin .gradle/2.2.1/taskArtifacts/outputFileStates.bin .gradle/2.2.1/taskArtifacts/taskArtifacts.bin .idea/misc.xml .idea/workspace.xml AliceVNC.iml build.gradle src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java |
| diffstat | 11 files changed, 335 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/misc.xml Thu Nov 26 03:39:36 2015 +0900 +++ b/.idea/misc.xml Sat Nov 28 00:08:42 2015 +0900 @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="EntryPointsManager"> + <entry_points version="2.0" /> + </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Remove" /> @@ -10,7 +13,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/classes" /> </component> <component name="masterDetails">
--- a/.idea/workspace.xml Thu Nov 26 03:39:36 2015 +0900 +++ b/.idea/workspace.xml Sat Nov 28 00:08:42 2015 +0900 @@ -1,19 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="b0cc22eb-4440-4b44-9c5c-b48bc3dfb6a0" name="Default" comment=""> + <list default="true" id="579d0a7e-9ab1-45d3-9d97-16dac425333a" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.hgignore" afterPath="$PROJECT_DIR$/.hgignore" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AliceVNC.iml" afterPath="$PROJECT_DIR$/AliceVNC.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> </list> <ignored path="AliceVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -48,11 +47,21 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true"> + <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.7217573"> - <caret line="24" column="54" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" /> + <state vertical-scroll-proportion="0.0"> + <caret line="23" column="51" selection-start-line="23" selection-start-column="51" selection-end-line="23" selection-end-column="51" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ReceiveMeasurement.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.53748006"> + <caret line="50" column="47" selection-start-line="50" selection-start-column="47" selection-end-line="50" selection-end-column="47" /> <folding /> </state> </provider> @@ -216,16 +225,97 @@ <entry key="$USER_HOME$/Development/IdeaProjects/Alice" value="1448284556000" /> <entry key="$USER_HOME$/Development/IdeaProjects/Alice_old/Alice" value="1440142856000" /> <entry key="$USER_HOME$/Development/IdeaProjects/OldAlice/Alice" value="1447995807000" /> - <entry key="$PROJECT_DIR$/../Alice" value="1448458165000" /> - <entry key="$PROJECT_DIR$" value="1448458325000" /> + <entry key="$PROJECT_DIR$/../Alice" value="1448474758000" /> + <entry key="$PROJECT_DIR$" value="1448604158000" /> + <entry key="$PROJECT_DIR$/../tvnjviewer" value="1448451058000" /> </map> </option> - </component> - <component name="IdeDocumentHistory"> - <option name="CHANGED_PATHS"> - <list> - <option value="$PROJECT_DIR$/build.gradle" /> - </list> + <option name="projectBuildClasspath"> + <map> + <entry key="$PROJECT_DIR$"> + <value> + <ExternalProjectBuildClasspathPojo> + <option name="modulesBuildClasspath"> + <map> + <entry key="$PROJECT_DIR$"> + <value> + <ExternalModuleBuildClasspathPojo> + <option name="entries"> + <list> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ce8b1c47ee222312b4954fc1cdfcdad463e8b3e/tightvnc-jviewer-2.7.2.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/ae90862641220b0d9c791cda18913541b8a0771d/Alice-1.1.jar" /> + </list> + </option> + <option name="path" value="$PROJECT_DIR$" /> + </ExternalModuleBuildClasspathPojo> + </value> + </entry> + </map> + </option> + <option name="name" value="AliceVNC" /> + <option name="projectBuildClasspath"> + <list> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/ant-1.9.3.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/ant-launcher-1.9.3.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-base-services-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-base-services-groovy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-cli-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-core-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-docs-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-launcher-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-messaging-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-model-core-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-model-groovy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-open-api-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-resources-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-tooling-api-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-ui-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/gradle-wrapper-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/groovy-all-2.3.6.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/ant-antlr-1.9.3.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-announce-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-antlr-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-build-comparison-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-build-init-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-code-quality-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-cunit-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-dependency-management-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-diagnostics-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ear-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ide-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ide-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-ivy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-jacoco-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-javascript-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-jetty-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-groovy-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-java-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-jvm-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-language-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-maven-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-osgi-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-platform-base-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-platform-jvm-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-platform-native-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-plugin-development-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-plugin-use-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-plugins-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-publish-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-reporting-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-resources-http-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-scala-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-signing-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/gradle-sonar-2.2.1.jar" /> + <option value="/usr/local/Cellar/gradle/2.2.1/libexec/lib/plugins/ivy-2.2.0.jar" /> + <option value="$PROJECT_DIR$/buildSrc/src/main/java" /> + <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" /> + </list> + </option> + </ExternalProjectBuildClasspathPojo> + </value> + </entry> + </map> </option> </component> <component name="MavenImportPreferences"> @@ -237,8 +327,8 @@ </component> <component name="ProjectFrameBounds"> <option name="y" value="23" /> - <option name="width" value="1440" /> - <option name="height" value="873" /> + <option name="width" value="1280" /> + <option name="height" value="773" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -265,8 +355,7 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane" /> - <pane id="Scratches" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -278,6 +367,198 @@ <option name="myItemId" value="External Libraries" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: cr.ie.u_ryukyu.ac.jp:Alice:1.1" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Alice-1.1.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: cr.ie.u_ryukyu.ac.jp:Alice:1.1" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Alice-1.1.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="alice" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="topology" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: cr.ie.u_ryukyu.ac.jp:Alice:1.1" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Alice-1.1.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="alice" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="topology" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="node" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: cr.ie.u_ryukyu.ac.jp:Alice:1.1" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Alice-1.1.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="alice" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: com.glavsoft.viewer:tightvnc-jviewer:2.7.2" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="tightvnc-jviewer-2.7.2.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: com.glavsoft.viewer:tightvnc-jviewer:2.7.2" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="tightvnc-jviewer-2.7.2.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="alice" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="topology" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: com.glavsoft.viewer:tightvnc-jviewer:2.7.2" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="tightvnc-jviewer-2.7.2.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="alice" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="topology" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="node" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Gradle: com.glavsoft.viewer:tightvnc-jviewer:2.7.2" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="tightvnc-jviewer-2.7.2.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="alice" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="AliceVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -317,7 +598,8 @@ </PATH> </subPane> </pane> - <pane id="Scope" /> + <pane id="Scratches" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -327,7 +609,7 @@ <property name="MemberChooser.sorted" value="false" /> <property name="MemberChooser.showClasses" value="true" /> <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/../Alice/build.gradle" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/build.gradle" /> <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" /> <property name="settings.editor.splitter.proportion" value="0.2" /> </component> @@ -422,27 +704,26 @@ <component name="ShelveChangesManager" show_recycled="false" /> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> - <changelist id="b0cc22eb-4440-4b44-9c5c-b48bc3dfb6a0" name="Default" comment="" /> - <created>1448458936205</created> + <changelist id="579d0a7e-9ab1-45d3-9d97-16dac425333a" name="Default" comment="" /> + <created>1448604706276</created> <option name="number" value="Default" /> - <updated>1448458936205</updated> + <updated>1448604706276</updated> </task> <servers /> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1440" height="873" extended-state="6" /> + <frame x="0" y="23" width="1280" height="773" extended-state="6" /> <editor active="true" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2819063" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -465,31 +746,35 @@ <breakpoint-manager /> <watches-manager /> </component> - <component name="antWorkspaceConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="FILTER_TARGETS" value="false" /> - </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/AliceVNC.iml"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/ae90862641220b0d9c791cda18913541b8a0771d/Alice-1.1.jar!/alice/topology/node/TopologyNodeConfig.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state vertical-scroll-proportion="-14.444445"> + <caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../Alice/Alice.iml"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ce8b1c47ee222312b4954fc1cdfcdad463e8b3e/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNodeConfig.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state vertical-scroll-proportion="0.12857144"> + <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.7217573"> - <caret line="24" column="54" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" /> + <state vertical-scroll-proportion="0.0"> + <caret line="23" column="51" selection-start-line="23" selection-start-column="51" selection-end-line="23" selection-end-column="51" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.53748006"> + <caret line="50" column="47" selection-start-line="50" selection-start-column="47" selection-end-line="50" selection-end-column="47" /> <folding /> </state> </provider>
--- a/AliceVNC.iml Thu Nov 26 03:39:36 2015 +0900 +++ b/AliceVNC.iml Sat Nov 28 00:08:42 2015 +0900 @@ -17,7 +17,7 @@ <orderEntry type="module-library" exported=""> <library name="Gradle: com.glavsoft.viewer:tightvnc-jviewer:2.7.2"> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/389ef780510b73af44702e902967cae059c320b9/tightvnc-jviewer-2.7.2.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ce8b1c47ee222312b4954fc1cdfcdad463e8b3e/tightvnc-jviewer-2.7.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -26,7 +26,7 @@ <orderEntry type="module-library" exported=""> <library name="Gradle: cr.ie.u_ryukyu.ac.jp:Alice:1.1"> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/508c6f1b3941ccd1e59da029b0c238671504766c/Alice-1.1.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/ae90862641220b0d9c791cda18913541b8a0771d/Alice-1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/build.gradle Thu Nov 26 03:39:36 2015 +0900 +++ b/build.gradle Sat Nov 28 00:08:42 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/tip/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/f2c44c2c559c/' } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Thu Nov 26 03:39:36 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Sat Nov 28 00:08:42 2015 +0900 @@ -55,7 +55,7 @@ pw.close(); } } else { - ods.flip("parent", info.key, info);//下から計測用パケットがきたときの処理 + ods.put("parent", info.key, info.getReceiveData());//下から計測用パケットがきたときの処理 } } catch (IOException e) {
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Thu Nov 26 03:39:36 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Sat Nov 28 00:08:42 2015 +0900 @@ -47,14 +47,14 @@ if (!info1.from.equals(node)) { // not need send data comes from // Data Segment from other node is already serialized - ods.flip(node, "updateRectangle", info1); //TODO need timeout counter + ods.put(node, "updateRectangle", info1.getReceiveData()); //TODO need timeout counter // for measurement ReceiveData r = info2.getReceiveData(); if (!r.getSetTime()) { r.setTimes(System.currentTimeMillis(), true, 0);//送信時間をセット } - ods.flip(node, "pixelData", info2); + ods.put(node, "pixelData", info2.getReceiveData()); } }