Mercurial > hg > Applications > TreeVNC
changeset 366:2d83bea06f00
Check connectionPresenter
| author | innparusu |
|---|---|
| date | Mon, 10 Aug 2015 20:13:52 +0900 |
| parents | 6558eb66ac8e |
| children | 0e3af3c8b771 |
| files | .idea/workspace.xml src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java |
| diffstat | 3 files changed, 371 insertions(+), 356 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Mon Aug 10 18:47:38 2015 +0900 +++ b/.idea/workspace.xml Mon Aug 10 20:13:52 2015 +0900 @@ -2,7 +2,9 @@ <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$/TreeVNC.iml" afterPath="$PROJECT_DIR$/TreeVNC.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -30,14 +32,22 @@ <splitter split-orientation="horizontal" split-proportion="0.5"> <split-first> <leaf> + <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" vertical-offset="1063" max-vertical-offset="9900"> + <caret line="86" column="1" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="150" max-vertical-offset="4470"> - <caret line="48" column="20" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" /> + <state vertical-scroll-proportion="-43.075" vertical-offset="2645" max-vertical-offset="7104"> + <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#4717#4718#0" expanded="true" /> - <element signature="e#4757#4758#0" expanded="true" /> <element signature="e#8562#8563#0" expanded="true" /> <element signature="e#8603#8604#0" expanded="true" /> </folding> @@ -45,107 +55,99 @@ </provider> </entry> </file> - <file leaf-file-name="ProtocolSettings.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <file leaf-file-name="ProtocolContext.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="58" 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 /> + </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" vertical-offset="65" max-vertical-offset="1242"> + <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> + </file> + <file leaf-file-name="PlainSocketImpl.java" pinned="false" current-in-tab="false"> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/net/PlainSocketImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="5760"> - <caret line="49" column="28" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" /> + <state vertical-scroll-proportion="0.0" vertical-offset="113" max-vertical-offset="1290"> + <caret line="95" column="16" selection-start-line="95" selection-start-column="16" selection-end-line="95" selection-end-column="16" /> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.33305013" vertical-offset="4368" max-vertical-offset="23576"> + <caret line="199" column="0" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" /> + <folding> + <element signature="e#17149#17150#0" expanded="true" /> + <element signature="e#17190#17191#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="11038" max-vertical-offset="13260"> + <caret line="415" column="15" selection-start-line="415" selection-start-column="15" selection-end-line="415" selection-end-column="15" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#7372#7373#0" expanded="true" /> + <element signature="e#7404#7405#0" expanded="true" /> + <element signature="e#10791#10792#0" expanded="true" /> + <element signature="e#10819#10820#0" expanded="true" /> + <element signature="e#14437#14438#0" expanded="true" /> + <element signature="e#14491#14492#0" expanded="true" /> + <element signature="e#15284#15295#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" vertical-offset="960" max-vertical-offset="3600"> - <caret line="107" column="13" selection-start-line="107" selection-start-column="13" selection-end-line="107" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ViewerInterface.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="690" max-vertical-offset="810"> - <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InitState.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1020" max-vertical-offset="1350"> - <caret line="78" column="14" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="14" /> - <folding> - <element signature="e#0#3986#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ProtocolState.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="615"> - <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="26" /> + <state vertical-scroll-proportion="0.0" vertical-offset="958" max-vertical-offset="6561"> + <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1095" max-vertical-offset="4140"> - <caret line="92" column="25" selection-start-line="92" selection-start-column="25" selection-end-line="92" selection-end-column="25" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="3000" max-vertical-offset="6735"> - <caret line="226" column="27" selection-start-line="226" selection-start-column="8" selection-end-line="226" selection-end-column="27" /> + <state vertical-scroll-proportion="-10.725" vertical-offset="17496" max-vertical-offset="21950"> + <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> <folding> - <element signature="imports" expanded="true" /> - <element signature="e#10093#10094#0" expanded="true" /> - <element signature="e#10136#10137#0" expanded="true" /> - <element signature="e#10562#10563#0" expanded="true" /> - <element signature="e#10594#10595#0" expanded="true" /> - <element signature="e#10630#10631#0" expanded="true" /> - <element signature="e#10658#10659#0" expanded="true" /> - <element signature="e#10696#10697#0" expanded="true" /> - <element signature="e#10740#10741#0" expanded="true" /> - <element signature="e#10786#10787#0" expanded="true" /> - <element signature="e#10827#10828#0" expanded="true" /> - <element signature="e#14228#14229#0" expanded="true" /> - <element signature="e#14282#14283#0" expanded="true" /> - <element signature="e#14332#14333#0" expanded="true" /> - <element signature="e#14363#14364#0" expanded="true" /> - <element signature="e#14412#14413#0" expanded="true" /> - <element signature="e#14437#14438#0" expanded="true" /> - <element signature="e#14487#14488#0" expanded="true" /> - <element signature="e#14513#14514#0" expanded="true" /> - <element signature="e#15075#15086#0" expanded="true" /> + <element signature="e#20907#20908#0" expanded="true" /> + <element signature="e#20937#20938#0" expanded="true" /> + <element signature="e#33323#34451#0" expanded="true" /> + <element signature="e#34450#34451#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="SshConnectionManager.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ssh/SshConnectionManager.java"> + <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.23076923" vertical-offset="126" max-vertical-offset="2115"> - <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="1696" max-vertical-offset="5742"> + <caret line="78" column="45" selection-start-line="78" selection-start-column="45" selection-end-line="78" selection-end-column="45" /> + <folding /> </state> </provider> </entry> @@ -157,9 +159,12 @@ <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1905" max-vertical-offset="4140"> - <caret line="146" column="27" selection-start-line="146" selection-start-column="27" selection-end-line="146" selection-end-column="27" /> - <folding /> + <state vertical-scroll-proportion="0.89039934" vertical-offset="2172" max-vertical-offset="6164"> + <caret line="159" column="13" selection-start-line="159" selection-start-column="5" selection-end-line="159" selection-end-column="13" /> + <folding> + <element signature="e#5159#5160#0" expanded="true" /> + <element signature="e#5206#5207#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -167,7 +172,7 @@ <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" vertical-offset="225" max-vertical-offset="675"> + <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> @@ -177,7 +182,7 @@ <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2085" max-vertical-offset="4215"> + <state vertical-scroll-proportion="0.0" vertical-offset="2115" max-vertical-offset="7587"> <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" /> <folding /> </state> @@ -460,9 +465,10 @@ <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/ConnectionPresenter.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.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/swing/SwingRfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> </list> </option> @@ -496,7 +502,6 @@ <sortByType /> </navigator> <panes> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -760,6 +765,7 @@ </subPane> </pane> <pane id="Scope" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -799,7 +805,13 @@ <option name="PASS_PARENT_ENVS" value="true" /> <module name="TreeVNC" /> <envs /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> <method /> </configuration> @@ -1008,45 +1020,45 @@ <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="false" weight="0.39980304" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <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.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="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" 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="true" 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="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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="true" weight="0.24973932" 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" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39980304" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -1076,7 +1088,26 @@ <option name="LAST_COMMIT_MESSAGE" value="setFitScreen in ReceiverTask" /> </component> <component name="XDebuggerManager"> - <breakpoint-manager /> + <breakpoint-manager> + <breakpoints> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> + <line>862</line> + <properties /> + <option name="timeStamp" value="6" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>199</line> + <properties /> + <option name="timeStamp" value="13" /> + </line-breakpoint> + </breakpoints> + <breakpoints-dialog> + <breakpoints-dialog /> + </breakpoints-dialog> + <option name="time" value="14" /> + </breakpoint-manager> <watches-manager /> </component> <component name="antWorkspaceConfiguration"> @@ -1084,87 +1115,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="960" max-vertical-offset="3600"> - <caret line="107" column="13" selection-start-line="107" selection-start-column="13" selection-end-line="107" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="690" max-vertical-offset="810"> - <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1020" max-vertical-offset="1350"> - <caret line="78" column="14" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="14" /> - <folding> - <element signature="e#0#3986#0" expanded="true" /> - </folding> - </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" vertical-offset="105" max-vertical-offset="615"> - <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="26" /> - <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" vertical-offset="3000" max-vertical-offset="6735"> - <caret line="226" column="27" selection-start-line="226" selection-start-column="8" selection-end-line="226" selection-end-column="27" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#10093#10094#0" expanded="true" /> - <element signature="e#10136#10137#0" expanded="true" /> - <element signature="e#10562#10563#0" expanded="true" /> - <element signature="e#10594#10595#0" expanded="true" /> - <element signature="e#10630#10631#0" expanded="true" /> - <element signature="e#10658#10659#0" expanded="true" /> - <element signature="e#10696#10697#0" expanded="true" /> - <element signature="e#10740#10741#0" expanded="true" /> - <element signature="e#10786#10787#0" expanded="true" /> - <element signature="e#10827#10828#0" expanded="true" /> - <element signature="e#14228#14229#0" expanded="true" /> - <element signature="e#14282#14283#0" expanded="true" /> - <element signature="e#14332#14333#0" expanded="true" /> - <element signature="e#14363#14364#0" expanded="true" /> - <element signature="e#14412#14413#0" expanded="true" /> - <element signature="e#14437#14438#0" expanded="true" /> - <element signature="e#14487#14488#0" expanded="true" /> - <element signature="e#14513#14514#0" expanded="true" /> - <element signature="e#15075#15086#0" expanded="true" /> - </folding> - </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" vertical-offset="585" max-vertical-offset="2115"> - <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1905" max-vertical-offset="4140"> - <caret line="146" column="27" selection-start-line="146" selection-start-column="27" selection-end-line="146" selection-end-column="27" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="675"> @@ -1185,6 +1135,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4995"> <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> @@ -1194,25 +1145,13 @@ <caret line="461" column="26" selection-start-line="461" selection-start-column="26" selection-end-line="461" selection-end-column="26" /> <folding> <element signature="imports" expanded="true" /> - <element signature="e#10093#10094#0" expanded="true" /> - <element signature="e#10136#10137#0" expanded="true" /> - <element signature="e#10562#10563#0" expanded="true" /> - <element signature="e#10594#10595#0" expanded="true" /> - <element signature="e#10630#10631#0" expanded="true" /> - <element signature="e#10658#10659#0" expanded="true" /> - <element signature="e#10696#10697#0" expanded="true" /> - <element signature="e#10740#10741#0" expanded="true" /> - <element signature="e#10786#10787#0" expanded="true" /> - <element signature="e#10827#10828#0" expanded="true" /> - <element signature="e#14228#14229#0" expanded="true" /> - <element signature="e#14282#14283#0" expanded="true" /> - <element signature="e#14332#14333#0" expanded="true" /> - <element signature="e#14363#14364#0" expanded="true" /> - <element signature="e#14412#14413#0" expanded="true" /> + <element signature="e#7372#7373#0" expanded="true" /> + <element signature="e#7404#7405#0" expanded="true" /> + <element signature="e#10791#10792#0" expanded="true" /> + <element signature="e#10819#10820#0" expanded="true" /> <element signature="e#14437#14438#0" expanded="true" /> - <element signature="e#14487#14488#0" expanded="true" /> - <element signature="e#14513#14514#0" expanded="true" /> - <element signature="e#15075#15086#0" expanded="true" /> + <element signature="e#14491#14492#0" expanded="true" /> + <element signature="e#15284#15295#0" expanded="true" /> </folding> </state> </provider> @@ -1222,10 +1161,10 @@ <state vertical-scroll-proportion="0.0" vertical-offset="2880" max-vertical-offset="12900"> <caret line="218" column="40" selection-start-line="218" selection-start-column="40" selection-end-line="218" selection-end-column="40" /> <folding> - <element signature="e#23709#23710#0" expanded="true" /> - <element signature="e#23741#23742#0" expanded="true" /> - <element signature="e#33731#33732#0" expanded="true" /> - <element signature="e#33763#33764#0" expanded="true" /> + <element signature="e#17149#17150#0" expanded="true" /> + <element signature="e#17190#17191#0" expanded="true" /> + <element signature="e#33581#33582#0" expanded="true" /> + <element signature="e#33613#33614#0" expanded="true" /> </folding> </state> </provider> @@ -1247,6 +1186,12 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="930"> <caret line="42" column="24" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" /> + <folding> + <element signature="e#0#2596#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2421#2514#0" expanded="false" /> + <element signature="e#2513#2514#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -1254,6 +1199,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="1110"> <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -1261,6 +1207,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="990"> <caret line="53" column="41" selection-start-line="53" selection-start-column="41" selection-end-line="53" selection-end-column="41" /> + <folding /> </state> </provider> </entry> @@ -1282,6 +1229,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="825" max-vertical-offset="1440"> <caret line="78" column="11" selection-start-line="78" selection-start-column="11" selection-end-line="78" selection-end-column="11" /> + <folding /> </state> </provider> </entry> @@ -1306,13 +1254,6 @@ </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" vertical-offset="0" max-vertical-offset="5940"> - <caret line="22" column="18" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" /> - </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" vertical-offset="0" max-vertical-offset="1989"> @@ -1338,6 +1279,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="315" max-vertical-offset="2304"> <caret line="78" column="11" selection-start-line="78" selection-start-column="11" selection-end-line="78" selection-end-column="11" /> + <folding /> </state> </provider> </entry> @@ -1345,13 +1287,12 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1674"> <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/ReceiverTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2961" max-vertical-offset="4950"> - <caret line="283" column="28" selection-start-line="283" selection-start-column="28" selection-end-line="283" selection-end-column="28" /> + <folding> + <element signature="e#0#2596#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2421#2514#0" expanded="false" /> + <element signature="e#2513#2514#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -1359,6 +1300,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-30.625" vertical-offset="0" max-vertical-offset="1850"> <caret line="79" column="18" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="18" /> + <folding /> </state> </provider> </entry> @@ -1373,20 +1315,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1650"> <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/com/glavsoft/rfb/protocol/ProtocolContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="525" max-vertical-offset="2727"> - <caret line="72" column="9" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" /> - </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="-22.225" vertical-offset="20471" max-vertical-offset="26190"> - <caret line="863" column="58" selection-start-line="863" selection-start-column="58" selection-end-line="863" selection-end-column="58" /> + <folding /> </state> </provider> </entry> @@ -1394,26 +1323,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="237" max-vertical-offset="2235"> <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/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-23.725" vertical-offset="21581" max-vertical-offset="25320"> - <caret line="833" column="34" selection-start-line="833" selection-start-column="34" selection-end-line="833" selection-end-column="34" /> - <folding> - <element signature="e#23709#23710#0" expanded="true" /> - <element signature="e#23741#23742#0" expanded="true" /> - <element signature="e#33731#33732#0" expanded="true" /> - <element signature="e#33763#33764#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <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" vertical-offset="90" max-vertical-offset="3480"> - <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -1429,116 +1339,18 @@ <state vertical-scroll-proportion="0.0" vertical-offset="15375" max-vertical-offset="26730"> <caret line="536" column="22" selection-start-line="536" selection-start-column="22" selection-end-line="536" selection-end-column="22" /> <folding> - <element signature="e#16772#16773#0" expanded="true" /> - <element signature="e#16829#16830#0" expanded="true" /> + <element signature="e#16772#16773#0" expanded="false" /> + <element signature="e#16829#16830#0" expanded="false" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125"> - <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/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="1020" max-vertical-offset="1350"> <caret line="78" column="14" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="14" /> <folding> - <element signature="e#0#3986#0" expanded="true" /> - </folding> - </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" vertical-offset="0" max-vertical-offset="1312"> - <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="26" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="150" max-vertical-offset="4470"> - <caret line="48" column="20" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" /> - <folding> - <element signature="e#4717#4718#0" expanded="true" /> - <element signature="e#4757#4758#0" expanded="true" /> - <element signature="e#8562#8563#0" expanded="true" /> - <element signature="e#8603#8604#0" expanded="true" /> - </folding> - </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" vertical-offset="240" max-vertical-offset="5760"> - <caret line="49" column="28" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" /> - <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="2085" max-vertical-offset="4215"> - <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="960" max-vertical-offset="3600"> - <caret line="107" column="13" selection-start-line="107" selection-start-column="13" selection-end-line="107" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810"> - <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1905" max-vertical-offset="4140"> - <caret line="146" column="27" selection-start-line="146" selection-start-column="27" selection-end-line="146" selection-end-column="27" /> - <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" vertical-offset="4786" max-vertical-offset="11225"> - <caret line="226" column="27" selection-start-line="226" selection-start-column="8" selection-end-line="226" selection-end-column="27" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#10093#10094#0" expanded="true" /> - <element signature="e#10136#10137#0" expanded="true" /> - <element signature="e#10562#10563#0" expanded="true" /> - <element signature="e#10594#10595#0" expanded="true" /> - <element signature="e#10630#10631#0" expanded="true" /> - <element signature="e#10658#10659#0" expanded="true" /> - <element signature="e#10696#10697#0" expanded="true" /> - <element signature="e#10740#10741#0" expanded="true" /> - <element signature="e#10786#10787#0" expanded="true" /> - <element signature="e#10827#10828#0" expanded="true" /> - <element signature="e#14228#14229#0" expanded="true" /> - <element signature="e#14282#14283#0" expanded="true" /> - <element signature="e#14332#14333#0" expanded="true" /> - <element signature="e#14363#14364#0" expanded="true" /> - <element signature="e#14412#14413#0" expanded="true" /> - <element signature="e#14437#14438#0" expanded="true" /> - <element signature="e#14487#14488#0" expanded="true" /> - <element signature="e#14513#14514#0" expanded="true" /> - <element signature="e#15075#15086#0" expanded="true" /> + <element signature="e#0#3986#0" expanded="false" /> </folding> </state> </provider> @@ -1551,16 +1363,218 @@ </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" vertical-offset="0" max-vertical-offset="1312"> + <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="26" /> + <folding /> + </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.23076923" vertical-offset="126" max-vertical-offset="2115"> - <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" /> + <state vertical-scroll-proportion="0.0" vertical-offset="126" max-vertical-offset="2115"> + <caret line="79" column="42" selection-start-line="79" selection-start-column="42" selection-end-line="79" selection-end-column="42" /> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="840"> + <caret line="53" column="8" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="8" /> + <folding /> + </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" vertical-offset="240" max-vertical-offset="5760"> + <caret line="49" column="28" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125"> + <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="2115" max-vertical-offset="7587"> + <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Class.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="2488" max-vertical-offset="53025"> + <caret line="259" column="0" selection-start-line="259" selection-start-column="0" selection-end-line="259" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Thread.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="9913" max-vertical-offset="29460"> + <caret line="744" column="0" selection-start-line="744" selection-start-column="0" selection-end-line="745" selection-end-column="0" /> + <folding /> + </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="4830"> + <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="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/rt.jar!/sun/misc/Unsafe.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-27.96" vertical-offset="4056" max-vertical-offset="5850"> + <caret line="363" column="12" selection-start-line="363" selection-start-column="12" selection-end-line="363" selection-end-column="12" /> + <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.89039934" vertical-offset="2172" max-vertical-offset="6164"> + <caret line="159" column="13" selection-start-line="159" selection-start-column="5" selection-end-line="159" selection-end-column="13" /> + <folding> + <element signature="e#5159#5160#0" expanded="true" /> + <element signature="e#5206#5207#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <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" vertical-offset="231" max-vertical-offset="7656"> + <caret line="49" column="25" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" /> + <folding> + <element signature="e#1835#1836#0" expanded="true" /> + <element signature="e#1882#1883#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="7817" max-vertical-offset="9288"> + <caret line="268" column="19" selection-start-line="268" selection-start-column="19" selection-end-line="268" selection-end-column="19" /> + <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" vertical-offset="1696" max-vertical-offset="5742"> + <caret line="78" column="45" selection-start-line="78" selection-start-column="45" selection-end-line="78" selection-end-column="45" /> + <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="1063" max-vertical-offset="9900"> + <caret line="86" column="1" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/net/PlainSocketImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="113" max-vertical-offset="1290"> + <caret line="95" column="16" selection-start-line="95" selection-start-column="16" selection-end-line="95" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1417" max-vertical-offset="6561"> + <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> + <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" vertical-offset="65" max-vertical-offset="1242"> + <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="58" 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 /> + </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="-10.725" vertical-offset="17496" max-vertical-offset="21950"> + <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#20907#20908#0" expanded="true" /> + <element signature="e#20937#20938#0" expanded="true" /> + <element signature="e#33323#34451#0" expanded="true" /> + <element signature="e#34450#34451#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-43.075" vertical-offset="2645" max-vertical-offset="7104"> + <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#8562#8563#0" expanded="true" /> + <element signature="e#8603#8604#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" vertical-offset="11038" max-vertical-offset="13260"> + <caret line="415" column="15" selection-start-line="415" selection-start-column="15" selection-end-line="415" selection-end-column="15" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#7372#7373#0" expanded="true" /> + <element signature="e#7404#7405#0" expanded="true" /> + <element signature="e#10791#10792#0" expanded="true" /> + <element signature="e#10819#10820#0" expanded="true" /> + <element signature="e#14437#14438#0" expanded="true" /> + <element signature="e#14491#14492#0" expanded="true" /> + <element signature="e#15284#15295#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.33305013" vertical-offset="4368" max-vertical-offset="23576"> + <caret line="199" column="0" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" /> + <folding> + <element signature="e#17149#17150#0" expanded="true" /> + <element signature="e#17190#17191#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states>
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Aug 10 18:47:38 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Aug 10 20:13:52 2015 +0900 @@ -413,6 +413,7 @@ @Override public void setVisible(boolean b) { + if(connectionPresenter == null) return; SwingViewerWindow v = connectionPresenter.getViewer(); if (v != null) v.setVisible(b);
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Mon Aug 10 18:47:38 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Mon Aug 10 20:13:52 2015 +0900 @@ -108,7 +108,7 @@ try { get(); presenter.showMessage("Handshake established"); - if(myRfb.hasViewer()) { + if(myRfb.getViewer() != null) { myRfb.getViewer().newVNCConnection(presenter); } ClipboardControllerImpl clipboardController;