Mercurial > hg > Applications > TreeVNC
changeset 384:0bbfc23ef8c4
implements exchangeDirectConnectedServer method
| author | innparusu |
|---|---|
| date | Fri, 04 Sep 2015 18:18:17 +0900 |
| parents | 7d55adebcacb |
| children | b0be610bc4db |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java |
| diffstat | 4 files changed, 406 insertions(+), 179 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Fri Sep 04 17:10:53 2015 +0900 +++ b/.idea/workspace.xml Fri Sep 04 18:18:17 2015 +0900 @@ -2,13 +2,8 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java" /> - <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/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/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -34,14 +29,14 @@ <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.37262586"> + <splitter split-orientation="horizontal" split-proportion="0.43382573"> <split-first> <leaf> <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.4549147" vertical-offset="0" max-vertical-offset="7040"> - <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" /> + <state vertical-scroll-proportion="-1.9496344" vertical-offset="3440" max-vertical-offset="7040"> + <caret line="74" column="20" selection-start-line="74" selection-start-column="20" selection-end-line="74" selection-end-column="20" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -514,14 +509,9 @@ <file leaf-file-name="FramebufferUpdateRectangle.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="945"> - <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding> - <element signature="e#0#2757#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2465#2466#0" expanded="false" /> - <element signature="e#2500#2501#0" expanded="false" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1260"> + <caret line="54" column="41" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="41" /> + <folding /> </state> </provider> </entry> @@ -539,7 +529,7 @@ <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="1035"> + <state vertical-scroll-proportion="0.0" vertical-offset="67" max-vertical-offset="1587"> <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> <folding /> </state> @@ -563,25 +553,16 @@ </split-first> <split-second> <leaf> - <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="818" max-vertical-offset="4140"> - <caret line="160" column="0" selection-start-line="160" selection-start-column="0" selection-end-line="160" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> + <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.88787377" vertical-offset="4071" max-vertical-offset="9560"> - <caret line="263" column="33" selection-start-line="263" selection-start-column="33" selection-end-line="263" selection-end-column="33" /> + <state vertical-scroll-proportion="-12.3" vertical-offset="5288" max-vertical-offset="9600"> + <caret line="299" column="0" selection-start-line="299" selection-start-column="0" selection-end-line="299" selection-end-column="0" /> <folding> <element signature="e#0#16299#0" expanded="true" /> <element signature="imports" expanded="true" /> <element signature="e#1732#1759#0" expanded="true" /> + <element signature="e#9717#9718#0" expanded="true" /> <element signature="e#10452#10612#0" expanded="true" /> <element signature="e#10611#10612#0" expanded="true" /> <element signature="e#14905#14906#0" expanded="true" /> @@ -601,19 +582,44 @@ <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"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-22.6" vertical-offset="5812" max-vertical-offset="7682"> - <caret line="360" column="24" selection-start-line="360" selection-start-column="24" selection-end-line="360" selection-end-column="24" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="RfbConnectionWorker.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="640"> - <caret line="44" column="30" selection-start-line="44" selection-start-column="30" selection-end-line="44" selection-end-column="30" /> - <folding /> + <state vertical-scroll-proportion="-21.975" vertical-offset="7785" max-vertical-offset="8976"> + <caret line="399" column="28" selection-start-line="399" selection-start-column="28" selection-end-line="399" selection-end-column="28" /> + <folding> + <element signature="e#3436#3437#0" expanded="true" /> + <element signature="e#3473#3474#0" expanded="true" /> + <element signature="e#3532#3533#0" expanded="true" /> + <element signature="e#3584#3585#0" expanded="true" /> + <element signature="e#3637#3638#0" expanded="true" /> + <element signature="e#3676#3677#0" expanded="true" /> + <element signature="e#3750#3751#0" expanded="true" /> + <element signature="e#3806#3807#0" expanded="true" /> + <element signature="e#5105#5106#0" expanded="true" /> + <element signature="e#5178#5179#0" expanded="true" /> + <element signature="e#7334#7335#0" expanded="true" /> + <element signature="e#7420#7421#0" expanded="true" /> + <element signature="e#11983#11984#0" expanded="true" /> + <element signature="e#12052#12053#0" expanded="true" /> + <element signature="e#12086#12087#0" expanded="true" /> + <element signature="e#12117#12118#0" expanded="true" /> + <element signature="e#12686#12687#0" expanded="true" /> + <element signature="e#12753#12754#0" expanded="true" /> + <element signature="e#12794#12795#0" expanded="true" /> + <element signature="e#12827#12828#0" expanded="true" /> + <element signature="e#12875#12876#0" expanded="true" /> + <element signature="e#12909#12910#0" expanded="true" /> + <element signature="e#12950#12951#0" expanded="true" /> + <element signature="e#12989#12990#0" expanded="true" /> + <element signature="e#13042#13043#0" expanded="true" /> + <element signature="e#13081#13082#0" expanded="true" /> + <element signature="e#13122#13123#0" expanded="true" /> + <element signature="e#13161#13162#0" expanded="true" /> + <element signature="e#13207#13208#0" expanded="true" /> + <element signature="e#13239#13240#0" expanded="true" /> + <element signature="e#13283#13284#0" expanded="true" /> + <element signature="e#13313#13314#0" expanded="true" /> + <element signature="e#13522#13523#0" expanded="true" /> + <element signature="e#13576#13577#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -628,6 +634,16 @@ </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" vertical-offset="1212" max-vertical-offset="4023"> + <caret line="68" column="30" selection-start-line="68" selection-start-column="30" selection-end-line="68" selection-end-column="30" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> @@ -651,33 +667,106 @@ <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.0" vertical-offset="16046" max-vertical-offset="19895"> - <caret line="854" column="60" selection-start-line="854" selection-start-column="60" selection-end-line="854" selection-end-column="60" /> + <state vertical-scroll-proportion="0.0" vertical-offset="16433" max-vertical-offset="19895"> + <caret line="862" column="124" selection-start-line="862" selection-start-column="124" selection-end-line="862" selection-end-column="124" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="6762"> + <caret line="90" column="71" selection-start-line="90" selection-start-column="71" selection-end-line="90" selection-end-column="71" /> <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"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-18.975" vertical-offset="2416" max-vertical-offset="6400"> - <caret line="170" column="24" selection-start-line="170" selection-start-column="23" selection-end-line="170" selection-end-column="24" /> - <folding> - <element signature="e#9205#9206#0" expanded="true" /> - <element signature="e#9255#9256#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> <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="-9.275" vertical-offset="23488" max-vertical-offset="27093"> - <caret line="810" column="24" selection-start-line="810" selection-start-column="24" selection-end-line="810" selection-end-column="24" /> + <state vertical-scroll-proportion="0.6708648" vertical-offset="24709" max-vertical-offset="25900"> + <caret line="940" column="13" selection-start-line="940" selection-start-column="13" selection-end-line="940" selection-end-column="13" /> <folding> - <element signature="e#27046#27058#0" expanded="true" /> + <element signature="e#4355#7595#0" expanded="true" /> + <element signature="e#7594#7595#0" expanded="true" /> + <element signature="e#7762#14315#0" expanded="true" /> + <element signature="e#11482#11808#0" expanded="true" /> + <element signature="e#11807#11808#0" expanded="true" /> + <element signature="e#12053#12379#0" expanded="true" /> + <element signature="e#12378#12379#0" expanded="true" /> + <element signature="e#12610#12936#0" expanded="true" /> + <element signature="e#12935#12936#0" expanded="true" /> + <element signature="e#13158#13484#0" expanded="true" /> + <element signature="e#13483#13484#0" expanded="true" /> + <element signature="e#14314#14315#0" expanded="true" /> + <element signature="e#16633#16634#0" expanded="true" /> + <element signature="e#16674#16675#0" expanded="true" /> + <element signature="e#16727#16728#0" expanded="true" /> + <element signature="e#16765#16766#0" expanded="true" /> + <element signature="e#16806#16807#0" expanded="true" /> + <element signature="e#16839#16840#0" expanded="true" /> + <element signature="e#16904#16905#0" expanded="true" /> + <element signature="e#16945#16946#0" expanded="true" /> + <element signature="e#18175#18176#0" expanded="true" /> + <element signature="e#18201#18202#0" expanded="true" /> + <element signature="e#18243#18244#0" expanded="true" /> + <element signature="e#18272#18273#0" expanded="true" /> + <element signature="e#18437#18438#0" expanded="true" /> + <element signature="e#18480#18481#0" expanded="true" /> + <element signature="e#18523#18524#0" expanded="true" /> + <element signature="e#18563#18564#0" expanded="true" /> + <element signature="e#19156#19157#0" expanded="true" /> + <element signature="e#19189#19190#0" expanded="true" /> + <element signature="e#19231#19232#0" expanded="true" /> + <element signature="e#19268#19269#0" expanded="true" /> + <element signature="e#19307#19308#0" expanded="true" /> + <element signature="e#19340#19341#0" expanded="true" /> + <element signature="e#19388#19389#0" expanded="true" /> + <element signature="e#19421#19422#0" expanded="true" /> + <element signature="e#22357#22358#0" expanded="true" /> + <element signature="e#22395#22396#0" expanded="true" /> + <element signature="e#23239#23240#0" expanded="true" /> + <element signature="e#23271#23272#0" expanded="true" /> + <element signature="e#26978#26990#0" expanded="true" /> + <element signature="e#30476#30477#0" expanded="true" /> + <element signature="e#30504#30505#0" expanded="true" /> + <element signature="e#30532#30533#0" expanded="true" /> + <element signature="e#30557#30558#0" expanded="true" /> + <element signature="e#30697#30698#0" expanded="true" /> + <element signature="e#30733#30734#0" expanded="true" /> + <element signature="e#30766#30767#0" expanded="true" /> + <element signature="e#30795#30796#0" expanded="true" /> + <element signature="e#30866#30867#0" expanded="true" /> + <element signature="e#30916#30917#0" expanded="true" /> + <element signature="e#32739#32740#0" expanded="true" /> + <element signature="e#32774#32775#0" expanded="true" /> + <element signature="e#32857#32858#0" expanded="true" /> + <element signature="e#32900#32901#0" expanded="true" /> + <element signature="e#32957#32958#0" expanded="true" /> + <element signature="e#32982#32983#0" expanded="true" /> + <element signature="e#33016#33017#0" expanded="true" /> + <element signature="e#33048#33049#0" expanded="true" /> + <element signature="e#33091#33092#0" expanded="true" /> + <element signature="e#33120#33121#0" expanded="true" /> + <element signature="e#33169#33170#0" expanded="true" /> + <element signature="e#33213#33214#0" expanded="true" /> + <element signature="e#33266#33267#0" expanded="true" /> + <element signature="e#33310#33311#0" expanded="true" /> + <element signature="e#33367#33368#0" expanded="true" /> + <element signature="e#33416#33417#0" expanded="true" /> + <element signature="e#33872#33873#0" expanded="true" /> + <element signature="e#33916#33917#0" expanded="true" /> + <element signature="e#33987#33988#0" expanded="true" /> + <element signature="e#34049#34050#0" expanded="true" /> + <element signature="e#34655#34656#0" expanded="true" /> + <element signature="e#34689#34690#0" expanded="true" /> + <element signature="e#34725#34726#0" expanded="true" /> + <element signature="e#34760#34761#0" expanded="true" /> + <element signature="e#34794#34795#0" expanded="true" /> + <element signature="e#34825#34826#0" expanded="true" /> </folding> </state> </provider> @@ -971,13 +1060,14 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> <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/RfbConnectionWorker.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.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/TreeVncCommand.java" /> </list> </option> </component> @@ -1412,7 +1502,7 @@ </extension> <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="--direct --host 10.0.1.61:5950" /> + <option name="PROGRAM_PARAMETERS" value="-d" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -1666,7 +1756,7 @@ <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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32940573" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19547021" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19518442" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> @@ -1678,34 +1768,34 @@ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13529718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.14520334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14520334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34118852" sideWeight="0.5" order="2" side_tool="false" 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="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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> + <window_info id="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="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="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="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="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="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.109228365" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.11991658" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13529718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14520334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34118852" sideWeight="0.5" order="2" side_tool="false" 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="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" 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.32988676" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" 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.39980304" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32940573" 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.19547021" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32988676" sideWeight="0.5" order="12" 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.32940573" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" 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" /> @@ -1743,7 +1833,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>202</line> + <line>201</line> <properties /> <option name="timeStamp" value="13" /> </line-breakpoint> @@ -1785,7 +1875,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>559</line> + <line>558</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1809,7 +1899,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>824</line> + <line>844</line> <properties /> <option name="timeStamp" value="85" /> </line-breakpoint> @@ -1821,7 +1911,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>818</line> + <line>817</line> <properties /> <option name="timeStamp" value="90" /> </line-breakpoint> @@ -1900,7 +1990,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>320</line> + <line>319</line> <properties /> <option name="timeStamp" value="118" /> </line-breakpoint> @@ -2252,14 +2342,6 @@ </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" vertical-offset="790" max-vertical-offset="3427"> - <caret line="68" column="22" selection-start-line="68" selection-start-column="22" selection-end-line="68" selection-end-column="22" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="314" max-vertical-offset="2280"> @@ -2271,14 +2353,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1656"> - <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="923" max-vertical-offset="6072"> @@ -2287,19 +2361,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="219" max-vertical-offset="1827"> - <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding> - <element signature="e#0#2757#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2465#2466#0" expanded="false" /> - <element signature="e#2500#2501#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="3251" max-vertical-offset="6102"> @@ -2776,14 +2837,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-24.75" vertical-offset="66" max-vertical-offset="9702"> - <caret line="70" column="14" selection-start-line="70" selection-start-column="14" selection-end-line="70" selection-end-column="14" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="640"> @@ -2792,17 +2845,6 @@ </state> </provider> </entry> - <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="-18.975" vertical-offset="2416" max-vertical-offset="6400"> - <caret line="170" column="24" selection-start-line="170" selection-start-column="23" selection-end-line="170" selection-end-column="24" /> - <folding> - <element signature="e#9205#9206#0" expanded="true" /> - <element signature="e#9255#9256#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="818" max-vertical-offset="4140"> @@ -2811,24 +2853,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.4549147" vertical-offset="0" max-vertical-offset="7040"> - <caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </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="-22.6" vertical-offset="5812" max-vertical-offset="7682"> - <caret line="360" column="24" selection-start-line="360" selection-start-column="24" selection-end-line="360" selection-end-column="24" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990"> @@ -2845,24 +2869,6 @@ </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="-9.275" vertical-offset="23488" max-vertical-offset="27093"> - <caret line="810" column="24" selection-start-line="810" selection-start-column="24" selection-end-line="810" selection-end-column="24" /> - <folding> - <element signature="e#27046#27058#0" expanded="true" /> - </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.0" vertical-offset="16046" max-vertical-offset="19895"> - <caret line="854" column="60" selection-start-line="854" selection-start-column="60" selection-end-line="854" selection-end-column="60" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/VncProxyService.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185"> @@ -2871,14 +2877,68 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1656"> + <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1260"> + <caret line="54" column="41" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="41" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-1.9496344" vertical-offset="3440" max-vertical-offset="7040"> + <caret line="74" column="20" selection-start-line="74" selection-start-column="20" selection-end-line="74" selection-end-column="20" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="6762"> + <caret line="90" column="71" selection-start-line="90" selection-start-column="71" selection-end-line="90" selection-end-column="71" /> + <folding /> + </state> + </provider> + </entry> + <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="1.9193954" vertical-offset="0" max-vertical-offset="4608"> + <caret line="170" column="8" selection-start-line="170" selection-start-column="8" selection-end-line="170" selection-end-column="8" /> + <folding> + <element signature="e#9205#9206#0" expanded="true" /> + <element signature="e#9255#9256#0" expanded="true" /> + </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.0" vertical-offset="15954" max-vertical-offset="19895"> + <caret line="862" column="124" selection-start-line="862" selection-start-column="124" selection-end-line="862" selection-end-column="124" /> + <folding /> + </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.88787377" vertical-offset="4071" max-vertical-offset="9560"> - <caret line="263" column="33" selection-start-line="263" selection-start-column="33" selection-end-line="263" selection-end-column="33" /> + <state vertical-scroll-proportion="-12.3" vertical-offset="5288" max-vertical-offset="9600"> + <caret line="299" column="0" selection-start-line="299" selection-start-column="0" selection-end-line="299" selection-end-column="0" /> <folding> <element signature="e#0#16299#0" expanded="true" /> <element signature="imports" expanded="true" /> <element signature="e#1732#1759#0" expanded="true" /> + <element signature="e#9717#9718#0" expanded="true" /> <element signature="e#10452#10612#0" expanded="true" /> <element signature="e#10611#10612#0" expanded="true" /> <element signature="e#14905#14906#0" expanded="true" /> @@ -2894,6 +2954,143 @@ </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="-21.975" vertical-offset="7785" max-vertical-offset="8976"> + <caret line="399" column="28" selection-start-line="399" selection-start-column="28" selection-end-line="399" selection-end-column="28" /> + <folding> + <element signature="e#3436#3437#0" expanded="true" /> + <element signature="e#3473#3474#0" expanded="true" /> + <element signature="e#3532#3533#0" expanded="true" /> + <element signature="e#3584#3585#0" expanded="true" /> + <element signature="e#3637#3638#0" expanded="true" /> + <element signature="e#3676#3677#0" expanded="true" /> + <element signature="e#3750#3751#0" expanded="true" /> + <element signature="e#3806#3807#0" expanded="true" /> + <element signature="e#5105#5106#0" expanded="true" /> + <element signature="e#5178#5179#0" expanded="true" /> + <element signature="e#7334#7335#0" expanded="true" /> + <element signature="e#7420#7421#0" expanded="true" /> + <element signature="e#11983#11984#0" expanded="true" /> + <element signature="e#12052#12053#0" expanded="true" /> + <element signature="e#12086#12087#0" expanded="true" /> + <element signature="e#12117#12118#0" expanded="true" /> + <element signature="e#12686#12687#0" expanded="true" /> + <element signature="e#12753#12754#0" expanded="true" /> + <element signature="e#12794#12795#0" expanded="true" /> + <element signature="e#12827#12828#0" expanded="true" /> + <element signature="e#12875#12876#0" expanded="true" /> + <element signature="e#12909#12910#0" expanded="true" /> + <element signature="e#12950#12951#0" expanded="true" /> + <element signature="e#12989#12990#0" expanded="true" /> + <element signature="e#13042#13043#0" expanded="true" /> + <element signature="e#13081#13082#0" expanded="true" /> + <element signature="e#13122#13123#0" expanded="true" /> + <element signature="e#13161#13162#0" expanded="true" /> + <element signature="e#13207#13208#0" expanded="true" /> + <element signature="e#13239#13240#0" expanded="true" /> + <element signature="e#13283#13284#0" expanded="true" /> + <element signature="e#13313#13314#0" expanded="true" /> + <element signature="e#13522#13523#0" expanded="true" /> + <element signature="e#13576#13577#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" vertical-offset="1212" max-vertical-offset="4023"> + <caret line="68" column="30" selection-start-line="68" selection-start-column="30" selection-end-line="68" selection-end-column="30" /> + <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.6708648" vertical-offset="24709" max-vertical-offset="25900"> + <caret line="940" column="13" selection-start-line="940" selection-start-column="13" selection-end-line="940" selection-end-column="13" /> + <folding> + <element signature="e#4355#7595#0" expanded="true" /> + <element signature="e#7594#7595#0" expanded="true" /> + <element signature="e#7762#14315#0" expanded="true" /> + <element signature="e#11482#11808#0" expanded="true" /> + <element signature="e#11807#11808#0" expanded="true" /> + <element signature="e#12053#12379#0" expanded="true" /> + <element signature="e#12378#12379#0" expanded="true" /> + <element signature="e#12610#12936#0" expanded="true" /> + <element signature="e#12935#12936#0" expanded="true" /> + <element signature="e#13158#13484#0" expanded="true" /> + <element signature="e#13483#13484#0" expanded="true" /> + <element signature="e#14314#14315#0" expanded="true" /> + <element signature="e#16633#16634#0" expanded="true" /> + <element signature="e#16674#16675#0" expanded="true" /> + <element signature="e#16727#16728#0" expanded="true" /> + <element signature="e#16765#16766#0" expanded="true" /> + <element signature="e#16806#16807#0" expanded="true" /> + <element signature="e#16839#16840#0" expanded="true" /> + <element signature="e#16904#16905#0" expanded="true" /> + <element signature="e#16945#16946#0" expanded="true" /> + <element signature="e#18175#18176#0" expanded="true" /> + <element signature="e#18201#18202#0" expanded="true" /> + <element signature="e#18243#18244#0" expanded="true" /> + <element signature="e#18272#18273#0" expanded="true" /> + <element signature="e#18437#18438#0" expanded="true" /> + <element signature="e#18480#18481#0" expanded="true" /> + <element signature="e#18523#18524#0" expanded="true" /> + <element signature="e#18563#18564#0" expanded="true" /> + <element signature="e#19156#19157#0" expanded="true" /> + <element signature="e#19189#19190#0" expanded="true" /> + <element signature="e#19231#19232#0" expanded="true" /> + <element signature="e#19268#19269#0" expanded="true" /> + <element signature="e#19307#19308#0" expanded="true" /> + <element signature="e#19340#19341#0" expanded="true" /> + <element signature="e#19388#19389#0" expanded="true" /> + <element signature="e#19421#19422#0" expanded="true" /> + <element signature="e#22357#22358#0" expanded="true" /> + <element signature="e#22395#22396#0" expanded="true" /> + <element signature="e#23239#23240#0" expanded="true" /> + <element signature="e#23271#23272#0" expanded="true" /> + <element signature="e#26978#26990#0" expanded="true" /> + <element signature="e#30476#30477#0" expanded="true" /> + <element signature="e#30504#30505#0" expanded="true" /> + <element signature="e#30532#30533#0" expanded="true" /> + <element signature="e#30557#30558#0" expanded="true" /> + <element signature="e#30697#30698#0" expanded="true" /> + <element signature="e#30733#30734#0" expanded="true" /> + <element signature="e#30766#30767#0" expanded="true" /> + <element signature="e#30795#30796#0" expanded="true" /> + <element signature="e#30866#30867#0" expanded="true" /> + <element signature="e#30916#30917#0" expanded="true" /> + <element signature="e#32739#32740#0" expanded="true" /> + <element signature="e#32774#32775#0" expanded="true" /> + <element signature="e#32857#32858#0" expanded="true" /> + <element signature="e#32900#32901#0" expanded="true" /> + <element signature="e#32957#32958#0" expanded="true" /> + <element signature="e#32982#32983#0" expanded="true" /> + <element signature="e#33016#33017#0" expanded="true" /> + <element signature="e#33048#33049#0" expanded="true" /> + <element signature="e#33091#33092#0" expanded="true" /> + <element signature="e#33120#33121#0" expanded="true" /> + <element signature="e#33169#33170#0" expanded="true" /> + <element signature="e#33213#33214#0" expanded="true" /> + <element signature="e#33266#33267#0" expanded="true" /> + <element signature="e#33310#33311#0" expanded="true" /> + <element signature="e#33367#33368#0" expanded="true" /> + <element signature="e#33416#33417#0" expanded="true" /> + <element signature="e#33872#33873#0" expanded="true" /> + <element signature="e#33916#33917#0" expanded="true" /> + <element signature="e#33987#33988#0" expanded="true" /> + <element signature="e#34049#34050#0" expanded="true" /> + <element signature="e#34655#34656#0" expanded="true" /> + <element signature="e#34689#34690#0" expanded="true" /> + <element signature="e#34725#34726#0" expanded="true" /> + <element signature="e#34760#34761#0" expanded="true" /> + <element signature="e#34794#34795#0" expanded="true" /> + <element signature="e#34825#34826#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Fri Sep 04 17:10:53 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Fri Sep 04 18:18:17 2015 +0900 @@ -106,13 +106,12 @@ /** * handle new client accept * it also handle TreeVNC Command - * @param newCli * @param os * @param is * @throws IOException * @throws TransportException */ - public void newClient(final Socket newCli,final Writer os, final Reader is) { + public void newClient(final Writer os, final Reader is) { final int myId = clients; final MulticastQueue.Client<LinkedList<ByteBuffer>> c = multicastqueue.newClient(); final AtomicInteger writerRunning = new AtomicInteger(); @@ -312,7 +311,7 @@ writerRunning.set(1); try { requestThreadNotify(); // send full screen request via fullScreenRequestThread - + // after this, we discard upward packet. new Thread(reader, "upward-packet-processing").start(); @@ -445,7 +444,7 @@ if (rootSelectionPanel != null) { rootSelectionPanel.checkBox(Integer.toString(port) + ":" + hostname + ":" + myHostName); rootSelectionPanel.setButton(); - rootSelectionPanel.visible(); + rootSelectionPanel.visible(); } } @@ -469,7 +468,7 @@ public boolean getCuiVersion() { return cuiVersion; - } + } public void setCuiVersion(boolean flag) { cuiVersion = flag; @@ -588,7 +587,7 @@ /** * gzip byte arrays - * + * * @param deflater * @param inputs * byte data[] @@ -639,7 +638,7 @@ /** * gunzip byte arrays - * + * * @param inflater * @param inputs * byte data[] @@ -677,7 +676,7 @@ * @param dataLen * @param reader * @throws TransportException - * @throws UnsupportedEncodingException + * @throws UnsupportedEncodingException */ public void readSendData(int dataLen, Reader reader, byte[] bytes, FramebufferUpdateRectangle rect) throws TransportException, UnsupportedEncodingException { @@ -693,7 +692,7 @@ header.limit(16); if (header.get(0) == FramebufferUpdate) { int encoding = header.getInt(12); - + if (encoding == EncodingType.ZRLE.getId() || encoding == EncodingType.ZLIB.getId()) { // recompress into ZREE @@ -876,7 +875,7 @@ public int getNodeNum(int port, String address) { int nodeNum = 0; - + for (Iterator<TreeVNCNode> i = nodeList.iterator(); i.hasNext();) { TreeVNCNode tvn = (TreeVNCNode)i.next(); if (port == tvn.port && address.equals(tvn.hostname)) { @@ -926,4 +925,25 @@ public boolean hasParent() { return id != -1; } + + /** + * server change to directed connected server + * server mayble on the diffrent network + * so can not in whereToConnect message + * reuse dynamic connect sorcket us a new client + * reother server exchange socket when serverChangeRequest with id -1 + * @param previousReader + * @param previousWriter + */ + public void exchangeDirectConnectedServer(Reader previousReader, Writer previousWriter) { + String adr = viewer.getRfb().getMyAddress(); + ScreenChangeRequest scr = new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, (short) -1, singleWidth, singleHeight); + try { + scr.send(previousWriter); + } catch (TransportException e) { + e.printStackTrace(); + return; + } + newClient(previousWriter, previousReader); + } } \ No newline at end of file
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java Fri Sep 04 17:10:53 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java Fri Sep 04 18:18:17 2015 +0900 @@ -66,7 +66,7 @@ handleLostParent(port,hostname, myHostName); break; case NEW_NODE : - rfb.newClient(connection, os, is); + rfb.newClient(os, is); break; case QUIT_LOOP : break;
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Fri Sep 04 17:10:53 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Fri Sep 04 18:18:17 2015 +0900 @@ -25,7 +25,10 @@ package com.glavsoft.viewer; import com.glavsoft.rfb.protocol.Protocol; +import com.glavsoft.rfb.protocol.ProtocolContext; import com.glavsoft.rfb.protocol.ProtocolSettings; +import com.glavsoft.transport.Reader; +import com.glavsoft.transport.Writer; import com.glavsoft.utils.Strings; import com.glavsoft.viewer.mvp.Model; import com.glavsoft.viewer.mvp.Presenter; @@ -33,6 +36,7 @@ import com.glavsoft.viewer.swing.*; import com.glavsoft.viewer.swing.gui.ConnectionView; import com.glavsoft.viewer.swing.gui.ConnectionsHistory; +import jp.ac.u_ryukyu.treevnc.ScreenChangeRequest; import jp.ac.u_ryukyu.treevnc.TreeRFBProto; import java.net.Socket; @@ -161,7 +165,7 @@ final ConnectionParams connectionParams = (ConnectionParams) getModel(CONNECTION_PARAMS_MODEL); if(!cuiVersion) networkConnectionWorker = connectionWorkerFactory.createNetworkConnectionWorker(); - else + else networkConnectionWorker = new SwingNetworkConnectionWorker(null); networkConnectionWorker.setConnectionParams(connectionParams); networkConnectionWorker.setPresenter(this); @@ -385,10 +389,16 @@ public synchronized void newVNCConnection(Protocol workingProtocol) { TreeRFBProto rfb = viewer.getRfb(); + ProtocolContext previousContext = rfb.getContext(); rfb.stopReceiverTask(); rfb.setProtocolContext(workingProtocol); viewer.setConnectionPresenter(this); viewer.getConnectionPresenter().addModel("ConnectionParamsModel", connectionParams); + if (previousContext != null && rfb.isTreeManager() && rfb.hasParent()) { + Reader previousReader = previousContext.getReader(); + Writer previousWriter = previousContext.getWriter(); + rfb.exchangeDirectConnectedServer(previousReader, previousWriter); + } rfb.enableChildrenTransmission(); rfb.printNetworkInterface(); rfb.sendDesktopSizeChange(reconnectingId);