Mercurial > hg > Applications > TreeVNC
changeset 369:2d01ec1c02d2
Fix ReConnectingFlag
| author | innparusu |
|---|---|
| date | Sat, 15 Aug 2015 17:28:19 +0900 |
| parents | b60780e1fafc |
| children | 2c61e6d434ff |
| 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/CuiViewer.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java |
| diffstat | 8 files changed, 420 insertions(+), 808 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Sat Aug 15 04:21:33 2015 +0900 +++ b/.idea/workspace.xml Sat Aug 15 17:28:19 2015 +0900 @@ -2,9 +2,14 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="setFitScreen in ReceiverTask"> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -22,6 +27,9 @@ <component name="CreatePatchCommitExecutor"> <option name="PATCH_PATH" value="" /> </component> + <component name="DaemonCodeAnalyzer"> + <disable_hints /> + </component> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="FavoritesManager"> <favorites_list name="TreeVNC" /> @@ -33,15 +41,11 @@ <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="86" column="1" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> + <state vertical-scroll-proportion="0.0" vertical-offset="2539" max-vertical-offset="7636"> + <caret line="74" column="21" selection-start-line="74" selection-start-column="21" selection-end-line="74" selection-end-column="21" /> <folding> - <element signature="e#0#17023#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#16504#16505#0" expanded="false" /> - <element signature="e#16537#16538#0" expanded="false" /> - <element signature="e#16578#16579#0" expanded="false" /> - <element signature="e#16616#16617#0" expanded="false" /> + <element signature="e#16578#16579#0" expanded="true" /> + <element signature="e#16616#16617#0" expanded="true" /> </folding> </state> </provider> @@ -50,48 +54,9 @@ <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"> - <caret line="244" column="20" selection-start-line="244" selection-start-column="20" selection-end-line="244" selection-end-column="20" /> - <folding> - <element signature="e#0#12518#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3407#3408#0" expanded="false" /> - <element signature="e#3441#3442#0" expanded="false" /> - <element signature="e#3833#3834#0" expanded="false" /> - <element signature="e#3867#3868#0" expanded="false" /> - <element signature="e#4154#4155#0" expanded="false" /> - <element signature="e#4194#4195#0" expanded="false" /> - <element signature="e#4261#4262#0" expanded="false" /> - <element signature="e#4301#4302#0" expanded="false" /> - <element signature="e#4346#4347#0" expanded="false" /> - <element signature="e#4376#4377#0" expanded="false" /> - <element signature="e#4543#4544#0" expanded="false" /> - <element signature="e#4574#4575#0" expanded="false" /> - <element signature="e#4624#4625#0" expanded="false" /> - <element signature="e#4655#4656#0" expanded="false" /> - <element signature="e#4717#4718#0" expanded="false" /> - <element signature="e#4757#4758#0" expanded="false" /> - <element signature="e#4952#4953#0" expanded="false" /> - <element signature="e#4992#4993#0" expanded="false" /> - <element signature="e#5051#5052#0" expanded="false" /> - <element signature="e#5082#5083#0" expanded="false" /> - <element signature="e#5129#5130#0" expanded="false" /> - <element signature="e#5158#5159#0" expanded="false" /> - <element signature="e#5205#5206#0" expanded="false" /> - <element signature="e#5234#5235#0" expanded="false" /> - <element signature="e#12000#12001#0" expanded="false" /> - <element signature="e#12026#12027#0" expanded="false" /> - <element signature="e#12085#12086#0" expanded="false" /> - <element signature="e#12123#12124#0" expanded="false" /> - <element signature="e#12169#12170#0" expanded="false" /> - <element signature="e#12199#12200#0" expanded="false" /> - <element signature="e#12275#12276#0" expanded="false" /> - <element signature="e#12329#12330#0" expanded="false" /> - <element signature="e#12385#12386#0" expanded="false" /> - <element signature="e#12423#12424#0" expanded="false" /> - <element signature="e#12474#12475#0" expanded="false" /> - <element signature="e#12514#12515#0" expanded="false" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="1593" max-vertical-offset="7056"> + <caret line="185" column="30" selection-start-line="185" selection-start-column="30" selection-end-line="185" selection-end-column="30" /> + <folding /> </state> </provider> </entry> @@ -99,29 +64,9 @@ <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="450" max-vertical-offset="1515"> <caret line="58" column="9" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" /> - <folding> - <element signature="e#0#3575#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2916#2917#0" expanded="false" /> - <element signature="e#2954#2955#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <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"> - <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> - <folding> - <element signature="e#0#3515#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3477#3478#0" expanded="false" /> - <element signature="e#3510#3511#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -129,35 +74,21 @@ <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="199" column="0" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" /> + <state vertical-scroll-proportion="-42.525" vertical-offset="15173" max-vertical-offset="18062"> + <caret line="862" column="4" selection-start-line="862" selection-start-column="4" selection-end-line="862" selection-end-column="4" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <file leaf-file-name="Presenter.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.67181927"> - <caret line="329" column="7" selection-start-line="329" selection-start-column="7" selection-end-line="329" selection-end-column="7" /> + <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="5568"> + <caret line="53" column="36" selection-start-line="53" selection-start-column="36" selection-end-line="53" selection-end-column="36" /> <folding> - <element signature="e#0#15185#0" expanded="true" /> - <element signature="imports" expanded="true" /> - <element signature="e#1656#1683#0" expanded="true" /> - <element signature="e#6747#6748#0" expanded="true" /> - <element signature="e#6776#6777#0" expanded="true" /> - <element signature="e#7032#7033#0" expanded="true" /> - <element signature="e#7064#7065#0" expanded="true" /> - <element signature="e#8936#8937#0" expanded="true" /> - <element signature="e#8979#8980#0" expanded="true" /> - <element signature="e#9405#9406#0" expanded="true" /> - <element signature="e#9437#9438#0" expanded="true" /> - <element signature="e#10542#10695#0" expanded="true" /> - <element signature="e#10694#10695#0" expanded="true" /> - <element signature="e#14050#14051#0" expanded="true" /> - <element signature="e#14076#14077#0" expanded="true" /> - <element signature="e#14638#14649#0" expanded="true" /> + <element signature="e#1937#1938#0" expanded="true" /> + <element signature="e#1986#1987#0" expanded="true" /> </folding> </state> </provider> @@ -166,7 +97,7 @@ <file leaf-file-name="VncProxyService.java" pinned="false" current-in-tab="false"> <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"> + <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> @@ -176,38 +107,33 @@ <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="981" max-vertical-offset="2970"> <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.2540486" vertical-offset="6142" max-vertical-offset="9812"> + <caret line="320" column="67" selection-start-line="320" selection-start-column="67" selection-end-line="320" selection-end-column="67" /> + <folding> + <element signature="e#0#15369#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#14822#14833#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> - <folding> - <element signature="e#0#11210#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#8038#8288#0" expanded="false" /> - <element signature="e#8287#8288#0" expanded="false" /> - <element signature="e#9036#9037#0" expanded="false" /> - <element signature="e#9086#9087#0" expanded="false" /> - <element signature="e#9164#9165#0" expanded="false" /> - <element signature="e#9210#9211#0" expanded="false" /> - <element signature="e#9280#9281#0" expanded="false" /> - <element signature="e#9324#9325#0" expanded="false" /> - <element signature="e#9402#9403#0" expanded="false" /> - <element signature="e#9458#9459#0" expanded="false" /> - <element signature="e#10336#10807#0" expanded="false" /> - <element signature="e#10806#10807#0" expanded="false" /> - <element signature="e#11088#11089#0" expanded="false" /> - <element signature="e#11123#11124#0" expanded="false" /> - <element signature="e#11170#11171#0" expanded="false" /> - <element signature="e#11206#11207#0" expanded="false" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="1245" max-vertical-offset="4820"> + <caret line="126" column="31" selection-start-line="126" selection-start-column="31" selection-end-line="126" selection-end-column="31" /> + <folding /> </state> </provider> </entry> @@ -215,90 +141,9 @@ <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="10695" max-vertical-offset="13095"> <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> - <folding> - <element signature="e#0#41446#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#4710#5235#0" expanded="false" /> - <element signature="e#5014#5201#0" expanded="false" /> - <element signature="e#5200#5201#0" expanded="false" /> - <element signature="e#5234#5235#0" expanded="false" /> - <element signature="e#5604#5605#0" expanded="false" /> - <element signature="e#5669#5670#0" expanded="false" /> - <element signature="e#5741#5742#0" expanded="false" /> - <element signature="e#5806#5807#0" expanded="false" /> - <element signature="e#6236#6237#0" expanded="false" /> - <element signature="e#6301#6302#0" expanded="false" /> - <element signature="e#6373#6374#0" expanded="false" /> - <element signature="e#6438#6439#0" expanded="false" /> - <element signature="e#8190#8191#0" expanded="false" /> - <element signature="e#8232#8233#0" expanded="false" /> - <element signature="e#8299#8300#0" expanded="false" /> - <element signature="e#8354#8355#0" expanded="false" /> - <element signature="e#13717#13930#0" expanded="false" /> - <element signature="e#13929#13930#0" expanded="false" /> - <element signature="e#14002#14214#0" expanded="false" /> - <element signature="e#14213#14214#0" expanded="false" /> - <element signature="e#14291#14545#0" expanded="false" /> - <element signature="e#14544#14545#0" expanded="false" /> - <element signature="e#14653#15147#0" expanded="false" /> - <element signature="e#15146#15147#0" expanded="false" /> - <element signature="e#15262#15751#0" expanded="false" /> - <element signature="e#15750#15751#0" expanded="false" /> - <element signature="e#18559#18923#0" expanded="false" /> - <element signature="e#18922#18923#0" expanded="false" /> - <element signature="e#19409#19410#0" expanded="false" /> - <element signature="e#19463#19464#0" expanded="false" /> - <element signature="e#21296#21297#0" expanded="false" /> - <element signature="e#21375#21376#0" expanded="false" /> - <element signature="e#21802#21803#0" expanded="false" /> - <element signature="e#21864#21865#0" expanded="false" /> - <element signature="e#22451#22452#0" expanded="false" /> - <element signature="e#22508#22509#0" expanded="false" /> - <element signature="e#22541#22542#0" expanded="false" /> - <element signature="e#22599#22600#0" expanded="false" /> - <element signature="e#22633#22634#0" expanded="false" /> - <element signature="e#22723#22724#0" expanded="false" /> - <element signature="e#22758#22759#0" expanded="false" /> - <element signature="e#22830#22831#0" expanded="false" /> - <element signature="e#27434#27622#0" expanded="false" /> - <element signature="e#27621#27622#0" expanded="false" /> - <element signature="e#28166#28684#0" expanded="false" /> - <element signature="e#28316#28634#0" expanded="false" /> - <element signature="e#28633#28634#0" expanded="false" /> - <element signature="e#28683#28684#0" expanded="false" /> - <element signature="e#28833#28834#0" expanded="false" /> - <element signature="e#28886#28887#0" expanded="false" /> - <element signature="e#28930#28931#0" expanded="false" /> - <element signature="e#28983#28984#0" expanded="false" /> - <element signature="e#29270#29937#0" expanded="false" /> - <element signature="e#29936#29937#0" expanded="false" /> - <element signature="e#30030#30190#0" expanded="false" /> - <element signature="e#30189#30190#0" expanded="false" /> - <element signature="e#30437#30645#0" expanded="false" /> - <element signature="e#30644#30645#0" expanded="false" /> - <element signature="e#30713#30929#0" expanded="false" /> - <element signature="e#30928#30929#0" expanded="false" /> - <element signature="e#31029#31246#0" expanded="false" /> - <element signature="e#31245#31246#0" expanded="false" /> - <element signature="e#31462#31674#0" expanded="false" /> - <element signature="e#31673#31674#0" expanded="false" /> - <element signature="e#31811#32019#0" expanded="false" /> - <element signature="e#32018#32019#0" expanded="false" /> - <element signature="e#32160#32612#0" expanded="false" /> - <element signature="e#32611#32612#0" expanded="false" /> - <element signature="e#32751#33201#0" expanded="false" /> - <element signature="e#33200#33201#0" expanded="false" /> - <element signature="e#34591#34911#0" expanded="false" /> - <element signature="e#34910#34911#0" expanded="false" /> - <element signature="e#35051#35930#0" expanded="false" /> - <element signature="e#35929#35930#0" expanded="false" /> - <element signature="e#36586#36983#0" expanded="false" /> - <element signature="e#36982#36983#0" expanded="false" /> - <element signature="e#40973#40974#0" expanded="false" /> - <element signature="e#41008#41009#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -310,18 +155,21 @@ <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="244" column="62" selection-start-line="244" selection-start-column="62" selection-end-line="244" selection-end-column="62" /> - <folding /> + <state vertical-scroll-proportion="0.0" vertical-offset="570" max-vertical-offset="4065"> + <caret line="152" column="39" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" /> + <folding> + <element signature="e#5279#5280#0" expanded="true" /> + <element signature="e#5321#5322#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ConnectionParams.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="ConnectionParams.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.75029725"> - <caret line="214" column="26" selection-start-line="214" selection-start-column="26" selection-end-line="214" selection-end-column="26" /> + <state vertical-scroll-proportion="0.0" vertical-offset="711" max-vertical-offset="2700"> + <caret line="177" column="52" selection-start-line="177" selection-start-column="52" selection-end-line="177" selection-end-column="52" /> <folding /> </state> </provider> @@ -330,23 +178,37 @@ <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675"> <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.27884614" vertical-offset="957" max-vertical-offset="9686"> + <caret line="85" column="19" selection-start-line="85" selection-start-column="19" selection-end-line="85" selection-end-column="19" /> <folding> - <element signature="e#0#2687#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2623#2624#0" expanded="false" /> - <element signature="e#2683#2684#0" expanded="false" /> + <element signature="e#3216#3217#0" expanded="true" /> + <element signature="e#3253#3254#0" expanded="true" /> + <element signature="e#3312#3313#0" expanded="true" /> + <element signature="e#3364#3365#0" expanded="true" /> + <element signature="e#3417#3418#0" expanded="true" /> + <element signature="e#3456#3457#0" expanded="true" /> + <element signature="e#3530#3531#0" expanded="true" /> + <element signature="e#3586#3587#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <file leaf-file-name="ViewerInterface.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="339" column="47" selection-start-line="339" selection-start-column="47" selection-end-line="339" selection-end-column="47" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="870"> + <caret line="57" column="1" selection-start-line="57" selection-start-column="1" selection-end-line="57" selection-end-column="1" /> <folding /> </state> </provider> @@ -625,25 +487,23 @@ <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/EncodingType.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.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/ViewerInterface.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" /> </list> </option> </component> - <component name="NamedScopeManager"> - <order /> - </component> <component name="ProjectFrameBounds"> + <option name="x" value="4" /> <option name="y" value="23" /> - <option name="width" value="1920" /> - <option name="height" value="1177" /> + <option name="width" value="3836" /> + <option name="height" value="2137" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -668,7 +528,7 @@ <sortByType /> </navigator> <panes> - <pane id="Scratches" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -931,8 +791,8 @@ </PATH> </subPane> </pane> - <pane id="Scope" /> <pane id="PackagesPane" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -990,26 +850,6 @@ <option name="PROGRAM_PARAMETERS" /> <method /> </configuration> - <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> - <module name="" /> - <option name="ACTIVITY_CLASS" value="" /> - <option name="MODE" value="default_activity" /> - <option name="DEPLOY" value="true" /> - <option name="ARTIFACT_NAME" value="" /> - <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> - <option name="USE_LAST_SELECTED_DEVICE" value="false" /> - <option name="PREFERRED_AVD" value="" /> - <option name="USE_COMMAND_LINE" value="true" /> - <option name="COMMAND_LINE" value="" /> - <option name="WIPE_USER_DATA" value="false" /> - <option name="DISABLE_BOOT_ANIMATION" value="false" /> - <option name="NETWORK_SPEED" value="full" /> - <option name="NETWORK_LATENCY" value="none" /> - <option name="CLEAR_LOGCAT" value="false" /> - <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> - <method /> - </configuration> <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> <module name="" /> <option name="TESTING_TYPE" value="0" /> @@ -1031,27 +871,16 @@ <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> <method /> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> <method /> </configuration> - <configuration default="true" type="Application" factoryName="Application"> + <configuration default="true" type="JarApplication" factoryName="JAR Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> <envs /> <method /> </configuration> @@ -1071,40 +900,6 @@ </ExternalSystemSettings> <method /> </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <patterns /> - <method /> - </configuration> - <configuration default="true" type="JarApplication" factoryName="JAR Application"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <envs /> - <method /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - <method /> - </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="" /> @@ -1133,6 +928,75 @@ <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" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" value="-ea" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <envs /> + <patterns /> + <method /> + </configuration> + <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> + <module name="" /> + <option name="ACTIVITY_CLASS" value="" /> + <option name="MODE" value="default_activity" /> + <option name="DEPLOY" value="true" /> + <option name="ARTIFACT_NAME" value="" /> + <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> + <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <option name="NETWORK_LATENCY" value="none" /> + <option name="CLEAR_LOGCAT" value="false" /> + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <method /> + </configuration> <list size="1"> <item index="0" class="java.lang.String" itemvalue="Application.TreeViewer" /> </list> @@ -1175,48 +1039,48 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1920" height="1177" extended-state="6" /> + <frame x="4" y="23" width="3836" height="2137" extended-state="6" /> <editor active="true" /> <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" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="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="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="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="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19685768" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="8" 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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10885417" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.119791664" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10870699" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13034411" 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.32809612" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="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.32988676" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19685768" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="8" 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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.109228365" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.11991658" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.11991658" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="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" /> @@ -1244,6 +1108,9 @@ <option name="myLimit" value="2678400000" /> </component> <component name="VcsManagerConfiguration"> + <option name="myTodoPanelSettings"> + <TodoPanelSettings /> + </option> <MESSAGE value="add ExtendetDesktopSize" /> <MESSAGE value="FramebufferUpdateRequestMessage to false" /> <MESSAGE value="setFitScreen in ReceiverTask" /> @@ -1260,7 +1127,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>199</line> + <line>198</line> <properties /> <option name="timeStamp" value="13" /> </line-breakpoint> @@ -1283,175 +1150,85 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> - <folding> - <element signature="e#0#41446#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#4710#5235#0" expanded="false" /> - <element signature="e#5014#5201#0" expanded="false" /> - <element signature="e#5200#5201#0" expanded="false" /> - <element signature="e#5234#5235#0" expanded="false" /> - <element signature="e#5604#5605#0" expanded="false" /> - <element signature="e#5669#5670#0" expanded="false" /> - <element signature="e#5741#5742#0" expanded="false" /> - <element signature="e#5806#5807#0" expanded="false" /> - <element signature="e#6236#6237#0" expanded="false" /> - <element signature="e#6301#6302#0" expanded="false" /> - <element signature="e#6373#6374#0" expanded="false" /> - <element signature="e#6438#6439#0" expanded="false" /> - <element signature="e#8190#8191#0" expanded="false" /> - <element signature="e#8232#8233#0" expanded="false" /> - <element signature="e#8299#8300#0" expanded="false" /> - <element signature="e#8354#8355#0" expanded="false" /> - <element signature="e#13717#13930#0" expanded="false" /> - <element signature="e#13929#13930#0" expanded="false" /> - <element signature="e#14002#14214#0" expanded="false" /> - <element signature="e#14213#14214#0" expanded="false" /> - <element signature="e#14291#14545#0" expanded="false" /> - <element signature="e#14544#14545#0" expanded="false" /> - <element signature="e#14653#15147#0" expanded="false" /> - <element signature="e#15146#15147#0" expanded="false" /> - <element signature="e#15262#15751#0" expanded="false" /> - <element signature="e#15750#15751#0" expanded="false" /> - <element signature="e#18559#18923#0" expanded="false" /> - <element signature="e#18922#18923#0" expanded="false" /> - <element signature="e#19409#19410#0" expanded="false" /> - <element signature="e#19463#19464#0" expanded="false" /> - <element signature="e#21296#21297#0" expanded="false" /> - <element signature="e#21375#21376#0" expanded="false" /> - <element signature="e#21802#21803#0" expanded="false" /> - <element signature="e#21864#21865#0" expanded="false" /> - <element signature="e#22451#22452#0" expanded="false" /> - <element signature="e#22508#22509#0" expanded="false" /> - <element signature="e#22541#22542#0" expanded="false" /> - <element signature="e#22599#22600#0" expanded="false" /> - <element signature="e#22633#22634#0" expanded="false" /> - <element signature="e#22723#22724#0" expanded="false" /> - <element signature="e#22758#22759#0" expanded="false" /> - <element signature="e#22830#22831#0" expanded="false" /> - <element signature="e#27434#27622#0" expanded="false" /> - <element signature="e#27621#27622#0" expanded="false" /> - <element signature="e#28166#28684#0" expanded="false" /> - <element signature="e#28316#28634#0" expanded="false" /> - <element signature="e#28633#28634#0" expanded="false" /> - <element signature="e#28683#28684#0" expanded="false" /> - <element signature="e#28833#28834#0" expanded="false" /> - <element signature="e#28886#28887#0" expanded="false" /> - <element signature="e#28930#28931#0" expanded="false" /> - <element signature="e#28983#28984#0" expanded="false" /> - <element signature="e#29270#29937#0" expanded="false" /> - <element signature="e#29936#29937#0" expanded="false" /> - <element signature="e#30030#30190#0" expanded="false" /> - <element signature="e#30189#30190#0" expanded="false" /> - <element signature="e#30437#30645#0" expanded="false" /> - <element signature="e#30644#30645#0" expanded="false" /> - <element signature="e#30713#30929#0" expanded="false" /> - <element signature="e#30928#30929#0" expanded="false" /> - <element signature="e#31029#31246#0" expanded="false" /> - <element signature="e#31245#31246#0" expanded="false" /> - <element signature="e#31462#31674#0" expanded="false" /> - <element signature="e#31673#31674#0" expanded="false" /> - <element signature="e#31811#32019#0" expanded="false" /> - <element signature="e#32018#32019#0" expanded="false" /> - <element signature="e#32160#32612#0" expanded="false" /> - <element signature="e#32611#32612#0" expanded="false" /> - <element signature="e#32751#33201#0" expanded="false" /> - <element signature="e#33200#33201#0" expanded="false" /> - <element signature="e#34591#34911#0" expanded="false" /> - <element signature="e#34910#34911#0" expanded="false" /> - <element signature="e#35051#35930#0" expanded="false" /> - <element signature="e#35929#35930#0" expanded="false" /> - <element signature="e#36586#36983#0" expanded="false" /> - <element signature="e#36982#36983#0" expanded="false" /> - <element signature="e#40973#40974#0" expanded="false" /> - <element signature="e#41008#41009#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="244" column="62" selection-start-line="244" selection-start-column="62" selection-end-line="244" selection-end-column="62" /> - <folding /> + <folding> + <element signature="e#5279#5280#0" expanded="true" /> + <element signature="e#5321#5322#0" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> + <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="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding> - <element signature="e#0#2687#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2623#2624#0" expanded="false" /> - <element signature="e#2683#2684#0" expanded="false" /> + <element signature="e#3216#3217#0" expanded="true" /> + <element signature="e#3253#3254#0" expanded="true" /> + <element signature="e#3312#3313#0" expanded="true" /> + <element signature="e#3364#3365#0" expanded="true" /> + <element signature="e#3417#3418#0" expanded="true" /> + <element signature="e#3456#3457#0" expanded="true" /> + <element signature="e#3530#3531#0" expanded="true" /> + <element signature="e#3586#3587#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="0.0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" /> - <folding /> + <folding> + <element signature="e#3216#3217#0" expanded="true" /> + <element signature="e#3253#3254#0" expanded="true" /> + <element signature="e#3312#3313#0" expanded="true" /> + <element signature="e#3364#3365#0" expanded="true" /> + <element signature="e#3417#3418#0" expanded="true" /> + <element signature="e#3456#3457#0" expanded="true" /> + <element signature="e#3530#3531#0" expanded="true" /> + <element signature="e#3586#3587#0" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding> - <element signature="e#0#17023#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#16504#16505#0" expanded="false" /> - <element signature="e#16537#16538#0" expanded="false" /> - <element signature="e#16578#16579#0" expanded="false" /> - <element signature="e#16616#16617#0" expanded="false" /> + <element signature="e#16578#16579#0" expanded="true" /> + <element signature="e#16616#16617#0" expanded="true" /> </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="461" column="26" selection-start-line="461" selection-start-column="26" selection-end-line="461" selection-end-column="26" /> <folding> - <element signature="e#0#15185#0" expanded="true" /> + <element signature="e#0#15369#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#1656#1683#0" expanded="true" /> - <element signature="e#6747#6748#0" expanded="true" /> - <element signature="e#6776#6777#0" expanded="true" /> - <element signature="e#7032#7033#0" expanded="true" /> - <element signature="e#7064#7065#0" expanded="true" /> - <element signature="e#8936#8937#0" expanded="true" /> - <element signature="e#8979#8980#0" expanded="true" /> - <element signature="e#9405#9406#0" expanded="true" /> - <element signature="e#9437#9438#0" expanded="true" /> - <element signature="e#10542#10695#0" expanded="true" /> - <element signature="e#10694#10695#0" expanded="true" /> - <element signature="e#14050#14051#0" expanded="true" /> - <element signature="e#14076#14077#0" expanded="true" /> - <element signature="e#14638#14649#0" expanded="true" /> + <element signature="e#14822#14833#0" expanded="true" /> </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="218" column="40" selection-start-line="218" selection-start-column="40" selection-end-line="218" selection-end-column="40" /> <folding /> </state> @@ -1459,534 +1236,349 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="286" column="20" selection-start-line="286" selection-start-column="20" selection-end-line="286" selection-end-column="20" /> - <folding> - <element signature="e#0#12518#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3407#3408#0" expanded="false" /> - <element signature="e#3441#3442#0" expanded="false" /> - <element signature="e#3833#3834#0" expanded="false" /> - <element signature="e#3867#3868#0" expanded="false" /> - <element signature="e#4154#4155#0" expanded="false" /> - <element signature="e#4194#4195#0" expanded="false" /> - <element signature="e#4261#4262#0" expanded="false" /> - <element signature="e#4301#4302#0" expanded="false" /> - <element signature="e#4346#4347#0" expanded="false" /> - <element signature="e#4376#4377#0" expanded="false" /> - <element signature="e#4543#4544#0" expanded="false" /> - <element signature="e#4574#4575#0" expanded="false" /> - <element signature="e#4624#4625#0" expanded="false" /> - <element signature="e#4655#4656#0" expanded="false" /> - <element signature="e#4717#4718#0" expanded="false" /> - <element signature="e#4757#4758#0" expanded="false" /> - <element signature="e#4952#4953#0" expanded="false" /> - <element signature="e#4992#4993#0" expanded="false" /> - <element signature="e#5051#5052#0" expanded="false" /> - <element signature="e#5082#5083#0" expanded="false" /> - <element signature="e#5129#5130#0" expanded="false" /> - <element signature="e#5158#5159#0" expanded="false" /> - <element signature="e#5205#5206#0" expanded="false" /> - <element signature="e#5234#5235#0" expanded="false" /> - <element signature="e#12000#12001#0" expanded="false" /> - <element signature="e#12026#12027#0" expanded="false" /> - <element signature="e#12085#12086#0" expanded="false" /> - <element signature="e#12123#12124#0" expanded="false" /> - <element signature="e#12169#12170#0" expanded="false" /> - <element signature="e#12199#12200#0" expanded="false" /> - <element signature="e#12275#12276#0" expanded="false" /> - <element signature="e#12329#12330#0" expanded="false" /> - <element signature="e#12385#12386#0" expanded="false" /> - <element signature="e#12423#12424#0" expanded="false" /> - <element signature="e#12474#12475#0" expanded="false" /> - <element signature="e#12514#12515#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/FramebufferUpdateRequestMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="42" column="24" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="53" column="41" selection-start-line="53" selection-start-column="41" selection-end-line="53" selection-end-column="41" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/NoneAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/TightAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="93" column="61" selection-start-line="93" selection-start-column="61" selection-end-line="93" selection-end-column="61" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/RfbCapabilityInfo.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="78" column="11" selection-start-line="78" selection-start-column="11" selection-end-line="78" selection-end-column="11" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/EncodingType.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="154" column="29" selection-start-line="154" selection-start-column="29" selection-end-line="154" selection-end-column="29" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="30" column="37" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/AuthHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.060331825"> + <state vertical-scroll-proportion="0.060331825" vertical-offset="0" max-vertical-offset="0"> <caret line="34" column="22" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/NoneAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/TightAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="93" column="61" selection-start-line="93" selection-start-column="61" selection-end-line="93" selection-end-column="61" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/RfbCapabilityInfo.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="78" column="11" selection-start-line="78" selection-start-column="11" selection-end-line="78" selection-end-column="11" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/FramebufferUpdateRequestMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="42" column="24" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-30.625"> + <state vertical-scroll-proportion="-30.625" vertical-offset="0" max-vertical-offset="0"> <caret line="79" column="18" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="18" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/SecurityType33State.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="44" column="21" selection-start-line="44" selection-start-column="21" selection-end-line="44" selection-end-column="21" /> </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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="68" column="16" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.12066365"> + <state vertical-scroll-proportion="0.12066365" vertical-offset="0" max-vertical-offset="0"> <caret line="38" column="9" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="78" column="14" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="14" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </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.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="26" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ssh/SshConnectionManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="79" column="42" selection-start-line="79" selection-start-column="42" selection-end-line="79" selection-end-column="42" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="53" column="8" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="8" /> - </state> - </provider> - </entry> <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="49" column="28" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" /> </state> </provider> </entry> + <entry file="jar://$PROJECT_DIR$/src/libs/jsch-0.1.50.jar!/com/jcraft/jsch/JSch.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="268" column="19" selection-start-line="268" selection-start-column="19" selection-end-line="268" selection-end-column="19" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <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="0" max-vertical-offset="0"> + <caret line="58" column="9" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" /> + <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="0" max-vertical-offset="0"> + <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="711" max-vertical-offset="2700"> + <caret line="177" column="52" selection-start-line="177" selection-start-column="52" selection-end-line="177" selection-end-column="52" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675"> <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> - <folding> - <element signature="e#0#2687#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2623#2624#0" expanded="false" /> - <element signature="e#2683#2684#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/src/libs/jsch-0.1.50.jar!/com/jcraft/jsch/JSch.class"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state vertical-scroll-proportion="0.06787331" vertical-offset="0" max-vertical-offset="1989"> + <caret line="34" column="17" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" /> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="49" column="25" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="870"> + <caret line="57" column="1" selection-start-line="57" selection-start-column="1" selection-end-line="57" selection-end-column="1" /> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="268" column="19" selection-start-line="268" selection-start-column="19" selection-end-line="268" selection-end-column="19" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> + <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="86" column="1" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> + <state vertical-scroll-proportion="0.0" vertical-offset="570" max-vertical-offset="4065"> + <caret line="152" column="39" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" /> <folding> - <element signature="e#0#17023#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#16504#16505#0" expanded="false" /> - <element signature="e#16537#16538#0" expanded="false" /> - <element signature="e#16578#16579#0" expanded="false" /> - <element signature="e#16616#16617#0" expanded="false" /> + <element signature="e#5279#5280#0" expanded="true" /> + <element signature="e#5321#5322#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"> - <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> - <folding> - <element signature="e#0#11210#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#8038#8288#0" expanded="false" /> - <element signature="e#8287#8288#0" expanded="false" /> - <element signature="e#9036#9037#0" expanded="false" /> - <element signature="e#9086#9087#0" expanded="false" /> - <element signature="e#9164#9165#0" expanded="false" /> - <element signature="e#9210#9211#0" expanded="false" /> - <element signature="e#9280#9281#0" expanded="false" /> - <element signature="e#9324#9325#0" expanded="false" /> - <element signature="e#9402#9403#0" expanded="false" /> - <element signature="e#9458#9459#0" expanded="false" /> - <element signature="e#10336#10807#0" expanded="false" /> - <element signature="e#10806#10807#0" expanded="false" /> - <element signature="e#11088#11089#0" expanded="false" /> - <element signature="e#11123#11124#0" expanded="false" /> - <element signature="e#11170#11171#0" expanded="false" /> - <element signature="e#11206#11207#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> - <folding> - <element signature="e#0#3515#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3477#3478#0" expanded="false" /> - <element signature="e#3510#3511#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <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"> - <caret line="58" column="9" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" /> - <folding> - <element signature="e#0#3575#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2916#2917#0" expanded="false" /> - <element signature="e#2954#2955#0" expanded="false" /> - </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"> - <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> - <folding> - <element signature="e#0#41446#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#4710#5235#0" expanded="false" /> - <element signature="e#5014#5201#0" expanded="false" /> - <element signature="e#5200#5201#0" expanded="false" /> - <element signature="e#5234#5235#0" expanded="false" /> - <element signature="e#5604#5605#0" expanded="false" /> - <element signature="e#5669#5670#0" expanded="false" /> - <element signature="e#5741#5742#0" expanded="false" /> - <element signature="e#5806#5807#0" expanded="false" /> - <element signature="e#6236#6237#0" expanded="false" /> - <element signature="e#6301#6302#0" expanded="false" /> - <element signature="e#6373#6374#0" expanded="false" /> - <element signature="e#6438#6439#0" expanded="false" /> - <element signature="e#8190#8191#0" expanded="false" /> - <element signature="e#8232#8233#0" expanded="false" /> - <element signature="e#8299#8300#0" expanded="false" /> - <element signature="e#8354#8355#0" expanded="false" /> - <element signature="e#13717#13930#0" expanded="false" /> - <element signature="e#13929#13930#0" expanded="false" /> - <element signature="e#14002#14214#0" expanded="false" /> - <element signature="e#14213#14214#0" expanded="false" /> - <element signature="e#14291#14545#0" expanded="false" /> - <element signature="e#14544#14545#0" expanded="false" /> - <element signature="e#14653#15147#0" expanded="false" /> - <element signature="e#15146#15147#0" expanded="false" /> - <element signature="e#15262#15751#0" expanded="false" /> - <element signature="e#15750#15751#0" expanded="false" /> - <element signature="e#18559#18923#0" expanded="false" /> - <element signature="e#18922#18923#0" expanded="false" /> - <element signature="e#19409#19410#0" expanded="false" /> - <element signature="e#19463#19464#0" expanded="false" /> - <element signature="e#21296#21297#0" expanded="false" /> - <element signature="e#21375#21376#0" expanded="false" /> - <element signature="e#21802#21803#0" expanded="false" /> - <element signature="e#21864#21865#0" expanded="false" /> - <element signature="e#22451#22452#0" expanded="false" /> - <element signature="e#22508#22509#0" expanded="false" /> - <element signature="e#22541#22542#0" expanded="false" /> - <element signature="e#22599#22600#0" expanded="false" /> - <element signature="e#22633#22634#0" expanded="false" /> - <element signature="e#22723#22724#0" expanded="false" /> - <element signature="e#22758#22759#0" expanded="false" /> - <element signature="e#22830#22831#0" expanded="false" /> - <element signature="e#27434#27622#0" expanded="false" /> - <element signature="e#27621#27622#0" expanded="false" /> - <element signature="e#28166#28684#0" expanded="false" /> - <element signature="e#28316#28634#0" expanded="false" /> - <element signature="e#28633#28634#0" expanded="false" /> - <element signature="e#28683#28684#0" expanded="false" /> - <element signature="e#28833#28834#0" expanded="false" /> - <element signature="e#28886#28887#0" expanded="false" /> - <element signature="e#28930#28931#0" expanded="false" /> - <element signature="e#28983#28984#0" expanded="false" /> - <element signature="e#29270#29937#0" expanded="false" /> - <element signature="e#29936#29937#0" expanded="false" /> - <element signature="e#30030#30190#0" expanded="false" /> - <element signature="e#30189#30190#0" expanded="false" /> - <element signature="e#30437#30645#0" expanded="false" /> - <element signature="e#30644#30645#0" expanded="false" /> - <element signature="e#30713#30929#0" expanded="false" /> - <element signature="e#30928#30929#0" expanded="false" /> - <element signature="e#31029#31246#0" expanded="false" /> - <element signature="e#31245#31246#0" expanded="false" /> - <element signature="e#31462#31674#0" expanded="false" /> - <element signature="e#31673#31674#0" expanded="false" /> - <element signature="e#31811#32019#0" expanded="false" /> - <element signature="e#32018#32019#0" expanded="false" /> - <element signature="e#32160#32612#0" expanded="false" /> - <element signature="e#32611#32612#0" expanded="false" /> - <element signature="e#32751#33201#0" expanded="false" /> - <element signature="e#33200#33201#0" expanded="false" /> - <element signature="e#34591#34911#0" expanded="false" /> - <element signature="e#34910#34911#0" expanded="false" /> - <element signature="e#35051#35930#0" expanded="false" /> - <element signature="e#35929#35930#0" expanded="false" /> - <element signature="e#36586#36983#0" expanded="false" /> - <element signature="e#36982#36983#0" expanded="false" /> - <element signature="e#40973#40974#0" expanded="false" /> - <element signature="e#41008#41009#0" expanded="false" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="1245" max-vertical-offset="4820"> + <caret line="126" column="31" selection-start-line="126" selection-start-column="31" selection-end-line="126" selection-end-column="31" /> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="244" column="20" selection-start-line="244" selection-start-column="20" selection-end-line="244" selection-end-column="20" /> - <folding> - <element signature="e#0#12518#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3407#3408#0" expanded="false" /> - <element signature="e#3441#3442#0" expanded="false" /> - <element signature="e#3833#3834#0" expanded="false" /> - <element signature="e#3867#3868#0" expanded="false" /> - <element signature="e#4154#4155#0" expanded="false" /> - <element signature="e#4194#4195#0" expanded="false" /> - <element signature="e#4261#4262#0" expanded="false" /> - <element signature="e#4301#4302#0" expanded="false" /> - <element signature="e#4346#4347#0" expanded="false" /> - <element signature="e#4376#4377#0" expanded="false" /> - <element signature="e#4543#4544#0" expanded="false" /> - <element signature="e#4574#4575#0" expanded="false" /> - <element signature="e#4624#4625#0" expanded="false" /> - <element signature="e#4655#4656#0" expanded="false" /> - <element signature="e#4717#4718#0" expanded="false" /> - <element signature="e#4757#4758#0" expanded="false" /> - <element signature="e#4952#4953#0" expanded="false" /> - <element signature="e#4992#4993#0" expanded="false" /> - <element signature="e#5051#5052#0" expanded="false" /> - <element signature="e#5082#5083#0" expanded="false" /> - <element signature="e#5129#5130#0" expanded="false" /> - <element signature="e#5158#5159#0" expanded="false" /> - <element signature="e#5205#5206#0" expanded="false" /> - <element signature="e#5234#5235#0" expanded="false" /> - <element signature="e#12000#12001#0" expanded="false" /> - <element signature="e#12026#12027#0" expanded="false" /> - <element signature="e#12085#12086#0" expanded="false" /> - <element signature="e#12123#12124#0" expanded="false" /> - <element signature="e#12169#12170#0" expanded="false" /> - <element signature="e#12199#12200#0" expanded="false" /> - <element signature="e#12275#12276#0" expanded="false" /> - <element signature="e#12329#12330#0" expanded="false" /> - <element signature="e#12385#12386#0" expanded="false" /> - <element signature="e#12423#12424#0" expanded="false" /> - <element signature="e#12474#12475#0" expanded="false" /> - <element signature="e#12514#12515#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="244" column="62" selection-start-line="244" selection-start-column="62" selection-end-line="244" selection-end-column="62" /> + <state vertical-scroll-proportion="0.0" vertical-offset="1593" max-vertical-offset="7056"> + <caret line="185" column="30" selection-start-line="185" selection-start-column="30" selection-end-line="185" selection-end-column="30" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="339" column="47" selection-start-line="339" selection-start-column="47" selection-end-line="339" selection-end-column="47" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> + <state vertical-scroll-proportion="-42.525" vertical-offset="15173" max-vertical-offset="18062"> + <caret line="862" column="4" selection-start-line="862" selection-start-column="4" selection-end-line="862" selection-end-column="4" /> <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"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <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/TreeRFBProto.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="199" column="0" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" /> - <folding /> + <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="5568"> + <caret line="53" column="36" selection-start-line="53" selection-start-column="36" selection-end-line="53" selection-end-column="36" /> + <folding> + <element signature="e#1937#1938#0" expanded="true" /> + <element signature="e#1986#1987#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="446" max-vertical-offset="7636"> + <caret line="74" column="21" selection-start-line="74" selection-start-column="21" selection-end-line="74" selection-end-column="21" /> + <folding> + <element signature="e#16578#16579#0" expanded="true" /> + <element signature="e#16616#16617#0" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.67181927"> - <caret line="329" column="7" selection-start-line="329" selection-start-column="7" selection-end-line="329" selection-end-column="7" /> + <state vertical-scroll-proportion="0.2540486" vertical-offset="6142" max-vertical-offset="9812"> + <caret line="320" column="67" selection-start-line="320" selection-start-column="67" selection-end-line="320" selection-end-column="67" /> <folding> - <element signature="e#0#15185#0" expanded="true" /> + <element signature="e#0#15369#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#1656#1683#0" expanded="true" /> - <element signature="e#6747#6748#0" expanded="true" /> - <element signature="e#6776#6777#0" expanded="true" /> - <element signature="e#7032#7033#0" expanded="true" /> - <element signature="e#7064#7065#0" expanded="true" /> - <element signature="e#8936#8937#0" expanded="true" /> - <element signature="e#8979#8980#0" expanded="true" /> - <element signature="e#9405#9406#0" expanded="true" /> - <element signature="e#9437#9438#0" expanded="true" /> - <element signature="e#10542#10695#0" expanded="true" /> - <element signature="e#10694#10695#0" expanded="true" /> - <element signature="e#14050#14051#0" expanded="true" /> - <element signature="e#14076#14077#0" expanded="true" /> - <element signature="e#14638#14649#0" expanded="true" /> + <element signature="e#14822#14833#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.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="0.75029725"> - <caret line="214" column="26" selection-start-line="214" selection-start-column="26" selection-end-line="214" selection-end-column="26" /> - <folding /> + <state vertical-scroll-proportion="0.27884614" vertical-offset="957" max-vertical-offset="9686"> + <caret line="85" column="19" selection-start-line="85" selection-start-column="19" selection-end-line="85" selection-end-column="19" /> + <folding> + <element signature="e#3216#3217#0" expanded="true" /> + <element signature="e#3253#3254#0" expanded="true" /> + <element signature="e#3312#3313#0" expanded="true" /> + <element signature="e#3364#3365#0" expanded="true" /> + <element signature="e#3417#3418#0" expanded="true" /> + <element signature="e#3456#3457#0" expanded="true" /> + <element signature="e#3530#3531#0" expanded="true" /> + <element signature="e#3586#3587#0" expanded="true" /> + </folding> </state> </provider> </entry>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Sat Aug 15 04:21:33 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Sat Aug 15 17:28:19 2015 +0900 @@ -6,6 +6,7 @@ import java.net.*; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.util.Enumeration; import java.util.Iterator; import java.util.LinkedList; import java.util.concurrent.atomic.AtomicInteger; @@ -46,7 +47,6 @@ private TreeVncCommandChannelListener acceptThread; private TreeRootFinderListener getCast; private CreateConnectionParam cp; - private short reconnectingId; // Change Server Request to id's node VNC server private TreeVNCNetwork nets = new TreeVNCNetwork(); private TreeVncRootSelectionPanel rootSelectionPanel; private String vncInterface; @@ -57,7 +57,6 @@ private boolean permitChangeScreen = true; private boolean leader; private boolean hasViewer = false; - private boolean reconnecting; private boolean normalTermination; private boolean isTreeManager; public boolean showTreeNode = false; @@ -481,37 +480,30 @@ public synchronized void vncConnected(boolean ready) { enableChildrenTransmission(); - if (ready && reconnecting) { - printNetworkInterface(); - sendDesktopSizeChange(reconnectingId); - reconnecting = false; - /* - if (reconnectingId == 0) { - viewer.setVisible(false); - } - */ - } - if (reconnectingId!=0) { - readyReconnect = ready; - if (ready) { - notifyAll(); - } + readyReconnect = ready; + if (ready) { + notifyAll(); } } - private void printNetworkInterface() { + public void printNetworkInterface() { Socket vncSocket = viewer.getVNCSocket(); NetworkInterface ni = nets.getInterface(vncSocket); if (ni!=null) { vncInterface = ni.getName(); - System.out.println("VNCNetworkInterface :" + vncInterface); + System.out.print("VNCNetworkInterface :" + vncInterface); + Enumeration<InetAddress> addresses = ni.getInetAddresses(); + while(addresses.hasMoreElements()) { + InetAddress adr = addresses.nextElement(); + System.out.print(" "+adr); + } + System.out.println(); } } public synchronized void waitForVNCConnection() { - if (reconnectingId!=0) { - while (!readyReconnect) { + while (!readyReconnect) { try { wait(); } catch (InterruptedException e) { @@ -519,9 +511,6 @@ System.out.println("interrupt wait for vnc connection."); } } - } else { - System.out.println("changeVNCServer : got recconectionId == 0"); - } } @@ -831,13 +820,9 @@ return; } // serverChangeの処理 - reconnectingId = newVNCServerId; - vncProxyService.inhelitClients(vncProxyService, hostName); + vncProxyService.inhelitClients(vncProxyService, hostName, newVNCServerId); // after connecting VNC server, rfb send SEND_INIT_DATA command and wakes me up if necessary - reconnecting = true; // stop reader stop - stopReceiverTask(); - waitForVNCConnection(); } /** @@ -875,14 +860,6 @@ hasViewer = b; } - public void setReconnecting(boolean b) { - reconnecting = b; - } - - public int getReconnectingId() { - return reconnectingId; - } - public void setShowTree(boolean showTree) { this.showTreeNode = showTree; }
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Sat Aug 15 04:21:33 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Sat Aug 15 17:28:19 2015 +0900 @@ -26,11 +26,13 @@ import com.glavsoft.rfb.protocol.ProtocolSettings; 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.TreeRFBProto; import java.net.Socket; import java.util.logging.Logger; @@ -64,6 +66,25 @@ private boolean isTreeVNC = false; private boolean cuiVersion; private boolean noConnection = false; + public ViewerInterface viewer; + private ConnectionParams connectionParams; + private short reconnectingId; + + public short getReconnectingId() { + return reconnectingId; + } + + public void setReconnectingId(short reconnectingId) { + this.reconnectingId = reconnectingId; + } + + public ConnectionParams getConnectionParams() { + return connectionParams; + } + + public void setConnectionParams(ConnectionParams connectionParams) { + this.connectionParams = connectionParams; + } public ConnectionPresenter(boolean hasSshSupport, boolean allowInteractive) { this.hasSshSupport = hasSshSupport; @@ -331,6 +352,7 @@ } public void startVNCConnection(Viewer viewer) { + this.viewer = viewer; final boolean hasJsch = viewer.checkJsch(); ConnectionView connectionView = new ConnectionView( viewer, // appWindowListener @@ -353,4 +375,13 @@ setNeedReconnection(!viewer.noConnection); startConnection(viewer.settings, viewer.uiSettings, viewer.paramsMask); } + + public void newVNCConnection() { + TreeRFBProto rfb = viewer.getRfb(); + rfb.stopReceiverTask(); + viewer.getConnectionPresenter().addModel("ConnectionParamsModel", connectionParams); + rfb.enableChildrenTransmission(); + rfb.printNetworkInterface(); + rfb.sendDesktopSizeChange(reconnectingId); + } }
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Sat Aug 15 04:21:33 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Sat Aug 15 17:28:19 2015 +0900 @@ -150,6 +150,11 @@ } @Override + public ConnectionPresenter getConnectionPresenter() { + return connectionPresenter; + } + + @Override public void windowOpened(WindowEvent e) { /* nop */ } @@ -242,7 +247,7 @@ } @Override - public void inhelitClients(ViewerInterface vncProxyService, String hostName) { + public void inhelitClients(ViewerInterface vncProxyService, String hostName, short newVNCServerId) { }
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Sat Aug 15 04:21:33 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Sat Aug 15 17:28:19 2015 +0900 @@ -230,6 +230,11 @@ } @Override + public ConnectionPresenter getConnectionPresenter() { + return connectionPresenter; + } + + @Override public void windowOpened(WindowEvent e) { /* nop */ } @Override public void windowClosed(WindowEvent e) { /* nop */ } @@ -305,10 +310,10 @@ * inherited clients * @param vs * @param hostName + * @param newVNCServerId */ @Override - public void inhelitClients(ViewerInterface vs, String hostName) { - myRfb.vncConnected(false); + public void inhelitClients(ViewerInterface vs, String hostName, short newVNCServerId) { final boolean hasJsch = checkJsch(); final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet; final ConnectionPresenter connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); @@ -316,6 +321,8 @@ ConnectionParams connectionParams = new ConnectionParams(); connectionParams.setConnectionParam(hostName, vncport); connectionPresenter.addModel("ConnectionParamsModel", connectionParams); + connectionPresenter.setConnectionParams(connectionParams); + connectionPresenter.setReconnectingId(newVNCServerId); isApplet = true; this.setNoConnection(false); final Viewer v = this; @@ -379,7 +386,6 @@ connectionParams.setConnectionParam(hostname, vncport); isApplet = true; settings.setViewOnly(true); // too avoid unnecessary upward traffic - rfb.setReconnecting(true); ArrayList<Rectangle> rectangles = getScreenRectangles(); int leftScreenNumber = 0; @@ -395,7 +401,6 @@ connectionParams.setConnectionParam(hostName, vncport); isApplet = true; myRfbProto.createConnectionAndStart(this); - myRfbProto.setReconnecting(true); run(); }
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Sat Aug 15 04:21:33 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Sat Aug 15 17:28:19 2015 +0900 @@ -5,6 +5,7 @@ import java.net.Socket; import java.util.ArrayList; +import com.glavsoft.viewer.mvp.Presenter; import jp.ac.u_ryukyu.treevnc.TreeRFBProto; public interface ViewerInterface extends Runnable { @@ -29,7 +30,7 @@ public void connectToParenet(int port, String hostname) throws IOException; - public void inhelitClients(ViewerInterface vncProxyService, String hostName); + public void inhelitClients(ViewerInterface vncProxyService, String hostName, short newVNCServerId); public void proxyStart(String[] args, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay); @@ -52,4 +53,6 @@ public ArrayList<Rectangle> getScreenRectangles(); void newVNCConnection(ConnectionPresenter presenter); + + ConnectionPresenter getConnectionPresenter(); }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java Sat Aug 15 04:21:33 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java Sat Aug 15 17:28:19 2015 +0900 @@ -219,4 +219,5 @@ this.hostName = hostname; this.portNumber = port; } + }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Sat Aug 15 04:21:33 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Sat Aug 15 17:28:19 2015 +0900 @@ -108,9 +108,7 @@ try { get(); presenter.showMessage("Handshake established"); - if(myRfb.getViewer() != null) { - myRfb.getViewer().newVNCConnection(presenter); - } + presenter.newVNCConnection(); ClipboardControllerImpl clipboardController; if(!myRfb.getCuiVersion()) clipboardController = new ClipboardControllerImpl(workingProtocol, rfbSettings.getRemoteCharsetName());