Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 434:aad75cd6d9e2
Multicast joins both ipv4 and ipv6 now.
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sat, 11 Jun 2016 22:42:58 +0900 |
| parents | ff7fa81f3616 |
| children | 4ac83ab4be81 |
| files | .idea/gradle.xml .idea/workspace.xml src/main/java/com/glavsoft/rfb/protocol/state/InitState.java src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java |
| diffstat | 8 files changed, 566 insertions(+), 315 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/gradle.xml Fri Jun 10 19:58:59 2016 +0900 +++ b/.idea/gradle.xml Sat Jun 11 22:42:58 2016 +0900 @@ -12,11 +12,6 @@ <option value="$PROJECT_DIR$" /> </set> </option> - <option name="myModules"> - <set> - <option value="$PROJECT_DIR$" /> - </set> - </option> </GradleProjectSettings> </option> </component>
--- a/.idea/workspace.xml Fri Jun 10 19:58:59 2016 +0900 +++ b/.idea/workspace.xml Sat Jun 11 22:42:58 2016 +0900 @@ -2,9 +2,14 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="8c014d34-63b7-4e87-8d9c-e9f73c2c3803" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -42,21 +47,11 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-14.156863"> - <caret line="827" column="34" selection-start-line="827" selection-start-column="34" selection-end-line="827" selection-end-column="34" /> + <state vertical-scroll-proportion="0.0"> + <caret line="454" column="0" selection-start-line="454" selection-start-column="0" selection-end-line="454" selection-end-column="0" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -64,84 +59,101 @@ </provider> </entry> </file> - <file leaf-file-name="ViewerInterface.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" /> + <caret line="106" column="0" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" /> + <folding> + <element signature="e#1969#1970#0" expanded="true" /> + <element signature="e#1993#1994#0" expanded="true" /> + <element signature="e#2946#2947#0" expanded="true" /> + <element signature="e#2972#2973#0" expanded="true" /> + <element signature="e#3000#3001#0" expanded="true" /> + <element signature="e#3018#3019#0" expanded="true" /> + <element signature="e#4541#4542#0" expanded="true" /> + <element signature="e#4569#4570#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeVncCommand.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Todo.txt" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Todo.txt"> + <file leaf-file-name="TreeVncProtocol.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="0" column="33" selection-start-line="0" selection-start-column="33" selection-end-line="0" selection-end-column="33" /> + <caret line="83" column="37" selection-start-line="83" selection-start-column="37" selection-end-line="83" selection-end-column="37" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.3446635"> - <caret line="1022" column="44" selection-start-line="1022" selection-start-column="44" selection-end-line="1022" selection-end-column="44" /> + <state vertical-scroll-proportion="0.0"> + <caret line="1034" column="91" selection-start-line="1034" selection-start-column="91" selection-end-line="1034" selection-end-column="91" /> <folding> - <element signature="e#14143#14397#0" expanded="true" /> - <element signature="e#14396#14397#0" expanded="true" /> - <element signature="e#34754#35093#0" expanded="true" /> - <element signature="e#35092#35093#0" expanded="true" /> - <element signature="e#35708#36105#0" expanded="true" /> - <element signature="e#36104#36105#0" expanded="true" /> - <element signature="e#41200#41494#0" expanded="true" /> - <element signature="e#41493#41494#0" expanded="true" /> - <element signature="e#44522#44523#0" expanded="true" /> - <element signature="e#44557#44558#0" expanded="true" /> - <element signature="e#45081#45082#0" expanded="true" /> - <element signature="e#45114#45115#0" expanded="true" /> + <element signature="e#0#45566#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="UiSettings.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> + <file leaf-file-name="FindRoot.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" /> + <caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> + <folding> + <element signature="e#2138#2139#0" expanded="true" /> + <element signature="e#2189#2190#0" expanded="true" /> + <element signature="e#4339#4340#0" expanded="true" /> + <element signature="e#4370#4371#0" expanded="true" /> + <element signature="e#4406#4407#0" expanded="true" /> + <element signature="e#4453#4454#0" expanded="true" /> + <element signature="e#4489#4490#0" expanded="true" /> + <element signature="e#4521#4522#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeRootFinderListener.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.9076043"> + <caret line="81" column="23" selection-start-line="81" selection-start-column="23" selection-end-line="81" selection-end-column="23" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <file leaf-file-name="InitState.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="192" column="37" selection-start-line="192" selection-start-column="37" selection-end-line="192" selection-end-column="37" /> + <caret line="33" column="2" selection-start-line="33" selection-start-column="2" selection-end-line="33" selection-end-column="2" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <file leaf-file-name="CreateConnectionParam.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="174" column="27" selection-start-line="174" selection-start-column="27" selection-end-line="174" selection-end-column="27" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="333" column="41" selection-start-line="333" selection-start-column="41" selection-end-line="333" selection-end-column="41" /> + <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" /> <folding /> </state> </provider> @@ -453,6 +465,11 @@ <option value="$PROJECT_DIR$/Todo.txt" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java" /> </list> </option> </component> @@ -463,11 +480,14 @@ </MavenGeneralSettings> </option> </component> + <component name="NamedScopeManager"> + <order /> + </component> <component name="ProjectFrameBounds"> - <option name="x" value="4" /> - <option name="y" value="23" /> - <option name="width" value="3836" /> - <option name="height" value="2137" /> + <option name="x" value="365" /> + <option name="y" value="256" /> + <option name="width" value="2050" /> + <option name="height" value="1324" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -490,13 +510,8 @@ <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> - <manualOrder /> - <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scope" /> - <pane id="Scratches" /> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -655,8 +670,113 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="glavsoft" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="rfb" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="glavsoft" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="rfb" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="protocol" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="glavsoft" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="rfb" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="protocol" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="state" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </pane> + <pane id="Scratches" /> + <pane id="PackagesPane" /> + <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -669,6 +789,14 @@ <property name="settings.editor.selected.configurable" value="preferences.keymap" /> <property name="settings.editor.splitter.proportion" value="0.2" /> <property name="SearchEverywhereHistoryKey" value="fit	PSI	JAVA://com.glavsoft.viewer.swing.SwingViewerWindow#fitScreen" /> + <property name="recentsLimit" value="5" /> + <property name="FullScreen" value="false" /> + </component> + <component name="RecentsManager"> + <key name="MoveMembersDialog.RECENTS_KEY"> + <recent name="jp.ac.u_ryukyu.treevnc.TreeRootFinderListener" /> + <recent name="jp.ac.u_ryukyu.treevnc.FindRoot" /> + </key> </component> <component name="RunManager" selected="Application.TreeVNC -d"> <configuration default="false" name="TreeViewer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> @@ -734,15 +862,6 @@ <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> - <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> - <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> - <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> - <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> - <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> - <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> - <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> - <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> <method /> </configuration> <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> @@ -764,15 +883,6 @@ <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"> @@ -835,61 +945,11 @@ <patterns /> <method /> </configuration> - <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <patterns /> - <method /> - </configuration> <configuration default="true" type="JarApplication" factoryName="JAR Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <envs /> <method /> </configuration> - <configuration default="true" type="Java Scratch" factoryName="Java Scratch"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="SCRATCH_FILE_ID" value="0" /> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> - <envs /> - <method /> - </configuration> - <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="TreeVNC" /> - <envs /> - <method /> - </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -926,34 +986,6 @@ <listeners /> <method /> </configuration> - <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="SUITE_NAME" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="GROUP_NAME" /> - <option name="TEST_OBJECT" value="CLASS" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" /> - <option name="OUTPUT_DIRECTORY" /> - <option name="ANNOTATION_TYPE" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <option name="USE_DEFAULT_REPORTERS" value="false" /> - <option name="PROPERTIES_FILE" /> - <envs /> - <properties /> - <listeners /> - <method /> - </configuration> <configuration default="false" name="TreeVNC -d" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> @@ -1016,32 +1048,33 @@ </history-entry> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="3836" height="2137" extended-state="6" /> + <frame x="365" y="256" width="2050" height="1324" extended-state="0" /> <editor active="true" /> <layout> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953984" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22612569" 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.19916579" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.084723674" 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="-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="false" 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="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <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="TODO" active="false" anchor="bottom" 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="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="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="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" 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.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.1990244" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <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="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" 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" 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" 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" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953984" sideWeight="0.5" order="7" 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="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" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22612569" 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="true" weight="0.084723674" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="Vcs.Log.UiProperties"> @@ -1077,18 +1110,96 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/Todo.txt"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="454" column="0" selection-start-line="454" selection-start-column="0" selection-end-line="454" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="0" column="33" selection-start-line="0" selection-start-column="33" selection-end-line="0" selection-end-column="33" /> + <caret line="106" column="0" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" /> + <folding> + <element signature="e#1969#1970#0" expanded="true" /> + <element signature="e#1993#1994#0" expanded="true" /> + <element signature="e#2946#2947#0" expanded="true" /> + <element signature="e#2972#2973#0" expanded="true" /> + <element signature="e#3000#3001#0" expanded="true" /> + <element signature="e#3018#3019#0" expanded="true" /> + <element signature="e#4541#4542#0" expanded="true" /> + <element signature="e#4569#4570#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="83" column="37" selection-start-line="83" selection-start-column="37" selection-end-line="83" selection-end-column="37" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="1034" column="91" selection-start-line="1034" selection-start-column="91" selection-end-line="1034" selection-end-column="91" /> + <folding> + <element signature="e#0#45566#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" /> + <caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> + <folding> + <element signature="e#2138#2139#0" expanded="true" /> + <element signature="e#2189#2190#0" expanded="true" /> + <element signature="e#4339#4340#0" expanded="true" /> + <element signature="e#4370#4371#0" expanded="true" /> + <element signature="e#4406#4407#0" expanded="true" /> + <element signature="e#4453#4454#0" expanded="true" /> + <element signature="e#4489#4490#0" expanded="true" /> + <element signature="e#4521#4522#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="33" column="2" selection-start-line="33" selection-start-column="2" selection-end-line="33" selection-end-column="2" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" /> <folding /> </state> </provider> @@ -1097,7 +1208,40 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" /> - <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="827" column="34" selection-start-line="827" selection-start-column="34" selection-end-line="827" selection-end-column="34" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Todo.txt"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="0" column="33" selection-start-line="0" selection-start-column="33" selection-end-line="0" selection-end-column="33" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding> + <element signature="e#0#45566#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -1105,17 +1249,20 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" /> - <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-14.156863"> - <caret line="827" column="34" selection-start-line="827" selection-start-column="34" selection-end-line="827" selection-end-column="34" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0"> + <caret line="192" column="37" selection-start-line="192" selection-start-column="37" selection-end-line="192" selection-end-column="37" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="174" column="27" selection-start-line="174" selection-start-column="27" selection-end-line="174" selection-end-column="27" /> </state> </provider> </entry> @@ -1127,11 +1274,38 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/Todo.txt"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="0" column="33" selection-start-line="0" selection-start-column="33" selection-end-line="0" selection-end-column="33" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="174" column="27" selection-start-line="174" selection-start-column="27" selection-end-line="174" selection-end-column="27" /> - <folding /> </state> </provider> </entry> @@ -1139,33 +1313,121 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="192" column="37" selection-start-line="192" selection-start-column="37" selection-end-line="192" selection-end-column="37" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="333" column="41" selection-start-line="333" selection-start-column="41" selection-end-line="333" selection-end-column="41" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.3446635"> - <caret line="1022" column="44" selection-start-line="1022" selection-start-column="44" selection-end-line="1022" selection-end-column="44" /> + <state vertical-scroll-proportion="0.0"> + <caret line="1034" column="91" selection-start-line="1034" selection-start-column="91" selection-end-line="1034" selection-end-column="91" /> + <folding> + <element signature="e#0#45566#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="33" column="2" selection-start-line="33" selection-start-column="2" selection-end-line="33" selection-end-column="2" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="83" column="37" selection-start-line="83" selection-start-column="37" selection-end-line="83" selection-end-column="37" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="454" column="0" selection-start-line="454" selection-start-column="0" selection-end-line="454" selection-end-column="0" /> <folding> - <element signature="e#14143#14397#0" expanded="true" /> - <element signature="e#14396#14397#0" expanded="true" /> - <element signature="e#34754#35093#0" expanded="true" /> - <element signature="e#35092#35093#0" expanded="true" /> - <element signature="e#35708#36105#0" expanded="true" /> - <element signature="e#36104#36105#0" expanded="true" /> - <element signature="e#41200#41494#0" expanded="true" /> - <element signature="e#41493#41494#0" expanded="true" /> - <element signature="e#44522#44523#0" expanded="true" /> - <element signature="e#44557#44558#0" expanded="true" /> - <element signature="e#45081#45082#0" expanded="true" /> - <element signature="e#45114#45115#0" expanded="true" /> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="106" column="0" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" /> + <folding> + <element signature="e#1969#1970#0" expanded="true" /> + <element signature="e#1993#1994#0" expanded="true" /> + <element signature="e#2946#2947#0" expanded="true" /> + <element signature="e#2972#2973#0" expanded="true" /> + <element signature="e#3000#3001#0" expanded="true" /> + <element signature="e#3018#3019#0" expanded="true" /> + <element signature="e#4541#4542#0" expanded="true" /> + <element signature="e#4569#4570#0" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/net/MulticastSocket.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.33278823"> + <caret line="82" column="6" selection-start-line="82" selection-start-column="6" selection-end-line="82" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> + <folding> + <element signature="e#2138#2139#0" expanded="true" /> + <element signature="e#2189#2190#0" expanded="true" /> + <element signature="e#4339#4340#0" expanded="true" /> + <element signature="e#4370#4371#0" expanded="true" /> + <element signature="e#4406#4407#0" expanded="true" /> + <element signature="e#4453#4454#0" expanded="true" /> + <element signature="e#4489#4490#0" expanded="true" /> + <element signature="e#4521#4522#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.9076043"> + <caret line="81" column="23" selection-start-line="81" selection-start-column="23" selection-end-line="81" selection-end-column="23" /> + <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> </project> \ No newline at end of file
--- a/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java Fri Jun 10 19:58:59 2016 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java Sat Jun 11 22:42:58 2016 +0900 @@ -24,15 +24,10 @@ package com.glavsoft.rfb.protocol.state; -import com.glavsoft.exceptions.AuthenticationFailedException; -import com.glavsoft.exceptions.FatalException; -import com.glavsoft.exceptions.TransportException; -import com.glavsoft.exceptions.UnsupportedProtocolVersionException; -import com.glavsoft.exceptions.UnsupportedSecurityTypeException; +import com.glavsoft.exceptions.*; import com.glavsoft.rfb.encoding.ServerInitMessage; import com.glavsoft.rfb.protocol.ProtocolContext; import com.glavsoft.rfb.protocol.ProtocolSettings; -import jp.ac.u_ryukyu.treevnc.TreeRFBProto; /** * ClientInit @@ -79,7 +74,7 @@ context.setPixelFormat(serverInitMessage.getPixelFormat()); context.setFbWidth(serverInitMessage.getFrameBufferWidth()); context.setFbHeight(serverInitMessage.getFrameBufferHeight()); - System.out.println("serverInit : width : " + context.getFbWidth() + " height : " + context.getFbHeight()); + // System.out.println("serverInit : width : " + context.getFbWidth() + " height : " + context.getFbHeight()); context.setRemoteDesktopName(serverInitMessage.getName()); context.setInitData(serverInitMessage.getInitData()); }
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java Fri Jun 10 19:58:59 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java Sat Jun 11 22:42:58 2016 +0900 @@ -1,24 +1,19 @@ package jp.ac.u_ryukyu.treevnc; +import com.glavsoft.rfb.protocol.ProtocolContext.TreeCommand; +import com.glavsoft.viewer.swing.ConnectionParams; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.net.DatagramPacket; -import java.net.InetAddress; -import java.net.MulticastSocket; -import java.net.ServerSocket; -import java.net.Socket; +import java.net.*; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import com.glavsoft.rfb.protocol.ProtocolContext.TreeCommand; -import com.glavsoft.viewer.swing.ConnectionParams; - public class FindRoot implements Runnable { final int BUFSIZE = 1024; - private InetAddress mAddr; private MulticastSocket soc; - + private InetAddress mAddr; private ServerSocket server = null; private BufferedReader is; private int port; @@ -32,23 +27,20 @@ * @param createConnectionParam */ public FindRoot(int _port, CreateConnectionParam createConnectionParam) { - CreateConnectionParam cp = createConnectionParam; - port = _port; - rootSelectionPanel.setCp(cp); - createSocket(); - } + port = _port; + CreateConnectionParam cp = createConnectionParam; + rootSelectionPanel.setCp(cp); + try { + soc = TreeRootFinderListener.createMulticastSocket(); + soc.setTimeToLive(1); + mAddr = InetAddress.getByName(TreeRootFinderListener.McastAddr); + System.out.println("FindRoot socket on " + TreeRootFinderListener.McastAddr + " " + mAddr + " port " + _port); + } catch (IOException e) { + System.out.println("cannot create FindRoot socket. " + e); + return; + } + } - public void createSocket() { - try { - mAddr = InetAddress.getByName(TreeRootFinderListener.McastAddr); - soc = new MulticastSocket(); - soc.joinGroup(mAddr); - soc.setTimeToLive(1); - } catch (IOException e) { - System.out.println("cannot create FindRoot socket."); - e.printStackTrace(); - } - } /** * send find root message.
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Fri Jun 10 19:58:59 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Sat Jun 11 22:42:58 2016 +0900 @@ -1,5 +1,17 @@ package jp.ac.u_ryukyu.treevnc; +import com.glavsoft.exceptions.TransportException; +import com.glavsoft.rfb.client.ClientToServerMessage; +import com.glavsoft.rfb.encoding.EncodingType; +import com.glavsoft.rfb.encoding.decoder.FramebufferUpdateRectangle; +import com.glavsoft.rfb.protocol.Protocol; +import com.glavsoft.rfb.protocol.ProtocolContext; +import com.glavsoft.transport.Reader; +import com.glavsoft.transport.Writer; +import com.glavsoft.viewer.ConnectionPresenter; +import com.glavsoft.viewer.ViewerInterface; +import com.glavsoft.viewer.swing.ConnectionParams; + import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; @@ -14,18 +26,6 @@ import java.util.zip.Deflater; import java.util.zip.Inflater; -import com.glavsoft.exceptions.TransportException; -import com.glavsoft.rfb.client.ClientToServerMessage; -import com.glavsoft.rfb.encoding.EncodingType; -import com.glavsoft.rfb.encoding.decoder.FramebufferUpdateRectangle; -import com.glavsoft.rfb.protocol.Protocol; -import com.glavsoft.rfb.protocol.ProtocolContext; -import com.glavsoft.transport.Reader; -import com.glavsoft.transport.Writer; -import com.glavsoft.viewer.ConnectionPresenter; -import com.glavsoft.viewer.ViewerInterface; -import com.glavsoft.viewer.swing.ConnectionParams; - public class TreeRFBProto { @@ -149,19 +149,18 @@ c.poll(); // discard, should be timeout count++; if (flag == 0) { - System.out.println("Discarding " + myId - + " count=" + count); + // System.out.println("Discarding " + myId + " count=" + count); flag = 1; } wait(10); // if this is too short, writer cannot // take the poll, if this is too // long, memory will overflow... } - if (flag == 1) - System.out.println("Resuming " + myId + " count=" + count); + // if (flag == 1) + // System.out.println("Resuming " + myId + " count=" + count); if (state != 1) { System.out.println("Client died " + myId); - System.out.println("task stop"); + // System.out.println("task stop"); String rootHostName = null; int rootHostPort = 0; String myHostName = null; @@ -182,7 +181,7 @@ } } catch (InterruptedException e) { e.printStackTrace(); - System.out.println("timer thread interrupt."); + System.out.println("timer thread interrupted."); } } } @@ -453,7 +452,6 @@ public void addHostToSelectionPanel(int port, String hostname, String myHostName) { if (rootSelectionPanel != null) { rootSelectionPanel.checkBox(Integer.toString(port) + ":" + hostname + ":" + myHostName); - rootSelectionPanel.setButton(); rootSelectionPanel.visible(); } }
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java Fri Jun 10 19:58:59 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java Sat Jun 11 22:42:58 2016 +0900 @@ -1,16 +1,15 @@ package jp.ac.u_ryukyu.treevnc; -import java.io.IOException; -import java.net.*; -import java.lang.SecurityManager; - import com.glavsoft.rfb.protocol.ProtocolContext.TreeCommand; import com.glavsoft.viewer.ViewerInterface; import com.glavsoft.viewer.swing.ConnectionParams; +import java.io.IOException; +import java.net.*; + public class TreeRootFinderListener implements Runnable { public static final String Ipv4McastAddr = "224.0.0.1"; - public static final String Ipv6McastAddr = "FF02::1"; + public static final String Ipv6McastAddr = "ff02::1"; public static String McastAddr = Ipv4McastAddr; static final int BufSize = 1024; @@ -22,21 +21,31 @@ public TreeRootFinderListener(ViewerInterface vncProxyService) { vps = vncProxyService; } - - /** + + public static MulticastSocket createMulticastSocket() throws IOException { + MulticastSocket soc = new MulticastSocket(ConnectionParams.DEFAULT_VNC_ROOT_FINDER); + try { + soc.joinGroup(InetAddress.getByName(McastAddr)); + } catch (SocketException e) { + System.out.println("join to " + Ipv4McastAddr + " failed."); + } + try { + soc.joinGroup(InetAddress.getByName(Ipv6McastAddr)); + } catch (SocketException e) { + System.out.println("join to " + Ipv6McastAddr + " failed."); + } + return soc; + } + + /** * To find TreeVNC root, a client sends me a multicast, reply our address to him. * It contains a port to receive, so multiple TREEVNC clients can run on a PC. */ private void replyToRootSearchMulticast() { byte[] buf = new byte[BufSize]; try { - soc = new MulticastSocket(ConnectionParams.DEFAULT_VNC_ROOT_FINDER); - try { - soc.joinGroup(InetAddress.getByName(McastAddr)); - } catch (SocketException e) { - McastAddr = Ipv6McastAddr; - soc.joinGroup(InetAddress.getByName(Ipv6McastAddr)); - } + soc = createMulticastSocket(); + System.out.println("FindRoot listening on "+ InetAddress.getByName(McastAddr)); DatagramPacket recvPacket = new DatagramPacket(buf, BufSize); while (!stopFlag) { @@ -67,8 +76,8 @@ System.out.println("tree-root-find-listener :" + e.getMessage()); } } - - public int parse_code( byte[] bs,int offset,int len ) + + public int parse_code( byte[] bs,int offset,int len ) { int intval = 0; for( int i = offset; i < len ; i++ ) {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Fri Jun 10 19:58:59 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Sat Jun 11 22:42:58 2016 +0900 @@ -1,12 +1,13 @@ package jp.ac.u_ryukyu.treevnc; -import javax.swing.*; - import com.glavsoft.viewer.swing.ConnectionParams; +import javax.swing.*; import java.awt.*; -import java.awt.event.*; -import java.io.IOException; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; public class TreeVncRootSelectionPanel extends JFrame implements ActionListener, ItemListener { @@ -24,7 +25,6 @@ private double width = 750; private double height = 500; private JLabel label; - private boolean flag; private int counter = 0; // private JCheckBox[] check = new JCheckBox[20]; private Checkbox[] check = new Checkbox[20]; @@ -87,6 +87,10 @@ contentPane.add(label, BorderLayout.SOUTH); } + /** + * add tree vnc server selection + * @param str + */ public void checkBox(String str) { if (counter == 0) check[counter] = new Checkbox(str, true, ch); @@ -105,16 +109,6 @@ contentPane.add(panel, BorderLayout.CENTER); } - public String getAddressOption() { - while (!(flag)) { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - return t1.getText(); - } public String getPortOption() { return t2.getText(); @@ -126,7 +120,6 @@ public void actionPerformed(ActionEvent e) { if (advancedMenu.getSelectedIndex() == 0) { - flag = true; for (int t = 0; t < counter; t++) { int ipv4AddressLength = 3; int ipv6AddressLength = 17; @@ -134,7 +127,7 @@ String hostAddress = null; String rootAddress = null; if (check[t].getState()) { - System.out.println(check[t].getLabel()); + // System.out.println("Root Seletion Panel get the address : "+e+" "+check[t].getLabel()); String str = check[t].getLabel(); String[] temp = str.split(":"); if (temp.length == ipv4AddressLength) {
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Fri Jun 10 19:58:59 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Sat Jun 11 22:42:58 2016 +0900 @@ -31,14 +31,19 @@ import com.glavsoft.rfb.protocol.ProtocolContext; import com.glavsoft.rfb.protocol.ProtocolSettings; import com.glavsoft.utils.Keymap; -import com.glavsoft.viewer.*; +import com.glavsoft.viewer.ConnectionPresenter; +import com.glavsoft.viewer.UiSettings; +import com.glavsoft.viewer.Viewer; +import com.glavsoft.viewer.ViewerInterface; import com.glavsoft.viewer.swing.gui.OptionsDialog; +import jp.ac.u_ryukyu.treevnc.ScreenChangeRequest; +import jp.ac.u_ryukyu.treevnc.ScreenChangeSelectionPanel; +import jp.ac.u_ryukyu.treevnc.TreeRFBProto; import javax.swing.*; import javax.swing.border.BevelBorder; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; - import java.awt.*; import java.awt.event.*; import java.lang.reflect.Field; @@ -52,8 +57,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import jp.ac.u_ryukyu.treevnc.*; - public class SwingViewerWindow implements IChangeSettingsListener { public static final int FS_SCROLLING_ACTIVE_BORDER = 20; private JToggleButton zoomFitButton; @@ -1014,25 +1017,29 @@ final int thatScreenY = (int) presenter.getY(); final int thatScreenWidth = presenter.getFrameSizeWidth(); final int thatScreenHeight = presenter.getFrameSizeHeight(); - System.out.println("thatScreenX:"+thatScreenX); - System.out.println("thatScreenY:"+thatScreenY); - System.out.println("thatScreenWidth:"+thatScreenWidth); - System.out.println("thatScreenHeight:"+thatScreenHeight); - System.out.println("getMaximum:"+scroller.getHorizontalScrollBar().getMaximum()); - System.out.println("getMinmum:"+scroller.getHorizontalScrollBar().getMinimum()); - // uiSettings.zoomToFit(2*thatScreenWidth, 2*thatScreenHeight, thisScreenWidth, thisScreenHeight); + if (false) { + System.out.println("thatScreenX:" + thatScreenX); + System.out.println("thatScreenY:" + thatScreenY); + System.out.println("thatScreenWidth:" + thatScreenWidth); + System.out.println("thatScreenHeight:" + thatScreenHeight); + System.out.println("getMaximum:" + scroller.getHorizontalScrollBar().getMaximum()); + System.out.println("getMinmum:" + scroller.getHorizontalScrollBar().getMinimum()); + // uiSettings.zoomToFit(2*thatScreenWidth, 2*thatScreenHeight, thisScreenWidth, thisScreenHeight); + } int singleWidth = viewer.getRfb().getSingleWidth() * viewer.getRfb().getRetinaScale(); int singleHeight = viewer.getRfb().getSingleHeight() * viewer.getRfb().getRetinaScale(); - System.out.println("singleeight:"+singleHeight); + if (false) + System.out.println("singleeight:"+singleHeight); //frame.setSize(thisScreenWidth, thisScreenHeight); uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, singleWidth, singleHeight); - final Rectangle visible = new Rectangle(thatScreenX,thatScreenY,thatScreenWidth,thatScreenHeight); + // final Rectangle visible = new Rectangle(thatScreenX,thatScreenY,thatScreenWidth,thatScreenHeight); SwingUtilities.invokeLater(new Runnable(){ public void run() { + // we want to shift thaScreenX, to do so, * 1.5 is required. scroller.getHorizontalScrollBar().setValue((int)(thatScreenX*1.5)); scroller.getVerticalScrollBar().setValue((int)(thatScreenY*1.5)); - //scroller.scrollRectToVisible(visible); + // scroller.scrollRectToVisible(visible); this does not work } }); }