Mercurial > hg > Applications > AliceVNC
changeset 86:4a8755a30aa8 default tip
add topology manager number to 'host' key
| author | Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 10 Feb 2016 22:54:46 +0900 |
| parents | e9005f975703 |
| children | |
| files | .idea/workspace.xml build.gradle src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java |
| diffstat | 10 files changed, 575 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Sat Jan 30 21:12:23 2016 +0900 +++ b/.idea/workspace.xml Wed Feb 10 22:54:46 2016 +0900 @@ -2,16 +2,16 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="218b4a07-8dd8-40d3-9d55-74fbbfe96f52" 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/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/AliceVNC.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java" /> + <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" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java" /> </list> <ignored path="AliceVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -46,41 +46,101 @@ </component> <component name="FileEditorManager"> <leaf> + <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/build.gradle"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.3649635"> + <caret line="10" column="75" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="StartAliceVNC.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> + <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AliceVNCConfig.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" /> + <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="17" column="22" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TopologyNode.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/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNode.class"> + <file leaf-file-name="ReceiveAliceVNCMessage.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-7.851852"> - <caret line="27" column="16" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="16" /> + <state vertical-scroll-proportion="0.0"> + <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="StopProxy.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StartTopologyNode.class" pinned="false" current-in-tab="true"> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class"> + <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.67159766"> - <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" /> + <state vertical-scroll-proportion="0.0"> + <caret line="47" column="18" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="18" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConfigurationFinish.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/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/ConfigurationFinish.class"> + <file leaf-file-name="AliceVNC.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CheckMyName.java" pinned="false" current-in-tab="false"> + <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="-3.6296296"> - <caret line="36" column="43" selection-start-line="36" selection-start-column="43" selection-end-line="36" selection-end-column="43" /> + <state vertical-scroll-proportion="0.0"> + <caret line="29" column="45" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CheckCurrentInfo.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" /> <folding /> </state> </provider> @@ -251,6 +311,21 @@ </map> </option> </component> + <component name="IdeDocumentHistory"> + <option name="CHANGED_PATHS"> + <list> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java" /> + <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/CheckCurrentInfo.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java" /> + <option value="$PROJECT_DIR$/build.gradle" /> + </list> + </option> + </component> <component name="MavenImportPreferences"> <option name="generalSettings"> <MavenGeneralSettings> @@ -350,13 +425,72 @@ <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" /> <property name="settings.editor.splitter.proportion" value="0.2" /> </component> - <component name="RunManager" selected="Application.firefly"> + <component name="RunManager" selected="Application.both"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <module name="" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> <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" /> @@ -380,6 +514,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="" /> @@ -401,6 +551,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" /> @@ -437,6 +642,34 @@ <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> <configuration default="false" name="firefly" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" value="jp.ac.u_ryukyu.alicevnc.StartAliceVNC" /> @@ -452,11 +685,46 @@ <envs /> <method /> </configuration> - <list size="1"> + <configuration default="false" name="local" type="Application" factoryName="Application"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" value="jp.ac.u_ryukyu.alicevnc.StartAliceVNC" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="-host 10.0.2.199 -p 25000 " /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <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="AliceVNC" /> + <envs /> + <method /> + </configuration> + <configuration default="false" name="both" type="Application" factoryName="Application"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" value="jp.ac.u_ryukyu.alicevnc.StartAliceVNC" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="-host 133.13.50.70 -p 23000 -host 10.0.2.199 -p 25000 " /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <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="AliceVNC" /> + <envs /> + <method /> + </configuration> + <list size="3"> <item index="0" class="java.lang.String" itemvalue="Application.firefly" /> + <item index="1" class="java.lang.String" itemvalue="Application.local" /> + <item index="2" class="java.lang.String" itemvalue="Application.both" /> </list> </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="218b4a07-8dd8-40d3-9d55-74fbbfe96f52" name="Default" comment="" /> @@ -477,50 +745,80 @@ <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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977098" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" 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="2" 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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959612" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <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="false" show_stripe_button="true" weight="0.26412213" 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="-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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" 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.23816794" sideWeight="0.5" order="3" side_tool="false" 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="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="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" /> </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> <breakpoints> + <line-breakpoint type="java-line"> + <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/IncomingReverseKey.class</url> + <line>22</line> + <properties /> + <option name="timeStamp" value="12" /> + </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/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class</url> <line>54</line> <properties /> + <option name="timeStamp" value="31" /> </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/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/ConfigurationFinish.class</url> - <line>31</line> + <line>32</line> <properties /> - <option name="timeStamp" value="1" /> + <option name="timeStamp" value="32" /> + </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/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/Start.class</url> + <line>25</line> + <properties /> + <option name="timeStamp" value="33" /> </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/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/ConfigurationFinish.class</url> - <line>36</line> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java</url> + <line>19</line> <properties /> - <option name="timeStamp" value="3" /> + <option name="timeStamp" value="34" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java</url> + <line>22</line> + <properties /> + <option name="timeStamp" value="35" /> </line-breakpoint> </breakpoints> - <option name="time" value="4" /> + <breakpoints-dialog> + <breakpoints-dialog /> + </breakpoints-dialog> + <option name="time" value="36" /> </breakpoint-manager> <watches-manager /> </component> @@ -534,18 +832,160 @@ <option name="showOnlyWarnings" value="false" /> </component> <component name="editorHistoryManager"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/IncomingConnectionInfo.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-4.148148"> + <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_60.jdk/Contents/Home/src.zip!/java/util/concurrent/atomic/AtomicInteger.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.33150685"> + <caret line="193" column="21" selection-start-line="193" selection-start-column="21" selection-end-line="193" selection-end-column="21" /> + <folding> + <element signature="e#4946#4947#0" expanded="false" /> + <element signature="e#5015#5016#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/IncomingAbstractHostName.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-9.444445"> + <caret line="23" column="44" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/IncomingReverseKey.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-6.148148"> + <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/CodeSegmentManager.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-4.148148"> + <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/InputDataSegment.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-5.5555553"> + <caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/Receiver.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-2.7777777"> + <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" /> + <folding /> + </state> + </provider> + </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNode.class"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-7.851852"> - <caret line="27" column="16" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="16" /> + <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="49" column="17" selection-start-line="49" selection-start-column="17" selection-end-line="49" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/CodeSegment.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-4.148148"> + <caret line="15" column="43" selection-start-line="15" selection-start-column="43" selection-end-line="15" selection-end-column="43" /> + <folding> + <element signature="e#637#638#0" expanded="true" /> + <element signature="e#671#672#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/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/OutputDataSegment.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-2.2222223"> + <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/MeasurementData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" /> + <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.0"> + <caret line="30" column="47" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="47" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-9.740741"> + <caret line="54" column="0" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" /> <folding /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/ConfigurationFinish.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-3.6296296"> - <caret line="36" column="43" selection-start-line="36" selection-start-column="43" selection-end-line="36" selection-end-column="43" /> + <state vertical-scroll-proportion="-4.4814816"> + <caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/Start.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-7.3703704"> + <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" /> <folding /> </state> </provider> @@ -553,15 +993,63 @@ <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> + <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" /> + <folding /> + </state> + </provider> + </entry> + <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="47" column="18" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="18" /> + <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="17" column="22" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" /> + <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.0"> + <caret line="29" column="45" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" /> <folding /> </state> </provider> </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/8fc1e66b8d0d0e4c58243d713460a1f09d34574f/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.67159766"> - <caret line="55" column="15" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" /> + <state vertical-scroll-proportion="0.0"> + <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/build.gradle"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.3649635"> + <caret line="10" column="75" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" /> <folding /> </state> </provider>
--- a/build.gradle Sat Jan 30 21:12:23 2016 +0900 +++ b/build.gradle Wed Feb 10 22:54:46 2016 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/e0be473562ca/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/6b7a96002adf/' } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java Wed Feb 10 22:54:46 2016 +0900 @@ -5,17 +5,19 @@ public class AliceVNC extends CodeSegment { + private int topMNumber; private AliceVNCConfig conf; - public AliceVNC(AliceVNCConfig conf) { + public AliceVNC(AliceVNCConfig conf, int topMNumber) { this.conf = conf; + this.topMNumber = topMNumber; } public void run() { System.out.println(); ods.put("AliceVNCConfig", conf); new ReceiveMeasurement(); - new CheckMyName(); + new CheckMyName(topMNumber); }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Wed Feb 10 22:54:46 2016 +0900 @@ -11,8 +11,10 @@ private Receiver info = ids.create(CommandType.TAKE); // current Server Info private AliceVNCMessage order; + private int topMNumber; - public CheckCurrentInfo(AliceVNCMessage order){ + public CheckCurrentInfo(AliceVNCMessage order, int topMNumber){ + this.topMNumber = topMNumber; info.setKey("currentServer"); this.order = order; } @@ -50,6 +52,6 @@ ods.update("currentServer", current); } } - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Wed Feb 10 22:54:46 2016 +0900 @@ -7,24 +7,28 @@ public class CheckMyName extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.PEEK); - public CheckMyName(){ - info.setKey("host"); + public CheckMyName(int topMNumber){ + this.topMNumber = topMNumber; + for (int i = 1; i <= topMNumber; i++) { + info.setKey("host"+i); + } } @Override public void run() { - System.out.println("CheckMyName host index:" + DataSegment.getLocal().getDSindex("host")); + //System.out.println("CheckMyName host index:" + DataSegment.getLocal().getDSindex("host")); if ("node0".equals(info.asString())) { new CreateWindow("local"); - new NegotiateVNCServer(); + new NegotiateVNCServer(topMNumber); } else { new CreateWindow("parent"); } - new ReceiveAliceVNCMessage(); - new SendChangeRequest(); + new ReceiveAliceVNCMessage(topMNumber); + new SendChangeRequest(topMNumber); } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Wed Feb 10 22:54:46 2016 +0900 @@ -15,14 +15,16 @@ private Receiver info = ids.create(CommandType.PEEK); private Receiver info1 = ids.create(CommandType.PEEK); - public NegotiateVNCServer(){ - info.setKey("host"); + public NegotiateVNCServer(int topMNumber){ + for (int i = 1; i <= topMNumber; i++) { + info.setKey("host"+i); + } info1.setKey("AliceVNCConfig"); } @Override public void run() { - System.out.println("NegotiateVNCServer host index:" + DataSegment.getLocal().getDSindex("host")); + //System.out.println("NegotiateVNCServer host index:" + DataSegment.getLocal().getDSindex("host")); AliceVNCConfig conf = info1.asClass(AliceVNCConfig.class); String hostname = info.asString();
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Wed Feb 10 22:54:46 2016 +0900 @@ -8,10 +8,12 @@ import alice.datasegment.Receiver; public class ReceiveAliceVNCMessage extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.TAKE); private Receiver info1 = ids.create(CommandType.PEEK); // connection list - public ReceiveAliceVNCMessage() { + public ReceiveAliceVNCMessage(int topMNumber) { + this.topMNumber = topMNumber; info.setKey("AliceVNCMessage"); info1.setKey("_CLIST"); } @@ -27,14 +29,14 @@ if (clist.contains("parent")){ order.route.add(info.from); ods.put("parent", "AliceVNCMessage", order); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } else { // this node is root. order.route.add(info.from); if (order.messageID == MessageType.CurrentVNCInfo.getId()) { ods.put("currentServer", order); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } else { - new CheckCurrentInfo(order); // check change Server flag. + new CheckCurrentInfo(order, topMNumber); // check change Server flag. } } } else if (order.messageID == MessageType.StartNegotiate.getId()|| @@ -45,17 +47,17 @@ if (order.messageID == MessageType.StartNegotiate.getId()){ // negotiate VNCServer by Viewer ods.put("vncRight", true); - new NegotiateVNCServer(); - new ReceiveAliceVNCMessage(); + new NegotiateVNCServer(topMNumber); + new ReceiveAliceVNCMessage(topMNumber); } else if(order.messageID == MessageType.StopProxy.getId()) { - new StopProxy(); + new StopProxy(topMNumber); } else if (order.messageID == MessageType.DeniedRequest.getId()) { // pop up window or message } } else { String address = order.getNextAddress(); ods.put(address, "AliceVNCMessage", order); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Wed Feb 10 22:54:46 2016 +0900 @@ -10,13 +10,17 @@ public class SendChangeRequest extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.PEEK); // hostName private Receiver info1 = ids.create(CommandType.PEEK); // connection list private Receiver info2 = ids.create(CommandType.PEEK); // AliceVNCConfig private Receiver info3 = ids.create(CommandType.TAKE); // request - public SendChangeRequest(){ - info.setKey("host"); + public SendChangeRequest(int topMNumber){ + this.topMNumber = topMNumber; + for (int i = 1; i <= topMNumber; i++) { + info.setKey("host"+i); + } info1.setKey("_CLIST"); info2.setKey("AliceVNCConfig"); info3.setKey("Request"); @@ -41,7 +45,7 @@ } ods.put(address, "AliceVNCMessage", mes); - new SendChangeRequest(); + new SendChangeRequest(topMNumber); } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Wed Feb 10 22:54:46 2016 +0900 @@ -14,17 +14,17 @@ public class StartAliceVNC { public static void main(String args[]){ AliceVNCConfig conf = new AliceVNCConfig(args); + LinkedList<TopologyNodeConfig> topologyNodeConfigs = new TopologyNodeConfig().MultiTopologyNodeCongingFactory(args); - AliceVNC cs = new AliceVNC(conf); + AliceVNC cs = new AliceVNC(conf, topologyNodeConfigs.size()); if (conf.debugMode()) { cs.ods.put("_CLIST", new ArrayList<String>()); - cs.ods.put("host", "node0"); + //cs.ods.put("host", "node0"); cs.execute(); return; } - LinkedList<TopologyNodeConfig> topologyNodeConfigs = new TopologyNodeConfig().MultiTopologyNodeCongingFactory(args); new TopologyNode(topologyNodeConfigs, cs); }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Sat Jan 30 21:12:23 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Wed Feb 10 22:54:46 2016 +0900 @@ -8,9 +8,11 @@ public class StopProxy extends CodeSegment { + private int topMNumber; private Receiver info = ids.create(CommandType.TAKE); - public StopProxy() { + public StopProxy(int topMNumber) { + this.topMNumber = topMNumber; info.setKey("viewer"); } @Override @@ -18,7 +20,7 @@ System.out.println("call clean up session"); Viewer v = info.asClass(Viewer.class); v.closeApp(); - new ReceiveAliceVNCMessage(); + new ReceiveAliceVNCMessage(topMNumber); } }