Mercurial > hg > Applications > AliceVNC
changeset 55:fe627049e289
update maven added compressed to DSM name
line wrap: on
line diff
--- a/.idea/gradle.xml Mon Nov 16 15:41:01 2015 +0900 +++ b/.idea/gradle.xml Mon Nov 16 20:06:13 2015 +0900 @@ -11,11 +11,6 @@ <option value="$PROJECT_DIR$" /> </set> </option> - <option name="myModules"> - <set> - <option value="$PROJECT_DIR$" /> - </set> - </option> </GradleProjectSettings> </option> </component>
--- a/.idea/workspace.xml Mon Nov 16 15:41:01 2015 +0900 +++ b/.idea/workspace.xml Mon Nov 16 20:06:13 2015 +0900 @@ -3,11 +3,32 @@ <component name="ChangeListManager"> <list default="true" id="2df74a32-7ed2-4925-b73f-da5fc4704494" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/libs/AliceVNC.jar" afterPath="$PROJECT_DIR$/build/libs/AliceVNC.jar" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckMyName.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/CheckMyName.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/CreateWindow.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/CreateWindow.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.class" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/StopProxy.class" afterPath="$PROJECT_DIR$/build/classes/main/jp/ac/u_ryukyu/alicevnc/StopProxy.class" /> + <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$/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/CreateWindow.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.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/ReceiveMeasurement.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> + <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/StopProxy.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="AliceVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -26,6 +47,9 @@ <component name="CreatePatchCommitExecutor"> <option name="PATCH_PATH" value="" /> </component> + <component name="DaemonCodeAnalyzer"> + <disable_hints /> + </component> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExternalProjectsManager"> <system id="GRADLE"> @@ -41,22 +65,22 @@ <favorites_list name="AliceVNC" /> </component> <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <leaf> <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"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="203" max-vertical-offset="930"> + <caret line="57" column="21" selection-start-line="57" selection-start-column="21" selection-end-line="57" selection-end-column="21" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="RenderAndControllerHolder.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/RenderAndControllerHolder.java"> + <file leaf-file-name="OutputDataSegment.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.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/codesegment/OutputDataSegment.class"> <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" /> + <state vertical-scroll-proportion="-12.08" vertical-offset="508" max-vertical-offset="1830"> + <caret line="62" column="17" selection-start-line="62" selection-start-column="17" selection-end-line="62" selection-end-column="17" /> <folding /> </state> </provider> @@ -65,9 +89,12 @@ <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="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" /> - <folding /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> + <caret line="13" column="38" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" /> + <folding> + <element signature="e#310#311#0" expanded="true" /> + <element signature="e#365#366#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -75,8 +102,20 @@ <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="0.0"> - <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="480"> + <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" /> + <folding> + <element signature="imports" expanded="false" /> + </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" vertical-offset="0" max-vertical-offset="600"> + <caret line="18" column="39" selection-start-line="18" selection-start-column="39" selection-end-line="18" selection-end-column="39" /> <folding /> </state> </provider> @@ -85,18 +124,8 @@ <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="0.0"> - <caret line="46" column="43" selection-start-line="46" selection-start-column="43" selection-end-line="46" selection-end-column="43" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ReceiveUpdateRectangle.java" pinned="false" current-in-tab="true"> - <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.8262108"> - <caret line="55" column="57" selection-start-line="55" selection-start-column="57" selection-end-line="55" selection-end-column="57" /> + <state vertical-scroll-proportion="0.0" vertical-offset="203" max-vertical-offset="930"> + <caret line="56" column="39" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="39" /> <folding /> </state> </provider> @@ -105,38 +134,38 @@ <file leaf-file-name="CreateWindow.java" pinned="false" current-in-tab="false"> <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="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855"> + <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> </file> - <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"> + <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.0"> - <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> + <state vertical-scroll-proportion="0.20157067" vertical-offset="73" max-vertical-offset="525"> + <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"> + <file leaf-file-name="ReceiveUpdateRectangle.java" pinned="false" current-in-tab="false"> + <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="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" /> + <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="1380"> + <caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" /> <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.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/topology/node/TopologyNode.class"> + <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="-3.8888888"> - <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" /> + <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="840"> + <caret line="25" column="34" selection-start-line="25" selection-start-column="34" selection-end-line="25" selection-end-column="34" /> <folding /> </state> </provider> @@ -411,11 +440,11 @@ </option> <option name="modificationStamps"> <map> - <entry key="$USER_HOME$/IdeaProjects/Alice" value="1446367970000" /> - <entry key="$USER_HOME$/IdeaProjects/Alice_old/Alice" value="1440142856000" /> <entry key="$PROJECT_DIR$" value="1446984750000" /> <entry key="$PROJECT_DIR$/../OldAliceVNC" value="1446365710000" /> <entry key="$PROJECT_DIR$/../tvnjviewer" value="1446981734000" /> + <entry key="$USER_HOME$/IdeaProjects/Alice" value="1446367970000" /> + <entry key="$USER_HOME$/IdeaProjects/Alice_old/Alice" value="1440142856000" /> </map> </option> <option name="projectBuildClasspath"> @@ -510,18 +539,18 @@ <option name="CHANGED_PATHS"> <list> <option value="$USER_HOME$/IdeaProjects/Alice/build/libs/Alice.jar!/alice/topology/node/TopologyNodeConfig.class" /> - <option value="$PROJECT_DIR$/build.gradle" /> + <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/AliceVNC.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/NegotiateVNCServer.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.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/StartAliceVNC.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.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/StopProxy.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.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/CreateWindow.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/AliceVNC.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> + <option value="$PROJECT_DIR$/build.gradle" /> </list> </option> </component> @@ -537,8 +566,8 @@ </component> <component name="ProjectFrameBounds"> <option name="y" value="23" /> - <option name="width" value="1920" /> - <option name="height" value="1177" /> + <option name="width" value="1280" /> + <option name="height" value="773" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -561,12 +590,10 @@ <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> - <manualOrder /> - <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scope" /> <pane id="PackagesPane" /> - <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -681,7 +708,7 @@ <property name="MemberChooser.sorted" value="false" /> <property name="MemberChooser.showClasses" value="true" /> <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/build.gradle" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../IdeaProjects/Alice/build.gradle" /> <property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.proportion" value="0.15" /> <property name="project.structure.side.proportion" value="0.2" /> @@ -693,6 +720,7 @@ <property name="dynamic.classpath" value="false" /> <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.repository.indices" /> <property name="settings.editor.splitter.proportion" value="0.2" /> + <property name="restartRequiresConfirmation" value="true" /> </component> <component name="RunManager" selected="Application.StartAliceVNC"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> @@ -701,33 +729,13 @@ <option name="PROGRAM_PARAMETERS" /> <method /> </configuration> - <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> + <configuration default="true" type="GroovyScriptRunConfiguration" factoryName="Groovy"> <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="" /> + <setting name="path" value="" /> + <setting name="vmparams" value="" /> + <setting name="params" value="" /> + <setting name="workDir" value="file://$PROJECT_DIR$" /> + <setting name="debug" value="false" /> <method /> </configuration> <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> @@ -749,38 +757,19 @@ <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" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> <method /> </configuration> - <configuration default="true" type="Application" factoryName="Application"> + <configuration default="true" type="JarApplication" factoryName="JAR Application"> <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" value="$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="" /> + <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/Alice.jar" /> <envs /> <method /> </configuration> @@ -800,48 +789,17 @@ </ExternalSystemSettings> <method /> </configuration> - <configuration default="true" type="GroovyScriptRunConfiguration" factoryName="Groovy"> + <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> - <setting name="path" value="" /> - <setting name="vmparams" value="" /> - <setting name="params" value="" /> - <setting name="workDir" value="file://$PROJECT_DIR$" /> - <setting name="debug" value="false" /> - <method /> - </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <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" /> + <option name="VM_PARAMETERS" /> <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" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> - <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" /> - <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/Alice.jar" /> - <envs /> - <method /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> <method /> </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> @@ -872,11 +830,67 @@ <listeners /> <method /> </configuration> + <configuration default="true" type="Application" factoryName="Application"> + <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" value="$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="" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="JUnit" factoryName="JUnit"> + <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" value="-ea" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> + <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="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" /> + <method /> + </configuration> <configuration default="false" name="StartAliceVNC" 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 syaony.st.ie.u-ryukyu.ac.jp -host `hostname` -level fatal -p 22000 " /> + <option name="PROGRAM_PARAMETERS" value="-host syaony.st.ie.u-ryukyu.ac.jp -level fatal -p 22000 " /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="1.8" /> @@ -985,61 +999,61 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1920" height="1177" extended-state="6" /> - <editor active="false" /> + <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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3258278" sideWeight="0.5" order="7" 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.3344538" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32532346" 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.3271523" 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.175" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1765625" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <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="4" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15526803" 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="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="Application Servers" 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="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="7" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26739427" 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" weight="0.33" sideWeight="0.5" order="2" 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" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292683" 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" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3271523" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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" weight="0.25" 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" weight="0.15526803" sideWeight="0.5" order="3" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3258278" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3344538" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27059773" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3740458" 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" weight="0.17596567" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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" weight="0.26739427" 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" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> - <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="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="4" side_tool="false" content_ui="tabs" /> - <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="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="8" side_tool="true" content_ui="tabs" /> - <window_info id="Application Servers" 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="10" side_tool="false" 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.3344538" sideWeight="0.5" order="5" 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.17731093" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <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="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="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" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="7" 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.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="12" 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="3" 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="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="9" 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.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28476822" sideWeight="0.5" order="11" 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.13805436" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2621951" 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="6" 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="4" side_tool="true" content_ui="tabs" /> + <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292683" sideWeight="0.5" order="7" 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" weight="0.25" 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" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13805436" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292683" 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" weight="0.17731093" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28476822" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2621951" 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" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292683" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3344538" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" 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" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout-to-restore> </component> <component name="Vcs.Log.UiProperties"> @@ -1053,6 +1067,11 @@ <component name="VcsContentAnnotationSettings"> <option name="myLimit" value="2678400000" /> </component> + <component name="VcsManagerConfiguration"> + <option name="myTodoPanelSettings"> + <TodoPanelSettings /> + </option> + </component> <component name="XDebuggerManager"> <breakpoint-manager> <breakpoints> @@ -1120,17 +1139,24 @@ <option name="FILTER_TARGETS" 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.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/topology/node/TopologyNode.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="345"> + <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" /> <folding /> </state> @@ -1138,7 +1164,7 @@ </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" /> <folding /> </state> @@ -1146,23 +1172,28 @@ </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.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="20" column="35" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" /> - <folding /> + <folding> + <element signature="e#310#311#0" expanded="true" /> + <element signature="e#365#366#0" expanded="true" /> + </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="47" column="43" selection-start-line="47" selection-start-column="43" selection-end-line="47" selection-end-column="43" /> <folding /> </state> @@ -1170,15 +1201,14 @@ </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/daemon/AliceDaemon.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="42" column="49" selection-start-line="42" selection-start-column="49" selection-end-line="42" selection-end-column="49" /> - <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" /> <folding /> </state> @@ -1186,7 +1216,7 @@ </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/daemon/IncomingTcpConnection.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="108" column="120" selection-start-line="108" selection-start-column="120" selection-end-line="108" selection-end-column="120" /> <folding /> </state> @@ -1194,7 +1224,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> @@ -1202,106 +1232,98 @@ </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ac5ec316dc973d87d99ed14e050b29ecae51475/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/Receiver.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.15422885"> + <state vertical-scroll-proportion="0.15422885" vertical-offset="0" max-vertical-offset="0"> <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ac5ec316dc973d87d99ed14e050b29ecae51475/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.6976744"> + <state vertical-scroll-proportion="0.6976744" vertical-offset="0" max-vertical-offset="0"> <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ac5ec316dc973d87d99ed14e050b29ecae51475/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/InputDataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.14925373"> + <state vertical-scroll-proportion="0.14925373" vertical-offset="0" max-vertical-offset="0"> <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ac5ec316dc973d87d99ed14e050b29ecae51475/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/CodeSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="33" column="24" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ac5ec316dc973d87d99ed14e050b29ecae51475/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/ReceiveData.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.14925373"> + <state vertical-scroll-proportion="0.14925373" vertical-offset="0" max-vertical-offset="0"> <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/5ac5ec316dc973d87d99ed14e050b29ecae51475/tightvnc-jviewer-2.7.2.jar!/alice/codesegment/OutputDataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/fb143fb7224d414525ee612537beb40b7d3f81da/tightvnc-jviewer-2.7.3.jar!/alice/codesegment/InputDataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="65" column="26" selection-start-line="65" selection-start-column="26" selection-end-line="65" selection-end-column="26" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/2f429e3a4c3c8b9d276649efc4d141e6221daf74/Alice-1.1.jar!/alice/codesegment/InputDataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-17.4"> + <state vertical-scroll-proportion="-17.4" vertical-offset="0" max-vertical-offset="0"> <caret line="67" column="27" selection-start-line="67" selection-start-column="12" selection-end-line="67" selection-end-column="27" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/2f429e3a4c3c8b9d276649efc4d141e6221daf74/Alice-1.1.jar!/alice/datasegment/Receiver.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.6367521"> + <state vertical-scroll-proportion="0.6367521" vertical-offset="0" max-vertical-offset="0"> <caret line="37" column="25" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="25" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/2f429e3a4c3c8b9d276649efc4d141e6221daf74/Alice-1.1.jar!/alice/datasegment/LocalDataSegmentManager.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.12820514"> + <state vertical-scroll-proportion="0.12820514" vertical-offset="0" max-vertical-offset="0"> <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build.gradle"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="21" column="32" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" /> - </state> - </provider> - </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/c3f69116069d58299466ebb3362a1e6c260eb8a0/Alice-1.1.jar!/alice/daemon/AliceDaemon.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.1278409"> + <state vertical-scroll-proportion="0.1278409" vertical-offset="0" max-vertical-offset="0"> <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cr.ie.u_ryukyu.ac.jp/Alice/1.1/2f429e3a4c3c8b9d276649efc4d141e6221daf74/Alice-1.1.jar!/alice/daemon/AliceDaemon.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-16.8"> + <state vertical-scroll-proportion="-16.8" vertical-offset="0" max-vertical-offset="0"> <caret line="62" column="9" selection-start-line="62" selection-start-column="9" selection-end-line="62" 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.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/daemon/AliceDaemon.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="42" column="49" selection-start-line="42" selection-start-column="49" selection-end-line="42" selection-end-column="49" /> - <folding /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/daemon/IncomingTcpConnection.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="108" column="120" selection-start-line="108" selection-start-column="120" selection-end-line="108" selection-end-column="120" /> <folding /> </state> @@ -1309,47 +1331,42 @@ </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/com/glavsoft/core/SettingsChangedEvent.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.05842259"> + <state vertical-scroll-proportion="0.05842259" vertical-offset="0" max-vertical-offset="0"> <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> - <folding /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/com/glavsoft/rfb/protocol/ReceiverTask.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-0.7010711"> + <state vertical-scroll-proportion="-0.7010711" vertical-offset="0" max-vertical-offset="0"> <caret line="67" column="23" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" /> - <folding /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/jp/ac/u_ryukyu/ie/cr/DecodeInfomation.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-21.925926"> + <state vertical-scroll-proportion="-21.925926" vertical-offset="0" max-vertical-offset="0"> <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" 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.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/javassist/ClassPoolTail.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-3.3333333"> + <state vertical-scroll-proportion="-3.3333333" vertical-offset="0" max-vertical-offset="0"> <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" /> - <folding /> </state> </provider> </entry> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/javassist/ClassPathList.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-3.3333333"> + <state vertical-scroll-proportion="-3.3333333" vertical-offset="0" max-vertical-offset="0"> <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="23" column="41" selection-start-line="23" selection-start-column="41" selection-end-line="23" selection-end-column="41" /> <folding /> </state> @@ -1357,135 +1374,173 @@ </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="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/NegotiateVNCServer.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/MyMessageQueue.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="35" column="11" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="11" /> - <folding /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNC.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/RenderAndControllerHolder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="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/AliceVNCConfig.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.2200903"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510"> <caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/topology/node/TopologyNode.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.14957266" vertical-offset="0" max-vertical-offset="702"> + <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/StartAliceVNC.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.1523702"> - <caret line="14" column="49" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540"> + <caret line="30" column="19" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" /> + <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" vertical-offset="0" max-vertical-offset="0"> + <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/MyMessageQueue.java"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/datasegment/Receiver.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> + <state vertical-scroll-proportion="0.43019944" vertical-offset="628" max-vertical-offset="1530"> + <caret line="71" column="16" selection-start-line="71" selection-start-column="16" selection-end-line="71" selection-end-column="16" /> + <folding> + <element signature="e#1917#1918#0" expanded="true" /> + <element signature="e#1952#1953#0" expanded="true" /> + </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" vertical-offset="0" max-vertical-offset="705"> + <caret line="21" column="39" selection-start-line="21" selection-start-column="39" selection-end-line="21" selection-end-column="39" /> + <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" vertical-offset="390" max-vertical-offset="1380"> + <caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" /> <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="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="480"> + <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" /> + <folding> + <element signature="imports" expanded="false" /> + </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" vertical-offset="0" max-vertical-offset="600"> + <caret line="18" column="39" selection-start-line="18" selection-start-column="39" selection-end-line="18" selection-end-column="39" /> + <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.0" vertical-offset="0" max-vertical-offset="390"> + <caret line="13" column="38" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" /> + <folding> + <element signature="e#310#311#0" expanded="true" /> + <element signature="e#365#366#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.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/codesegment/CodeSegment.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.53418803" vertical-offset="0" max-vertical-offset="702"> + <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" /> <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="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/RenderAndControllerHolder.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" /> + <state vertical-scroll-proportion="0.0" vertical-offset="203" max-vertical-offset="930"> + <caret line="57" column="21" selection-start-line="57" selection-start-column="21" selection-end-line="57" selection-end-column="21" /> <folding /> </state> </provider> </entry> - <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="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/topology/node/TopologyNode.class"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.3/2b5a1f571897023d87515ddf2d2719ea69043b0c/tightvnc-jviewer-2.7.3.jar!/alice/codesegment/OutputDataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-3.8888888"> - <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/StopProxy.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" /> + <state vertical-scroll-proportion="-12.08" vertical-offset="508" max-vertical-offset="1830"> + <caret line="62" column="17" selection-start-line="62" selection-start-column="17" selection-end-line="62" selection-end-column="17" /> <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="46" column="43" selection-start-line="46" selection-start-column="43" selection-end-line="46" selection-end-column="43" /> + <state vertical-scroll-proportion="0.0" vertical-offset="203" max-vertical-offset="930"> + <caret line="56" column="39" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="39" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java"> + <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="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="840"> + <caret line="25" column="34" selection-start-line="25" selection-start-column="34" selection-end-line="25" selection-end-column="34" /> <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="64" column="0" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855"> + <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="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java"> + <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.8262108"> - <caret line="55" column="57" selection-start-line="55" selection-start-column="57" selection-end-line="55" selection-end-column="57" /> + <state vertical-scroll-proportion="0.20157067" vertical-offset="73" max-vertical-offset="525"> + <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> </component> <component name="hg4idea.settings"> - <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" /> + <option name="CHECK_INCOMING_OUTGOING" value="true" /> </component> <component name="masterDetails"> <states>
--- a/build.gradle Mon Nov 16 15:41:01 2015 +0900 +++ b/build.gradle Mon Nov 16 20:06:13 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/23130e4d6e71/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/276fc89ee8e4/' } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java Mon Nov 16 20:06:13 2015 +0900 @@ -13,7 +13,7 @@ private AliceVNCMessage order; public CheckCurrentInfo(AliceVNCMessage order){ - info.setKey("currentServer"); + info.setKey("compressedLocal","currentServer"); this.order = order; } @@ -23,13 +23,13 @@ if (order.name.equals(current.name)) { // need check route and node name - ods.update("currentServer", current); + ods.update("compressedcurrentServer", current); } else { if (current.allowChange) { // send Stop message to current current.messageID = MessageType.StopProxy.getId(); String address = current.getNextAddress(); - ods.put(address, "AliceVNCMessage", current); + ods.put("compressed" + address, "AliceVNCMessage", current); AliceVNCMessage mes = new AliceVNCMessage(MessageType.StartNegotiate); mes.route = new ArrayList<String>(); @@ -38,13 +38,13 @@ } mes.name = "node0"; address = mes.getNextAddress(); - ods.put(address, "AliceVNCMessage", mes); + ods.put("compressed" + address, "AliceVNCMessage", mes); } else { // not allow to change order.messageID = MessageType.DeniedRequest.getId(); order.name = "node0"; String address = order.getNextAddress(); - ods.put(address, "AliceVNCMessage", order); + ods.put("compressed" + address, "AliceVNCMessage", order); // update current server info ods.update("currentServer", current);
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java Mon Nov 16 20:06:13 2015 +0900 @@ -9,7 +9,7 @@ private Receiver info = ids.create(CommandType.PEEK); public CheckMyName(){ - info.setKey("host"); + info.setKey("compressedLocal", "host"); } @Override
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CreateWindow.java Mon Nov 16 20:06:13 2015 +0900 @@ -48,7 +48,7 @@ width = message.width; height = message.height; name = message.name; - ods.update("initMessage", message); + ods.update("compressedinitMessage", message); context.setPixelFormat(pixelFormat); context.setFbWidth(width);
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java Mon Nov 16 20:06:13 2015 +0900 @@ -15,8 +15,8 @@ private Receiver info1 = ids.create(CommandType.PEEK); public NegotiateVNCServer(){ - info.setKey("host"); - info1.setKey("AliceVNCConfig"); + info.setKey("compressedLocal","host"); + info1.setKey("compressedLocal","AliceVNCConfig"); } @Override
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveAliceVNCMessage.java Mon Nov 16 20:06:13 2015 +0900 @@ -12,8 +12,8 @@ private Receiver info1 = ids.create(CommandType.PEEK); // connection list public ReceiveAliceVNCMessage() { - info.setKey("AliceVNCMessage"); - info1.setKey("_CLIST"); + info.setKey("compressedLocal","AliceVNCMessage"); + info1.setKey("compressedLocal","_CLIST"); } @Override @@ -26,7 +26,7 @@ order.messageID == MessageType.CurrentVNCInfo.getId()) { if (clist.contains("parent")){ order.route.add(info.from); - ods.put("parent", "AliceVNCMessage", order); + ods.put("compressedparent", "AliceVNCMessage", order); new ReceiveAliceVNCMessage(); } else { // this node is root. order.route.add(info.from); @@ -54,7 +54,7 @@ } } else { String address = order.getNextAddress(); - ods.put(address, "AliceVNCMessage", order); + ods.put("compressed" + address, "AliceVNCMessage", order); new ReceiveAliceVNCMessage(); } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Mon Nov 16 20:06:13 2015 +0900 @@ -20,9 +20,9 @@ private Receiver info2 = ids.create(CommandType.PEEK); public ReceiveMeasurement() { - info.setKey("measurement"); - info1.setKey("_CLIST"); - info2.setKey("AliceVNCConfig"); + info.setKey("compressedLocal","measurement"); + info1.setKey("compressedLocal","_CLIST"); + info2.setKey("compressedLocal","AliceVNCConfig"); } @SuppressWarnings("unchecked")
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Mon Nov 16 20:06:13 2015 +0900 @@ -23,10 +23,10 @@ private Receiver info3 = ids.create(CommandType.PEEK); public ReceiveUpdateRectangle(){ - info.setKey("holder"); - info1.setKey("updateRectangle"); - info2.setKey("pixelData"); - info3.setKey("_CLIST"); + info.setKey("compressedLocal","holder"); + info1.setKey("compressedLocal","updateRectangle"); + info2.setKey("compressedLocal","pixelData"); + info3.setKey("compressedLocal","_CLIST"); } @SuppressWarnings("unchecked")
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/SendChangeRequest.java Mon Nov 16 20:06:13 2015 +0900 @@ -16,10 +16,10 @@ private Receiver info3 = ids.create(CommandType.TAKE); // request public SendChangeRequest(){ - info.setKey("host"); - info1.setKey("_CLIST"); - info2.setKey("AliceVNCConfig"); - info3.setKey("Request"); + info.setKey("compressedLocal","host"); + info1.setKey("compressedLocal","_CLIST"); + info2.setKey("compressedLocal","AliceVNCConfig"); + info3.setKey("compressedLocal","Request"); } @Override @@ -40,7 +40,7 @@ address = "parent"; } - ods.put(address, "AliceVNCMessage", mes); + ods.put("compressed" + address, "AliceVNCMessage", mes); new SendChangeRequest(); }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Mon Nov 16 15:41:01 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java Mon Nov 16 20:06:13 2015 +0900 @@ -11,7 +11,7 @@ private Receiver info = ids.create(CommandType.TAKE); public StopProxy() { - info.setKey("viewer"); + info.setKey("compressedLocal","viewer"); } @Override public void run() {