Mercurial > hg > Applications > AliceVNC
changeset 80:c94436e90e9e
update Alice r:579
| author | Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 17 Dec 2015 21:29:44 +0900 |
| parents | 3a27a0727705 |
| children | a2cf391b8a34 |
| files | .gradle/2.2.1/taskArtifacts/cache.properties.lock .gradle/2.2.1/taskArtifacts/fileHashes.bin .gradle/2.2.1/taskArtifacts/fileSnapshots.bin .gradle/2.2.1/taskArtifacts/outputFileStates.bin .gradle/2.2.1/taskArtifacts/taskArtifacts.bin .idea/workspace.xml build.gradle src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java |
| diffstat | 9 files changed, 226 insertions(+), 72 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Thu Dec 17 17:16:07 2015 +0900 +++ b/.idea/workspace.xml Thu Dec 17 21:29:44 2015 +0900 @@ -2,16 +2,9 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="6ff93eeb-5bea-4f4e-b5b2-726d76c38fdc" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AliceVNC.iml" afterPath="$PROJECT_DIR$/AliceVNC.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/NegotiateVNCServer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.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" /> </list> <ignored path="AliceVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -46,14 +39,44 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="CheckMyName.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java"> + <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.41095892"> + <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.47445256"> - <caret line="17" column="85" selection-start-line="17" selection-start-column="85" selection-end-line="17" selection-end-column="85" /> + <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="TopologyNodeConfig.class" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNodeConfig.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-5.0"> + <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" /> + <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="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" /> <folding> - <element signature="e#315#316#0" expanded="true" /> - <element signature="e#350#351#0" expanded="true" /> + <element signature="e#681#682#0" expanded="true" /> + <element signature="e#710#711#0" expanded="true" /> </folding> </state> </provider> @@ -62,21 +85,18 @@ <file leaf-file-name="DataSegment.class" pinned="false" current-in-tab="false"> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-1.7407408"> - <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" /> - <folding> - <element signature="e#1628#1629#0" expanded="true" /> - <element signature="e#1668#1669#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="-2.2222223"> + <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" /> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="LocalDataSegmentManager.class" pinned="false" current-in-tab="false"> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class"> + <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="-2.2222223"> - <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> + <state vertical-scroll-proportion="0.0"> + <caret line="42" column="33" selection-start-line="42" selection-start-column="33" selection-end-line="42" selection-end-column="33" /> <folding /> </state> </provider> @@ -86,30 +106,37 @@ <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="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> + <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <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/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNode.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-8.333333"> + <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="DataSegmentKey.class" pinned="false" current-in-tab="false"> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegmentKey.class"> + <file leaf-file-name="AliceDaemon.class" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/daemon/AliceDaemon.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-8.333333"> - <caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" /> - <folding> - <element signature="e#4142#4143#0" expanded="true" /> - <element signature="e#4179#4180#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="-10.814815"> + <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> + <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"> + <file leaf-file-name="StartTopologyNode.class" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> + <state vertical-scroll-proportion="-5.814815"> + <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> <folding /> </state> </provider> @@ -285,6 +312,9 @@ <list> <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/AliceVNCConfig.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java" /> + <option value="$PROJECT_DIR$/build.gradle" /> </list> </option> </component> @@ -405,7 +435,7 @@ <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" /> <property name="settings.editor.splitter.proportion" value="0.2" /> </component> - <component name="RunManager"> + <component name="RunManager" selected="Application.StartLocal"> <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" /> @@ -650,6 +680,40 @@ <listeners /> <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 133.13.50.70 -p 23000 -host 10.0.2.199 -p 24000" /> + <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="StartLocal" 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 24000" /> + <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="2"> + <item index="0" class="java.lang.String" itemvalue="Application.StartAliceVNC" /> + <item index="1" class="java.lang.String" itemvalue="Application.StartLocal" /> + </list> </component> <component name="ShelveChangesManager" show_recycled="false" /> <component name="TaskManager"> @@ -672,23 +736,23 @@ <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.33" 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="false" 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="true" show_stripe_button="true" weight="0.32977098" 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.32977098" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="VcsContentAnnotationSettings"> @@ -698,18 +762,31 @@ <breakpoint-manager> <breakpoints> <line-breakpoint enabled="true" type="java-line"> - <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class</url> - <line>25</line> - <properties /> - </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class</url> <line>28</line> <properties /> <option name="timeStamp" value="1" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class</url> + <line>25</line> + <properties /> + <option name="timeStamp" value="4" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNode.class</url> + <line>19</line> + <properties /> + <option name="timeStamp" value="6" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-field"> + <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class</url> + <line>18</line> + <properties field="dataSegment" class="alice.datasegment.DataSegment" /> + <option name="timeStamp" value="2" /> + </line-breakpoint> </breakpoints> - <option name="time" value="2" /> + <option name="time" value="7" /> </breakpoint-manager> <watches-manager /> </component> @@ -742,10 +819,48 @@ </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="17" column="85" selection-start-line="17" selection-start-column="85" selection-end-line="17" selection-end-column="85" /> + <folding> + <element signature="e#315#316#0" expanded="false" /> + <element signature="e#350#351#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/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-5.259259"> + <caret line="27" column="11" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="11" /> + <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="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> + <caret line="25" column="14" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" /> + <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="15" column="16" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="32" /> + <folding> + <element signature="e#226#227#0" expanded="true" /> + <element signature="e#258#259#0" expanded="true" /> + </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="42" column="33" selection-start-line="42" selection-start-column="33" selection-end-line="42" selection-end-column="33" /> <folding /> </state> </provider> @@ -753,38 +868,75 @@ <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="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> + <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/daemon/AliceDaemon.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-10.814815"> + <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" 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/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/StartTopologyNode.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-5.814815"> + <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://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNode.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-8.333333"> + <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" 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/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/DataSegment.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-1.7407408"> - <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" /> + <state vertical-scroll-proportion="-2.2222223"> + <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" /> + <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="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" /> <folding> - <element signature="e#1628#1629#0" expanded="true" /> - <element signature="e#1668#1669#0" expanded="true" /> + <element signature="e#681#682#0" expanded="true" /> + <element signature="e#710#711#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/datasegment/LocalDataSegmentManager.class"> + <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="-2.2222223"> - <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> + <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$/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckMyName.java"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.glavsoft.viewer/tightvnc-jviewer/2.7.2/a3c4f58cab991c9f52649e287166cf6156e7fce/tightvnc-jviewer-2.7.2.jar!/alice/topology/node/TopologyNodeConfig.class"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.47445256"> - <caret line="17" column="85" selection-start-line="17" selection-start-column="85" selection-end-line="17" selection-end-column="85" /> - <folding> - <element signature="e#315#316#0" expanded="true" /> - <element signature="e#350#351#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="-5.0"> + <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/build.gradle"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.41095892"> + <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>
--- a/build.gradle Thu Dec 17 17:16:07 2015 +0900 +++ b/build.gradle Thu Dec 17 21:29:44 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/b2eb56ba6bc7/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/6d066093dda2/' } }
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java Thu Dec 17 17:16:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/AliceVNCConfig.java Thu Dec 17 21:29:44 2015 +0900 @@ -2,6 +2,8 @@ import alice.topology.node.TopologyNodeConfig; +import java.util.LinkedList; + public class AliceVNCConfig extends TopologyNodeConfig { private boolean change = true; private boolean debug = false;
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Thu Dec 17 17:16:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StartAliceVNC.java Thu Dec 17 21:29:44 2015 +0900 @@ -1,9 +1,11 @@ package jp.ac.u_ryukyu.alicevnc; import java.util.ArrayList; +import java.util.LinkedList; import alice.daemon.AliceDaemon; import alice.topology.node.TopologyNode; +import alice.topology.node.TopologyNodeConfig; /** * java -cp AliceVNC.jar alice.topology.manager.TopologyManager @@ -13,9 +15,8 @@ public static void main(String args[]){ AliceVNCConfig conf = new AliceVNCConfig(args); - AliceDaemon aliceDaemon = new AliceDaemon(conf); + AliceVNC cs = new AliceVNC(conf); - AliceVNC cs = new AliceVNC(conf); if (conf.debugMode()) { cs.ods.put("_CLIST", new ArrayList<String>()); cs.ods.put("host", "node0"); @@ -23,11 +24,10 @@ return; } - if (conf.getManagerHostName() ==null){ - conf.setManagerHostName("firefly.cr.ie.u-ryukyu.ac.jp"); - conf.setManagerPort(10000); + LinkedList<TopologyNodeConfig> topologyNodeConfigs = TopologyNodeConfig.MultiTopologyNodeCongingFactory(args); + for(TopologyNodeConfig config : topologyNodeConfigs){ + new TopologyNode(config, cs); } - new TopologyNode(conf, cs); } }