Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 381:47c018aed50e
Change condition to ZRLEESender.decode method
| author | innparusu |
|---|---|
| date | Thu, 03 Sep 2015 19:44:39 +0900 |
| parents | aef5cbdd84ab |
| children | 37eb97a23dcf |
| files | .idea/workspace.xml src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java |
| diffstat | 5 files changed, 513 insertions(+), 416 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Wed Sep 02 17:33:06 2015 +0900 +++ b/.idea/workspace.xml Thu Sep 03 19:44:39 2015 +0900 @@ -2,10 +2,10 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="setFitScreen in ReceiverTask"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/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/SendCheckDelay.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.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/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -34,11 +34,11 @@ <splitter split-orientation="horizontal" split-proportion="0.55"> <split-first> <leaf> - <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true"> + <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.43816793" vertical-offset="4394" max-vertical-offset="8448"> - <caret line="232" column="34" selection-start-line="232" selection-start-column="34" selection-end-line="232" selection-end-column="34" /> + <state vertical-scroll-proportion="0.0" vertical-offset="4658" max-vertical-offset="8448"> + <caret line="241" column="0" selection-start-line="241" selection-start-column="0" selection-end-line="241" selection-end-column="0" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -46,21 +46,69 @@ </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" vertical-offset="3251" max-vertical-offset="6102"> + <caret line="182" column="13" selection-start-line="182" selection-start-column="13" selection-end-line="182" selection-end-column="13" /> + <folding> + <element signature="e#6012#6013#0" expanded="true" /> + <element signature="e#6073#6074#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ZRLEESender.java" pinned="false" current-in-tab="true"> + <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.3800475" vertical-offset="0" max-vertical-offset="1440"> + <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ZRLEDecoder.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1972" max-vertical-offset="3938"> + <caret line="163" column="0" selection-start-line="163" selection-start-column="0" selection-end-line="163" selection-end-column="0" /> + <folding> + <element signature="e#0#6968#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ZlibDecoder.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1200"> + <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Component.java" pinned="false" current-in-tab="false"> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/awt/Component.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="73566" max-vertical-offset="232416"> + <caret line="3345" column="40" selection-start-line="3345" selection-start-column="40" selection-end-line="3345" selection-end-column="40" /> + <folding> + <element signature="e#115734#115735#0" expanded="true" /> + <element signature="e#115781#115782#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> <file leaf-file-name="FramebufferUpdateRectangle.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="960"> - <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> - <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" vertical-offset="0" max-vertical-offset="1344"> - <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> + <state vertical-scroll-proportion="0.0" vertical-offset="219" max-vertical-offset="1827"> + <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> <folding /> </state> </provider> @@ -69,8 +117,8 @@ <file leaf-file-name="TreeVncCommandChannelListener.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="760" max-vertical-offset="3870"> - <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="923" max-vertical-offset="6072"> + <caret line="127" column="33" selection-start-line="127" selection-start-column="33" selection-end-line="127" selection-end-column="33" /> <folding /> </state> </provider> @@ -79,64 +127,21 @@ <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1656"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1035"> <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ProtocolSettings.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1646" max-vertical-offset="7680"> - <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> - </file> - <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4410"> - <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SendCheckDelay.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java"> + <file leaf-file-name="HandshakeState.java" pinned="false" current-in-tab="false"> + <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" vertical-offset="0" max-vertical-offset="1276"> - <caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" /> - <folding /> - </state> - </provider> - </entry> - </file> - <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="-15.925" vertical-offset="14435" max-vertical-offset="19824"> - <caret line="703" column="23" selection-start-line="703" selection-start-column="23" selection-end-line="703" selection-end-column="23" /> + <state vertical-scroll-proportion="0.0" vertical-offset="314" max-vertical-offset="2280"> + <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <folding> - <element signature="e#3490#3491#0" expanded="true" /> - <element signature="e#3525#3526#0" expanded="true" /> - <element signature="e#27038#27050#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ZRLEDecoder.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="4117"> - <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" /> - <folding> - <element signature="e#0#6968#0" expanded="true" /> + <element signature="e#2053#2054#0" expanded="true" /> + <element signature="e#2074#2075#0" expanded="true" /> </folding> </state> </provider> @@ -146,80 +151,54 @@ </split-first> <split-second> <leaf> - <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" vertical-offset="1395" max-vertical-offset="4065"> - <caret line="112" column="13" selection-start-line="112" selection-start-column="13" selection-end-line="112" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="SendSound.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="1965"> - <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-0.62900764" vertical-offset="8399" max-vertical-offset="10375"> - <caret line="364" column="24" selection-start-line="364" selection-start-column="24" selection-end-line="364" selection-end-column="24" /> + <state vertical-scroll-proportion="0.0" vertical-offset="897" max-vertical-offset="3275"> + <caret line="61" column="17" selection-start-line="61" selection-start-column="17" selection-end-line="61" selection-end-column="17" /> <folding /> </state> </provider> </entry> </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"> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="801" max-vertical-offset="2790"> - <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> + <state vertical-scroll-proportion="-12.825" vertical-offset="3962" max-vertical-offset="10425"> + <caret line="223" column="0" selection-start-line="223" selection-start-column="0" selection-end-line="223" selection-end-column="0" /> <folding> - <element signature="e#0#7460#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2476#2477#0" expanded="false" /> - <element signature="e#2522#2523#0" expanded="false" /> - <element signature="e#3235#3236#0" expanded="false" /> - <element signature="e#3271#3272#0" expanded="false" /> - <element signature="e#3427#3428#0" expanded="false" /> - <element signature="e#3497#3498#0" expanded="false" /> - <element signature="e#3546#3547#0" expanded="false" /> - <element signature="e#3591#3592#0" expanded="false" /> - <element signature="e#3637#3638#0" expanded="false" /> - <element signature="e#3678#3679#0" expanded="false" /> - <element signature="e#3715#3716#0" expanded="false" /> - <element signature="e#3790#3791#0" expanded="false" /> - <element signature="e#3835#3836#0" expanded="false" /> - <element signature="e#3871#3872#0" expanded="false" /> - <element signature="e#3902#3903#0" expanded="false" /> - <element signature="e#3972#3973#0" expanded="false" /> - <element signature="e#4006#4007#0" expanded="false" /> - <element signature="e#4042#4043#0" expanded="false" /> - <element signature="e#4080#4081#0" expanded="false" /> - <element signature="e#4119#4120#0" expanded="false" /> - <element signature="e#4173#4174#0" expanded="false" /> - <element signature="e#4219#4220#0" expanded="false" /> - <element signature="e#4257#4258#0" expanded="false" /> - <element signature="e#4296#4297#0" expanded="false" /> - <element signature="e#4350#4351#0" expanded="false" /> - <element signature="e#4396#4397#0" expanded="false" /> + <element signature="e#9538#9539#0" expanded="true" /> + <element signature="e#9570#9571#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="SoundPacketQueue.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> + <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="3074" max-vertical-offset="7872"> + <caret line="196" column="0" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" /> + <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" vertical-offset="165" max-vertical-offset="375"> - <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215"> + <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" 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" vertical-offset="1514" max-vertical-offset="3912"> + <caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> <folding /> </state> </provider> @@ -228,28 +207,8 @@ <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="-13.75" vertical-offset="3674" max-vertical-offset="4944"> - <caret line="181" column="41" selection-start-line="181" selection-start-column="29" selection-end-line="181" selection-end-column="41" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="CreateConnectionParam.java" pinned="false" current-in-tab="false"> - <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" vertical-offset="690" max-vertical-offset="1020"> - <caret line="51" column="7" selection-start-line="50" selection-start-column="0" selection-end-line="58" selection-end-column="5" /> - <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"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="12780" max-vertical-offset="12975"> - <caret line="1015" column="32" selection-start-line="1015" selection-start-column="32" selection-end-line="1015" selection-end-column="32" /> + <state vertical-scroll-proportion="-7.875" vertical-offset="1125" max-vertical-offset="4944"> + <caret line="65" column="38" selection-start-line="65" selection-start-column="38" selection-end-line="65" selection-end-column="38" /> <folding /> </state> </provider> @@ -258,8 +217,38 @@ <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1350" max-vertical-offset="3645"> - <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" /> + <state vertical-scroll-proportion="0.0" vertical-offset="476" max-vertical-offset="6804"> + <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeVNCNode.java" pinned="false" current-in-tab="false"> + <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" vertical-offset="0" max-vertical-offset="510"> + <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeVncProtocol.java" pinned="false" current-in-tab="true"> + <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="1.1908156" vertical-offset="346" max-vertical-offset="2800"> + <caret line="78" column="20" selection-start-line="78" selection-start-column="20" selection-end-line="78" selection-end-column="20" /> + <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" vertical-offset="2937" max-vertical-offset="5764"> + <caret line="158" column="23" selection-start-line="158" selection-start-column="23" selection-end-line="158" selection-end-column="23" /> <folding /> </state> </provider> @@ -554,16 +543,19 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java" /> <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/TreeRFBProto.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/TreeVncCommandChannelListener.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="16" /> - <option name="y" value="23" /> + <option name="x" value="60" /> + <option name="y" value="81" /> <option name="width" value="3836" /> - <option name="height" value="2137" /> + <option name="height" value="2090" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -845,6 +837,44 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="protocol" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="state" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="glavsoft" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="rfb" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="encoding" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -952,7 +982,7 @@ </extension> <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="" /> + <option name="PROGRAM_PARAMETERS" value="--direct --host firefly.cr.ie.u-ryukyu.ac.jp:5950" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -1195,8 +1225,8 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="16" y="23" width="3836" height="2137" extended-state="6" /> - <editor active="true" /> + <frame x="60" y="81" width="3836" height="2090" extended-state="6" /> + <editor active="false" /> <layout> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> @@ -1217,8 +1247,8 @@ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13529718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32791728" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16110532" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3356855" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18978103" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -1385,34 +1415,88 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> - <line>116</line> + <line>122</line> <properties /> <option name="timeStamp" value="93" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> - <line>108</line> - <properties /> - <option name="timeStamp" value="97" /> - </line-breakpoint> - <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> <line>47</line> <properties /> <option name="timeStamp" value="99" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <condition disabled="true" expression="numberOfRectangles > 1" language="JAVA" custom="" /> <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> <line>228</line> <properties /> <option name="timeStamp" value="105" /> </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java</url> + <line>116</line> + <properties /> + <option name="timeStamp" value="108" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java</url> + <line>121</line> + <properties /> + <option name="timeStamp" value="110" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java</url> + <line>60</line> + <properties /> + <option name="timeStamp" value="112" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> + <line>108</line> + <properties /> + <option name="timeStamp" value="113" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.java</url> + <line>53</line> + <properties /> + <option name="timeStamp" value="114" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> + <line>78</line> + <properties /> + <option name="timeStamp" value="115" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java</url> + <line>68</line> + <properties /> + <option name="timeStamp" value="117" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>320</line> + <properties /> + <option name="timeStamp" value="118" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java</url> + <line>227</line> + <properties /> + <option name="timeStamp" value="119" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java</url> + <line>163</line> + <properties /> + <option name="timeStamp" value="120" /> + </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="107" /> + <option name="time" value="121" /> </breakpoint-manager> <watches-manager /> </component> @@ -1421,116 +1505,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.36299214" vertical-offset="2636" max-vertical-offset="4408"> - <caret line="197" column="21" selection-start-line="197" selection-start-column="21" selection-end-line="197" selection-end-column="21" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/javax/swing/SwingWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="9640" max-vertical-offset="12150"> - <caret line="736" column="0" selection-start-line="736" selection-start-column="0" selection-end-line="736" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.4396985" vertical-offset="0" max-vertical-offset="1592"> - <caret line="59" column="34" selection-start-line="59" selection-start-column="34" selection-end-line="59" selection-end-column="34" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitTightState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.19786432" vertical-offset="0" max-vertical-offset="1592"> - <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/zip/Inflater.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2935" max-vertical-offset="5640"> - <caret line="262" column="0" selection-start-line="262" selection-start-column="0" selection-end-line="262" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1224"> - <caret line="77" column="30" selection-start-line="77" selection-start-column="30" selection-end-line="77" selection-end-column="30" /> - <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" vertical-offset="1476" max-vertical-offset="3749"> - <caret line="121" column="58" selection-start-line="121" selection-start-column="58" selection-end-line="121" selection-end-column="58" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215"> - <caret line="61" column="38" selection-start-line="61" selection-start-column="38" selection-end-line="61" selection-end-column="38" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="885"> - <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="4661" max-vertical-offset="6270"> - <caret line="381" column="21" selection-start-line="381" selection-start-column="21" selection-end-line="381" selection-end-column="21" /> - <folding> - <element signature="e#12726#12727#0" expanded="false" /> - <element signature="e#12765#12766#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/LICENSE.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5175"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/build/tmp/noSshJar/MANIFEST.MF"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1592"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/README.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.10741206" vertical-offset="0" max-vertical-offset="1592"> - <caret line="9" column="44" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="44" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/build.gradle"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="675" max-vertical-offset="2010"> - <caret line="45" column="31" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="31" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/build/tmp/jar/MANIFEST.MF"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.01884422" vertical-offset="0" max-vertical-offset="1592"> - <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> - </state> - </provider> - </entry> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/HashMap.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="6220" max-vertical-offset="34710"> @@ -1605,14 +1579,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" vertical-offset="14446" max-vertical-offset="16435"> - <caret line="1015" column="32" selection-start-line="1015" selection-start-column="32" selection-end-line="1015" selection-end-column="32" /> - <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.18844222" vertical-offset="0" max-vertical-offset="1592"> @@ -1629,14 +1595,6 @@ </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" vertical-offset="4626" max-vertical-offset="7336"> - <caret line="209" column="24" selection-start-line="209" selection-start-column="24" selection-end-line="209" selection-end-column="24" /> - <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" vertical-offset="55" max-vertical-offset="2300"> @@ -1653,8 +1611,8 @@ <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2880"> <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> <folding> - <element signature="e#1502#1503#0" expanded="true" /> - <element signature="e#1576#1577#0" expanded="true" /> + <element signature="e#1502#1503#0" expanded="false" /> + <element signature="e#1576#1577#0" expanded="false" /> </folding> </state> </provider> @@ -1754,59 +1712,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="801" max-vertical-offset="2790"> - <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> - <folding> - <element signature="e#0#7460#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2476#2477#0" expanded="false" /> - <element signature="e#2522#2523#0" expanded="false" /> - <element signature="e#3235#3236#0" expanded="false" /> - <element signature="e#3271#3272#0" expanded="false" /> - <element signature="e#3427#3428#0" expanded="false" /> - <element signature="e#3497#3498#0" expanded="false" /> - <element signature="e#3546#3547#0" expanded="false" /> - <element signature="e#3591#3592#0" expanded="false" /> - <element signature="e#3637#3638#0" expanded="false" /> - <element signature="e#3678#3679#0" expanded="false" /> - <element signature="e#3715#3716#0" expanded="false" /> - <element signature="e#3790#3791#0" expanded="false" /> - <element signature="e#3835#3836#0" expanded="false" /> - <element signature="e#3871#3872#0" expanded="false" /> - <element signature="e#3902#3903#0" expanded="false" /> - <element signature="e#3972#3973#0" expanded="false" /> - <element signature="e#4006#4007#0" expanded="false" /> - <element signature="e#4042#4043#0" expanded="false" /> - <element signature="e#4080#4081#0" expanded="false" /> - <element signature="e#4119#4120#0" expanded="false" /> - <element signature="e#4173#4174#0" expanded="false" /> - <element signature="e#4219#4220#0" expanded="false" /> - <element signature="e#4257#4258#0" expanded="false" /> - <element signature="e#4296#4297#0" expanded="false" /> - <element signature="e#4350#4351#0" expanded="false" /> - <element signature="e#4396#4397#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="375"> - <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2593" max-vertical-offset="4172"> - <caret line="129" column="32" selection-start-line="129" selection-start-column="32" selection-end-line="129" selection-end-column="32" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.45038167" vertical-offset="2098" max-vertical-offset="3408"> @@ -1815,14 +1720,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="5832"> - <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RREDecoder.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="480"> @@ -1843,14 +1740,10 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.44896933" vertical-offset="0" max-vertical-offset="2641"> <caret line="51" column="14" selection-start-line="51" selection-start-column="14" selection-end-line="51" selection-end-column="14" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1965"> - <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> - <folding /> + <folding> + <element signature="e#1009#1010#0" expanded="true" /> + <element signature="e#1027#1028#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -1862,14 +1755,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.0" vertical-offset="0" max-vertical-offset="4410"> - <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" 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.0" vertical-offset="1646" max-vertical-offset="7680"> @@ -1878,14 +1763,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1656"> - <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="7588"> @@ -1894,78 +1771,290 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="121" max-vertical-offset="1700"> + <caret line="89" column="25" selection-start-line="89" selection-start-column="25" selection-end-line="89" selection-end-column="25" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitTightState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.30339196" vertical-offset="0" max-vertical-offset="1592"> + <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> + <folding> + <element signature="e#1938#1939#0" expanded="true" /> + <element signature="e#1959#1960#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.056532662" vertical-offset="0" max-vertical-offset="1592"> + <caret line="32" column="22" selection-start-line="32" selection-start-column="22" selection-end-line="32" selection-end-column="22" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1452"> + <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" /> + <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.08479899" vertical-offset="0" max-vertical-offset="1592"> + <caret line="34" column="17" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/javax/swing/SwingWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.35301507" vertical-offset="10964" max-vertical-offset="13770"> + <caret line="736" column="20" selection-start-line="736" selection-start-column="20" selection-end-line="736" selection-end-column="20" /> + <folding> + <element signature="e#23398#23399#0" expanded="false" /> + <element signature="e#23444#23445#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.103643216" vertical-offset="0" max-vertical-offset="1592"> + <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="801" max-vertical-offset="2790"> + <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> + <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="-13.75" vertical-offset="3674" max-vertical-offset="4944"> - <caret line="181" column="41" selection-start-line="181" selection-start-column="29" selection-end-line="181" selection-end-column="41" /> + <state vertical-scroll-proportion="-7.875" vertical-offset="1125" max-vertical-offset="4944"> + <caret line="65" column="38" selection-start-line="65" selection-start-column="38" selection-end-line="65" selection-end-column="38" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="897" max-vertical-offset="3275"> + <caret line="61" column="17" selection-start-line="61" selection-start-column="17" selection-end-line="61" selection-end-column="17" /> <folding /> </state> </provider> </entry> <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.62900764" vertical-offset="8399" max-vertical-offset="10375"> - <caret line="364" column="24" selection-start-line="364" selection-start-column="24" selection-end-line="364" selection-end-column="24" /> + <state vertical-scroll-proportion="-12.825" vertical-offset="3962" max-vertical-offset="10425"> + <caret line="223" column="0" selection-start-line="223" selection-start-column="0" selection-end-line="223" selection-end-column="0" /> + <folding> + <element signature="e#9538#9539#0" expanded="true" /> + <element signature="e#9570#9571#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" vertical-offset="1514" max-vertical-offset="3912"> + <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/swing/SwingConnectionWorkerFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215"> + <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="3074" max-vertical-offset="7872"> + <caret line="196" column="0" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="476" max-vertical-offset="6804"> + <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" /> + <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" vertical-offset="0" max-vertical-offset="510"> + <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> + <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" vertical-offset="2937" max-vertical-offset="5764"> + <caret line="158" column="23" selection-start-line="158" selection-start-column="23" selection-end-line="158" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="297" max-vertical-offset="7938"> + <caret line="82" column="0" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" /> + <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="1.1908156" vertical-offset="346" max-vertical-offset="2800"> + <caret line="78" column="20" selection-start-line="78" selection-start-column="20" selection-end-line="78" selection-end-column="20" /> + <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="-117.825" vertical-offset="1959" max-vertical-offset="19872"> + <caret line="325" column="0" selection-start-line="325" selection-start-column="0" selection-end-line="325" selection-end-column="0" /> + <folding> + <element signature="e#3490#3491#0" expanded="true" /> + <element signature="e#3525#3526#0" expanded="true" /> + <element signature="e#18296#18297#0" expanded="true" /> + <element signature="e#18325#18326#0" expanded="true" /> + <element signature="e#27038#27050#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.0" vertical-offset="1954" max-vertical-offset="17300"> + <caret line="193" column="15" selection-start-line="193" selection-start-column="15" selection-end-line="193" selection-end-column="15" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="790" max-vertical-offset="3427"> + <caret line="68" column="22" selection-start-line="68" selection-start-column="22" selection-end-line="68" selection-end-column="22" /> + <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" vertical-offset="314" max-vertical-offset="2280"> + <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> + <folding> + <element signature="e#2053#2054#0" expanded="true" /> + <element signature="e#2074#2075#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1656"> + <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="760" max-vertical-offset="3870"> - <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="923" max-vertical-offset="6072"> + <caret line="127" column="33" selection-start-line="127" selection-start-column="33" selection-end-line="127" selection-end-column="33" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="960"> - <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="219" max-vertical-offset="1827"> + <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> <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" vertical-offset="3251" max-vertical-offset="6102"> + <caret line="182" column="13" selection-start-line="182" selection-start-column="13" selection-end-line="182" selection-end-column="13" /> + <folding> + <element signature="e#6012#6013#0" expanded="true" /> + <element signature="e#6073#6074#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/awt/Component.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="73566" max-vertical-offset="232416"> + <caret line="3345" column="40" selection-start-line="3345" selection-start-column="40" selection-end-line="3345" selection-end-column="40" /> + <folding> + <element signature="e#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/ZRLEDecoder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="4117"> - <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" /> + <state vertical-scroll-proportion="0.0" vertical-offset="1972" max-vertical-offset="3938"> + <caret line="163" column="0" selection-start-line="163" selection-start-column="0" selection-end-line="163" selection-end-column="0" /> <folding> <element signature="e#0#6968#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/encoding/decoder/ZlibDecoder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-15.925" vertical-offset="14435" max-vertical-offset="19824"> - <caret line="703" column="23" selection-start-line="703" selection-start-column="23" selection-end-line="703" selection-end-column="23" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1200"> + <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="4658" max-vertical-offset="8448"> + <caret line="241" column="0" selection-start-line="241" selection-start-column="0" selection-end-line="241" selection-end-column="0" /> <folding> - <element signature="e#3490#3491#0" expanded="true" /> - <element signature="e#3525#3526#0" expanded="true" /> - <element signature="e#27038#27050#0" expanded="true" /> + <element signature="imports" expanded="true" /> </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" vertical-offset="0" max-vertical-offset="1344"> - <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> + <state vertical-scroll-proportion="0.3800475" vertical-offset="0" max-vertical-offset="1440"> + <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> <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.43816793" vertical-offset="4394" max-vertical-offset="8448"> - <caret line="232" column="34" selection-start-line="232" selection-start-column="34" selection-end-line="232" selection-end-column="34" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> </component> <component name="masterDetails"> <states>
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java Wed Sep 02 17:33:06 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java Thu Sep 03 19:44:39 2015 +0900 @@ -47,7 +47,6 @@ private EncodingType encodingType; public long time; public int port; - String localhost; public FramebufferUpdateRectangle() { // nop
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java Wed Sep 02 17:33:06 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java Thu Sep 03 19:44:39 2015 +0900 @@ -30,11 +30,15 @@ reader.reset(); if (rfb.hasViewer()) { ZRLEDecoder decoder = new ZRLEDecoder(); - if (rfb.isTreeManager()) { + if (rect.getEncodingType() == EncodingType.ZRLE) { + // ReadSendData convert ZRLE to ZRLEE + // unzipped data in the bytes rfb.readSendData(dataLen, reader, bytes, rect); decoder.decode1(renderer, rect, bytes, 0); return; - } else if (!rfb.getCuiVersion()) { + } else { + // no reencoding is required + // readSend does not peform unzip, do the fullrecoding rfb.readSendData(dataLen, reader, null, rect); reader.reset(); reader.skip(16);
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java Wed Sep 02 17:33:06 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java Thu Sep 03 19:44:39 2015 +0900 @@ -55,8 +55,7 @@ byte [] bytes = ByteBuffer.getInstance().getBuffer(zippedLength + length); reader.readBytes(bytes, 0, zippedLength); if (null == decoder || encodingType == EncodingType.ZRLEE) { - //if (null == decoder) { - decoder = new Inflater(); + decoder = new Inflater(); } decoder.setInput(bytes, 0, zippedLength); try {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java Wed Sep 02 17:33:06 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java Thu Sep 03 19:44:39 2015 +0900 @@ -106,14 +106,20 @@ sendRfbVersion(os); byte[] b; if ((b = readVersionMsg(is, os))!=null) { + // direct TreeVNC Command from TreeRoot + // such as connectTo, connectToAsLeader + // or direct TreeVNC Command from lower node + // such as LostParent, LostChild TreeVncCommand cmd = treeVncCommand(b,is,os,myHostAddress,intf); if (cmd!=null) return cmd; } + // normal connection from TreeVNC node candidate sendSecurityType(os); readSecType(is); sendSecResult(os); readClientInit(is); sendInitData(os); + System.out.println("direct connection from "+connection.getInetAddress()); return new TreeVncCommand(rfb, myHostAddress, TreeCommand.NEW_NODE, os, is, connection); }