Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 389:5a61cbdd83ab
Lock rfb
| author | innparusu |
|---|---|
| date | Tue, 22 Sep 2015 16:03:22 +0900 |
| parents | 367352328329 |
| children | dc168770dbe3 |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java |
| diffstat | 4 files changed, 449 insertions(+), 865 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Fri Sep 18 16:42:47 2015 +0900 +++ b/.idea/workspace.xml Tue Sep 22 16:03:22 2015 +0900 @@ -4,7 +4,6 @@ <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/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" /> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> @@ -34,10 +33,10 @@ <splitter split-orientation="horizontal" split-proportion="0.4635514"> <split-first> <leaf> - <file leaf-file-name="ProtocolState.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="ProtocolState.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.50988877" vertical-offset="0" max-vertical-offset="1618"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615"> <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" /> <folding /> </state> @@ -47,7 +46,7 @@ <file leaf-file-name="ProtocolContext.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1427" max-vertical-offset="2828"> + <state vertical-scroll-proportion="0.0" vertical-offset="1155" max-vertical-offset="1515"> <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" /> <folding /> </state> @@ -57,7 +56,7 @@ <file leaf-file-name="ZRLEESender.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900"> + <state vertical-scroll-proportion="0.0" vertical-offset="300" max-vertical-offset="900"> <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> <folding /> </state> @@ -67,11 +66,9 @@ <file leaf-file-name="ZRLEDecoder.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2415" max-vertical-offset="2685"> + <state vertical-scroll-proportion="0.0" vertical-offset="2085" max-vertical-offset="2355"> <caret line="163" column="0" selection-start-line="163" selection-start-column="0" selection-end-line="163" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -79,7 +76,7 @@ <file leaf-file-name="ZlibDecoder.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="720"> + <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="720"> <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" /> <folding /> </state> @@ -89,7 +86,7 @@ <file leaf-file-name="ProtocolSettings.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1474" max-vertical-offset="8448"> + <state vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="5760"> <caret line="42" column="21" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="21" /> <folding /> </state> @@ -99,7 +96,7 @@ <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="0" max-vertical-offset="1260"> + <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="945"> <caret line="54" column="41" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="41" /> <folding /> </state> @@ -109,9 +106,20 @@ <file leaf-file-name="TreeManagement.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="398" max-vertical-offset="6550"> + <state vertical-scroll-proportion="0.0" vertical-offset="1485" max-vertical-offset="3930"> <caret line="102" column="29" selection-start-line="102" selection-start-column="29" selection-end-line="102" selection-end-column="29" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#250#263#0" expanded="false" /> + <element signature="e#5556#5557#0" expanded="false" /> + <element signature="e#5622#5623#0" expanded="false" /> + <element signature="e#8109#8110#0" expanded="false" /> + <element signature="e#8140#8141#0" expanded="false" /> + <element signature="e#8196#8197#0" expanded="false" /> + <element signature="e#8226#8227#0" expanded="false" /> + <element signature="e#8260#8261#0" expanded="false" /> + <element signature="e#8293#8294#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -119,13 +127,23 @@ <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="67" max-vertical-offset="1587"> + <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="1035"> <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> </file> + <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="true"> + <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="0.3426791" vertical-offset="2300" max-vertical-offset="5080"> + <caret line="180" column="8" selection-start-line="180" selection-start-column="8" selection-end-line="180" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </split-first> <split-second> @@ -133,25 +151,25 @@ <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="-12.175" vertical-offset="8813" max-vertical-offset="12000"> + <state vertical-scroll-proportion="0.0" vertical-offset="5580" max-vertical-offset="7200"> <caret line="388" column="56" selection-start-line="388" selection-start-column="56" selection-end-line="388" selection-end-column="56" /> <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#9689#9690#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" /> - <element signature="e#14959#14960#0" expanded="true" /> - <element signature="e#15009#15010#0" expanded="true" /> - <element signature="e#15040#15041#0" expanded="true" /> - <element signature="e#15089#15090#0" expanded="true" /> - <element signature="e#15114#15115#0" expanded="true" /> - <element signature="e#15164#15165#0" expanded="true" /> - <element signature="e#15190#15191#0" expanded="true" /> - <element signature="e#15752#15763#0" expanded="true" /> + <element signature="e#6823#6824#0" expanded="false" /> + <element signature="e#6852#6853#0" expanded="false" /> + <element signature="e#7108#7109#0" expanded="false" /> + <element signature="e#7140#7141#0" expanded="false" /> + <element signature="e#7676#7677#0" expanded="false" /> + <element signature="e#7718#7719#0" expanded="false" /> + <element signature="e#9152#9153#0" expanded="false" /> + <element signature="e#9195#9196#0" expanded="false" /> + <element signature="e#9621#9622#0" expanded="false" /> + <element signature="e#9653#9654#0" expanded="false" /> + <element signature="e#9755#9756#0" expanded="false" /> + <element signature="e#9799#9800#0" expanded="false" /> + <element signature="e#9845#9846#0" expanded="false" /> + <element signature="e#9886#9887#0" expanded="false" /> + <element signature="e#9929#9930#0" expanded="false" /> + <element signature="e#9967#9968#0" expanded="false" /> </folding> </state> </provider> @@ -160,43 +178,21 @@ <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="-25.175" vertical-offset="7489" max-vertical-offset="8976"> - <caret line="392" column="24" selection-start-line="392" selection-start-column="24" selection-end-line="392" selection-end-column="24" /> + <state vertical-scroll-proportion="0.0" vertical-offset="189" max-vertical-offset="9045"> + <caret line="72" column="26" selection-start-line="72" selection-start-column="26" selection-end-line="72" selection-end-column="26" /> <folding> - <element signature="e#3441#3442#0" expanded="true" /> - <element signature="e#3478#3479#0" expanded="true" /> - <element signature="e#3537#3538#0" expanded="true" /> - <element signature="e#3589#3590#0" expanded="true" /> - <element signature="e#3642#3643#0" expanded="true" /> - <element signature="e#3681#3682#0" expanded="true" /> - <element signature="e#3755#3756#0" expanded="true" /> - <element signature="e#3811#3812#0" expanded="true" /> - <element signature="e#5110#5111#0" expanded="true" /> - <element signature="e#5183#5184#0" expanded="true" /> - <element signature="e#7339#7340#0" expanded="true" /> - <element signature="e#7425#7426#0" expanded="true" /> - <element signature="e#11988#11989#0" expanded="true" /> - <element signature="e#12057#12058#0" expanded="true" /> - <element signature="e#12091#12092#0" expanded="true" /> - <element signature="e#12122#12123#0" expanded="true" /> - <element signature="e#12691#12692#0" expanded="true" /> - <element signature="e#12758#12759#0" expanded="true" /> - <element signature="e#12799#12800#0" expanded="true" /> - <element signature="e#12832#12833#0" expanded="true" /> - <element signature="e#12880#12881#0" expanded="true" /> - <element signature="e#12914#12915#0" expanded="true" /> - <element signature="e#12955#12956#0" expanded="true" /> - <element signature="e#12994#12995#0" expanded="true" /> - <element signature="e#13047#13048#0" expanded="true" /> - <element signature="e#13086#13087#0" expanded="true" /> - <element signature="e#13127#13128#0" expanded="true" /> - <element signature="e#13166#13167#0" expanded="true" /> - <element signature="e#13212#13213#0" expanded="true" /> - <element signature="e#13244#13245#0" expanded="true" /> - <element signature="e#13288#13289#0" expanded="true" /> - <element signature="e#13318#13319#0" expanded="true" /> - <element signature="e#13527#13528#0" expanded="true" /> - <element signature="e#13581#13582#0" expanded="true" /> + <element signature="e#3540#3541#0" expanded="true" /> + <element signature="e#3596#3597#0" expanded="true" /> + <element signature="e#4895#4896#0" expanded="true" /> + <element signature="e#4968#4969#0" expanded="true" /> + <element signature="e#7124#7125#0" expanded="true" /> + <element signature="e#7210#7211#0" expanded="true" /> + <element signature="e#11876#11877#0" expanded="true" /> + <element signature="e#11907#11908#0" expanded="true" /> + <element signature="e#13073#13074#0" expanded="true" /> + <element signature="e#13103#13104#0" expanded="true" /> + <element signature="e#13312#13313#0" expanded="true" /> + <element signature="e#13366#13367#0" expanded="true" /> </folding> </state> </provider> @@ -205,9 +201,20 @@ <file leaf-file-name="SwingNetworkConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3097"> + <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="2445"> <caret line="48" column="6" selection-start-line="48" selection-start-column="6" selection-end-line="48" selection-end-column="6" /> - <folding /> + <folding> + <element signature="e#0#8430#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#8042#8043#0" expanded="false" /> + <element signature="e#8098#8099#0" expanded="false" /> + <element signature="e#8175#8176#0" expanded="false" /> + <element signature="e#8217#8218#0" expanded="false" /> + <element signature="e#8290#8291#0" expanded="false" /> + <element signature="e#8340#8341#0" expanded="false" /> + <element signature="e#8385#8386#0" expanded="false" /> + <element signature="e#8426#8427#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -215,9 +222,13 @@ <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="2495" max-vertical-offset="4023"> + <state vertical-scroll-proportion="0.0" vertical-offset="2025" max-vertical-offset="2235"> <caret line="143" column="24" selection-start-line="143" selection-start-column="24" selection-end-line="143" selection-end-column="24" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#4591#4592#0" expanded="false" /> + <element signature="e#4621#4622#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -225,9 +236,13 @@ <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" vertical-offset="968" max-vertical-offset="4532"> + <state vertical-scroll-proportion="0.0" vertical-offset="1110" max-vertical-offset="3090"> <caret line="79" column="18" selection-start-line="79" selection-start-column="18" selection-end-line="79" selection-end-column="18" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#8529#8530#0" expanded="false" /> + <element signature="e#8595#8596#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -242,12 +257,14 @@ </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="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="2159" max-vertical-offset="5865"> - <caret line="171" column="52" selection-start-line="171" selection-start-column="52" selection-end-line="171" selection-end-column="52" /> - <folding /> + <state vertical-scroll-proportion="98.525" vertical-offset="4501" max-vertical-offset="6320"> + <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> + <folding> + <element signature="e#0#12518#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -255,9 +272,94 @@ <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="-29.7" vertical-offset="18454" max-vertical-offset="19941"> + <state vertical-scroll-proportion="0.0" vertical-offset="12810" max-vertical-offset="13005"> <caret line="1015" column="22" selection-start-line="1015" selection-start-column="22" selection-end-line="1015" selection-end-column="22" /> - <folding /> + <folding> + <element signature="e#0#40965#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#4639#5164#0" expanded="false" /> + <element signature="e#4943#5130#0" expanded="false" /> + <element signature="e#5129#5130#0" expanded="false" /> + <element signature="e#5163#5164#0" expanded="false" /> + <element signature="e#5533#5534#0" expanded="false" /> + <element signature="e#5598#5599#0" expanded="false" /> + <element signature="e#5670#5671#0" expanded="false" /> + <element signature="e#5735#5736#0" expanded="false" /> + <element signature="e#6165#6166#0" expanded="false" /> + <element signature="e#6230#6231#0" expanded="false" /> + <element signature="e#6302#6303#0" expanded="false" /> + <element signature="e#6367#6368#0" expanded="false" /> + <element signature="e#8119#8120#0" expanded="false" /> + <element signature="e#8161#8162#0" expanded="false" /> + <element signature="e#8228#8229#0" expanded="false" /> + <element signature="e#8283#8284#0" expanded="false" /> + <element signature="e#13646#13859#0" expanded="false" /> + <element signature="e#13858#13859#0" expanded="false" /> + <element signature="e#13931#14143#0" expanded="false" /> + <element signature="e#14142#14143#0" expanded="false" /> + <element signature="e#14220#14474#0" expanded="false" /> + <element signature="e#14473#14474#0" expanded="false" /> + <element signature="e#14582#15076#0" expanded="false" /> + <element signature="e#15075#15076#0" expanded="false" /> + <element signature="e#15191#15680#0" expanded="false" /> + <element signature="e#15679#15680#0" expanded="false" /> + <element signature="e#18487#18851#0" expanded="false" /> + <element signature="e#18850#18851#0" expanded="false" /> + <element signature="e#19337#19338#0" expanded="false" /> + <element signature="e#19391#19392#0" expanded="false" /> + <element signature="e#20835#20836#0" expanded="false" /> + <element signature="e#20865#20866#0" expanded="false" /> + <element signature="e#21224#21225#0" expanded="false" /> + <element signature="e#21303#21304#0" expanded="false" /> + <element signature="e#21730#21731#0" expanded="false" /> + <element signature="e#21792#21793#0" expanded="false" /> + <element signature="e#22379#22380#0" expanded="false" /> + <element signature="e#22436#22437#0" expanded="false" /> + <element signature="e#22469#22470#0" expanded="false" /> + <element signature="e#22527#22528#0" expanded="false" /> + <element signature="e#22561#22562#0" expanded="false" /> + <element signature="e#22651#22652#0" expanded="false" /> + <element signature="e#22686#22687#0" expanded="false" /> + <element signature="e#22758#22759#0" expanded="false" /> + <element signature="e#27362#27550#0" expanded="false" /> + <element signature="e#27549#27550#0" expanded="false" /> + <element signature="e#28094#28612#0" expanded="false" /> + <element signature="e#28244#28562#0" expanded="false" /> + <element signature="e#28561#28562#0" expanded="false" /> + <element signature="e#28611#28612#0" expanded="false" /> + <element signature="e#28761#28762#0" expanded="false" /> + <element signature="e#28814#28815#0" expanded="false" /> + <element signature="e#28858#28859#0" expanded="false" /> + <element signature="e#28911#28912#0" expanded="false" /> + <element signature="e#29198#29865#0" expanded="false" /> + <element signature="e#29864#29865#0" expanded="false" /> + <element signature="e#29958#30118#0" expanded="false" /> + <element signature="e#30117#30118#0" expanded="false" /> + <element signature="e#30365#30573#0" expanded="false" /> + <element signature="e#30572#30573#0" expanded="false" /> + <element signature="e#30641#30857#0" expanded="false" /> + <element signature="e#30856#30857#0" expanded="false" /> + <element signature="e#30957#31174#0" expanded="false" /> + <element signature="e#31173#31174#0" expanded="false" /> + <element signature="e#31390#31602#0" expanded="false" /> + <element signature="e#31601#31602#0" expanded="false" /> + <element signature="e#31739#31947#0" expanded="false" /> + <element signature="e#31946#31947#0" expanded="false" /> + <element signature="e#32088#32540#0" expanded="false" /> + <element signature="e#32539#32540#0" expanded="false" /> + <element signature="e#32679#33129#0" expanded="false" /> + <element signature="e#33128#33129#0" expanded="false" /> + <element signature="e#33251#34536#0" expanded="false" /> + <element signature="e#34535#34536#0" expanded="false" /> + <element signature="e#34676#34996#0" expanded="false" /> + <element signature="e#34995#34996#0" expanded="false" /> + <element signature="e#35136#35437#0" expanded="false" /> + <element signature="e#35436#35437#0" expanded="false" /> + <element signature="e#36093#36490#0" expanded="false" /> + <element signature="e#36489#36490#0" expanded="false" /> + <element signature="e#40480#40481#0" expanded="false" /> + <element signature="e#40515#40516#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -265,87 +367,11 @@ <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="2.2332268" vertical-offset="3825" max-vertical-offset="21960"> - <caret line="334" column="0" selection-start-line="334" selection-start-column="0" selection-end-line="334" selection-end-column="0" /> + <state vertical-scroll-proportion="-6.5054517" vertical-offset="18036" max-vertical-offset="19320"> + <caret line="495" column="0" selection-start-line="495" selection-start-column="0" selection-end-line="495" selection-end-column="0" /> <folding> - <element signature="e#4355#6952#0" expanded="true" /> - <element signature="e#6951#6952#0" expanded="true" /> - <element signature="e#7119#13672#0" expanded="true" /> - <element signature="e#10839#11165#0" expanded="true" /> - <element signature="e#11164#11165#0" expanded="true" /> - <element signature="e#11410#11736#0" expanded="true" /> - <element signature="e#11735#11736#0" expanded="true" /> - <element signature="e#11967#12293#0" expanded="true" /> - <element signature="e#12292#12293#0" expanded="true" /> - <element signature="e#12515#12841#0" expanded="true" /> - <element signature="e#12840#12841#0" expanded="true" /> - <element signature="e#13671#13672#0" expanded="true" /> - <element signature="e#15990#15991#0" expanded="true" /> - <element signature="e#16031#16032#0" expanded="true" /> - <element signature="e#16084#16085#0" expanded="true" /> - <element signature="e#16122#16123#0" expanded="true" /> - <element signature="e#16163#16164#0" expanded="true" /> - <element signature="e#16196#16197#0" expanded="true" /> - <element signature="e#16261#16262#0" expanded="true" /> - <element signature="e#16302#16303#0" expanded="true" /> - <element signature="e#17532#17533#0" expanded="true" /> - <element signature="e#17558#17559#0" expanded="true" /> - <element signature="e#17600#17601#0" expanded="true" /> - <element signature="e#17629#17630#0" expanded="true" /> - <element signature="e#17794#17795#0" expanded="true" /> - <element signature="e#17837#17838#0" expanded="true" /> - <element signature="e#17880#17881#0" expanded="true" /> - <element signature="e#17920#17921#0" expanded="true" /> - <element signature="e#18513#18514#0" expanded="true" /> - <element signature="e#18546#18547#0" expanded="true" /> - <element signature="e#18588#18589#0" expanded="true" /> - <element signature="e#18625#18626#0" expanded="true" /> - <element signature="e#18664#18665#0" expanded="true" /> - <element signature="e#18697#18698#0" expanded="true" /> - <element signature="e#18745#18746#0" expanded="true" /> - <element signature="e#18778#18779#0" expanded="true" /> - <element signature="e#20149#20161#0" expanded="true" /> - <element signature="e#21714#21715#0" expanded="true" /> - <element signature="e#21752#21753#0" expanded="true" /> - <element signature="e#22596#22597#0" expanded="true" /> - <element signature="e#22628#22629#0" expanded="true" /> - <element signature="e#26335#26347#0" expanded="true" /> - <element signature="e#29833#29834#0" expanded="true" /> - <element signature="e#29861#29862#0" expanded="true" /> - <element signature="e#29889#29890#0" expanded="true" /> - <element signature="e#29914#29915#0" expanded="true" /> - <element signature="e#30054#30055#0" expanded="true" /> - <element signature="e#30090#30091#0" expanded="true" /> - <element signature="e#30123#30124#0" expanded="true" /> - <element signature="e#30152#30153#0" expanded="true" /> - <element signature="e#30223#30224#0" expanded="true" /> - <element signature="e#30273#30274#0" expanded="true" /> - <element signature="e#32096#32097#0" expanded="true" /> - <element signature="e#32131#32132#0" expanded="true" /> - <element signature="e#32214#32215#0" expanded="true" /> - <element signature="e#32257#32258#0" expanded="true" /> - <element signature="e#32314#32315#0" expanded="true" /> - <element signature="e#32339#32340#0" expanded="true" /> - <element signature="e#32373#32374#0" expanded="true" /> - <element signature="e#32405#32406#0" expanded="true" /> - <element signature="e#32448#32449#0" expanded="true" /> - <element signature="e#32477#32478#0" expanded="true" /> - <element signature="e#32526#32527#0" expanded="true" /> - <element signature="e#32570#32571#0" expanded="true" /> - <element signature="e#32623#32624#0" expanded="true" /> - <element signature="e#32667#32668#0" expanded="true" /> - <element signature="e#32724#32725#0" expanded="true" /> - <element signature="e#32773#32774#0" expanded="true" /> - <element signature="e#33229#33230#0" expanded="true" /> - <element signature="e#33273#33274#0" expanded="true" /> - <element signature="e#33344#33345#0" expanded="true" /> - <element signature="e#33406#33407#0" expanded="true" /> - <element signature="e#34012#34013#0" expanded="true" /> - <element signature="e#34046#34047#0" expanded="true" /> - <element signature="e#34082#34083#0" expanded="true" /> - <element signature="e#34117#34118#0" expanded="true" /> - <element signature="e#34151#34152#0" expanded="true" /> - <element signature="e#34182#34183#0" expanded="true" /> + <element signature="e#19848#19860#0" expanded="true" /> + <element signature="e#26002#26014#0" expanded="true" /> </folding> </state> </provider> @@ -644,17 +670,17 @@ <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.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/ConnectionPresenter.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/ConnectionPresenter.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="-16" /> + <option name="x" value="4" /> <option name="y" value="23" /> <option name="width" value="3836" /> - <option name="height" value="2136" /> + <option name="height" value="2137" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -679,7 +705,6 @@ <sortByType /> </navigator> <panes> - <pane id="PackagesPane" /> <pane id="Scope" /> <pane id="ProjectPane"> <subPane> @@ -1047,6 +1072,7 @@ </PATH> </subPane> </pane> + <pane id="PackagesPane" /> <pane id="Scratches" /> </panes> </component> @@ -1071,7 +1097,7 @@ <property name="settings.editor.splitter.proportion" value="0.2" /> <property name="FullScreen" value="false" /> </component> - <component name="RunManager" selected="Application.TreeViewer"> + <component name="RunManager" selected="Application.TreeeViewer -d"> <configuration default="false" name="TreeViewer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> <pattern> @@ -1178,6 +1204,19 @@ </ExternalSystemSettings> <method /> </configuration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <method /> + </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="" /> @@ -1206,19 +1245,6 @@ <listeners /> <method /> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <method /> - </configuration> <configuration default="true" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" /> @@ -1275,9 +1301,27 @@ <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> <method /> </configuration> - <list size="2"> - <item index="0" class="java.lang.String" itemvalue="Application.TreeViewer" /> - <item index="1" class="java.lang.String" itemvalue="Application.IsRetina" /> + <configuration default="false" name="TreeeViewer -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" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="-d --showTree" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="TreeVNC" /> + <envs /> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Run" /> + <method /> + </configuration> + <list size="3"> + <item index="0" class="java.lang.String" itemvalue="Application.TreeeViewer -d" /> + <item index="1" class="java.lang.String" itemvalue="Application.TreeViewer" /> + <item index="2" class="java.lang.String" itemvalue="Application.IsRetina" /> </list> <recent_temporary> <list size="2"> @@ -1324,7 +1368,7 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="-16" y="23" width="3836" height="2136" extended-state="6" /> + <frame x="4" y="23" width="3836" height="2137" extended-state="6" /> <editor active="false" /> <layout> <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" /> @@ -1333,9 +1377,8 @@ <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18226601" 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.18217626" 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" /> @@ -1347,25 +1390,26 @@ <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.15745568" 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.15172054" 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.34118852" 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.15172054" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34071887" 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="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="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="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="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="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="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="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="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="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="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="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" /> @@ -1442,7 +1486,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>548</line> + <line>535</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1460,7 +1504,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>834</line> + <line>821</line> <properties /> <option name="timeStamp" value="85" /> </line-breakpoint> @@ -1562,20 +1606,14 @@ <option name="timeStamp" value="123" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>390</line> - <properties /> - <option name="timeStamp" value="125" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>191</line> + <line>192</line> <properties /> <option name="timeStamp" value="126" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>809</line> + <line>796</line> <properties /> <option name="timeStamp" value="127" /> </line-breakpoint> @@ -1585,15 +1623,9 @@ <properties /> <option name="timeStamp" value="129" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>403</line> - <properties /> - <option name="timeStamp" value="130" /> - </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> - <line>188</line> + <line>187</line> <properties /> <option name="timeStamp" value="131" /> </line-breakpoint> @@ -1605,7 +1637,7 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>309</line> + <line>310</line> <properties /> <option name="timeStamp" value="134" /> </line-breakpoint> @@ -1633,44 +1665,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="8605" max-vertical-offset="53025"> <caret line="680" column="0" selection-start-line="680" selection-start-column="0" selection-end-line="680" selection-end-column="0" /> - <folding> - <element signature="e#0#147270#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#22723#22724#0" expanded="false" /> - <element signature="e#22780#22781#0" expanded="false" /> - <element signature="e#23129#23130#0" expanded="false" /> - <element signature="e#23185#23186#0" expanded="false" /> - <element signature="e#32085#32086#0" expanded="false" /> - <element signature="e#32132#32133#0" expanded="false" /> - <element signature="e#45290#45291#0" expanded="false" /> - <element signature="e#45381#45382#0" expanded="false" /> - <element signature="e#56195#56196#0" expanded="false" /> - <element signature="e#56238#56239#0" expanded="false" /> - <element signature="e#57657#57658#0" expanded="false" /> - <element signature="e#57706#57707#0" expanded="false" /> - <element signature="e#57945#57946#0" expanded="false" /> - <element signature="e#58016#58017#0" expanded="false" /> - <element signature="e#58258#58259#0" expanded="false" /> - <element signature="e#58340#58341#0" expanded="false" /> - <element signature="e#103912#103913#0" expanded="false" /> - <element signature="e#103972#103973#0" expanded="false" /> - <element signature="e#112021#112022#0" expanded="false" /> - <element signature="e#112053#112054#0" expanded="false" /> - <element signature="e#112347#112348#0" expanded="false" /> - <element signature="e#112391#112392#0" expanded="false" /> - <element signature="e#113962#113963#0" expanded="false" /> - <element signature="e#113999#114000#0" expanded="false" /> - <element signature="e#114028#114029#0" expanded="false" /> - <element signature="e#114069#114070#0" expanded="false" /> - <element signature="e#116609#116610#0" expanded="false" /> - <element signature="e#116647#116648#0" expanded="false" /> - <element signature="e#136260#136261#0" expanded="false" /> - <element signature="e#136345#136346#0" expanded="false" /> - <element signature="e#138996#138997#0" expanded="false" /> - <element signature="e#139073#139074#0" expanded="false" /> - <element signature="e#143839#143840#0" expanded="false" /> - <element signature="e#143876#143877#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1845,10 +1839,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.30339196" vertical-offset="0" max-vertical-offset="1592"> <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> - <folding> - <element signature="e#1938#1939#0" expanded="false" /> - <element signature="e#1959#1960#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1890,7 +1880,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="897" max-vertical-offset="3275"> <caret line="61" column="17" selection-start-line="61" selection-start-column="17" selection-end-line="61" selection-end-column="17" /> - <folding /> </state> </provider> </entry> @@ -1909,18 +1898,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="3251" max-vertical-offset="6102"> <caret line="182" column="13" selection-start-line="182" selection-start-column="13" selection-end-line="182" selection-end-column="13" /> - <folding> - <element signature="e#0#8650#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3024#3025#0" expanded="false" /> - <element signature="e#3072#3073#0" expanded="false" /> - <element signature="e#5581#5582#0" expanded="false" /> - <element signature="e#5613#5614#0" expanded="false" /> - <element signature="e#5662#5663#0" expanded="false" /> - <element signature="e#5694#5695#0" expanded="false" /> - <element signature="e#8612#8613#0" expanded="false" /> - <element signature="e#8645#8646#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1928,401 +1905,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="73566" max-vertical-offset="232416"> <caret line="3345" column="40" selection-start-line="3345" selection-start-column="40" selection-end-line="3345" selection-end-column="40" /> - <folding> - <element signature="e#0#377448#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#20741#20742#0" expanded="false" /> - <element signature="e#20774#20775#0" expanded="false" /> - <element signature="e#27745#27746#0" expanded="false" /> - <element signature="e#27812#27813#0" expanded="false" /> - <element signature="e#29358#29359#0" expanded="false" /> - <element signature="e#29419#29420#0" expanded="false" /> - <element signature="e#29475#29476#0" expanded="false" /> - <element signature="e#29543#29544#0" expanded="false" /> - <element signature="e#29815#29816#0" expanded="false" /> - <element signature="e#29870#29871#0" expanded="false" /> - <element signature="e#29949#29950#0" expanded="false" /> - <element signature="e#30010#30011#0" expanded="false" /> - <element signature="e#30067#30068#0" expanded="false" /> - <element signature="e#30135#30136#0" expanded="false" /> - <element signature="e#30205#30206#0" expanded="false" /> - <element signature="e#30257#30258#0" expanded="false" /> - <element signature="e#30473#30474#0" expanded="false" /> - <element signature="e#30540#30541#0" expanded="false" /> - <element signature="e#30733#30734#0" expanded="false" /> - <element signature="e#30792#30793#0" expanded="false" /> - <element signature="e#30851#30852#0" expanded="false" /> - <element signature="e#30907#30908#0" expanded="false" /> - <element signature="e#30961#30962#0" expanded="false" /> - <element signature="e#31029#31030#0" expanded="false" /> - <element signature="e#31088#31089#0" expanded="false" /> - <element signature="e#31136#31137#0" expanded="false" /> - <element signature="e#31206#31207#0" expanded="false" /> - <element signature="e#31254#31255#0" expanded="false" /> - <element signature="e#31313#31314#0" expanded="false" /> - <element signature="e#31390#31391#0" expanded="false" /> - <element signature="e#31452#31453#0" expanded="false" /> - <element signature="e#31509#31510#0" expanded="false" /> - <element signature="e#31559#31560#0" expanded="false" /> - <element signature="e#31608#31609#0" expanded="false" /> - <element signature="e#31659#31660#0" expanded="false" /> - <element signature="e#31709#31710#0" expanded="false" /> - <element signature="e#31755#31756#0" expanded="false" /> - <element signature="e#31800#31801#0" expanded="false" /> - <element signature="e#31846#31847#0" expanded="false" /> - <element signature="e#31891#31892#0" expanded="false" /> - <element signature="e#31948#31949#0" expanded="false" /> - <element signature="e#32002#32003#0" expanded="false" /> - <element signature="e#32059#32060#0" expanded="false" /> - <element signature="e#32113#32114#0" expanded="false" /> - <element signature="e#32187#32188#0" expanded="false" /> - <element signature="e#32247#32248#0" expanded="false" /> - <element signature="e#32297#32298#0" expanded="false" /> - <element signature="e#32363#32364#0" expanded="false" /> - <element signature="e#32430#32431#0" expanded="false" /> - <element signature="e#32482#32483#0" expanded="false" /> - <element signature="e#32701#32702#0" expanded="false" /> - <element signature="e#32763#32764#0" expanded="false" /> - <element signature="e#33174#33175#0" expanded="false" /> - <element signature="e#33229#33230#0" expanded="false" /> - <element signature="e#33321#33322#0" expanded="false" /> - <element signature="e#33368#33369#0" expanded="false" /> - <element signature="e#34813#34814#0" expanded="false" /> - <element signature="e#34860#34861#0" expanded="false" /> - <element signature="e#35174#35175#0" expanded="false" /> - <element signature="e#35203#35204#0" expanded="false" /> - <element signature="e#35420#35421#0" expanded="false" /> - <element signature="e#35467#35468#0" expanded="false" /> - <element signature="e#35690#35691#0" expanded="false" /> - <element signature="e#35717#35718#0" expanded="false" /> - <element signature="e#38201#38202#0" expanded="false" /> - <element signature="e#38238#38239#0" expanded="false" /> - <element signature="e#39573#39574#0" expanded="false" /> - <element signature="e#39600#39601#0" expanded="false" /> - <element signature="e#40173#40174#0" expanded="false" /> - <element signature="e#40212#40213#0" expanded="false" /> - <element signature="e#41173#41174#0" expanded="false" /> - <element signature="e#41219#41220#0" expanded="false" /> - <element signature="e#42274#42275#0" expanded="false" /> - <element signature="e#42314#42315#0" expanded="false" /> - <element signature="e#42743#42744#0" expanded="false" /> - <element signature="e#42790#42791#0" expanded="false" /> - <element signature="e#42835#42836#0" expanded="false" /> - <element signature="e#42865#42866#0" expanded="false" /> - <element signature="e#43181#43182#0" expanded="false" /> - <element signature="e#43264#43265#0" expanded="false" /> - <element signature="e#47536#47537#0" expanded="false" /> - <element signature="e#47571#47572#0" expanded="false" /> - <element signature="e#49065#49066#0" expanded="false" /> - <element signature="e#49103#49104#0" expanded="false" /> - <element signature="e#49258#49259#0" expanded="false" /> - <element signature="e#49288#49289#0" expanded="false" /> - <element signature="e#50094#50095#0" expanded="false" /> - <element signature="e#50119#50120#0" expanded="false" /> - <element signature="e#53054#53055#0" expanded="false" /> - <element signature="e#53082#53083#0" expanded="false" /> - <element signature="e#55232#55233#0" expanded="false" /> - <element signature="e#55255#55256#0" expanded="false" /> - <element signature="e#57027#57028#0" expanded="false" /> - <element signature="e#57064#57065#0" expanded="false" /> - <element signature="e#57110#57111#0" expanded="false" /> - <element signature="e#57178#57179#0" expanded="false" /> - <element signature="e#61184#61185#0" expanded="false" /> - <element signature="e#61227#61228#0" expanded="false" /> - <element signature="e#63292#63293#0" expanded="false" /> - <element signature="e#63335#63336#0" expanded="false" /> - <element signature="e#63604#63605#0" expanded="false" /> - <element signature="e#63649#63650#0" expanded="false" /> - <element signature="e#65989#65990#0" expanded="false" /> - <element signature="e#66026#66027#0" expanded="false" /> - <element signature="e#69348#69349#0" expanded="false" /> - <element signature="e#69381#69382#0" expanded="false" /> - <element signature="e#71158#71159#0" expanded="false" /> - <element signature="e#71204#71205#0" expanded="false" /> - <element signature="e#71249#71250#0" expanded="false" /> - <element signature="e#71287#71288#0" expanded="false" /> - <element signature="e#72045#72046#0" expanded="false" /> - <element signature="e#72071#72072#0" expanded="false" /> - <element signature="e#73038#73039#0" expanded="false" /> - <element signature="e#73075#73076#0" expanded="false" /> - <element signature="e#73601#73602#0" expanded="false" /> - <element signature="e#73630#73631#0" expanded="false" /> - <element signature="e#73778#73779#0" expanded="false" /> - <element signature="e#73829#73830#0" expanded="false" /> - <element signature="e#74351#74352#0" expanded="false" /> - <element signature="e#74388#74389#0" expanded="false" /> - <element signature="e#75252#75253#0" expanded="false" /> - <element signature="e#75277#75278#0" expanded="false" /> - <element signature="e#75442#75443#0" expanded="false" /> - <element signature="e#75484#75485#0" expanded="false" /> - <element signature="e#75865#75866#0" expanded="false" /> - <element signature="e#75896#75897#0" expanded="false" /> - <element signature="e#76048#76049#0" expanded="false" /> - <element signature="e#76105#76106#0" expanded="false" /> - <element signature="e#77012#77013#0" expanded="false" /> - <element signature="e#77056#77057#0" expanded="false" /> - <element signature="e#82938#82939#0" expanded="false" /> - <element signature="e#82992#82993#0" expanded="false" /> - <element signature="e#83382#83383#0" expanded="false" /> - <element signature="e#83406#83407#0" expanded="false" /> - <element signature="e#83796#83797#0" expanded="false" /> - <element signature="e#83820#83821#0" expanded="false" /> - <element signature="e#84190#84191#0" expanded="false" /> - <element signature="e#84218#84219#0" expanded="false" /> - <element signature="e#84593#84594#0" expanded="false" /> - <element signature="e#84622#84623#0" expanded="false" /> - <element signature="e#88309#88310#0" expanded="false" /> - <element signature="e#88368#88369#0" expanded="false" /> - <element signature="e#89626#89627#0" expanded="false" /> - <element signature="e#89660#89661#0" expanded="false" /> - <element signature="e#89901#89902#0" expanded="false" /> - <element signature="e#89939#89940#0" expanded="false" /> - <element signature="e#91798#91799#0" expanded="false" /> - <element signature="e#91831#91832#0" expanded="false" /> - <element signature="e#92067#92068#0" expanded="false" /> - <element signature="e#92103#92104#0" expanded="false" /> - <element signature="e#93996#93997#0" expanded="false" /> - <element signature="e#94029#94030#0" expanded="false" /> - <element signature="e#94829#94830#0" expanded="false" /> - <element signature="e#94868#94869#0" expanded="false" /> - <element signature="e#95247#95248#0" expanded="false" /> - <element signature="e#95286#95287#0" expanded="false" /> - <element signature="e#97756#97757#0" expanded="false" /> - <element signature="e#97807#97808#0" expanded="false" /> - <element signature="e#98063#98064#0" expanded="false" /> - <element signature="e#98087#98088#0" expanded="false" /> - <element signature="e#102003#102004#0" expanded="false" /> - <element signature="e#102044#102045#0" expanded="false" /> - <element signature="e#108442#108443#0" expanded="false" /> - <element signature="e#108489#108490#0" expanded="false" /> - <element signature="e#109269#109270#0" expanded="false" /> - <element signature="e#109308#109309#0" expanded="false" /> - <element signature="e#112003#112004#0" expanded="false" /> - <element signature="e#112027#112028#0" expanded="false" /> - <element signature="e#113128#113129#0" expanded="false" /> - <element signature="e#113152#113153#0" expanded="false" /> - <element signature="e#114014#114015#0" expanded="false" /> - <element signature="e#114061#114062#0" expanded="false" /> - <element signature="e#114727#114728#0" expanded="false" /> - <element signature="e#114775#114776#0" expanded="false" /> - <element signature="e#118877#118878#0" expanded="false" /> - <element signature="e#118901#118902#0" expanded="false" /> - <element signature="e#120005#120006#0" expanded="false" /> - <element signature="e#120029#120030#0" expanded="false" /> - <element signature="e#127614#127615#0" expanded="false" /> - <element signature="e#127674#127675#0" expanded="false" /> - <element signature="e#130347#130348#0" expanded="false" /> - <element signature="e#130405#130406#0" expanded="false" /> - <element signature="e#138564#138565#0" expanded="false" /> - <element signature="e#138601#138602#0" expanded="false" /> - <element signature="e#148312#148313#0" expanded="false" /> - <element signature="e#148352#148353#0" expanded="false" /> - <element signature="e#150476#150477#0" expanded="false" /> - <element signature="e#150524#150525#0" expanded="false" /> - <element signature="e#150672#150673#0" expanded="false" /> - <element signature="e#150724#150725#0" expanded="false" /> - <element signature="e#150928#150929#0" expanded="false" /> - <element signature="e#151005#151006#0" expanded="false" /> - <element signature="e#154922#154923#0" expanded="false" /> - <element signature="e#154957#154958#0" expanded="false" /> - <element signature="e#157914#157915#0" expanded="false" /> - <element signature="e#157954#157955#0" expanded="false" /> - <element signature="e#160105#160106#0" expanded="false" /> - <element signature="e#160153#160154#0" expanded="false" /> - <element signature="e#160661#160662#0" expanded="false" /> - <element signature="e#160714#160715#0" expanded="false" /> - <element signature="e#161644#161645#0" expanded="false" /> - <element signature="e#161697#161698#0" expanded="false" /> - <element signature="e#162460#162461#0" expanded="false" /> - <element signature="e#162500#162501#0" expanded="false" /> - <element signature="e#162554#162555#0" expanded="false" /> - <element signature="e#162589#162590#0" expanded="false" /> - <element signature="e#162633#162634#0" expanded="false" /> - <element signature="e#162677#162678#0" expanded="false" /> - <element signature="e#162717#162718#0" expanded="false" /> - <element signature="e#162753#162754#0" expanded="false" /> - <element signature="e#162797#162798#0" expanded="false" /> - <element signature="e#162833#162834#0" expanded="false" /> - <element signature="e#163675#163676#0" expanded="false" /> - <element signature="e#163725#163726#0" expanded="false" /> - <element signature="e#163943#163944#0" expanded="false" /> - <element signature="e#163979#163980#0" expanded="false" /> - <element signature="e#164421#164422#0" expanded="false" /> - <element signature="e#164456#164457#0" expanded="false" /> - <element signature="e#164612#164613#0" expanded="false" /> - <element signature="e#164686#164687#0" expanded="false" /> - <element signature="e#165116#165117#0" expanded="false" /> - <element signature="e#165157#165158#0" expanded="false" /> - <element signature="e#166243#166244#0" expanded="false" /> - <element signature="e#166278#166279#0" expanded="false" /> - <element signature="e#166442#166443#0" expanded="false" /> - <element signature="e#166493#166494#0" expanded="false" /> - <element signature="e#166747#166748#0" expanded="false" /> - <element signature="e#166794#166795#0" expanded="false" /> - <element signature="e#166968#166969#0" expanded="false" /> - <element signature="e#166996#166997#0" expanded="false" /> - <element signature="e#167304#167305#0" expanded="false" /> - <element signature="e#167340#167341#0" expanded="false" /> - <element signature="e#181686#181687#0" expanded="false" /> - <element signature="e#181731#181732#0" expanded="false" /> - <element signature="e#188454#188455#0" expanded="false" /> - <element signature="e#188514#188515#0" expanded="false" /> - <element signature="e#191025#191026#0" expanded="false" /> - <element signature="e#191081#191082#0" expanded="false" /> - <element signature="e#194580#194581#0" expanded="false" /> - <element signature="e#194640#194641#0" expanded="false" /> - <element signature="e#198856#198857#0" expanded="false" /> - <element signature="e#198880#198881#0" expanded="false" /> - <element signature="e#203947#203948#0" expanded="false" /> - <element signature="e#204001#204002#0" expanded="false" /> - <element signature="e#206482#206483#0" expanded="false" /> - <element signature="e#206538#206539#0" expanded="false" /> - <element signature="e#212050#212051#0" expanded="false" /> - <element signature="e#212111#212112#0" expanded="false" /> - <element signature="e#218458#218459#0" expanded="false" /> - <element signature="e#218485#218486#0" expanded="false" /> - <element signature="e#222684#222703#0" expanded="false" /> - <element signature="e#223683#223684#0" expanded="false" /> - <element signature="e#223772#223773#0" expanded="false" /> - <element signature="e#225586#225587#0" expanded="false" /> - <element signature="e#225627#225628#0" expanded="false" /> - <element signature="e#240839#240840#0" expanded="false" /> - <element signature="e#240867#240868#0" expanded="false" /> - <element signature="e#246552#246553#0" expanded="false" /> - <element signature="e#246580#246581#0" expanded="false" /> - <element signature="e#246767#246768#0" expanded="false" /> - <element signature="e#246795#246796#0" expanded="false" /> - <element signature="e#246974#246975#0" expanded="false" /> - <element signature="e#247002#247003#0" expanded="false" /> - <element signature="e#247189#247190#0" expanded="false" /> - <element signature="e#247217#247218#0" expanded="false" /> - <element signature="e#247399#247400#0" expanded="false" /> - <element signature="e#247427#247428#0" expanded="false" /> - <element signature="e#247608#247609#0" expanded="false" /> - <element signature="e#247636#247637#0" expanded="false" /> - <element signature="e#247806#247807#0" expanded="false" /> - <element signature="e#247834#247835#0" expanded="false" /> - <element signature="e#248002#248003#0" expanded="false" /> - <element signature="e#248030#248031#0" expanded="false" /> - <element signature="e#248260#248261#0" expanded="false" /> - <element signature="e#248288#248289#0" expanded="false" /> - <element signature="e#256331#256332#0" expanded="false" /> - <element signature="e#256359#256360#0" expanded="false" /> - <element signature="e#256539#256540#0" expanded="false" /> - <element signature="e#256567#256568#0" expanded="false" /> - <element signature="e#257418#257419#0" expanded="false" /> - <element signature="e#257461#257462#0" expanded="false" /> - <element signature="e#258426#258427#0" expanded="false" /> - <element signature="e#258508#258509#0" expanded="false" /> - <element signature="e#269717#269718#0" expanded="false" /> - <element signature="e#269765#269766#0" expanded="false" /> - <element signature="e#271448#271449#0" expanded="false" /> - <element signature="e#271495#271496#0" expanded="false" /> - <element signature="e#271553#271554#0" expanded="false" /> - <element signature="e#271614#271615#0" expanded="false" /> - <element signature="e#274925#274926#0" expanded="false" /> - <element signature="e#274983#274984#0" expanded="false" /> - <element signature="e#277514#277515#0" expanded="false" /> - <element signature="e#277569#277570#0" expanded="false" /> - <element signature="e#277635#277636#0" expanded="false" /> - <element signature="e#277697#277698#0" expanded="false" /> - <element signature="e#280950#280951#0" expanded="false" /> - <element signature="e#281009#281010#0" expanded="false" /> - <element signature="e#291507#291508#0" expanded="false" /> - <element signature="e#291557#291558#0" expanded="false" /> - <element signature="e#291771#291772#0" expanded="false" /> - <element signature="e#291798#291799#0" expanded="false" /> - <element signature="e#291939#291940#0" expanded="false" /> - <element signature="e#291975#291976#0" expanded="false" /> - <element signature="e#294689#294690#0" expanded="false" /> - <element signature="e#294733#294734#0" expanded="false" /> - <element signature="e#298870#298871#0" expanded="false" /> - <element signature="e#298903#298904#0" expanded="false" /> - <element signature="e#299165#299166#0" expanded="false" /> - <element signature="e#299216#299217#0" expanded="false" /> - <element signature="e#299263#299264#0" expanded="false" /> - <element signature="e#299313#299314#0" expanded="false" /> - <element signature="e#301954#301955#0" expanded="false" /> - <element signature="e#302025#302026#0" expanded="false" /> - <element signature="e#302242#302243#0" expanded="false" /> - <element signature="e#302277#302278#0" expanded="false" /> - <element signature="e#302546#302547#0" expanded="false" /> - <element signature="e#302574#302575#0" expanded="false" /> - <element signature="e#303366#303367#0" expanded="false" /> - <element signature="e#303394#303395#0" expanded="false" /> - <element signature="e#332438#332439#0" expanded="false" /> - <element signature="e#332481#332482#0" expanded="false" /> - <element signature="e#335264#335265#0" expanded="false" /> - <element signature="e#335323#335324#0" expanded="false" /> - <element signature="e#336370#336371#0" expanded="false" /> - <element signature="e#336410#336411#0" expanded="false" /> - <element signature="e#342195#342196#0" expanded="false" /> - <element signature="e#342240#342241#0" expanded="false" /> - <element signature="e#343179#343180#0" expanded="false" /> - <element signature="e#343231#343232#0" expanded="false" /> - <element signature="e#343523#343524#0" expanded="false" /> - <element signature="e#343582#343583#0" expanded="false" /> - <element signature="e#343902#343903#0" expanded="false" /> - <element signature="e#343971#343972#0" expanded="false" /> - <element signature="e#345100#345101#0" expanded="false" /> - <element signature="e#345174#345175#0" expanded="false" /> - <element signature="e#345561#345562#0" expanded="false" /> - <element signature="e#345627#345628#0" expanded="false" /> - <element signature="e#345906#345907#0" expanded="false" /> - <element signature="e#345975#345976#0" expanded="false" /> - <element signature="e#346138#346139#0" expanded="false" /> - <element signature="e#346195#346196#0" expanded="false" /> - <element signature="e#346480#346481#0" expanded="false" /> - <element signature="e#346515#346516#0" expanded="false" /> - <element signature="e#346809#346810#0" expanded="false" /> - <element signature="e#346870#346871#0" expanded="false" /> - <element signature="e#347163#347164#0" expanded="false" /> - <element signature="e#347218#347219#0" expanded="false" /> - <element signature="e#347460#347461#0" expanded="false" /> - <element signature="e#347521#347522#0" expanded="false" /> - <element signature="e#347721#347722#0" expanded="false" /> - <element signature="e#347776#347777#0" expanded="false" /> - <element signature="e#348021#348022#0" expanded="false" /> - <element signature="e#348078#348079#0" expanded="false" /> - <element signature="e#348468#348469#0" expanded="false" /> - <element signature="e#348524#348525#0" expanded="false" /> - <element signature="e#348761#348762#0" expanded="false" /> - <element signature="e#348816#348817#0" expanded="false" /> - <element signature="e#349005#349006#0" expanded="false" /> - <element signature="e#349054#349055#0" expanded="false" /> - <element signature="e#349733#349734#0" expanded="false" /> - <element signature="e#349790#349791#0" expanded="false" /> - <element signature="e#351304#351305#0" expanded="false" /> - <element signature="e#351361#351362#0" expanded="false" /> - <element signature="e#352836#352837#0" expanded="false" /> - <element signature="e#352893#352894#0" expanded="false" /> - <element signature="e#353362#353363#0" expanded="false" /> - <element signature="e#353419#353420#0" expanded="false" /> - <element signature="e#354444#354445#0" expanded="false" /> - <element signature="e#354503#354504#0" expanded="false" /> - <element signature="e#354689#354690#0" expanded="false" /> - <element signature="e#354742#354743#0" expanded="false" /> - <element signature="e#355135#355136#0" expanded="false" /> - <element signature="e#355192#355193#0" expanded="false" /> - <element signature="e#355548#355549#0" expanded="false" /> - <element signature="e#355599#355600#0" expanded="false" /> - <element signature="e#356158#356159#0" expanded="false" /> - <element signature="e#356213#356214#0" expanded="false" /> - <element signature="e#356430#356431#0" expanded="false" /> - <element signature="e#356479#356480#0" expanded="false" /> - <element signature="e#357066#357067#0" expanded="false" /> - <element signature="e#357135#357136#0" expanded="false" /> - <element signature="e#357349#357350#0" expanded="false" /> - <element signature="e#357415#357416#0" expanded="false" /> - <element signature="e#357520#357521#0" expanded="false" /> - <element signature="e#357573#357574#0" expanded="false" /> - <element signature="e#357805#357806#0" expanded="false" /> - <element signature="e#357863#357864#0" expanded="false" /> - <element signature="e#358115#358116#0" expanded="false" /> - <element signature="e#358176#358177#0" expanded="false" /> - <element signature="e#377393#377394#0" expanded="false" /> - <element signature="e#377443#377444#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2330,9 +1912,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="1972" max-vertical-offset="3938"> <caret line="163" column="0" selection-start-line="163" selection-start-column="0" selection-end-line="163" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2396,7 +1976,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-1.6173842" vertical-offset="2099" max-vertical-offset="3330"> <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -2404,7 +1983,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.1085209" vertical-offset="0" max-vertical-offset="1244"> <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" /> - <folding /> </state> </provider> </entry> @@ -2429,7 +2007,7 @@ <state vertical-scroll-proportion="0.14947197" vertical-offset="0" max-vertical-offset="6072"> <caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" /> <folding> - <element signature="e#900#916#0" expanded="true" /> + <element signature="e#900#916#0" expanded="false" /> </folding> </state> </provider> @@ -2454,7 +2032,18 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="398" max-vertical-offset="6550"> <caret line="102" column="29" selection-start-line="102" selection-start-column="29" selection-end-line="102" selection-end-column="29" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#250#263#0" expanded="false" /> + <element signature="e#5556#5557#0" expanded="false" /> + <element signature="e#5622#5623#0" expanded="false" /> + <element signature="e#8109#8110#0" expanded="false" /> + <element signature="e#8140#8141#0" expanded="false" /> + <element signature="e#8196#8197#0" expanded="false" /> + <element signature="e#8226#8227#0" expanded="false" /> + <element signature="e#8260#8261#0" expanded="false" /> + <element signature="e#8293#8294#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2466,19 +2055,15 @@ </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"> - <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> - <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="2495" max-vertical-offset="4023"> <caret line="143" column="24" selection-start-line="143" selection-start-column="24" selection-end-line="143" selection-end-column="24" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#4591#4592#0" expanded="false" /> + <element signature="e#4621#4622#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2486,7 +2071,18 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3097"> <caret line="48" column="6" selection-start-line="48" selection-start-column="6" selection-end-line="48" selection-end-column="6" /> - <folding /> + <folding> + <element signature="e#0#8430#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#8042#8043#0" expanded="false" /> + <element signature="e#8098#8099#0" expanded="false" /> + <element signature="e#8175#8176#0" expanded="false" /> + <element signature="e#8217#8218#0" expanded="false" /> + <element signature="e#8290#8291#0" expanded="false" /> + <element signature="e#8340#8341#0" expanded="false" /> + <element signature="e#8385#8386#0" expanded="false" /> + <element signature="e#8426#8427#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2494,74 +2090,35 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="968" max-vertical-offset="4532"> <caret line="79" column="18" selection-start-line="79" selection-start-column="18" selection-end-line="79" selection-end-column="18" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#8529#8530#0" expanded="false" /> + <element signature="e#8595#8596#0" expanded="false" /> + </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="-12.175" vertical-offset="8813" max-vertical-offset="12000"> + <state vertical-scroll-proportion="0.0" vertical-offset="5580" max-vertical-offset="7200"> <caret line="388" column="56" selection-start-line="388" selection-start-column="56" selection-end-line="388" selection-end-column="56" /> <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#9689#9690#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" /> - <element signature="e#14959#14960#0" expanded="true" /> - <element signature="e#15009#15010#0" expanded="true" /> - <element signature="e#15040#15041#0" expanded="true" /> - <element signature="e#15089#15090#0" expanded="true" /> - <element signature="e#15114#15115#0" expanded="true" /> - <element signature="e#15164#15165#0" expanded="true" /> - <element signature="e#15190#15191#0" expanded="true" /> - <element signature="e#15752#15763#0" 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="-25.175" vertical-offset="7489" max-vertical-offset="8976"> - <caret line="392" column="24" selection-start-line="392" selection-start-column="24" selection-end-line="392" selection-end-column="24" /> - <folding> - <element signature="e#3441#3442#0" expanded="true" /> - <element signature="e#3478#3479#0" expanded="true" /> - <element signature="e#3537#3538#0" expanded="true" /> - <element signature="e#3589#3590#0" expanded="true" /> - <element signature="e#3642#3643#0" expanded="true" /> - <element signature="e#3681#3682#0" expanded="true" /> - <element signature="e#3755#3756#0" expanded="true" /> - <element signature="e#3811#3812#0" expanded="true" /> - <element signature="e#5110#5111#0" expanded="true" /> - <element signature="e#5183#5184#0" expanded="true" /> - <element signature="e#7339#7340#0" expanded="true" /> - <element signature="e#7425#7426#0" expanded="true" /> - <element signature="e#11988#11989#0" expanded="true" /> - <element signature="e#12057#12058#0" expanded="true" /> - <element signature="e#12091#12092#0" expanded="true" /> - <element signature="e#12122#12123#0" expanded="true" /> - <element signature="e#12691#12692#0" expanded="true" /> - <element signature="e#12758#12759#0" expanded="true" /> - <element signature="e#12799#12800#0" expanded="true" /> - <element signature="e#12832#12833#0" expanded="true" /> - <element signature="e#12880#12881#0" expanded="true" /> - <element signature="e#12914#12915#0" expanded="true" /> - <element signature="e#12955#12956#0" expanded="true" /> - <element signature="e#12994#12995#0" expanded="true" /> - <element signature="e#13047#13048#0" expanded="true" /> - <element signature="e#13086#13087#0" expanded="true" /> - <element signature="e#13127#13128#0" expanded="true" /> - <element signature="e#13166#13167#0" expanded="true" /> - <element signature="e#13212#13213#0" expanded="true" /> - <element signature="e#13244#13245#0" expanded="true" /> - <element signature="e#13288#13289#0" expanded="true" /> - <element signature="e#13318#13319#0" expanded="true" /> - <element signature="e#13527#13528#0" expanded="true" /> - <element signature="e#13581#13582#0" expanded="true" /> + <element signature="e#6823#6824#0" expanded="false" /> + <element signature="e#6852#6853#0" expanded="false" /> + <element signature="e#7108#7109#0" expanded="false" /> + <element signature="e#7140#7141#0" expanded="false" /> + <element signature="e#7676#7677#0" expanded="false" /> + <element signature="e#7718#7719#0" expanded="false" /> + <element signature="e#9152#9153#0" expanded="false" /> + <element signature="e#9195#9196#0" expanded="false" /> + <element signature="e#9621#9622#0" expanded="false" /> + <element signature="e#9653#9654#0" expanded="false" /> + <element signature="e#9755#9756#0" expanded="false" /> + <element signature="e#9799#9800#0" expanded="false" /> + <element signature="e#9845#9846#0" expanded="false" /> + <element signature="e#9886#9887#0" expanded="false" /> + <element signature="e#9929#9930#0" expanded="false" /> + <element signature="e#9967#9968#0" expanded="false" /> </folding> </state> </provider> @@ -2580,119 +2137,159 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.50988877" vertical-offset="0" max-vertical-offset="1618"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615"> <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" /> <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="12810" max-vertical-offset="13005"> + <caret line="1015" column="22" selection-start-line="1015" selection-start-column="22" selection-end-line="1015" selection-end-column="22" /> + <folding> + <element signature="e#0#40965#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#4639#5164#0" expanded="false" /> + <element signature="e#4943#5130#0" expanded="false" /> + <element signature="e#5129#5130#0" expanded="false" /> + <element signature="e#5163#5164#0" expanded="false" /> + <element signature="e#5533#5534#0" expanded="false" /> + <element signature="e#5598#5599#0" expanded="false" /> + <element signature="e#5670#5671#0" expanded="false" /> + <element signature="e#5735#5736#0" expanded="false" /> + <element signature="e#6165#6166#0" expanded="false" /> + <element signature="e#6230#6231#0" expanded="false" /> + <element signature="e#6302#6303#0" expanded="false" /> + <element signature="e#6367#6368#0" expanded="false" /> + <element signature="e#8119#8120#0" expanded="false" /> + <element signature="e#8161#8162#0" expanded="false" /> + <element signature="e#8228#8229#0" expanded="false" /> + <element signature="e#8283#8284#0" expanded="false" /> + <element signature="e#13646#13859#0" expanded="false" /> + <element signature="e#13858#13859#0" expanded="false" /> + <element signature="e#13931#14143#0" expanded="false" /> + <element signature="e#14142#14143#0" expanded="false" /> + <element signature="e#14220#14474#0" expanded="false" /> + <element signature="e#14473#14474#0" expanded="false" /> + <element signature="e#14582#15076#0" expanded="false" /> + <element signature="e#15075#15076#0" expanded="false" /> + <element signature="e#15191#15680#0" expanded="false" /> + <element signature="e#15679#15680#0" expanded="false" /> + <element signature="e#18487#18851#0" expanded="false" /> + <element signature="e#18850#18851#0" expanded="false" /> + <element signature="e#19337#19338#0" expanded="false" /> + <element signature="e#19391#19392#0" expanded="false" /> + <element signature="e#20835#20836#0" expanded="false" /> + <element signature="e#20865#20866#0" expanded="false" /> + <element signature="e#21224#21225#0" expanded="false" /> + <element signature="e#21303#21304#0" expanded="false" /> + <element signature="e#21730#21731#0" expanded="false" /> + <element signature="e#21792#21793#0" expanded="false" /> + <element signature="e#22379#22380#0" expanded="false" /> + <element signature="e#22436#22437#0" expanded="false" /> + <element signature="e#22469#22470#0" expanded="false" /> + <element signature="e#22527#22528#0" expanded="false" /> + <element signature="e#22561#22562#0" expanded="false" /> + <element signature="e#22651#22652#0" expanded="false" /> + <element signature="e#22686#22687#0" expanded="false" /> + <element signature="e#22758#22759#0" expanded="false" /> + <element signature="e#27362#27550#0" expanded="false" /> + <element signature="e#27549#27550#0" expanded="false" /> + <element signature="e#28094#28612#0" expanded="false" /> + <element signature="e#28244#28562#0" expanded="false" /> + <element signature="e#28561#28562#0" expanded="false" /> + <element signature="e#28611#28612#0" expanded="false" /> + <element signature="e#28761#28762#0" expanded="false" /> + <element signature="e#28814#28815#0" expanded="false" /> + <element signature="e#28858#28859#0" expanded="false" /> + <element signature="e#28911#28912#0" expanded="false" /> + <element signature="e#29198#29865#0" expanded="false" /> + <element signature="e#29864#29865#0" expanded="false" /> + <element signature="e#29958#30118#0" expanded="false" /> + <element signature="e#30117#30118#0" expanded="false" /> + <element signature="e#30365#30573#0" expanded="false" /> + <element signature="e#30572#30573#0" expanded="false" /> + <element signature="e#30641#30857#0" expanded="false" /> + <element signature="e#30856#30857#0" expanded="false" /> + <element signature="e#30957#31174#0" expanded="false" /> + <element signature="e#31173#31174#0" expanded="false" /> + <element signature="e#31390#31602#0" expanded="false" /> + <element signature="e#31601#31602#0" expanded="false" /> + <element signature="e#31739#31947#0" expanded="false" /> + <element signature="e#31946#31947#0" expanded="false" /> + <element signature="e#32088#32540#0" expanded="false" /> + <element signature="e#32539#32540#0" expanded="false" /> + <element signature="e#32679#33129#0" expanded="false" /> + <element signature="e#33128#33129#0" expanded="false" /> + <element signature="e#33251#34536#0" expanded="false" /> + <element signature="e#34535#34536#0" expanded="false" /> + <element signature="e#34676#34996#0" expanded="false" /> + <element signature="e#34995#34996#0" expanded="false" /> + <element signature="e#35136#35437#0" expanded="false" /> + <element signature="e#35436#35437#0" expanded="false" /> + <element signature="e#36093#36490#0" expanded="false" /> + <element signature="e#36489#36490#0" expanded="false" /> + <element signature="e#40480#40481#0" expanded="false" /> + <element signature="e#40515#40516#0" expanded="false" /> + </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"> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> + <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.42727274" vertical-offset="5174" max-vertical-offset="7056"> - <caret line="307" column="30" selection-start-line="307" selection-start-column="30" selection-end-line="307" selection-end-column="30" /> - <folding /> + <state vertical-scroll-proportion="98.525" vertical-offset="4501" max-vertical-offset="6320"> + <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> + <folding> + <element signature="e#0#12518#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <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="-29.7" vertical-offset="18454" max-vertical-offset="19941"> - <caret line="1015" column="22" selection-start-line="1015" selection-start-column="22" selection-end-line="1015" selection-end-column="22" /> - <folding /> + <state vertical-scroll-proportion="0.0" vertical-offset="54" max-vertical-offset="9045"> + <caret line="72" column="26" selection-start-line="72" selection-start-column="26" selection-end-line="72" selection-end-column="26" /> + <folding> + <element signature="e#3540#3541#0" expanded="true" /> + <element signature="e#3596#3597#0" expanded="true" /> + <element signature="e#4895#4896#0" expanded="true" /> + <element signature="e#4968#4969#0" expanded="true" /> + <element signature="e#7124#7125#0" expanded="true" /> + <element signature="e#7210#7211#0" expanded="true" /> + <element signature="e#11876#11877#0" expanded="true" /> + <element signature="e#11907#11908#0" expanded="true" /> + <element signature="e#13073#13074#0" expanded="true" /> + <element signature="e#13103#13104#0" expanded="true" /> + <element signature="e#13312#13313#0" expanded="true" /> + <element signature="e#13366#13367#0" expanded="true" /> + </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="0.0" vertical-offset="2159" max-vertical-offset="5865"> - <caret line="171" column="52" selection-start-line="171" selection-start-column="52" selection-end-line="171" selection-end-column="52" /> + <state vertical-scroll-proportion="0.3426791" vertical-offset="2300" max-vertical-offset="5080"> + <caret line="180" column="8" selection-start-line="180" selection-start-column="8" selection-end-line="180" selection-end-column="8" /> <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="2.2332268" vertical-offset="3825" max-vertical-offset="21960"> - <caret line="334" column="0" selection-start-line="334" selection-start-column="0" selection-end-line="334" selection-end-column="0" /> + <state vertical-scroll-proportion="-6.5054517" vertical-offset="18036" max-vertical-offset="19320"> + <caret line="495" column="0" selection-start-line="495" selection-start-column="0" selection-end-line="495" selection-end-column="0" /> <folding> - <element signature="e#4355#6952#0" expanded="true" /> - <element signature="e#6951#6952#0" expanded="true" /> - <element signature="e#7119#13672#0" expanded="true" /> - <element signature="e#10839#11165#0" expanded="true" /> - <element signature="e#11164#11165#0" expanded="true" /> - <element signature="e#11410#11736#0" expanded="true" /> - <element signature="e#11735#11736#0" expanded="true" /> - <element signature="e#11967#12293#0" expanded="true" /> - <element signature="e#12292#12293#0" expanded="true" /> - <element signature="e#12515#12841#0" expanded="true" /> - <element signature="e#12840#12841#0" expanded="true" /> - <element signature="e#13671#13672#0" expanded="true" /> - <element signature="e#15990#15991#0" expanded="true" /> - <element signature="e#16031#16032#0" expanded="true" /> - <element signature="e#16084#16085#0" expanded="true" /> - <element signature="e#16122#16123#0" expanded="true" /> - <element signature="e#16163#16164#0" expanded="true" /> - <element signature="e#16196#16197#0" expanded="true" /> - <element signature="e#16261#16262#0" expanded="true" /> - <element signature="e#16302#16303#0" expanded="true" /> - <element signature="e#17532#17533#0" expanded="true" /> - <element signature="e#17558#17559#0" expanded="true" /> - <element signature="e#17600#17601#0" expanded="true" /> - <element signature="e#17629#17630#0" expanded="true" /> - <element signature="e#17794#17795#0" expanded="true" /> - <element signature="e#17837#17838#0" expanded="true" /> - <element signature="e#17880#17881#0" expanded="true" /> - <element signature="e#17920#17921#0" expanded="true" /> - <element signature="e#18513#18514#0" expanded="true" /> - <element signature="e#18546#18547#0" expanded="true" /> - <element signature="e#18588#18589#0" expanded="true" /> - <element signature="e#18625#18626#0" expanded="true" /> - <element signature="e#18664#18665#0" expanded="true" /> - <element signature="e#18697#18698#0" expanded="true" /> - <element signature="e#18745#18746#0" expanded="true" /> - <element signature="e#18778#18779#0" expanded="true" /> - <element signature="e#20149#20161#0" expanded="true" /> - <element signature="e#21714#21715#0" expanded="true" /> - <element signature="e#21752#21753#0" expanded="true" /> - <element signature="e#22596#22597#0" expanded="true" /> - <element signature="e#22628#22629#0" expanded="true" /> - <element signature="e#26335#26347#0" expanded="true" /> - <element signature="e#29833#29834#0" expanded="true" /> - <element signature="e#29861#29862#0" expanded="true" /> - <element signature="e#29889#29890#0" expanded="true" /> - <element signature="e#29914#29915#0" expanded="true" /> - <element signature="e#30054#30055#0" expanded="true" /> - <element signature="e#30090#30091#0" expanded="true" /> - <element signature="e#30123#30124#0" expanded="true" /> - <element signature="e#30152#30153#0" expanded="true" /> - <element signature="e#30223#30224#0" expanded="true" /> - <element signature="e#30273#30274#0" expanded="true" /> - <element signature="e#32096#32097#0" expanded="true" /> - <element signature="e#32131#32132#0" expanded="true" /> - <element signature="e#32214#32215#0" expanded="true" /> - <element signature="e#32257#32258#0" expanded="true" /> - <element signature="e#32314#32315#0" expanded="true" /> - <element signature="e#32339#32340#0" expanded="true" /> - <element signature="e#32373#32374#0" expanded="true" /> - <element signature="e#32405#32406#0" expanded="true" /> - <element signature="e#32448#32449#0" expanded="true" /> - <element signature="e#32477#32478#0" expanded="true" /> - <element signature="e#32526#32527#0" expanded="true" /> - <element signature="e#32570#32571#0" expanded="true" /> - <element signature="e#32623#32624#0" expanded="true" /> - <element signature="e#32667#32668#0" expanded="true" /> - <element signature="e#32724#32725#0" expanded="true" /> - <element signature="e#32773#32774#0" expanded="true" /> - <element signature="e#33229#33230#0" expanded="true" /> - <element signature="e#33273#33274#0" expanded="true" /> - <element signature="e#33344#33345#0" expanded="true" /> - <element signature="e#33406#33407#0" expanded="true" /> - <element signature="e#34012#34013#0" expanded="true" /> - <element signature="e#34046#34047#0" expanded="true" /> - <element signature="e#34082#34083#0" expanded="true" /> - <element signature="e#34117#34118#0" expanded="true" /> - <element signature="e#34151#34152#0" expanded="true" /> - <element signature="e#34182#34183#0" expanded="true" /> + <element signature="e#19848#19860#0" expanded="true" /> + <element signature="e#26002#26014#0" expanded="true" /> </folding> </state> </provider>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Fri Sep 18 16:42:47 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Tue Sep 22 16:03:22 2015 +0900 @@ -22,6 +22,7 @@ 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; @@ -493,24 +494,10 @@ } } - - public synchronized void waitForVNCConnection() { - while (!readyReconnect) { - try { - wait(); - } catch (InterruptedException e) { - e.printStackTrace(); - System.out.println("interrupt wait for vnc connection."); - } - } - } - - public void sendDesktopSizeChange(short id) { LinkedList<ByteBuffer> desktopSize = new LinkedList<ByteBuffer>(); int width = context.getFbWidth(); int height = context.getFbHeight(); - byte[] initData = null; if (filterSingleDisplay) { originalInitData = createOriginalInitData(singleWidth, singleHeight, context.getRemoteDesktopName()); @@ -936,4 +923,27 @@ } newClient(previousWriter, previousReader); } + + /** + * Requested server is connected. stop old connection, replace old connection parameter such as + * context (PROTOCOL) + * start new connection and send INIT_DATA + * @param workingProtocol + * @param connectionPresenter + */ + public synchronized void newVNCConnection(Protocol workingProtocol, ConnectionPresenter connectionPresenter) { + ProtocolContext previousContext = getContext(); + stopReceiverTask(); + setProtocolContext(workingProtocol); + connectionPresenter.viewer.setConnectionPresenter(connectionPresenter); + connectionPresenter.viewer.getConnectionPresenter().addModel("ConnectionParamsModel", connectionPresenter.getConnectionParams()); + if (previousContext != null && isTreeManager() && hasParent()) { + Reader previousReader = previousContext.getReader(); + Writer previousWriter = previousContext.getWriter(); + exchangeDirectConnectedServer(previousReader, previousWriter); + } + enableChildrenTransmission(); + printNetworkInterface(); + sendDesktopSizeChange(connectionPresenter.getReconnectingId()); + } } \ No newline at end of file
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Fri Sep 18 16:42:47 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Tue Sep 22 16:03:22 2015 +0900 @@ -25,18 +25,13 @@ 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; import com.glavsoft.viewer.mvp.View; 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; @@ -386,21 +381,4 @@ setNeedReconnection(!viewer.noConnection); startConnection(viewer.settings, viewer.uiSettings, viewer.paramsMask, exchangeSocket); } - - 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); - } }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Fri Sep 18 16:42:47 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Tue Sep 22 16:03:22 2015 +0900 @@ -168,7 +168,7 @@ public void startVNCConnection() { presenter.showMessage("Handshake established"); - presenter.newVNCConnection(workingProtocol); + myRfb.newVNCConnection(workingProtocol, presenter); ClipboardControllerImpl clipboardController; if(!myRfb.getCuiVersion()) clipboardController = new ClipboardControllerImpl(workingProtocol, rfbSettings.getRemoteCharsetName()); @@ -178,7 +178,6 @@ rfbSettings.addListener(clipboardController); if(!myRfb.getCuiVersion()) viewerWindow = viewerWindowFactory.createViewerWindow(workingProtocol, rfbSettings, uiSettings, connectionString, presenter); - myRfb.setProtocolContext(workingProtocol); workingProtocol.startNormalHandling(this,viewerWindow.getSurface(), clipboardController, myRfb); presenter.showMessage("Started");