Mercurial > hg > Applications > TreeVNC
changeset 403:3a7d02844cfe
Enable AdvancedMenu to RootSelectionPanel
author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
---|---|
date | Mon, 19 Oct 2015 17:35:07 +0900 |
parents | 73c96a1d4a3a |
children | 92b22cad660b |
files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java |
diffstat | 2 files changed, 399 insertions(+), 628 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Thu Oct 15 04:45:16 2015 +0900 +++ b/.idea/workspace.xml Mon Oct 19 17:35:07 2015 +0900 @@ -2,8 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -26,38 +25,14 @@ <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.52451706"> + <splitter split-orientation="horizontal" split-proportion="0.52454215"> <split-first> <leaf> <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="178" column="48" selection-start-line="178" selection-start-column="48" selection-end-line="178" selection-end-column="48" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#9277#9278#0" expanded="false" /> - <element signature="e#9327#9328#0" expanded="false" /> - <element signature="e#9405#9406#0" expanded="false" /> - <element signature="e#9451#9452#0" expanded="false" /> - <element signature="e#9521#9522#0" expanded="false" /> - <element signature="e#9565#9566#0" expanded="false" /> - <element signature="e#9643#9644#0" expanded="false" /> - <element signature="e#9699#9700#0" expanded="false" /> - <element signature="e#11329#11330#0" expanded="false" /> - <element signature="e#11364#11365#0" expanded="false" /> - <element signature="e#11411#11412#0" expanded="false" /> - <element signature="e#11447#11448#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeVncCommand.java" pinned="false" current-in-tab="false"> - <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="68" column="24" selection-start-line="68" selection-start-column="24" selection-end-line="68" selection-end-column="24" /> + <caret line="62" column="19" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" /> <folding /> </state> </provider> @@ -66,139 +41,81 @@ <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.6830986"> - <caret line="396" column="43" selection-start-line="396" selection-start-column="43" selection-end-line="396" selection-end-column="43" /> + <state vertical-scroll-proportion="0.56478876"> + <caret line="415" column="16" selection-start-line="398" selection-start-column="21" selection-end-line="416" selection-end-column="44" /> <folding> <element signature="e#0#16876#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#6835#6836#0" expanded="true" /> - <element signature="e#6864#6865#0" expanded="true" /> - <element signature="e#7120#7121#0" expanded="true" /> - <element signature="e#7152#7153#0" expanded="true" /> - <element signature="e#7700#7701#0" expanded="true" /> - <element signature="e#7742#7743#0" expanded="true" /> - <element signature="e#9645#9646#0" expanded="true" /> - <element signature="e#9677#9678#0" expanded="true" /> - <element signature="e#9713#9714#0" expanded="true" /> - <element signature="e#9741#9742#0" expanded="true" /> - <element signature="e#9779#9780#0" expanded="true" /> - <element signature="e#9823#9824#0" expanded="true" /> - <element signature="e#9869#9870#0" expanded="true" /> - <element signature="e#9910#9911#0" expanded="true" /> - <element signature="e#9953#9954#0" expanded="true" /> - <element signature="e#9991#9992#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="71" column="32" selection-start-line="71" selection-start-column="32" selection-end-line="71" selection-end-column="32" /> + <folding> + <element signature="e#3477#3478#0" expanded="true" /> + <element signature="e#3510#3511#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="FindRoot.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" /> + <folding> + <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> </file> + <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-12.777778"> + <caret line="117" column="30" selection-start-line="117" selection-start-column="30" selection-end-line="117" selection-end-column="30" /> + <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="87" column="33" selection-start-line="87" selection-start-column="33" selection-end-line="87" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="61" column="42" selection-start-line="61" selection-start-column="42" selection-end-line="61" selection-end-column="42" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="TestTextBox.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" /> + <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="857" column="39" selection-start-line="857" selection-start-column="39" selection-end-line="857" selection-end-column="39" /> - <folding> - <element signature="e#0#40916#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#4640#5165#0" expanded="false" /> - <element signature="e#4944#5131#0" expanded="false" /> - <element signature="e#5130#5131#0" expanded="false" /> - <element signature="e#5164#5165#0" expanded="false" /> - <element signature="e#5534#5535#0" expanded="false" /> - <element signature="e#5599#5600#0" expanded="false" /> - <element signature="e#5671#5672#0" expanded="false" /> - <element signature="e#5736#5737#0" expanded="false" /> - <element signature="e#6166#6167#0" expanded="false" /> - <element signature="e#6231#6232#0" expanded="false" /> - <element signature="e#6303#6304#0" expanded="false" /> - <element signature="e#6368#6369#0" expanded="false" /> - <element signature="e#8120#8121#0" expanded="false" /> - <element signature="e#8162#8163#0" expanded="false" /> - <element signature="e#8229#8230#0" expanded="false" /> - <element signature="e#8284#8285#0" expanded="false" /> - <element signature="e#13647#13860#0" expanded="false" /> - <element signature="e#13859#13860#0" expanded="false" /> - <element signature="e#13932#14144#0" expanded="false" /> - <element signature="e#14143#14144#0" expanded="false" /> - <element signature="e#14221#14475#0" expanded="false" /> - <element signature="e#14474#14475#0" expanded="false" /> - <element signature="e#14583#15077#0" expanded="false" /> - <element signature="e#15076#15077#0" expanded="false" /> - <element signature="e#15192#15681#0" expanded="false" /> - <element signature="e#15680#15681#0" expanded="false" /> - <element signature="e#18488#18852#0" expanded="false" /> - <element signature="e#18851#18852#0" expanded="false" /> - <element signature="e#19338#19339#0" expanded="false" /> - <element signature="e#19392#19393#0" expanded="false" /> - <element signature="e#20836#20837#0" expanded="false" /> - <element signature="e#20866#20867#0" expanded="false" /> - <element signature="e#21225#21226#0" expanded="false" /> - <element signature="e#21304#21305#0" expanded="false" /> - <element signature="e#21731#21732#0" expanded="false" /> - <element signature="e#21793#21794#0" expanded="false" /> - <element signature="e#22380#22381#0" expanded="false" /> - <element signature="e#22437#22438#0" expanded="false" /> - <element signature="e#22470#22471#0" expanded="false" /> - <element signature="e#22528#22529#0" expanded="false" /> - <element signature="e#22562#22563#0" expanded="false" /> - <element signature="e#22652#22653#0" expanded="false" /> - <element signature="e#22687#22688#0" expanded="false" /> - <element signature="e#22759#22760#0" expanded="false" /> - <element signature="e#27363#27551#0" expanded="false" /> - <element signature="e#27550#27551#0" expanded="false" /> - <element signature="e#28095#28613#0" expanded="false" /> - <element signature="e#28245#28563#0" expanded="false" /> - <element signature="e#28562#28563#0" expanded="false" /> - <element signature="e#28612#28613#0" expanded="false" /> - <element signature="e#28762#28763#0" expanded="false" /> - <element signature="e#28815#28816#0" expanded="false" /> - <element signature="e#28859#28860#0" expanded="false" /> - <element signature="e#28912#28913#0" expanded="false" /> - <element signature="e#29199#29866#0" expanded="false" /> - <element signature="e#29865#29866#0" expanded="false" /> - <element signature="e#29959#30119#0" expanded="false" /> - <element signature="e#30118#30119#0" expanded="false" /> - <element signature="e#30366#30574#0" expanded="false" /> - <element signature="e#30573#30574#0" expanded="false" /> - <element signature="e#30642#30858#0" expanded="false" /> - <element signature="e#30857#30858#0" expanded="false" /> - <element signature="e#30958#31175#0" expanded="false" /> - <element signature="e#31174#31175#0" expanded="false" /> - <element signature="e#31391#31603#0" expanded="false" /> - <element signature="e#31602#31603#0" expanded="false" /> - <element signature="e#31740#31948#0" expanded="false" /> - <element signature="e#31947#31948#0" expanded="false" /> - <element signature="e#32089#32541#0" expanded="false" /> - <element signature="e#32540#32541#0" expanded="false" /> - <element signature="e#32680#33130#0" expanded="false" /> - <element signature="e#33129#33130#0" expanded="false" /> - <element signature="e#33252#34537#0" expanded="false" /> - <element signature="e#34536#34537#0" expanded="false" /> - <element signature="e#34639#34959#0" expanded="false" /> - <element signature="e#34958#34959#0" expanded="false" /> - <element signature="e#35055#35356#0" expanded="false" /> - <element signature="e#35355#35356#0" expanded="false" /> - <element signature="e#35971#36368#0" expanded="false" /> - <element signature="e#36367#36368#0" expanded="false" /> - <element signature="e#40358#40359#0" expanded="false" /> - <element signature="e#40393#40394#0" expanded="false" /> - <element signature="e#40879#40880#0" expanded="false" /> - <element signature="e#40912#40913#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="OptionsDialog.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java"> <provider selected="true" editor-type-id="text-editor"> @@ -207,30 +124,26 @@ <folding> <element signature="e#0#17972#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#2649#2761#0" expanded="false" /> - <element signature="e#2760#2761#0" expanded="false" /> + <element signature="e#2728#2729#0" expanded="false" /> + <element signature="e#2756#2757#0" expanded="false" /> <element signature="e#8927#8928#0" expanded="false" /> <element signature="e#8952#8953#0" expanded="false" /> <element signature="e#8993#8994#0" expanded="false" /> <element signature="e#9023#9024#0" expanded="false" /> <element signature="e#9261#9262#0" expanded="false" /> <element signature="e#9282#9283#0" expanded="false" /> - <element signature="e#10219#10352#0" expanded="false" /> - <element signature="e#10351#10352#0" expanded="false" /> - <element signature="e#11453#11577#0" expanded="false" /> - <element signature="e#11576#11577#0" expanded="false" /> - <element signature="e#13444#13664#0" expanded="false" /> - <element signature="e#13663#13664#0" expanded="false" /> + <element signature="e#10298#10299#0" expanded="false" /> + <element signature="e#10347#10348#0" expanded="false" /> + <element signature="e#11535#11536#0" expanded="false" /> + <element signature="e#11572#11573#0" expanded="false" /> <element signature="e#16751#16752#0" expanded="false" /> <element signature="e#16778#16779#0" expanded="false" /> <element signature="e#16806#16807#0" expanded="false" /> <element signature="e#16827#16828#0" expanded="false" /> - <element signature="e#17107#17232#0" expanded="false" /> - <element signature="e#17231#17232#0" expanded="false" /> - <element signature="e#17537#17683#0" expanded="false" /> - <element signature="e#17682#17683#0" expanded="false" /> - <element signature="e#17798#17923#0" expanded="false" /> - <element signature="e#17922#17923#0" expanded="false" /> + <element signature="e#17189#17190#0" expanded="false" /> + <element signature="e#17227#17228#0" expanded="false" /> + <element signature="e#17880#17881#0" expanded="false" /> + <element signature="e#17918#17919#0" expanded="false" /> </folding> </state> </provider> @@ -244,93 +157,34 @@ <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="36" column="36" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.4612006"> - <caret line="92" column="40" selection-start-line="92" selection-start-column="40" selection-end-line="92" selection-end-column="40" /> + <caret line="91" column="29" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" /> <folding> - <element signature="e#3549#3550#0" expanded="true" /> - <element signature="e#3585#3586#0" expanded="true" /> - <element signature="e#3644#3645#0" expanded="true" /> - <element signature="e#3694#3695#0" expanded="true" /> - <element signature="e#3733#3734#0" expanded="true" /> - <element signature="e#3768#3769#0" expanded="true" /> - <element signature="e#3811#3812#0" expanded="true" /> - <element signature="e#3841#3842#0" expanded="true" /> - <element signature="e#4597#7194#0" expanded="true" /> - <element signature="e#7193#7194#0" expanded="true" /> - <element signature="e#7361#13914#0" expanded="true" /> - <element signature="e#11081#11407#0" expanded="true" /> - <element signature="e#11406#11407#0" expanded="true" /> - <element signature="e#11652#11978#0" expanded="true" /> - <element signature="e#11977#11978#0" expanded="true" /> - <element signature="e#12209#12535#0" expanded="true" /> - <element signature="e#12534#12535#0" expanded="true" /> - <element signature="e#12757#13083#0" expanded="true" /> - <element signature="e#13082#13083#0" expanded="true" /> - <element signature="e#13913#13914#0" expanded="true" /> - <element signature="e#16232#16233#0" expanded="true" /> - <element signature="e#16273#16274#0" expanded="true" /> - <element signature="e#16326#16327#0" expanded="true" /> - <element signature="e#16364#16365#0" expanded="true" /> - <element signature="e#16405#16406#0" expanded="true" /> - <element signature="e#16438#16439#0" expanded="true" /> - <element signature="e#16503#16504#0" expanded="true" /> - <element signature="e#16544#16545#0" expanded="true" /> - <element signature="e#17774#17775#0" expanded="true" /> - <element signature="e#17800#17801#0" expanded="true" /> - <element signature="e#17842#17843#0" expanded="true" /> - <element signature="e#17871#17872#0" expanded="true" /> - <element signature="e#18036#18037#0" expanded="true" /> - <element signature="e#18079#18080#0" expanded="true" /> - <element signature="e#18122#18123#0" expanded="true" /> - <element signature="e#18162#18163#0" expanded="true" /> - <element signature="e#18820#18821#0" expanded="true" /> - <element signature="e#18853#18854#0" expanded="true" /> - <element signature="e#18895#18896#0" expanded="true" /> - <element signature="e#18932#18933#0" expanded="true" /> - <element signature="e#18971#18972#0" expanded="true" /> - <element signature="e#19004#19005#0" expanded="true" /> - <element signature="e#19052#19053#0" expanded="true" /> - <element signature="e#19085#19086#0" expanded="true" /> - <element signature="e#20107#20119#0" expanded="true" /> - <element signature="e#21639#21640#0" expanded="true" /> - <element signature="e#21677#21678#0" expanded="true" /> - <element signature="e#22521#22522#0" expanded="true" /> - <element signature="e#22553#22554#0" expanded="true" /> - <element signature="e#26260#26272#0" expanded="true" /> - <element signature="e#27359#27371#0" expanded="true" /> - <element signature="e#27804#27816#0" expanded="true" /> - <element signature="e#29758#29759#0" expanded="true" /> - <element signature="e#29786#29787#0" expanded="true" /> - <element signature="e#29814#29815#0" expanded="true" /> - <element signature="e#29839#29840#0" expanded="true" /> - <element signature="e#29979#29980#0" expanded="true" /> - <element signature="e#30015#30016#0" expanded="true" /> - <element signature="e#30048#30049#0" expanded="true" /> - <element signature="e#30077#30078#0" expanded="true" /> - <element signature="e#30148#30149#0" expanded="true" /> - <element signature="e#30198#30199#0" expanded="true" /> + <element signature="e#2312#2313#0" expanded="true" /> + <element signature="e#2327#2328#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="FindRoot.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <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="-67.0"> + <caret line="441" column="37" selection-start-line="441" selection-start-column="37" selection-end-line="441" selection-end-column="37" /> + <folding> + <element signature="e#33174#33175#0" expanded="true" /> + <element signature="e#33236#33237#0" expanded="true" /> + </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="67" column="43" selection-start-line="67" selection-start-column="43" selection-end-line="67" selection-end-column="43" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" /> + <folding /> </state> </provider> </entry> @@ -339,13 +193,8 @@ <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="35" column="35" selection-start-line="35" selection-start-column="35" selection-end-line="35" selection-end-column="35" /> - <folding> - <element signature="e#1209#1773#0" expanded="true" /> - <element signature="e#1772#1773#0" expanded="true" /> - <element signature="e#2134#2391#0" expanded="true" /> - <element signature="e#2390#2391#0" expanded="true" /> - </folding> + <caret line="42" column="66" selection-start-line="42" selection-start-column="64" selection-end-line="42" selection-end-column="66" /> + <folding /> </state> </provider> </entry> @@ -360,13 +209,21 @@ </provider> </entry> </file> - <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="true"> <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.0"> - <caret line="101" column="0" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" /> + <state vertical-scroll-proportion="0.6631098"> + <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" /> <folding> <element signature="imports" expanded="true" /> + <element signature="e#1904#1905#0" expanded="true" /> + <element signature="e#1928#1929#0" expanded="true" /> + <element signature="e#2996#2997#0" expanded="true" /> + <element signature="e#3022#3023#0" expanded="true" /> + <element signature="e#3050#3051#0" expanded="true" /> + <element signature="e#3068#3069#0" expanded="true" /> + <element signature="e#4557#4558#0" expanded="true" /> + <element signature="e#4585#4586#0" expanded="true" /> </folding> </state> </provider> @@ -400,8 +257,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="0.0"> - <caret line="72" column="29" selection-start-line="72" selection-start-column="29" selection-end-line="72" selection-end-column="29" /> + <state vertical-scroll-proportion="-47.666668"> + <caret line="91" column="19" selection-start-line="91" selection-start-column="19" selection-end-line="91" selection-end-column="19" /> <folding /> </state> </provider> @@ -684,7 +541,6 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.java" /> <option value="$PROJECT_DIR$/README.txt" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" /> - <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/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZlibDecoder.java" /> @@ -704,15 +560,16 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.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/TreeViewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> </list> </option> </component> @@ -747,6 +604,7 @@ <sortByType /> </navigator> <panes> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -945,9 +803,8 @@ </PATH> </subPane> </pane> + <pane id="PackagesPane" /> <pane id="Scratches" /> - <pane id="PackagesPane" /> - <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -1258,9 +1115,9 @@ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="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.18177083" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.108333334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18125" sideWeight="0.5" order="0" 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.31792977" 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.1078125" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -1269,18 +1126,18 @@ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="true" 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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14520334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34118852" 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.14520334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> @@ -1468,18 +1325,6 @@ <option name="timeStamp" value="134" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>918</line> - <properties /> - <option name="timeStamp" value="136" /> - </line-breakpoint> - <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>937</line> - <properties /> - <option name="timeStamp" value="137" /> - </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 /> @@ -1497,23 +1342,71 @@ <properties /> <option name="timeStamp" value="159" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java</url> - <line>101</line> + <line>91</line> <properties /> <option name="timeStamp" value="183" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java</url> <line>48</line> <properties /> <option name="timeStamp" value="185" /> </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>918</line> + <properties /> + <option name="timeStamp" value="186" /> + </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>937</line> + <properties /> + <option name="timeStamp" value="187" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java</url> + <line>189</line> + <properties /> + <option name="timeStamp" value="188" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> + <line>335</line> + <properties /> + <option name="timeStamp" value="189" /> + </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>797</line> + <properties /> + <option name="timeStamp" value="190" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> + <line>362</line> + <properties /> + <option name="timeStamp" value="191" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> + <line>96</line> + <properties /> + <option name="timeStamp" value="192" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> + <line>198</line> + <properties /> + <option name="timeStamp" value="193" /> + </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="186" /> + <option name="time" value="196" /> </breakpoint-manager> <watches-manager /> </component> @@ -1522,35 +1415,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/VncProxyService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/FramebufferUpdateRequestMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> - </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"> - <caret line="45" column="28" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" /> - <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.0"> - <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="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"> @@ -1601,13 +1465,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"> - <caret line="88" column="18" selection-start-line="88" selection-start-column="18" selection-end-line="88" selection-end-column="18" /> - </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"> @@ -1637,21 +1494,6 @@ </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="39" selection-start-line="61" selection-start-column="39" selection-end-line="61" selection-end-column="39" /> - </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="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" 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"> @@ -1663,7 +1505,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="447" column="0" selection-start-line="447" selection-start-column="0" selection-end-line="447" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -1750,10 +1591,8 @@ <folding> <element signature="e#0#40916#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#4640#5165#0" expanded="false" /> - <element signature="e#4944#5131#0" expanded="false" /> - <element signature="e#5130#5131#0" expanded="false" /> - <element signature="e#5164#5165#0" expanded="false" /> + <element signature="e#5037#5038#0" expanded="false" /> + <element signature="e#5108#5109#0" expanded="false" /> <element signature="e#5534#5535#0" expanded="false" /> <element signature="e#5599#5600#0" expanded="false" /> <element signature="e#5671#5672#0" expanded="false" /> @@ -1766,18 +1605,6 @@ <element signature="e#8162#8163#0" expanded="false" /> <element signature="e#8229#8230#0" expanded="false" /> <element signature="e#8284#8285#0" expanded="false" /> - <element signature="e#13647#13860#0" expanded="false" /> - <element signature="e#13859#13860#0" expanded="false" /> - <element signature="e#13932#14144#0" expanded="false" /> - <element signature="e#14143#14144#0" expanded="false" /> - <element signature="e#14221#14475#0" expanded="false" /> - <element signature="e#14474#14475#0" expanded="false" /> - <element signature="e#14583#15077#0" expanded="false" /> - <element signature="e#15076#15077#0" expanded="false" /> - <element signature="e#15192#15681#0" expanded="false" /> - <element signature="e#15680#15681#0" expanded="false" /> - <element signature="e#18488#18852#0" expanded="false" /> - <element signature="e#18851#18852#0" expanded="false" /> <element signature="e#19338#19339#0" expanded="false" /> <element signature="e#19392#19393#0" expanded="false" /> <element signature="e#20836#20837#0" expanded="false" /> @@ -1794,42 +1621,14 @@ <element signature="e#22652#22653#0" expanded="false" /> <element signature="e#22687#22688#0" expanded="false" /> <element signature="e#22759#22760#0" expanded="false" /> - <element signature="e#27363#27551#0" expanded="false" /> - <element signature="e#27550#27551#0" expanded="false" /> - <element signature="e#28095#28613#0" expanded="false" /> - <element signature="e#28245#28563#0" expanded="false" /> - <element signature="e#28562#28563#0" expanded="false" /> - <element signature="e#28612#28613#0" expanded="false" /> + <element signature="e#27456#27457#0" expanded="false" /> + <element signature="e#27528#27529#0" expanded="false" /> <element signature="e#28762#28763#0" expanded="false" /> <element signature="e#28815#28816#0" expanded="false" /> <element signature="e#28859#28860#0" expanded="false" /> <element signature="e#28912#28913#0" expanded="false" /> - <element signature="e#29199#29866#0" expanded="false" /> - <element signature="e#29865#29866#0" expanded="false" /> - <element signature="e#29959#30119#0" expanded="false" /> - <element signature="e#30118#30119#0" expanded="false" /> - <element signature="e#30366#30574#0" expanded="false" /> - <element signature="e#30573#30574#0" expanded="false" /> - <element signature="e#30642#30858#0" expanded="false" /> - <element signature="e#30857#30858#0" expanded="false" /> - <element signature="e#30958#31175#0" expanded="false" /> - <element signature="e#31174#31175#0" expanded="false" /> - <element signature="e#31391#31603#0" expanded="false" /> - <element signature="e#31602#31603#0" expanded="false" /> - <element signature="e#31740#31948#0" expanded="false" /> - <element signature="e#31947#31948#0" expanded="false" /> - <element signature="e#32089#32541#0" expanded="false" /> - <element signature="e#32540#32541#0" expanded="false" /> - <element signature="e#32680#33130#0" expanded="false" /> - <element signature="e#33129#33130#0" expanded="false" /> - <element signature="e#33252#34537#0" expanded="false" /> - <element signature="e#34536#34537#0" expanded="false" /> - <element signature="e#34639#34959#0" expanded="false" /> - <element signature="e#34958#34959#0" expanded="false" /> - <element signature="e#35055#35356#0" expanded="false" /> - <element signature="e#35355#35356#0" expanded="false" /> - <element signature="e#35971#36368#0" expanded="false" /> - <element signature="e#36367#36368#0" expanded="false" /> + <element signature="e#30036#30037#0" expanded="false" /> + <element signature="e#30104#30105#0" expanded="false" /> <element signature="e#40358#40359#0" expanded="false" /> <element signature="e#40393#40394#0" expanded="false" /> <element signature="e#40879#40880#0" expanded="false" /> @@ -1845,30 +1644,26 @@ <folding> <element signature="e#0#17972#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#2649#2761#0" expanded="false" /> - <element signature="e#2760#2761#0" expanded="false" /> + <element signature="e#2728#2729#0" expanded="false" /> + <element signature="e#2756#2757#0" expanded="false" /> <element signature="e#8927#8928#0" expanded="false" /> <element signature="e#8952#8953#0" expanded="false" /> <element signature="e#8993#8994#0" expanded="false" /> <element signature="e#9023#9024#0" expanded="false" /> <element signature="e#9261#9262#0" expanded="false" /> <element signature="e#9282#9283#0" expanded="false" /> - <element signature="e#10219#10352#0" expanded="false" /> - <element signature="e#10351#10352#0" expanded="false" /> - <element signature="e#11453#11577#0" expanded="false" /> - <element signature="e#11576#11577#0" expanded="false" /> - <element signature="e#13444#13664#0" expanded="false" /> - <element signature="e#13663#13664#0" expanded="false" /> + <element signature="e#10298#10299#0" expanded="false" /> + <element signature="e#10347#10348#0" expanded="false" /> + <element signature="e#11535#11536#0" expanded="false" /> + <element signature="e#11572#11573#0" expanded="false" /> <element signature="e#16751#16752#0" expanded="false" /> <element signature="e#16778#16779#0" expanded="false" /> <element signature="e#16806#16807#0" expanded="false" /> <element signature="e#16827#16828#0" expanded="false" /> - <element signature="e#17107#17232#0" expanded="false" /> - <element signature="e#17231#17232#0" expanded="false" /> - <element signature="e#17537#17683#0" expanded="false" /> - <element signature="e#17682#17683#0" expanded="false" /> - <element signature="e#17798#17923#0" expanded="false" /> - <element signature="e#17922#17923#0" expanded="false" /> + <element signature="e#17189#17190#0" expanded="false" /> + <element signature="e#17227#17228#0" expanded="false" /> + <element signature="e#17880#17881#0" expanded="false" /> + <element signature="e#17918#17919#0" expanded="false" /> </folding> </state> </provider> @@ -1894,14 +1689,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="232" column="28" selection-start-line="232" selection-start-column="28" selection-end-line="232" selection-end-column="28" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -1949,44 +1736,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"> - <caret line="178" column="48" selection-start-line="178" selection-start-column="48" selection-end-line="178" selection-end-column="48" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#9277#9278#0" expanded="false" /> - <element signature="e#9327#9328#0" expanded="false" /> - <element signature="e#9405#9406#0" expanded="false" /> - <element signature="e#9451#9452#0" expanded="false" /> - <element signature="e#9521#9522#0" expanded="false" /> - <element signature="e#9565#9566#0" expanded="false" /> - <element signature="e#9643#9644#0" expanded="false" /> - <element signature="e#9699#9700#0" expanded="false" /> - <element signature="e#11329#11330#0" expanded="false" /> - <element signature="e#11364#11365#0" expanded="false" /> - <element signature="e#11411#11412#0" expanded="false" /> - <element signature="e#11447#11448#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" /> - <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="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionsHistory.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -2010,45 +1759,10 @@ </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="72" column="29" selection-start-line="72" selection-start-column="29" selection-end-line="72" selection-end-column="29" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="36" column="36" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" /> - <folding /> - </state> - </provider> - </entry> <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/rt.jar!/sun/misc/Unsafe.class"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-10.592592"> <caret line="348" column="23" selection-start-line="348" selection-start-column="23" selection-end-line="348" selection-end-column="23" /> - <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="68" column="24" selection-start-line="68" selection-start-column="24" selection-end-line="68" selection-end-column="24" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="67" column="43" selection-start-line="67" selection-start-column="43" selection-end-line="67" selection-end-column="43" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> </state> </provider> </entry> @@ -2065,31 +1779,8 @@ <state vertical-scroll-proportion="0.13969733"> <caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" /> <folding> - <element signature="e#277#278#0" expanded="true" /> - <element signature="e#294#295#0" expanded="true" /> - </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.0"> - <caret line="101" column="0" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="35" column="35" selection-start-line="35" selection-start-column="35" selection-end-line="35" selection-end-column="35" /> - <folding> - <element signature="e#1209#1773#0" expanded="true" /> - <element signature="e#1772#1773#0" expanded="true" /> - <element signature="e#2134#2391#0" expanded="true" /> - <element signature="e#2390#2391#0" expanded="true" /> + <element signature="e#277#278#0" expanded="false" /> + <element signature="e#294#295#0" expanded="false" /> </folding> </state> </provider> @@ -2099,106 +1790,184 @@ <state vertical-scroll-proportion="0.29577464"> <caret line="22" column="28" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="28" /> <folding> - <element signature="e#738#739#0" expanded="true" /> - <element signature="e#766#767#0" expanded="true" /> + <element signature="e#738#739#0" expanded="false" /> + <element signature="e#766#767#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> + <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.17462166"> + <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.0"> + <caret line="61" column="42" selection-start-line="61" selection-start-column="42" selection-end-line="61" selection-end-column="42" /> + <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="87" column="33" selection-start-line="87" selection-start-column="33" selection-end-line="87" selection-end-column="33" /> + <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.10477299"> + <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="71" column="32" selection-start-line="71" selection-start-column="32" selection-end-line="71" selection-end-column="32" /> + <folding> + <element signature="e#3477#3478#0" expanded="true" /> + <element signature="e#3510#3511#0" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="42" column="66" selection-start-line="42" selection-start-column="64" selection-end-line="42" selection-end-column="66" /> + <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="-12.777778"> + <caret line="117" column="30" selection-start-line="117" selection-start-column="30" selection-end-line="117" selection-end-column="30" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="91" column="29" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" /> + <folding> + <element signature="e#2312#2313#0" expanded="true" /> + <element signature="e#2327#2328#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" /> + <folding> + <element signature="imports" expanded="true" /> + </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.4084507"> + <caret line="129" column="8" selection-start-line="129" selection-start-column="8" selection-end-line="129" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" /> + <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.4612006"> - <caret line="92" column="40" selection-start-line="92" selection-start-column="40" selection-end-line="92" selection-end-column="40" /> + <state vertical-scroll-proportion="-67.0"> + <caret line="441" column="37" selection-start-line="441" selection-start-column="37" selection-end-line="441" selection-end-column="37" /> <folding> - <element signature="e#3549#3550#0" expanded="true" /> - <element signature="e#3585#3586#0" expanded="true" /> - <element signature="e#3644#3645#0" expanded="true" /> - <element signature="e#3694#3695#0" expanded="true" /> - <element signature="e#3733#3734#0" expanded="true" /> - <element signature="e#3768#3769#0" expanded="true" /> - <element signature="e#3811#3812#0" expanded="true" /> - <element signature="e#3841#3842#0" expanded="true" /> - <element signature="e#4597#7194#0" expanded="true" /> - <element signature="e#7193#7194#0" expanded="true" /> - <element signature="e#7361#13914#0" expanded="true" /> - <element signature="e#11081#11407#0" expanded="true" /> - <element signature="e#11406#11407#0" expanded="true" /> - <element signature="e#11652#11978#0" expanded="true" /> - <element signature="e#11977#11978#0" expanded="true" /> - <element signature="e#12209#12535#0" expanded="true" /> - <element signature="e#12534#12535#0" expanded="true" /> - <element signature="e#12757#13083#0" expanded="true" /> - <element signature="e#13082#13083#0" expanded="true" /> - <element signature="e#13913#13914#0" expanded="true" /> - <element signature="e#16232#16233#0" expanded="true" /> - <element signature="e#16273#16274#0" expanded="true" /> - <element signature="e#16326#16327#0" expanded="true" /> - <element signature="e#16364#16365#0" expanded="true" /> - <element signature="e#16405#16406#0" expanded="true" /> - <element signature="e#16438#16439#0" expanded="true" /> - <element signature="e#16503#16504#0" expanded="true" /> - <element signature="e#16544#16545#0" expanded="true" /> - <element signature="e#17774#17775#0" expanded="true" /> - <element signature="e#17800#17801#0" expanded="true" /> - <element signature="e#17842#17843#0" expanded="true" /> - <element signature="e#17871#17872#0" expanded="true" /> - <element signature="e#18036#18037#0" expanded="true" /> - <element signature="e#18079#18080#0" expanded="true" /> - <element signature="e#18122#18123#0" expanded="true" /> - <element signature="e#18162#18163#0" expanded="true" /> - <element signature="e#18820#18821#0" expanded="true" /> - <element signature="e#18853#18854#0" expanded="true" /> - <element signature="e#18895#18896#0" expanded="true" /> - <element signature="e#18932#18933#0" expanded="true" /> - <element signature="e#18971#18972#0" expanded="true" /> - <element signature="e#19004#19005#0" expanded="true" /> - <element signature="e#19052#19053#0" expanded="true" /> - <element signature="e#19085#19086#0" expanded="true" /> - <element signature="e#20107#20119#0" expanded="true" /> - <element signature="e#21639#21640#0" expanded="true" /> - <element signature="e#21677#21678#0" expanded="true" /> - <element signature="e#22521#22522#0" expanded="true" /> - <element signature="e#22553#22554#0" expanded="true" /> - <element signature="e#26260#26272#0" expanded="true" /> - <element signature="e#27359#27371#0" expanded="true" /> - <element signature="e#27804#27816#0" expanded="true" /> - <element signature="e#29758#29759#0" expanded="true" /> - <element signature="e#29786#29787#0" expanded="true" /> - <element signature="e#29814#29815#0" expanded="true" /> - <element signature="e#29839#29840#0" expanded="true" /> - <element signature="e#29979#29980#0" expanded="true" /> - <element signature="e#30015#30016#0" expanded="true" /> - <element signature="e#30048#30049#0" expanded="true" /> - <element signature="e#30077#30078#0" expanded="true" /> - <element signature="e#30148#30149#0" expanded="true" /> - <element signature="e#30198#30199#0" expanded="true" /> + <element signature="e#33174#33175#0" expanded="true" /> + <element signature="e#33236#33237#0" 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.33239436"> + <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-47.666668"> + <caret line="91" column="19" selection-start-line="91" selection-start-column="19" selection-end-line="91" selection-end-column="19" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="62" column="19" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" /> + <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.6830986"> - <caret line="396" column="43" selection-start-line="396" selection-start-column="43" selection-end-line="396" selection-end-column="43" /> + <state vertical-scroll-proportion="0.56478876"> + <caret line="415" column="16" selection-start-line="398" selection-start-column="21" selection-end-line="416" selection-end-column="44" /> <folding> <element signature="e#0#16876#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#6835#6836#0" expanded="true" /> - <element signature="e#6864#6865#0" expanded="true" /> - <element signature="e#7120#7121#0" expanded="true" /> - <element signature="e#7152#7153#0" expanded="true" /> - <element signature="e#7700#7701#0" expanded="true" /> - <element signature="e#7742#7743#0" expanded="true" /> - <element signature="e#9645#9646#0" expanded="true" /> - <element signature="e#9677#9678#0" expanded="true" /> - <element signature="e#9713#9714#0" expanded="true" /> - <element signature="e#9741#9742#0" expanded="true" /> - <element signature="e#9779#9780#0" expanded="true" /> - <element signature="e#9823#9824#0" expanded="true" /> - <element signature="e#9869#9870#0" expanded="true" /> - <element signature="e#9910#9911#0" expanded="true" /> - <element signature="e#9953#9954#0" expanded="true" /> - <element signature="e#9991#9992#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> + <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.6631098"> + <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#1904#1905#0" expanded="true" /> + <element signature="e#1928#1929#0" expanded="true" /> + <element signature="e#2996#2997#0" expanded="true" /> + <element signature="e#3022#3023#0" expanded="true" /> + <element signature="e#3050#3051#0" expanded="true" /> + <element signature="e#3068#3069#0" expanded="true" /> + <element signature="e#4557#4558#0" expanded="true" /> + <element signature="e#4585#4586#0" expanded="true" /> </folding> </state> </provider>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Thu Oct 15 04:45:16 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Mon Oct 19 17:35:07 2015 +0900 @@ -17,10 +17,9 @@ private static final long serialVersionUID = 1L; private final FindRoot findRoot; private JPanel panel = new JPanel(); - private JButton button = new JButton("Connect"); - private JButton startRootButton = new JButton("Start as TreeVNC Root"); - private JButton startDisplayButton = new JButton("Start Display Mode"); - private TextField t1; + private JButton button = new JButton("Start"); + private JComboBox advancedMenu = new JComboBox(); + private TextField t1; private TextField t2; private double width = 750; private double height = 500; @@ -38,29 +37,20 @@ this.findRoot = findRoot; setTitle("TreeVNC Root Address"); setResizable(false); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - panel.add(startRootButton); - panel.add(startDisplayButton); - startRootButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - cp.setRootMode(); - cp.restart(); - unVisible(); - } - }); - startDisplayButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - cp.setDisplayMode(); - cp.restart(); - unVisible(); - } - }); + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + setAdvancedMenu(); + setButton(); + } + + private void setAdvancedMenu() { + advancedMenu.addItem("Connect to TreeVNC"); + advancedMenu.addItem("Start as TreeVNC Root"); + advancedMenu.addItem("Start Display Mode"); + panel.add(advancedMenu); contentPane.add(panel, BorderLayout.CENTER); } - public void ipRegister() { + public void ipRegister() { setSize(); setText(); setButton(); @@ -135,31 +125,43 @@ } public void actionPerformed(ActionEvent e) { - flag = true; - for (int t = 0; t < counter; t++) { - int ipv4AddressLength = 3; - int ipv6AddressLength = 17; - String port = null; - String hostAddress = null; - String rootAddress = null; - if (check[t].getState()) { - System.out.println(check[t].getLabel()); - String str = check[t].getLabel(); - String[] temp = str.split(":"); - if (temp.length == ipv4AddressLength) { - // IPv4 Address - port = temp[0]; - hostAddress = temp[1]; - rootAddress = temp[2]; - } else if (temp.length == ipv6AddressLength) { - // IPv6 Address - port = temp[0]; - hostAddress = temp[1] + ":" + temp[2] + ":" + temp[3] + ":" + temp[4] + ":" + temp[5] + ":" + temp[6] + ":" + temp[7] + ":" + temp[8]; - rootAddress = temp[9] + ":" + temp[10] + ":" + temp[11] + ":" + temp[12] + ":" + temp[13] + ":" + temp[14] + ":" + temp[15] + ":" + temp[16]; - } - cp.setHostName(hostAddress,Integer.parseInt(port),rootAddress); - unVisible(); + if (advancedMenu.getSelectedIndex() == 0) { + flag = true; + for (int t = 0; t < counter; t++) { + int ipv4AddressLength = 3; + int ipv6AddressLength = 17; + String port = null; + String hostAddress = null; + String rootAddress = null; + if (check[t].getState()) { + System.out.println(check[t].getLabel()); + String str = check[t].getLabel(); + String[] temp = str.split(":"); + if (temp.length == ipv4AddressLength) { + // IPv4 Address + port = temp[0]; + hostAddress = temp[1]; + rootAddress = temp[2]; + } else if (temp.length == ipv6AddressLength) { + // IPv6 Address + port = temp[0]; + hostAddress = temp[1] + ":" + temp[2] + ":" + temp[3] + ":" + temp[4] + ":" + temp[5] + ":" + temp[6] + ":" + temp[7] + ":" + temp[8]; + rootAddress = temp[9] + ":" + temp[10] + ":" + temp[11] + ":" + temp[12] + ":" + temp[13] + ":" + temp[14] + ":" + temp[15] + ":" + temp[16]; + } + cp.setHostName(hostAddress, Integer.parseInt(port), rootAddress); + unVisible(); + } } + } else if (advancedMenu.getSelectedIndex() == 1) { + // selected "Start as TreeVNC Root" + cp.setRootMode(); + cp.restart(); + unVisible(); + } else if (advancedMenu.getSelectedIndex() == 2) { + // selected "Start Display Mode" + cp.setDisplayMode(); + cp.restart(); + unVisible(); } }