Mercurial > hg > Applications > TreeVNC
changeset 426:3a97a014d7ee
Add reader.reset to socket timeout Exception
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Fri, 29 Jan 2016 20:27:25 +0900 |
| parents | 90c059a70e2e |
| children | ed15f0bd8dfa |
| files | .idea/workspace.xml src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java |
| diffstat | 2 files changed, 402 insertions(+), 358 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Wed Jan 27 16:51:38 2016 +0900 +++ b/.idea/workspace.xml Fri Jan 29 20:27:25 2016 +0900 @@ -3,8 +3,7 @@ <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <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/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -57,7 +56,17 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#5111#5112#0" expanded="false" /> + <element signature="e#5177#5178#0" expanded="false" /> + <element signature="e#7666#7667#0" expanded="false" /> + <element signature="e#7697#7698#0" expanded="false" /> + <element signature="e#7753#7754#0" expanded="false" /> + <element signature="e#7783#7784#0" expanded="false" /> + <element signature="e#7817#7818#0" expanded="false" /> + <element signature="e#7850#7851#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -77,7 +86,20 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" /> - <folding /> + <folding> + <element signature="e#352#353#0" expanded="false" /> + <element signature="e#382#383#0" expanded="false" /> + <element signature="e#425#426#0" expanded="false" /> + <element signature="e#463#464#0" expanded="false" /> + <element signature="e#502#503#0" expanded="false" /> + <element signature="e#533#534#0" expanded="false" /> + <element signature="e#561#562#0" expanded="false" /> + <element signature="e#588#589#0" expanded="false" /> + <element signature="e#631#632#0" expanded="false" /> + <element signature="e#664#665#0" expanded="false" /> + <element signature="e#714#715#0" expanded="false" /> + <element signature="e#745#746#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -85,8 +107,8 @@ <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="-9.37037"> - <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" /> + <state vertical-scroll-proportion="-19.11111"> + <caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" /> <folding> <element signature="e#3215#3216#0" expanded="true" /> <element signature="e#3252#3253#0" expanded="true" /> @@ -100,8 +122,8 @@ <file leaf-file-name="ConnectionView.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.58127016"> - <caret line="73" column="36" selection-start-line="73" selection-start-column="36" selection-end-line="73" selection-end-column="36" /> + <state vertical-scroll-proportion="0.63612217"> + <caret line="122" column="0" selection-start-line="122" selection-start-column="0" selection-end-line="122" selection-end-column="0" /> <folding /> </state> </provider> @@ -131,13 +153,12 @@ </split-first> <split-second> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> + <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.5963402"> - <caret line="999" column="41" selection-start-line="999" selection-start-column="41" selection-end-line="999" selection-end-column="41" /> + <state vertical-scroll-proportion="-8.888889"> + <caret line="16" column="49" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="49" /> <folding> - <element signature="imports" expanded="true" /> <element signature="e#1310#1334#0" expanded="true" /> <element signature="e#38425#38437#0" expanded="true" /> </folding> @@ -145,96 +166,102 @@ </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="-9.37037"> - <caret line="448" column="12" selection-start-line="448" selection-start-column="12" selection-end-line="448" selection-end-column="12" /> - <folding /> - </state> - </provider> - </entry> - </file> - <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.0"> - <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="MulticastQueue.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/MulticastQueue.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SwingNetworkConnectionWorker.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="53" column="27" selection-start-line="53" selection-start-column="27" selection-end-line="53" selection-end-column="27" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="62" column="15" selection-start-line="62" selection-start-column="15" selection-end-line="62" selection-end-column="15" /> - <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="165" column="8" selection-start-line="165" selection-start-column="8" selection-end-line="165" selection-end-column="8" /> + <caret line="177" column="40" selection-start-line="177" selection-start-column="40" selection-end-line="177" selection-end-column="40" /> + <folding> + <element signature="e#9694#9695#0" expanded="true" /> + <element signature="e#9738#9739#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SwingViewerWindowFactory.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="RequestScreenThread.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="1081" column="0" selection-start-line="1081" selection-start-column="0" selection-end-line="1081" selection-end-column="0" /> + <caret line="30" column="56" selection-start-line="30" selection-start-column="56" selection-end-line="30" selection-end-column="56" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.40358126"> + <caret line="164" column="24" selection-start-line="164" selection-start-column="24" selection-end-line="164" selection-end-column="24" /> <folding> - <element signature="e#43136#43137#0" expanded="true" /> + <element signature="e#0#18504#0" expanded="true" /> + <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ScreenChangeSelectionPanel.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeSelectionPanel.java"> + <file leaf-file-name="ServerInitMessage.java" pinned="false" current-in-tab="false"> + <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"> - <caret line="56" column="16" selection-start-line="56" selection-start-column="16" selection-end-line="56" selection-end-column="16" /> + <caret line="92" column="8" selection-start-line="92" selection-start-column="8" selection-end-line="92" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ZRLEESender.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" /> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="RendererImpl.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="70" column="41" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="41" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AbstructRenderer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/drawing/AbstructRenderer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-9.37037"> - <caret line="170" column="20" selection-start-line="170" selection-start-column="20" selection-end-line="170" selection-end-column="20" /> + <state vertical-scroll-proportion="-11.703704"> + <caret line="261" column="19" selection-start-line="261" selection-start-column="19" selection-end-line="261" selection-end-column="19" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Surface.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="116" column="50" selection-start-line="116" selection-start-column="50" selection-end-line="116" selection-end-column="50" /> <folding> - <element signature="e#0#18316#0" expanded="true" /> - <element signature="imports" expanded="true" /> + <element signature="e#5907#5908#0" expanded="true" /> + <element signature="e#5939#5940#0" expanded="true" /> + <element signature="e#6257#6258#0" expanded="true" /> + <element signature="e#6318#6319#0" expanded="true" /> </folding> </state> </provider> @@ -525,7 +552,6 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettingsData.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java" /> @@ -538,7 +564,6 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.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/gui/ConnectionView.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeSelectionPanel.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.java" /> @@ -559,15 +584,17 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.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/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.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" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="1919" /> + <option name="x" value="1920" /> <option name="y" value="23" /> <option name="width" value="1920" /> <option name="height" value="1177" /> @@ -1326,7 +1353,7 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="1919" y="23" width="1920" height="1177" extended-state="6" /> + <frame x="1920" y="23" width="1920" height="1177" extended-state="6" /> <editor active="true" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -1336,7 +1363,7 @@ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1155268" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1025878" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988676" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13541667" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> @@ -1347,7 +1374,7 @@ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24768947" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="1924" y="434" width="1916" height="296" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27818853" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="1924" y="434" width="1916" height="296" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -1558,18 +1585,6 @@ <option name="timeStamp" value="216" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java</url> - <line>30</line> - <properties /> - <option name="timeStamp" value="218" /> - </line-breakpoint> - <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java</url> - <line>183</line> - <properties /> - <option name="timeStamp" value="237" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> <line>224</line> <properties /> @@ -1691,12 +1706,6 @@ <option name="timeStamp" value="488" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> - <line>335</line> - <properties /> - <option name="timeStamp" value="490" /> - </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>761</line> <properties /> @@ -1709,16 +1718,34 @@ <option name="timeStamp" value="500" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> - <line>164</line> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> + <line>385</line> + <properties /> + <option name="timeStamp" value="502" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java</url> + <line>30</line> <properties /> - <option name="timeStamp" value="501" /> + <option name="timeStamp" value="505" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java</url> + <line>66</line> + <properties /> + <option name="timeStamp" value="506" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> + <line>253</line> + <properties /> + <option name="timeStamp" value="508" /> </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="502" /> + <option name="time" value="509" /> </breakpoint-manager> <watches-manager> <configuration name="Application"> @@ -1735,170 +1762,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.408472"> - <caret line="41" column="9" selection-start-line="41" selection-start-column="9" selection-end-line="41" selection-end-column="9" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/rt.jar!/sun/misc/Unsafe.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.34557822"> - <caret line="348" column="23" selection-start-line="348" selection-start-column="23" selection-end-line="348" selection-end-column="23" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="264" column="8" selection-start-line="264" selection-start-column="8" selection-end-line="264" selection-end-column="8" /> - <folding> - <element signature="e#8857#8858#0" expanded="true" /> - <element signature="e#8890#8891#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/MessageQueue.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="34" column="29" selection-start-line="34" selection-start-column="29" selection-end-line="34" selection-end-column="29" /> - <folding /> - </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"> - <caret line="16" column="35" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" /> - <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.60943645"> - <caret line="59" column="28" selection-start-line="59" selection-start-column="28" selection-end-line="59" selection-end-column="28" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ReceiveSound.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/util/concurrent/atomic/AtomicInteger.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="1.2652608"> - <caret line="115" column="22" selection-start-line="115" selection-start-column="17" selection-end-line="115" selection-end-column="22" /> - <folding> - <element signature="e#2032#2033#0" expanded="false" /> - <element signature="e#2060#2061#0" expanded="false" /> - <element signature="e#2195#2196#0" expanded="false" /> - <element signature="e#2227#2228#0" expanded="false" /> - </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="106" column="47" selection-start-line="106" selection-start-column="47" selection-end-line="106" selection-end-column="47" /> - <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"> - <caret line="60" column="9" selection-start-line="60" selection-start-column="9" selection-end-line="60" selection-end-column="9" /> - <folding> - <element signature="e#0#2596#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2473#2474#0" expanded="false" /> - <element signature="e#2509#2510#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/util/LinkedList.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.70474136"> - <caret line="240" column="13" selection-start-line="240" selection-start-column="13" selection-end-line="240" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNode.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="52" column="22" selection-start-line="52" selection-start-column="22" selection-end-line="52" selection-end-column="22" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="93" column="0" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#537#538#0" expanded="false" /> - <element signature="e#565#566#0" expanded="false" /> - <element signature="e#613#614#0" expanded="false" /> - <element signature="e#647#648#0" expanded="false" /> - <element signature="e#3023#3024#0" expanded="false" /> - <element signature="e#3069#3070#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/rt.jar!/sun/awt/datatransfer/SunClipboard.class"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-7.9259257"> @@ -1935,24 +1798,21 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" /> - <folding> - <element signature="e#277#278#0" expanded="true" /> - <element signature="e#294#295#0" expanded="true" /> - <element signature="e#948#949#0" expanded="true" /> - <element signature="e#969#970#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#5111#5112#0" expanded="false" /> + <element signature="e#5177#5178#0" expanded="false" /> + <element signature="e#7666#7667#0" expanded="false" /> + <element signature="e#7697#7698#0" expanded="false" /> + <element signature="e#7753#7754#0" expanded="false" /> + <element signature="e#7783#7784#0" expanded="false" /> + <element signature="e#7817#7818#0" expanded="false" /> + <element signature="e#7850#7851#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2004,17 +1864,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.114503816"> - <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> - <folding> - <element signature="e#8521#8522#0" expanded="true" /> - <element signature="e#8562#8563#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -2031,14 +1880,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <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> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/net/InetAddress.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.3323782"> @@ -2079,27 +1920,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.40076336"> - <caret line="48" column="9" selection-start-line="48" selection-start-column="9" selection-end-line="48" selection-end-column="9" /> - <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="-9.37037"> - <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" /> - <folding> - <element signature="e#3215#3216#0" expanded="true" /> - <element signature="e#3252#3253#0" expanded="true" /> - <element signature="e#12221#12222#0" expanded="true" /> - <element signature="e#12252#12253#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -2108,25 +1928,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.58127016"> - <caret line="73" column="36" selection-start-line="73" selection-start-column="36" selection-end-line="73" selection-end-column="36" /> - <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="-9.37037"> - <caret line="170" column="20" selection-start-line="170" selection-start-column="20" selection-end-line="170" selection-end-column="20" /> - <folding> - <element signature="e#0#18316#0" expanded="true" /> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -2143,20 +1944,31 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.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="-9.37037"> - <caret line="448" column="12" selection-start-line="448" selection-start-column="12" selection-end-line="448" selection-end-column="12" /> + <state vertical-scroll-proportion="0.0"> + <caret line="218" column="27" selection-start-line="218" selection-start-column="27" selection-end-line="218" selection-end-column="27" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="1081" column="0" selection-start-line="1081" selection-start-column="0" selection-end-line="1081" selection-end-column="0" /> + <caret line="201" column="12" selection-start-line="201" selection-start-column="12" selection-end-line="201" selection-end-column="12" /> + <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="-15.0"> + <caret line="330" column="0" selection-start-line="330" selection-start-column="0" selection-end-line="330" selection-end-column="0" /> <folding> - <element signature="e#43136#43137#0" expanded="true" /> + <element signature="e#10476#10648#0" expanded="true" /> + <element signature="e#10647#10648#0" expanded="true" /> + <element signature="e#15666#15667#0" expanded="true" /> + <element signature="e#15691#15692#0" expanded="true" /> </folding> </state> </provider> @@ -2164,7 +1976,232 @@ <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"> - <caret line="62" column="15" selection-start-line="62" selection-start-column="15" selection-end-line="62" selection-end-column="15" /> + <caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.33783785"> + <caret line="42" column="9" selection-start-line="42" selection-start-column="9" selection-end-line="42" selection-end-column="9" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettingsData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-0.6306306"> + <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="155" column="0" selection-start-line="155" selection-start-column="0" selection-end-line="155" selection-end-column="0" /> + <folding> + <element signature="e#2442#2443#0" expanded="false" /> + <element signature="e#2495#2496#0" expanded="false" /> + <element signature="e#5360#5361#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="81" column="53" selection-start-line="81" selection-start-column="53" selection-end-line="81" selection-end-column="53" /> + <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="473" column="16" selection-start-line="473" selection-start-column="16" selection-end-line="473" selection-end-column="16" /> + <folding> + <element signature="e#20758#20759#0" expanded="true" /> + <element signature="e#20788#20789#0" expanded="true" /> + <element signature="e#43136#43137#0" expanded="true" /> + <element signature="e#43171#43172#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="30" column="56" selection-start-line="30" selection-start-column="56" selection-end-line="30" selection-end-column="56" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/drawing/Renderer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.28266332"> + <caret line="42" column="29" selection-start-line="42" selection-start-column="25" selection-end-line="42" selection-end-column="29" /> + <folding> + <element signature="e#11744#11745#0" expanded="false" /> + <element signature="e#11771#11772#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/NullRenderer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.06362672"> + <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.42629904"> + <caret line="121" column="21" selection-start-line="121" selection-start-column="21" selection-end-line="121" selection-end-column="21" /> + <folding> + <element signature="e#4308#4309#0" expanded="true" /> + <element signature="e#4338#4339#0" expanded="true" /> + <element signature="e#4479#4480#0" expanded="true" /> + <element signature="e#4510#4511#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/javax/swing/plaf/basic/BasicTableHeaderUI.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="737" column="37" selection-start-line="737" selection-start-column="37" selection-end-line="737" selection-end-column="37" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/awt/Component.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.2545069"> + <caret line="131" column="2" selection-start-line="131" selection-start-column="2" selection-end-line="131" selection-end-column="2" /> + <folding> + <element signature="e#115734#115735#0" expanded="true" /> + <element signature="e#115781#115782#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/Decoder.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.31813362"> + <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/NullRepaintController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.19088016"> + <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/drawing/AbstructRenderer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-11.703704"> + <caret line="261" column="19" selection-start-line="261" selection-start-column="19" selection-end-line="261" selection-end-column="19" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="116" column="50" selection-start-line="116" selection-start-column="50" selection-end-line="116" selection-end-column="50" /> + <folding> + <element signature="e#5907#5908#0" expanded="true" /> + <element signature="e#5939#5940#0" expanded="true" /> + <element signature="e#6257#6258#0" expanded="true" /> + <element signature="e#6318#6319#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IRepaintController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.27888447"> + <caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="70" column="41" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="41" /> + <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="-19.11111"> + <caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" /> + <folding> + <element signature="e#3215#3216#0" expanded="true" /> + <element signature="e#3252#3253#0" expanded="true" /> + <element signature="e#12221#12222#0" expanded="true" /> + <element signature="e#12252#12253#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="-8.888889"> + <caret line="16" column="49" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="49" /> + <folding> + <element signature="e#1310#1334#0" expanded="true" /> + <element signature="e#38425#38437#0" expanded="true" /> + </folding> + </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"> + <caret line="92" column="8" selection-start-line="92" selection-start-column="8" selection-end-line="92" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.63612217"> + <caret line="122" column="0" selection-start-line="122" selection-start-column="0" selection-end-line="122" selection-end-column="0" /> <folding /> </state> </provider> @@ -2172,19 +2209,21 @@ <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="165" column="8" selection-start-line="165" selection-start-column="8" selection-end-line="165" selection-end-column="8" /> - <folding /> + <caret line="177" column="40" selection-start-line="177" selection-start-column="40" selection-end-line="177" selection-end-column="40" /> + <folding> + <element signature="e#9694#9695#0" expanded="true" /> + <element signature="e#9738#9739#0" expanded="true" /> + </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/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.5963402"> - <caret line="999" column="41" selection-start-line="999" selection-start-column="41" selection-end-line="999" selection-end-column="41" /> + <state vertical-scroll-proportion="0.40358126"> + <caret line="164" column="24" selection-start-line="164" selection-start-column="24" selection-end-line="164" selection-end-column="24" /> <folding> + <element signature="e#0#18504#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#1310#1334#0" expanded="true" /> - <element signature="e#38425#38437#0" expanded="true" /> </folding> </state> </provider>
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Wed Jan 27 16:51:38 2016 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Fri Jan 29 20:27:25 2016 +0900 @@ -161,6 +161,11 @@ if (rfb.isTreeManager()) { sendFrameBufferUpdateRequest(); } + try { + reader.reset(); + } catch (TransportException e1) { + e1.printStackTrace(); + } continue; } logger.severe("Close session : ReceiverTask : " + e.getMessage());