Mercurial > hg > Applications > TreeVNC
changeset 427:ed15f0bd8dfa
Remove shareScrrenNumber for ScreenChangeRequest Message
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 01 Feb 2016 04:39:53 +0900 |
| parents | 3a97a014d7ee |
| children | f6a828dd37b0 |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java |
| diffstat | 9 files changed, 489 insertions(+), 466 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Fri Jan 29 20:27:25 2016 +0900 +++ b/.idea/workspace.xml Mon Feb 01 04:39:53 2016 +0900 @@ -3,7 +3,14 @@ <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/com/glavsoft/rfb/protocol/ReceiverTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -38,44 +45,66 @@ <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.5274648"> + <splitter split-orientation="horizontal" split-proportion="0.4991987"> <split-first> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="ChildNodeAnnounce.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChildNodeAnnounce.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="TreeManagement.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" /> + <caret line="131" column="5" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" /> <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" /> + <element signature="e#5621#5622#0" expanded="false" /> + <element signature="e#5687#5688#0" expanded="false" /> + <element signature="e#8176#8177#0" expanded="false" /> + <element signature="e#8207#8208#0" expanded="false" /> + <element signature="e#8263#8264#0" expanded="false" /> + <element signature="e#8293#8294#0" expanded="false" /> + <element signature="e#8327#8328#0" expanded="false" /> + <element signature="e#8360#8361#0" expanded="false" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="Writer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java"> + <file leaf-file-name="TreeVncProtocol.java" pinned="false" current-in-tab="false"> + <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="72" column="9" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" /> + <folding> + <element signature="imports" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeVNCNetwork.java" pinned="false" current-in-tab="false"> + <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="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" /> + <caret line="37" column="62" selection-start-line="37" selection-start-column="62" selection-end-line="37" selection-end-column="62" /> + <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" /> + <element signature="e#3123#3124#0" expanded="false" /> + <element signature="e#3157#3158#0" expanded="false" /> + </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="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> <folding /> </state> </provider> @@ -97,8 +126,6 @@ <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> @@ -107,23 +134,38 @@ <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="-19.11111"> + <state vertical-scroll-proportion="-161.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#0#14863#0" expanded="true" /> + <element signature="imports" expanded="true" /> <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" /> + <element signature="e#3311#3312#0" expanded="true" /> + <element signature="e#3363#3364#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <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"> + <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.63612217"> - <caret line="122" column="0" selection-start-line="122" selection-start-column="0" selection-end-line="122" selection-end-column="0" /> + <state vertical-scroll-proportion="-13.962963"> + <caret line="76" column="32" selection-start-line="76" selection-start-column="32" selection-end-line="76" selection-end-column="32" /> + <folding> + <element signature="e#0#16960#0" expanded="true" /> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> + <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.17077799"> + <caret line="916" column="0" selection-start-line="916" selection-start-column="0" selection-end-line="916" selection-end-column="0" /> <folding /> </state> </provider> @@ -133,8 +175,10 @@ <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"> - <caret line="47" column="37" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" /> - <folding /> + <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="false" /> + </folding> </state> </provider> </entry> @@ -143,8 +187,12 @@ <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="107" column="9" selection-start-line="107" selection-start-column="9" selection-end-line="107" selection-end-column="9" /> - <folding /> + <caret line="90" column="46" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#4640#4641#0" expanded="false" /> + <element signature="e#4670#4671#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -153,57 +201,86 @@ </split-first> <split-second> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <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> + </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="-8.888889"> - <caret line="16" column="49" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="49" /> + <state vertical-scroll-proportion="0.5673624"> + <caret line="227" column="60" selection-start-line="227" selection-start-column="60" selection-end-line="227" selection-end-column="60" /> <folding> - <element signature="e#1310#1334#0" expanded="true" /> - <element signature="e#38425#38437#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#16951#16952#0" expanded="true" /> + <element signature="e#16992#16993#0" expanded="true" /> + <element signature="e#28183#28195#0" expanded="true" /> </folding> </state> </provider> </entry> </file> + <file leaf-file-name="ScreenChangeRequest.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ChengeDesktopSize.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChengeDesktopSize.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> + <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"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="176" column="60" selection-start-line="176" selection-start-column="60" selection-end-line="176" selection-end-column="60" /> + <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="118" column="1" selection-start-line="118" selection-start-column="1" selection-end-line="118" selection-end-column="1" /> + <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="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" /> + <state vertical-scroll-proportion="-8.222222"> + <caret line="165" column="17" selection-start-line="165" selection-start-column="17" selection-end-line="165" selection-end-column="17" /> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="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" /> + <caret line="175" column="33" selection-start-line="175" selection-start-column="33" selection-end-line="175" selection-end-column="33" /> <folding> <element signature="e#0#18504#0" expanded="true" /> <element signature="imports" expanded="true" /> @@ -212,57 +289,12 @@ </provider> </entry> </file> - <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="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="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="-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#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> + <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -558,7 +590,6 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> @@ -574,27 +605,28 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CheckDelayReply.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/MessageQueue.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.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/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> <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/SwingRfbConnectionWorker.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/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/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="1920" /> + <option name="x" value="3" /> <option name="y" value="23" /> <option name="width" value="1920" /> <option name="height" value="1177" /> @@ -901,8 +933,8 @@ </subPane> </pane> <pane id="Scope" /> + <pane id="Scratches" /> <pane id="PackagesPane" /> - <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -1309,9 +1341,9 @@ <item index="1" class="java.lang.String" itemvalue="Application.TreeeViewer --direct --host" /> <item index="2" class="java.lang.String" itemvalue="Application.TreeeViewer -d --checkDelay" /> <item index="3" class="java.lang.String" itemvalue="Application.TreeViewer -d --filterSingleDisplay" /> - <item index="4" class="java.lang.String" itemvalue="Application.TreeViewer" /> - <item index="5" class="java.lang.String" itemvalue="Application.IsRetina" /> - <item index="6" class="java.lang.String" itemvalue="Gradle.gradle build" /> + <item index="4" class="java.lang.String" itemvalue="Gradle.gradle build" /> + <item index="5" class="java.lang.String" itemvalue="Application.TreeViewer" /> + <item index="6" class="java.lang.String" itemvalue="Application.IsRetina" /> </list> <recent_temporary> <list size="2"> @@ -1353,8 +1385,8 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="1920" y="23" width="1920" height="1177" extended-state="6" /> - <editor active="true" /> + <frame x="3" y="23" width="1920" height="1177" extended-state="6" /> + <editor active="false" /> <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" /> <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> @@ -1363,18 +1395,17 @@ <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="false" show_stripe_button="true" weight="0.1025878" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4621072" 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" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19270833" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15729167" sideWeight="0.49499285" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902032" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" 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="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" 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="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="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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" /> @@ -1383,6 +1414,7 @@ <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="2020" y="181" width="1720" height="977" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.123173274" sideWeight="0.50500715" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902032" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> <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" /> @@ -1436,7 +1468,7 @@ <breakpoints> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>499</line> + <line>503</line> <properties /> <option name="timeStamp" value="25" /> </line-breakpoint> @@ -1448,13 +1480,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>430</line> + <line>434</line> <properties /> <option name="timeStamp" value="32" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>542</line> + <line>540</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1472,7 +1504,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>252</line> + <line>256</line> <properties /> <option name="timeStamp" value="89" /> </line-breakpoint> @@ -1513,12 +1545,6 @@ <option name="timeStamp" value="120" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>348</line> - <properties /> - <option name="timeStamp" value="133" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java</url> <line>57</line> <properties /> @@ -1550,13 +1576,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>987</line> + <line>981</line> <properties /> <option name="timeStamp" value="187" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> - <line>195</line> + <line>198</line> <properties /> <option name="timeStamp" value="188" /> </line-breakpoint> @@ -1574,7 +1600,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>508</line> + <line>506</line> <properties /> <option name="timeStamp" value="212" /> </line-breakpoint> @@ -1598,25 +1624,25 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java</url> - <line>28</line> + <line>27</line> <properties /> <option name="timeStamp" value="260" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>652</line> + <line>650</line> <properties /> <option name="timeStamp" value="264" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>152</line> + <line>156</line> <properties /> <option name="timeStamp" value="272" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java</url> - <line>41</line> + <line>39</line> <properties /> <option name="timeStamp" value="277" /> </line-breakpoint> @@ -1634,7 +1660,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>481</line> + <line>485</line> <properties /> <option name="timeStamp" value="303" /> </line-breakpoint> @@ -1646,7 +1672,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>534</line> + <line>532</line> <properties /> <option name="timeStamp" value="329" /> </line-breakpoint> @@ -1671,13 +1697,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>302</line> + <line>300</line> <properties /> <option name="timeStamp" value="449" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>282</line> + <line>280</line> <properties /> <option name="timeStamp" value="462" /> </line-breakpoint> @@ -1689,13 +1715,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>424</line> + <line>422</line> <properties /> <option name="timeStamp" value="470" /> </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>971</line> + <line>965</line> <properties /> <option name="timeStamp" value="487" /> </line-breakpoint> @@ -1707,45 +1733,27 @@ </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> + <line>837</line> <properties /> - <option name="timeStamp" value="492" /> + <option name="timeStamp" value="500" /> </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>838</line> + <line>132</line> <properties /> - <option name="timeStamp" value="500" /> + <option name="timeStamp" value="509" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-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="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" /> + <option name="timeStamp" value="510" /> </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="509" /> + <option name="time" value="511" /> </breakpoint-manager> <watches-manager> <configuration name="Application"> @@ -1762,84 +1770,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <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"> - <caret line="224" column="0" selection-start-line="224" selection-start-column="0" selection-end-line="224" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ClipboardControllerImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="90" column="0" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/lang/Object.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="381" column="29" selection-start-line="381" selection-start-column="29" selection-end-line="381" selection-end-column="29" /> - <folding> - <element signature="e#0#25868#0" expanded="false" /> - <element signature="e#5748#5749#0" expanded="false" /> - <element signature="e#5784#5785#0" expanded="false" /> - <element signature="e#10065#10066#0" expanded="false" /> - <element signature="e#10148#10149#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/java/net/SocketInputStream.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="93" column="23" selection-start-line="93" selection-start-column="23" selection-end-line="93" selection-end-column="23" /> - </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> - <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> - <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"> - <caret line="47" column="37" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.38210228"> - <caret line="43" column="20" selection-start-line="43" selection-start-column="20" selection-end-line="43" selection-end-column="20" /> - <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.33238637"> @@ -1884,23 +1814,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.3323782"> <caret line="188" column="6" selection-start-line="188" selection-start-column="6" selection-end-line="188" selection-end-column="6" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="107" column="9" selection-start-line="107" selection-start-column="9" selection-end-line="107" selection-end-column="9" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <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> @@ -1912,22 +1825,6 @@ </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.3323782"> - <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" /> - <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"> - <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> <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"> @@ -1936,51 +1833,6 @@ </state> </provider> </entry> - <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> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="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/TreeViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.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#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> - </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"> - <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"> @@ -1997,14 +1849,6 @@ </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"> @@ -2025,19 +1869,6 @@ </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"> @@ -2050,10 +1881,6 @@ <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> @@ -2082,7 +1909,6 @@ <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> @@ -2091,8 +1917,8 @@ <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" /> + <element signature="e#115734#115735#0" expanded="false" /> + <element signature="e#115781#115782#0" expanded="false" /> </folding> </state> </provider> @@ -2101,7 +1927,6 @@ <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> @@ -2113,32 +1938,10 @@ </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"> + <state vertical-scroll-proportion="0.0"> <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> @@ -2154,30 +1957,13 @@ <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" /> + <element signature="e#0#3688#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3580#3581#0" expanded="false" /> + <element signature="e#3608#3609#0" expanded="false" /> + <element signature="e#3646#3647#0" expanded="false" /> + <element signature="e#3683#3684#0" expanded="false" /> </folding> </state> </provider> @@ -2186,7 +1972,6 @@ <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> @@ -2194,40 +1979,282 @@ <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 /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#426#427#0" expanded="false" /> + <element signature="e#456#457#0" expanded="false" /> + </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"> + <state vertical-scroll-proportion="0.0"> <caret line="122" column="0" selection-start-line="122" selection-start-column="0" selection-end-line="122" selection-end-column="0" /> <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"> + <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="false" /> + </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> + <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" /> + </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="37" column="62" selection-start-line="37" selection-start-column="62" selection-end-line="37" selection-end-column="62" /> + <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" /> + <element signature="e#3123#3124#0" expanded="false" /> + <element signature="e#3157#3158#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="90" column="46" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#4640#4641#0" expanded="false" /> + <element signature="e#4670#4671#0" expanded="false" /> + </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="72" column="9" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" /> + <folding> + <element signature="imports" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <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.33333334"> + <caret line="70" column="21" selection-start-line="70" selection-start-column="21" selection-end-line="70" selection-end-column="21" /> + <folding> + <element signature="e#1388#1389#0" expanded="true" /> + <element signature="e#1421#1422#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="131" column="5" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#5621#5622#0" expanded="false" /> + <element signature="e#5687#5688#0" expanded="false" /> + <element signature="e#8176#8177#0" expanded="false" /> + <element signature="e#8207#8208#0" expanded="false" /> + <element signature="e#8263#8264#0" expanded="false" /> + <element signature="e#8293#8294#0" expanded="false" /> + <element signature="e#8327#8328#0" expanded="false" /> + <element signature="e#8360#8361#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/AbstractConnectionWorkerFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.1992032"> + <caret line="32" column="40" selection-start-line="32" selection-start-column="40" selection-end-line="32" selection-end-column="40" /> + <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.6374502"> + <caret line="61" column="31" selection-start-line="61" selection-start-column="31" selection-end-line="61" selection-end-column="31" /> + <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"> + <caret line="175" column="33" selection-start-line="175" selection-start-column="33" selection-end-line="175" selection-end-column="33" /> + <folding> + <element signature="e#0#18504#0" expanded="true" /> + <element signature="imports" 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.028462999"> + <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/swing/ConnectionParams.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.29886147"> + <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/swing/Surface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" /> + <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="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChengeDesktopSize.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> + <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="-8.222222"> + <caret line="165" column="17" selection-start-line="165" selection-start-column="17" selection-end-line="165" selection-end-column="17" /> + <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"> - <caret line="177" column="40" selection-start-line="177" selection-start-column="40" selection-end-line="177" selection-end-column="40" /> + <caret line="118" column="1" selection-start-line="118" selection-start-column="1" selection-end-line="118" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="176" column="60" selection-start-line="176" selection-start-column="60" selection-end-line="176" selection-end-column="60" /> + <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="-161.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#9694#9695#0" expanded="true" /> - <element signature="e#9738#9739#0" expanded="true" /> + <element signature="e#0#14863#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#3215#3216#0" expanded="true" /> + <element signature="e#3252#3253#0" expanded="true" /> + <element signature="e#3311#3312#0" expanded="true" /> + <element signature="e#3363#3364#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.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" /> + <state vertical-scroll-proportion="0.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="-13.962963"> + <caret line="76" column="32" selection-start-line="76" selection-start-column="32" selection-end-line="76" selection-end-column="32" /> <folding> - <element signature="e#0#18504#0" expanded="true" /> + <element signature="e#0#16960#0" expanded="true" /> <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.33333334"> + <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> + <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.5673624"> + <caret line="227" column="60" selection-start-line="227" selection-start-column="60" selection-end-line="227" selection-end-column="60" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#16951#16952#0" expanded="true" /> + <element signature="e#16992#16993#0" expanded="true" /> + <element signature="e#28183#28195#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.17077799"> + <caret line="916" column="0" selection-start-line="916" selection-start-column="0" selection-end-line="916" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> </component> <component name="hg4idea.settings"> <option name="CHECK_INCOMING_OUTGOING" value="true" />
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java Mon Feb 01 04:39:53 2016 +0900 @@ -25,9 +25,8 @@ private int frameSizeWidth; private int frameSizeHeight; private int port; - private int shareScreenNumber; - public ScreenChangeRequest(String adr, int port, short id, int x, int y, int width, int height, int shareScreenNumber, int scale) { + public ScreenChangeRequest(String adr, int port, short id, int x, int y, int width, int height, int scale) { this.bytes = adr; this.port = port; this.id = id; @@ -35,7 +34,6 @@ this.y = y; this.frameSizeWidth = width; this.frameSizeHeight = height; - this.shareScreenNumber = shareScreenNumber; this.scale = scale; System.out.println("Client send change screen server request :" + adr); } @@ -54,7 +52,6 @@ out.putInt(frameSizeWidth); out.putInt(frameSizeHeight); out.putInt(port); - out.putInt(shareScreenNumber); out.putInt(scale); writer.write(out.array(), 0, out.position()); writer.flush();
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java Mon Feb 01 04:39:53 2016 +0900 @@ -114,6 +114,23 @@ fixLostChild1(lostChildNodeNum); } + public void fixLostChild1(int nodeNum) { + TreeVNCNode deadNode; + try { + deadNode = nodeList.get(nodeNum); + } catch (IndexOutOfBoundsException e) { + // this node became new node instead of deathChild. + deadNode = null; + } + if (deadNode != null) { + moveLastNodeToLostNodePosition(deadNode.getTreeNum()); + lostNodeConnection(deadNode); + } + if (showTreeNode) { + showTreeNode(); + } + } + /** * send reconnect to all children * @param deadNode @@ -251,21 +268,4 @@ } return true; } - - public void fixLostChild1(int nodeNum) { - TreeVNCNode deadNode; - try { - deadNode = nodeList.get(nodeNum); - } catch (IndexOutOfBoundsException e) { - // this node became new node instead of deathChild. - deadNode = null; - } - if (deadNode != null) { - moveLastNodeToLostNodePosition(deadNode.getTreeNum()); - lostNodeConnection(deadNode); - } - if (showTreeNode) { - showTreeNode(); - } - } } \ No newline at end of file
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Feb 01 04:39:53 2016 +0900 @@ -75,7 +75,6 @@ private int singleWidth = 0; private int singleHeight = 0; - private int shareScreenNumber; private DatagramSocket socket = null; private byte[] originalInitData = null; @@ -227,10 +226,9 @@ int frameSizeWidth = buf.getInt(); int frameSizeHeight = buf.getInt(); int port = buf.getInt(); - int shareScreenNumber = buf.getInt(); int scale = buf.getInt(); System.out.println("Root server change request :" + newHostName + " : " + port); - changeVNCServer(viewer, newHostName, port, x, y, frameSizeWidth, frameSizeHeight, shareScreenNumber, scale, id, is, os); + changeVNCServer(viewer, newHostName, port, x, y, frameSizeWidth, frameSizeHeight, scale, id, is, os); } else { continue; } @@ -817,20 +815,21 @@ * * @param vncProxyService * @param hostName HostAddress + * @param x + * @param y * @param width FrameWidth * @param height FrameHeight - * @param shareScreenNumber + * @param scale * @param newVNCServerId * @param is * @param os */ - public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int port, int x, int y, int width, int height, int shareScreenNumber, int scale, short newVNCServerId, Reader is, Writer os) + public void changeVNCServer(ViewerInterface vncProxyService, String hostName, int port, int x, int y, int width, int height, int scale, short newVNCServerId, Reader is, Writer os) throws IOException { this.x = x; this.y = y; this.frameSizeWidth = width; this.frameSizeHeight = height; - this.shareScreenNumber = shareScreenNumber; this.singleWidth = frameSizeWidth; this.singleHeight = frameSizeHeight; this.retinaScale = scale; @@ -840,7 +839,7 @@ return; } // serverChangeの処理 - vncProxyService.inhelitClients(vncProxyService, hostName, newVNCServerId); + vncProxyService.inhelitClients(hostName, newVNCServerId); // after connecting VNC server, rfb send SEND_INIT_DATA command and wakes me up if necessary // stop reader stop } @@ -944,11 +943,6 @@ return singleHeight; } - public int getShareScreenNumber() { - return shareScreenNumber; - } - - public int getRetinaScale() { return retinaScale; } @@ -973,7 +967,7 @@ int scale = viewer.getRfb().getRetinaScale(); int x = 0; int y = 0; - ScreenChangeRequest scr = new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, (short) -1, x, y, singleWidth, singleHeight, shareScreenNumber, scale); + ScreenChangeRequest scr = new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, (short) -1, x, y, singleWidth, singleHeight, scale); try { scr.send(previousWriter); } catch (TransportException e) { @@ -993,7 +987,6 @@ */ public synchronized void newVNCConnection(Protocol workingProtocol, ConnectionPresenter connectionPresenter) { ProtocolContext previousContext = getContext(); - viewer.setVisible(false); stopReceiverTask(); setProtocolContext(workingProtocol); connectionPresenter.viewer.setConnectionPresenter(connectionPresenter);
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Mon Feb 01 04:39:53 2016 +0900 @@ -254,7 +254,7 @@ } @Override - public void inhelitClients(ViewerInterface vncProxyService, String hostName, short newVNCServerId) { + public void inhelitClients(String hostName, short newVNCServerId) { }
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Feb 01 04:39:53 2016 +0900 @@ -71,6 +71,10 @@ public int height; public int fixingSizeWidth; public int fixingSizeHeight; + private int x; + private int y; + private int frameSizeWidth; + private int frameSizeHeight; public static void main(String[] args) { Parser parser = new Parser(); @@ -319,7 +323,7 @@ * @param newVNCServerId */ @Override - public void inhelitClients(ViewerInterface vs, String hostName, short newVNCServerId) { + public void inhelitClients(String hostName, short newVNCServerId) { final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, newVNCServerId); isApplet = true; this.setNoConnection(false);
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Mon Feb 01 04:39:53 2016 +0900 @@ -7,7 +7,6 @@ import com.glavsoft.transport.Reader; import com.glavsoft.transport.Writer; -import com.glavsoft.viewer.mvp.Presenter; import jp.ac.u_ryukyu.treevnc.TreeRFBProto; public interface ViewerInterface extends Runnable { @@ -30,7 +29,7 @@ public void connectToParenet(int port, String hostname) throws IOException; - public void inhelitClients(ViewerInterface vncProxyService, String hostName, short newVNCServerId); + public void inhelitClients(String hostName, short newVNCServerId); public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay);
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java Mon Feb 01 04:39:53 2016 +0900 @@ -163,6 +163,7 @@ @Override public void startVNCConnection() { presenter.showMessage("Handshake established"); + SwingViewerWindow previousViewerWindow = myRfb.getViewer().getConnectionPresenter().getViewer(); myRfb.newVNCConnection(workingProtocol, presenter); ClipboardControllerImpl clipboardController; if(!myRfb.getCuiVersion()) @@ -187,6 +188,8 @@ if (myRfb.hasViewer()) { boolean visibility = presenter.getReconnectingId() != myRfb.getId(); viewerWindow.setVisible(visibility); + if (previousViewerWindow != null) + previousViewerWindow.setVisible(false); viewerWindow.zoomToFit(); } }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Fri Jan 29 20:27:25 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Mon Feb 01 04:39:53 2016 +0900 @@ -948,7 +948,7 @@ int scale = retinaScale(shareScreenNumber); if (viewer.getRfb().isTreeManager()) { - changeVncServer(viewer, x, y, singleWidth, singleHeight, shareScreenNumber, scale, viewer.getRfb().getId()); + changeVncServer(viewer, x, y, singleWidth, singleHeight, scale, viewer.getRfb().getId()); return; } @@ -957,7 +957,7 @@ if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) { // -1 means request to reverse direct connection socket short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId(); - context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, shareScreenNumber, scale)); + context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, scale)); } } } @@ -1081,10 +1081,10 @@ frame.setVisible(b); } - private void changeVncServer(ViewerInterface viewer, int x, int y, int width, int height, int shareScreenNumber, int scale, short id) { + private void changeVncServer(ViewerInterface viewer, int x, int y, int width, int height, int scale, short id) { String localhost = "127.0.0.1"; // InetAddress.getLocalHost().getHostName() try { - viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, x, y, width, height, shareScreenNumber, scale, id, null, null); + viewer.getRfb().changeVNCServer(viewer, localhost, ConnectionParams.DEFAULT_RFB_PORT, x, y, width, height, scale, id, null, null); } catch (Exception e1) { System.out.println("can't change server :" + e1.getMessage()); }