Mercurial > hg > Applications > AliceVNC
changeset 79:3a27a0727705
update Alice
| author | Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 17 Dec 2015 17:16:07 +0900 |
| parents | 72772652143c |
| children | c94436e90e9e |
| 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/workspace.xml AliceVNC.iml build.gradle src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java |
| diffstat | 10 files changed, 318 insertions(+), 339 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Dec 15 16:50:15 2015 +0900 +++ b/.idea/workspace.xml Thu Dec 17 17:16:07 2015 +0900 @@ -1,13 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="579d0a7e-9ab1-45d3-9d97-16dac425333a" name="Default" comment=""> + <list default="true" id="6ff93eeb-5bea-4f4e-b5b2-726d76c38fdc" 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$/.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/CheckMyName.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java" /> </list> <ignored path="AliceVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -41,22 +45,71 @@ <favorites_list name="AliceVNC" /> </component> <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/build.gradle"> + <leaf> + <file leaf-file-name="CheckMyName.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.23923445"> - <caret line="10" column="75" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" /> + <state vertical-scroll-proportion="0.47445256"> + <caret line="17" column="85" selection-start-line="17" selection-start-column="85" selection-end-line="17" selection-end-column="85" /> + <folding> + <element signature="e#315#316#0" expanded="true" /> + <element signature="e#350#351#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="DataSegment.class" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-1.7407408"> + <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" /> + <folding> + <element signature="e#1628#1629#0" expanded="true" /> + <element signature="e#1668#1669#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="LocalDataSegmentManager.class" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-2.2222223"> + <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ReceiveMeasurement.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> + <file leaf-file-name="SendChangeRequest.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="44" column="33" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" /> + <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="DataSegmentKey.class" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegmentKey.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-8.333333"> + <caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" /> + <folding> + <element signature="e#4142#4143#0" expanded="true" /> + <element signature="e#4179#4180#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="NegotiateVNCServer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> <folding /> </state> </provider> @@ -220,103 +273,18 @@ <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="1448474758000" /> - <entry key="$PROJECT_DIR$" value="1448604158000" /> - <entry key="$PROJECT_DIR$/../tvnjviewer" value="1448451058000" /> - </map> - </option> - <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> + <entry key="$PROJECT_DIR$/../Alice" value="1448719648000" /> + <entry key="$PROJECT_DIR$" value="1450337490000" /> + <entry key="$PROJECT_DIR$/../TreeVNC" value="1447053369000" /> + <entry key="$PROJECT_DIR$/../tvnjviewer" value="1450264775000" /> </map> </option> </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/build.gradle" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java" /> </list> </option> </component> @@ -357,8 +325,7 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scope" /> - <pane id="PackagesPane" /> + <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -370,92 +337,6 @@ <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> @@ -470,98 +351,6 @@ <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> @@ -601,7 +390,8 @@ </PATH> </subPane> </pane> - <pane id="Scratches" /> + <pane id="Scope" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -622,12 +412,71 @@ <option name="PROGRAM_PARAMETERS" /> <method /> </configuration> + <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> + <module name="" /> + <option name="ACTIVITY_CLASS" value="" /> + <option name="MODE" value="default_activity" /> + <option name="DEPLOY" value="true" /> + <option name="ARTIFACT_NAME" value="" /> + <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> + <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <option name="NETWORK_LATENCY" value="none" /> + <option name="CLEAR_LOGCAT" value="false" /> + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> + <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> + <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> + <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> + <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> + <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> + <method /> + </configuration> + <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> + <module name="" /> + <option name="TESTING_TYPE" value="0" /> + <option name="INSTRUMENTATION_RUNNER_CLASS" value="" /> + <option name="METHOD_NAME" value="" /> + <option name="CLASS_NAME" value="" /> + <option name="PACKAGE_NAME" value="" /> + <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> + <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <option name="NETWORK_LATENCY" value="none" /> + <option name="CLEAR_LOGCAT" value="false" /> + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> + <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> + <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> + <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> + <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> + <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> + <method /> + </configuration> <configuration default="true" type="Applet" factoryName="Applet"> - <module /> <option name="HTML_USED" value="false" /> <option name="WIDTH" value="400" /> <option name="HEIGHT" value="300" /> <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <module /> <method /> </configuration> <configuration default="true" type="Application" factoryName="Application"> @@ -645,6 +494,22 @@ <envs /> <method /> </configuration> + <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle"> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list /> + </option> + <option name="vmOptions" /> + </ExternalSystemSettings> + <method /> + </configuration> <configuration default="true" type="JUnit" factoryName="JUnit"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="" /> @@ -666,6 +531,61 @@ <patterns /> <method /> </configuration> + <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <envs /> + <patterns /> + <method /> + </configuration> + <configuration default="true" type="JarApplication" factoryName="JAR Application"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="Java Scratch" factoryName="Java Scratch"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="SCRATCH_FILE_ID" value="0" /> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="AliceVNC" /> + <envs /> + <method /> + </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -702,17 +622,42 @@ <listeners /> <method /> </configuration> + <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="SUITE_NAME" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="GROUP_NAME" /> + <option name="TEST_OBJECT" value="CLASS" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" /> + <option name="OUTPUT_DIRECTORY" /> + <option name="ANNOTATION_TYPE" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <option name="USE_DEFAULT_REPORTERS" value="false" /> + <option name="PROPERTIES_FILE" /> + <envs /> + <properties /> + <listeners /> + <method /> + </configuration> </component> <component name="ShelveChangesManager" show_recycled="false" /> - <component name="SvnConfiguration"> - <configuration /> - </component> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> - <changelist id="579d0a7e-9ab1-45d3-9d97-16dac425333a" name="Default" comment="" /> - <created>1448604706276</created> + <changelist id="6ff93eeb-5bea-4f4e-b5b2-726d76c38fdc" name="Default" comment="" /> + <created>1450337803994</created> <option name="number" value="Default" /> - <updated>1448604706276</updated> + <updated>1450337803994</updated> </task> <servers /> </component> @@ -720,101 +665,131 @@ <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="3" side_tool="false" content_ui="tabs" /> + <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="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="2" 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="7" 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="3" 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="7" 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="7" 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="3" 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="Metrics" 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="8" 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="3" 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="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.24959612" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Metrics" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32977098" sideWeight="0.5" order="1" 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" /> - <window_info id="UI Designer" 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="2" side_tool="false" content_ui="tabs" /> - <window_info id="Favorites" 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="2" side_tool="true" content_ui="tabs" /> + <window_info id="UI Designer" 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="Favorites" 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="true" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" /> <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" /> - <window_info id="Find" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> </layout> </component> - <component name="Vcs.Log.UiProperties"> - <option name="RECENTLY_FILTERED_USER_GROUPS"> - <collection /> - </option> - <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> - <collection /> - </option> - </component> <component name="VcsContentAnnotationSettings"> <option name="myLimit" value="2678400000" /> </component> <component name="XDebuggerManager"> - <breakpoint-manager /> + <breakpoint-manager> + <breakpoints> + <line-breakpoint enabled="true" type="java-line"> + <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class</url> + <line>25</line> + <properties /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class</url> + <line>28</line> + <properties /> + <option name="timeStamp" value="1" /> + </line-breakpoint> + </breakpoints> + <option name="time" value="2" /> + </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="com.sixrr.metrics.MetricsReloaded"> <option name="selectedProfile" value="" /> <option name="autoscroll" value="false" /> <option name="showOnlyWarnings" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/build.gradle"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/Command.class"> <provider selected="true" editor-type-id="text-editor"> - <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" /> + <state vertical-scroll-proportion="0.275"> + <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegmentKey.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-8.333333"> + <caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" /> + <folding> + <element signature="e#4142#4143#0" expanded="true" /> + <element signature="e#4179#4180#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java"> <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" /> + <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> <folding /> </state> </provider> </entry> - <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="-14.444445"> - <caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" /> - </state> - </provider> - </entry> - <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.12857144"> - <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="44" column="33" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" /> + <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build.gradle"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-1.7407408"> + <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" /> + <folding> + <element signature="e#1628#1629#0" expanded="true" /> + <element signature="e#1668#1669#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.23923445"> - <caret line="10" column="75" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" /> + <state vertical-scroll-proportion="-2.2222223"> + <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.47445256"> + <caret line="17" column="85" selection-start-line="17" selection-start-column="85" selection-end-line="17" selection-end-column="85" /> + <folding> + <element signature="e#315#316#0" expanded="true" /> + <element signature="e#350#351#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="hg4idea.settings"> - <option name="CHECK_INCOMING_OUTGOING" value="true" /> <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" /> </component> </project> \ No newline at end of file
--- a/AliceVNC.iml Tue Dec 15 16:50:15 2015 +0900 +++ b/AliceVNC.iml Thu Dec 17 17:16:07 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/5ce8b1c47ee222312b4954fc1cdfcdad463e8b3e/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/a3c4f58cab991c9f52649e287166cf6156e7fce/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/ae90862641220b0d9c791cda18913541b8a0771d/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/18786fef64d1ecb63b45c9fba9b720332bbe90f8/Alice-1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/build.gradle Tue Dec 15 16:50:15 2015 +0900 +++ b/build.gradle Thu Dec 17 17:16:07 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/56c893f71241/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/b2eb56ba6bc7/' } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Tue Dec 15 16:50:15 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Thu Dec 17 17:16:07 2015 +0900 @@ -2,6 +2,7 @@ import alice.codesegment.CodeSegment; import alice.datasegment.CommandType; +import alice.datasegment.DataSegment; import alice.datasegment.Receiver; public class CheckMyName extends CodeSegment { @@ -14,6 +15,7 @@ @Override public void run() { + System.out.println("CheckMyName host index:" + DataSegment.getLocal().getDSindex("host")); if ("node0".equals(info.asString())) { new CreateWindow("local"); new NegotiateVNCServer();
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Tue Dec 15 16:50:15 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Thu Dec 17 17:16:07 2015 +0900 @@ -2,6 +2,7 @@ import java.util.ArrayList; +import alice.datasegment.DataSegment; import jp.ac.u_ryukyu.alicevnc.AliceVNCMessage.MessageType; import com.glavsoft.viewer.Viewer; @@ -21,6 +22,7 @@ @Override public void run() { + System.out.println("NegotiateVNCServer host index:" + DataSegment.getLocal().getDSindex("host")); AliceVNCConfig conf = info1.asClass(AliceVNCConfig.class); String hostname = info.asString();