Mercurial > hg > Applications > TreeVNC
changeset 402:73c96a1d4a3a
Fix wasteful thread start
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 15 Oct 2015 04:45:16 +0900 |
| parents | 94c520535ef1 |
| children | 3a7d02844cfe |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java |
| diffstat | 3 files changed, 529 insertions(+), 304 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Oct 13 18:21:46 2015 +0900 +++ b/.idea/workspace.xml Thu Oct 15 04:45:16 2015 +0900 @@ -2,9 +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/CreateConnectionParam.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.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$/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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> @@ -37,7 +35,19 @@ <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="e#0#11451#0" expanded="true" /> + <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> @@ -47,42 +57,36 @@ <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="56" column="67" selection-start-line="56" selection-start-column="63" selection-end-line="56" selection-end-column="67" /> + <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> </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="24" column="37" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" /> - <folding> - <element signature="imports" expanded="true" /> - </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.33239436"> - <caret line="369" column="66" selection-start-line="369" selection-start-column="66" selection-end-line="369" selection-end-column="66" /> + <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" /> <folding> - <element signature="e#0#16554#0" expanded="true" /> + <element signature="e#0#16876#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#6823#6824#0" expanded="true" /> - <element signature="e#6852#6853#0" expanded="true" /> - <element signature="e#7108#7109#0" expanded="true" /> - <element signature="e#7140#7141#0" expanded="true" /> - <element signature="e#7688#7689#0" expanded="true" /> - <element signature="e#7730#7731#0" expanded="true" /> - <element signature="e#9164#9165#0" expanded="true" /> - <element signature="e#9207#9208#0" expanded="true" /> - <element signature="e#9941#9942#0" expanded="true" /> - <element signature="e#9979#9980#0" 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> @@ -106,8 +110,10 @@ <folding> <element signature="e#0#40916#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#5037#5038#0" expanded="false" /> - <element signature="e#5108#5109#0" 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" /> @@ -120,6 +126,18 @@ <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" /> @@ -136,14 +154,42 @@ <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#27456#27457#0" expanded="false" /> - <element signature="e#27528#27529#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#30036#30037#0" expanded="false" /> - <element signature="e#30104#30105#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" /> @@ -161,26 +207,30 @@ <folding> <element signature="e#0#17972#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#2728#2729#0" expanded="false" /> - <element signature="e#2756#2757#0" expanded="false" /> + <element signature="e#2649#2761#0" expanded="false" /> + <element signature="e#2760#2761#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#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#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#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#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" /> + <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" /> </folding> </state> </provider> @@ -193,26 +243,93 @@ <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="-21.666666"> - <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" /> + <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" /> <folding> - <element signature="e#2009#2010#0" expanded="true" /> - <element signature="e#2040#2041#0" expanded="true" /> - <element signature="e#2073#2074#0" expanded="true" /> - <element signature="e#2095#2096#0" expanded="true" /> + <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" /> </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"> + <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="-2.7777777"> - <caret line="53" column="44" selection-start-line="53" selection-start-column="44" selection-end-line="53" selection-end-column="44" /> + <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="e#31944#31945#0" expanded="true" /> - <element signature="e#31987#31988#0" expanded="true" /> + <element signature="imports" expanded="true" /> </folding> </state> </provider> @@ -222,8 +339,13 @@ <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="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> - <folding /> + <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> </state> </provider> </entry> @@ -238,29 +360,13 @@ </provider> </entry> </file> - <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="false"> <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="1.0746951"> - <caret line="55" column="29" selection-start-line="55" selection-start-column="29" selection-end-line="55" selection-end-column="29" /> + <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="e#1405#1554#0" expanded="true" /> - <element signature="e#1553#1554#0" expanded="true" /> - <element signature="e#1596#1772#0" expanded="true" /> - <element signature="e#1771#1772#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="RequestScreenThread.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="44" column="8" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="8" /> - <folding> - <element signature="e#948#949#0" expanded="true" /> - <element signature="e#969#970#0" expanded="true" /> + <element signature="imports" expanded="true" /> </folding> </state> </provider> @@ -271,7 +377,22 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="257" column="57" selection-start-line="257" selection-start-column="57" selection-end-line="257" selection-end-column="57" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#2256#2283#0" expanded="false" /> + <element signature="e#2346#2364#0" expanded="false" /> + <element signature="e#5490#5491#0" expanded="false" /> + <element signature="e#5515#5516#0" expanded="false" /> + <element signature="e#5587#5588#0" expanded="false" /> + <element signature="e#5637#5638#0" expanded="false" /> + <element signature="e#5705#5706#0" expanded="false" /> + <element signature="e#5753#5754#0" expanded="false" /> + <element signature="e#10490#10508#0" expanded="false" /> + <element signature="e#14383#14384#0" expanded="false" /> + <element signature="e#14433#14434#0" expanded="false" /> + <element signature="e#14671#14672#0" expanded="false" /> + <element signature="e#14715#14716#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -286,51 +407,6 @@ </provider> </entry> </file> - <file leaf-file-name="ConnectionView.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="435" column="6" selection-start-line="435" selection-start-column="6" selection-end-line="435" selection-end-column="6" /> - <folding> - <element signature="e#0#17422#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3371#3712#0" expanded="false" /> - <element signature="e#3711#3712#0" expanded="false" /> - <element signature="e#7414#7793#0" expanded="false" /> - <element signature="e#7792#7793#0" expanded="false" /> - <element signature="e#7925#9008#0" expanded="false" /> - <element signature="e#9007#9008#0" expanded="false" /> - <element signature="e#9151#9511#0" expanded="false" /> - <element signature="e#9510#9511#0" expanded="false" /> - <element signature="e#9736#9989#0" expanded="false" /> - <element signature="e#9988#9989#0" expanded="false" /> - <element signature="e#11599#11882#0" expanded="false" /> - <element signature="e#11881#11882#0" expanded="false" /> - <element signature="e#12846#12847#0" expanded="false" /> - <element signature="e#12891#12892#0" expanded="false" /> - <element signature="e#12940#12941#0" expanded="false" /> - <element signature="e#13007#13008#0" expanded="false" /> - <element signature="e#13044#13045#0" expanded="false" /> - <element signature="e#13092#13093#0" expanded="false" /> - <element signature="e#14663#14664#0" expanded="false" /> - <element signature="e#14722#14723#0" expanded="false" /> - <element signature="e#15360#15361#0" expanded="false" /> - <element signature="e#15398#15399#0" expanded="false" /> - <element signature="e#15876#15877#0" expanded="false" /> - <element signature="e#15929#15930#0" expanded="false" /> - <element signature="e#15961#15962#0" expanded="false" /> - <element signature="e#15988#15989#0" expanded="false" /> - <element signature="e#17136#17137#0" expanded="false" /> - <element signature="e#17197#17198#0" expanded="false" /> - <element signature="e#17265#17266#0" expanded="false" /> - <element signature="e#17309#17310#0" expanded="false" /> - <element signature="e#17373#17374#0" expanded="false" /> - <element signature="e#17418#17419#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </split-second> </splitter> @@ -631,11 +707,11 @@ <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/TreeRFBProto.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/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/Viewer.java" /> </list> </option> @@ -644,9 +720,8 @@ <order /> </component> <component name="ProjectFrameBounds"> - <option name="x" value="4" /> <option name="y" value="23" /> - <option name="width" value="1916" /> + <option name="width" value="1920" /> <option name="height" value="1177" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> @@ -871,8 +946,8 @@ </subPane> </pane> <pane id="Scratches" /> + <pane id="PackagesPane" /> <pane id="Scope" /> - <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -1164,8 +1239,8 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="1916" height="1177" extended-state="6" /> - <editor active="true" /> + <frame x="0" y="23" width="1920" height="1177" 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" /> @@ -1183,9 +1258,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.18215032" 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.115344465" 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.31792977" sideWeight="0.5" order="2" 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="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="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" /> @@ -1194,18 +1269,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="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="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="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="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="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="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="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="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="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" /> @@ -1243,7 +1318,7 @@ <breakpoints> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>489</line> + <line>499</line> <properties /> <option name="timeStamp" value="25" /> </line-breakpoint> @@ -1255,7 +1330,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>420</line> + <line>430</line> <properties /> <option name="timeStamp" value="32" /> </line-breakpoint> @@ -1296,12 +1371,6 @@ <option name="timeStamp" value="80" /> </line-breakpoint> <line-breakpoint type="java-line"> - <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>809</line> - <properties /> - <option name="timeStamp" value="85" /> - </line-breakpoint> - <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> <line>252</line> <properties /> @@ -1314,12 +1383,6 @@ <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>47</line> - <properties /> - <option name="timeStamp" value="99" /> - </line-breakpoint> - <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>248</line> @@ -1363,12 +1426,6 @@ <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/com/glavsoft/rfb/protocol/ReceiverTask.java</url> <line>247</line> <properties /> @@ -1412,13 +1469,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>914</line> + <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>933</line> + <line>937</line> <properties /> <option name="timeStamp" value="137" /> </line-breakpoint> @@ -1428,23 +1485,35 @@ <properties /> <option name="timeStamp" value="141" /> </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/FindRoot.java</url> <line>42</line> <properties /> <option name="timeStamp" value="151" /> </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/CreateConnectionParam.java</url> <line>33</line> <properties /> <option name="timeStamp" value="159" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java</url> + <line>101</line> + <properties /> + <option name="timeStamp" value="183" /> + </line-breakpoint> + <line-breakpoint enabled="true" 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> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="160" /> + <option name="time" value="186" /> </breakpoint-manager> <watches-manager /> </component> @@ -1453,20 +1522,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="102" column="29" selection-start-line="102" selection-start-column="29" selection-end-line="102" selection-end-column="29" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" /> - </state> - </provider> - </entry> <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"> @@ -1474,13 +1529,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="39" column="38" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" /> - </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"> @@ -1702,8 +1750,10 @@ <folding> <element signature="e#0#40916#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#5037#5038#0" expanded="false" /> - <element signature="e#5108#5109#0" 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" /> @@ -1716,6 +1766,18 @@ <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" /> @@ -1732,14 +1794,42 @@ <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#27456#27457#0" expanded="false" /> - <element signature="e#27528#27529#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#30036#30037#0" expanded="false" /> - <element signature="e#30104#30105#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" /> @@ -1755,26 +1845,30 @@ <folding> <element signature="e#0#17972#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#2728#2729#0" expanded="false" /> - <element signature="e#2756#2757#0" expanded="false" /> + <element signature="e#2649#2761#0" expanded="false" /> + <element signature="e#2760#2761#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#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#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#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#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" /> + <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" /> </folding> </state> </provider> @@ -1860,18 +1954,19 @@ <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="e#0#11451#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="44" column="8" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="8" /> - <folding> - <element signature="e#948#949#0" expanded="true" /> - <element signature="e#969#970#0" expanded="true" /> + <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> @@ -1884,14 +1979,6 @@ </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="56" column="67" selection-start-line="56" selection-start-column="63" selection-end-line="56" selection-end-column="67" /> - <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"> @@ -1900,53 +1987,26 @@ </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="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> - <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="24" column="37" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" /> - <folding> - <element signature="imports" expanded="true" /> - </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="-21.666666"> - <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" /> - <folding> - <element signature="e#2009#2010#0" expanded="true" /> - <element signature="e#2040#2041#0" expanded="true" /> - <element signature="e#2073#2074#0" expanded="true" /> - <element signature="e#2095#2096#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-2.7777777"> - <caret line="53" column="44" selection-start-line="53" selection-start-column="44" selection-end-line="53" selection-end-column="44" /> - <folding> - <element signature="e#31944#31945#0" expanded="true" /> - <element signature="e#31987#31988#0" expanded="true" /> - </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"> <caret line="257" column="57" selection-start-line="257" selection-start-column="57" selection-end-line="257" selection-end-column="57" /> - <folding /> + <folding> + <element signature="imports" expanded="false" /> + <element signature="e#2256#2283#0" expanded="false" /> + <element signature="e#2346#2364#0" expanded="false" /> + <element signature="e#5490#5491#0" expanded="false" /> + <element signature="e#5515#5516#0" expanded="false" /> + <element signature="e#5587#5588#0" expanded="false" /> + <element signature="e#5637#5638#0" expanded="false" /> + <element signature="e#5705#5706#0" expanded="false" /> + <element signature="e#5753#5754#0" expanded="false" /> + <element signature="e#10490#10508#0" expanded="false" /> + <element signature="e#14383#14384#0" expanded="false" /> + <element signature="e#14433#14434#0" expanded="false" /> + <element signature="e#14671#14672#0" expanded="false" /> + <element signature="e#14715#14716#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -1958,36 +2018,187 @@ </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> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.034924332"> + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.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="1.0746951"> - <caret line="55" column="29" selection-start-line="55" selection-start-column="29" selection-end-line="55" selection-end-column="29" /> + <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" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRootFinderListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <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" /> + </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" /> <folding> - <element signature="e#1405#1554#0" expanded="true" /> - <element signature="e#1553#1554#0" expanded="true" /> - <element signature="e#1596#1772#0" expanded="true" /> - <element signature="e#1771#1772#0" expanded="true" /> + <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" /> </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.33239436"> - <caret line="369" column="66" selection-start-line="369" selection-start-column="66" selection-end-line="369" selection-end-column="66" /> + <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" /> <folding> - <element signature="e#0#16554#0" expanded="true" /> + <element signature="e#0#16876#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#6823#6824#0" expanded="true" /> - <element signature="e#6852#6853#0" expanded="true" /> - <element signature="e#7108#7109#0" expanded="true" /> - <element signature="e#7140#7141#0" expanded="true" /> - <element signature="e#7688#7689#0" expanded="true" /> - <element signature="e#7730#7731#0" expanded="true" /> - <element signature="e#9164#9165#0" expanded="true" /> - <element signature="e#9207#9208#0" expanded="true" /> - <element signature="e#9941#9942#0" expanded="true" /> - <element signature="e#9979#9980#0" 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>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Tue Oct 13 18:21:46 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Thu Oct 15 04:45:16 2015 +0900 @@ -59,13 +59,13 @@ private boolean leader; private boolean hasViewer = false; private boolean normalTermination; + private boolean isTreeManager; public boolean showTreeNode = false; public boolean checkDelay = false; public boolean addSerialNum = false; public boolean fixingSize = false; public boolean filterSingleDisplay = false; - public int frameSizeWidth; public int frameSizeHeight; public int fixingSizeWidth; @@ -85,6 +85,10 @@ this.isTreeManager = isTreeManager; this.viewer = viewer; // this.socket = createSocket(); + startTreeRootFindThread(); + } + + public void startTreeRootFindThread() { if(isTreeManager()) { getCast = new TreeRootFinderListener(viewer); Thread treeRootFindThread = new Thread(getCast, "tree-root-find-listener"); @@ -96,6 +100,10 @@ return isTreeManager; } + public void setIsTreeManager(boolean isTreeManager) { + this.isTreeManager = isTreeManager; + } + public boolean isAddSerialNum() { return addSerialNum; } @@ -105,7 +113,7 @@ } /** - * handle new client accept + * handle new client accept * it also handle TreeVNC Command * @param os * @param is @@ -808,10 +816,6 @@ */ public void createConnectionAndStart(ViewerInterface v) { selectPort(ConnectionParams.DEFAULT_VNC_ROOT); - startTreeVncCommandListener(); - } - - public void startTreeVncCommandListener() { acceptThread = new TreeVncCommandChannelListener(this, getAcceptPort()); Thread thread = new Thread(acceptThread, "TreeVNC-accept"); thread.start();
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Oct 13 18:21:46 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Thu Oct 15 04:45:16 2015 +0900 @@ -105,8 +105,8 @@ private Viewer(Parser parser) { this(); setLoggingLevel(parser.isSet(ParametersHandler.ARG_VERBOSE) ? Level.FINE : - parser.isSet(ParametersHandler.ARG_VERBOSE_MORE) ? Level.FINER : - Level.INFO); + parser.isSet(ParametersHandler.ARG_VERBOSE_MORE) ? Level.FINER : + Level.INFO); paramsMask = ParametersHandler.completeSettingsFromCLI(parser, connectionParams, settings, uiSettings); passwordFromParams = parser.getValueFor(ParametersHandler.ARG_PASSWORD); @@ -333,7 +333,7 @@ } public void changeToDirectConnectedServer(String hostName, Reader is, Writer os) { - final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short)-1); + final ConnectionPresenter connectionPresenter = createNewConnectionPresenter(hostName, (short) -1); connectionPresenter.startVNCConnection(this, true, is, os); }; @@ -370,6 +370,7 @@ // selected "Start Display Mode" or "Start as TreeVNC Root" for start selection panel if (cp.isDisplayMode() || cp.isRootMode()) { myRfb = rfb; + myRfb.setIsTreeManager(true); return; } } @@ -392,20 +393,29 @@ printUsage(parser.optionsUsage()); System.exit(0); } - TreeRFBProto rfb = new TreeRFBProto(true, this); - myRfb = rfb; - rfb.setShowTree(showTree); - rfb.setCheckDelay(checkDelay); - rfb.setAddSerialNum(addSerialNum); - rfb.setFixingSize(fixingSize); + + // myRfb is null if use command line option "-d" "-p" + // myRfb not null if use start panel + if (myRfb == null) { + myRfb = new TreeRFBProto(true, this); + } + + myRfb.setShowTree(showTree); + myRfb.setCheckDelay(checkDelay); + myRfb.setAddSerialNum(addSerialNum); + myRfb.setFixingSize(fixingSize); if(fixingSize) { - rfb.fixingSizeWidth = fixingSizeWidth; - rfb.fixingSizeHeight = fixingSizeHeight; + myRfb.fixingSizeWidth = fixingSizeWidth; + myRfb.fixingSizeHeight = fixingSizeHeight; } - rfb.setFilterSingleDisplay(filterSingleDisplay); - rfb.setCuiVersion(false); - rfb.setHasViewer(true); // this flag will be overwrited after this method. Do we have to set here? - rfb.createConnectionAndStart(this); + myRfb.setFilterSingleDisplay(filterSingleDisplay); + myRfb.setCuiVersion(false); + myRfb.setHasViewer(true); // this flag will be overwrited after this method. Do we have to set here? + if (myRfb.getAcceptThread() == null) { + myRfb.createConnectionAndStart(this); + } else { + myRfb.startTreeRootFindThread(); + } setIsTreeVNC(true); if (hostName == null) { hostName = "localhost";