Mercurial > hg > Applications > TreeVNC
changeset 429:e16fb899620f
Fix allocate the myId for LostChild
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 01 Feb 2016 15:42:27 +0900 |
| parents | f6a828dd37b0 |
| children | 340b62546e0a |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java |
| diffstat | 2 files changed, 47 insertions(+), 269 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Mon Feb 01 05:57:18 2016 +0900 +++ b/.idea/workspace.xml Mon Feb 01 15:42:27 2016 +0900 @@ -2,12 +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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -50,17 +45,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="131" column="5" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#5621#5622#0" expanded="false" /> - <element signature="e#5687#5688#0" expanded="false" /> - <element signature="e#8176#8177#0" expanded="false" /> - <element signature="e#8207#8208#0" expanded="false" /> - <element signature="e#8263#8264#0" expanded="false" /> - <element signature="e#8293#8294#0" expanded="false" /> - <element signature="e#8327#8328#0" expanded="false" /> - <element signature="e#8360#8361#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -70,9 +55,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="72" column="9" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -82,17 +65,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="37" column="62" selection-start-line="37" selection-start-column="62" selection-end-line="37" selection-end-column="62" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#537#538#0" expanded="false" /> - <element signature="e#565#566#0" expanded="false" /> - <element signature="e#613#614#0" expanded="false" /> - <element signature="e#647#648#0" expanded="false" /> - <element signature="e#3023#3024#0" expanded="false" /> - <element signature="e#3069#3070#0" expanded="false" /> - <element signature="e#3123#3124#0" expanded="false" /> - <element signature="e#3157#3158#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -112,18 +85,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" /> - <folding> - <element signature="e#352#353#0" expanded="false" /> - <element signature="e#382#383#0" expanded="false" /> - <element signature="e#425#426#0" expanded="false" /> - <element signature="e#463#464#0" expanded="false" /> - <element signature="e#502#503#0" expanded="false" /> - <element signature="e#533#534#0" expanded="false" /> - <element signature="e#561#562#0" expanded="false" /> - <element signature="e#588#589#0" expanded="false" /> - <element signature="e#631#632#0" expanded="false" /> - <element signature="e#664#665#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -131,35 +93,13 @@ <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="true"> <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.2271605"> - <caret line="384" column="5" selection-start-line="384" selection-start-column="5" selection-end-line="384" selection-end-column="5" /> + <state vertical-scroll-proportion="0.3625498"> + <caret line="412" column="0" selection-start-line="412" selection-start-column="0" selection-end-line="412" selection-end-column="0" /> <folding> <element signature="e#0#15751#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#3351#3352#0" expanded="true" /> - <element signature="e#3388#3389#0" expanded="true" /> - <element signature="e#3447#3448#0" expanded="true" /> - <element signature="e#3499#3500#0" expanded="true" /> - <element signature="e#13641#13642#0" expanded="true" /> - <element signature="e#13693#13694#0" expanded="true" /> - <element signature="e#13752#13753#0" expanded="true" /> - <element signature="e#13806#13807#0" expanded="true" /> - <element signature="e#13857#13858#0" expanded="true" /> - <element signature="e#13903#13904#0" expanded="true" /> - <element signature="e#13934#13935#0" expanded="true" /> - <element signature="e#13960#13961#0" expanded="true" /> - <element signature="e#13991#13992#0" expanded="true" /> - <element signature="e#14017#14018#0" expanded="true" /> <element signature="e#14055#14056#0" expanded="true" /> <element signature="e#14092#14093#0" expanded="true" /> - <element signature="e#14131#14132#0" expanded="true" /> - <element signature="e#14169#14170#0" expanded="true" /> - <element signature="e#14204#14205#0" expanded="true" /> - <element signature="e#14238#14239#0" expanded="true" /> - <element signature="e#14263#14264#0" expanded="true" /> - <element signature="e#14287#14288#0" expanded="true" /> - <element signature="e#14312#14313#0" expanded="true" /> - <element signature="e#14336#14337#0" expanded="true" /> </folding> </state> </provider> @@ -173,7 +113,6 @@ <folding> <element signature="e#0#17368#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#1732#1759#0" expanded="true" /> </folding> </state> </provider> @@ -182,7 +121,7 @@ <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="-28.333334"> + <state vertical-scroll-proportion="0.0"> <caret line="916" column="0" selection-start-line="916" selection-start-column="0" selection-end-line="916" selection-end-column="0" /> <folding /> </state> @@ -194,9 +133,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -206,11 +143,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="90" column="46" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#4640#4641#0" expanded="false" /> - <element signature="e#4670#4671#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -232,47 +165,14 @@ <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.962963"> - <caret line="180" column="32" selection-start-line="180" selection-start-column="32" selection-end-line="180" selection-end-column="32" /> + <state vertical-scroll-proportion="0.8347107"> + <caret line="216" column="37" selection-start-line="216" selection-start-column="37" selection-end-line="216" selection-end-column="37" /> <folding> <element signature="imports" expanded="true" /> - <element signature="e#16946#16947#0" expanded="true" /> - <element signature="e#16987#16988#0" expanded="true" /> - <element signature="e#18487#18488#0" expanded="true" /> - <element signature="e#18513#18514#0" expanded="true" /> - <element signature="e#28178#28190#0" expanded="true" /> - <element signature="e#33390#33391#0" expanded="true" /> - <element signature="e#33425#33426#0" expanded="true" /> - <element signature="e#33508#33509#0" expanded="true" /> - <element signature="e#33550#33551#0" expanded="true" /> - <element signature="e#33607#33608#0" expanded="true" /> - <element signature="e#33632#33633#0" expanded="true" /> - <element signature="e#33666#33667#0" expanded="true" /> - <element signature="e#33698#33699#0" expanded="true" /> - <element signature="e#33741#33742#0" expanded="true" /> - <element signature="e#33770#33771#0" expanded="true" /> - <element signature="e#33819#33820#0" expanded="true" /> - <element signature="e#33863#33864#0" expanded="true" /> - <element signature="e#33916#33917#0" expanded="true" /> - <element signature="e#33960#33961#0" expanded="true" /> - <element signature="e#34017#34018#0" expanded="true" /> - <element signature="e#34065#34066#0" expanded="true" /> - <element signature="e#34523#34524#0" expanded="true" /> - <element signature="e#34567#34568#0" expanded="true" /> - <element signature="e#34638#34639#0" expanded="true" /> - <element signature="e#34700#34701#0" expanded="true" /> - <element signature="e#35295#35296#0" expanded="true" /> - <element signature="e#35319#35320#0" expanded="true" /> - <element signature="e#35344#35345#0" expanded="true" /> - <element signature="e#35368#35369#0" expanded="true" /> - <element signature="e#35403#35404#0" expanded="true" /> - <element signature="e#35437#35438#0" expanded="true" /> - <element signature="e#35473#35474#0" expanded="true" /> - <element signature="e#35508#35509#0" expanded="true" /> - <element signature="e#35543#35544#0" expanded="true" /> - <element signature="e#35577#35578#0" expanded="true" /> - <element signature="e#35612#35613#0" expanded="true" /> - <element signature="e#35643#35644#0" expanded="true" /> + <element signature="e#4748#7473#0" expanded="true" /> + <element signature="e#7472#7473#0" expanded="true" /> + <element signature="e#31644#31645#0" expanded="true" /> + <element signature="e#31694#31695#0" expanded="true" /> </folding> </state> </provider> @@ -331,7 +231,7 @@ <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="-7.111111"> + <state vertical-scroll-proportion="0.0"> <caret line="166" column="21" selection-start-line="166" selection-start-column="21" selection-end-line="166" selection-end-column="21" /> <folding /> </state> @@ -688,7 +588,7 @@ </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="3" /> + <option name="x" value="1920" /> <option name="y" value="23" /> <option name="width" value="1920" /> <option name="height" value="1177" /> @@ -718,6 +618,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scratches" /> + <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -995,8 +897,6 @@ </subPane> </pane> <pane id="Scope" /> - <pane id="Scratches" /> - <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -1447,7 +1347,7 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="3" y="23" width="1920" height="1177" extended-state="6" /> + <frame x="1920" y="23" width="1920" height="1177" extended-state="6" /> <editor active="true" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -1457,18 +1357,17 @@ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22550832" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22550832" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988676" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19270833" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15729167" sideWeight="0.49499285" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902032" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27818853" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="1924" y="434" width="1916" height="296" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27818853" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="1924" y="434" width="1916" height="296" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -1477,6 +1376,7 @@ <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="2020" y="181" width="1720" height="977" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.123173274" sideWeight="0.50500715" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902032" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -1548,7 +1448,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>535</line> + <line>533</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1656,7 +1556,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>501</line> + <line>499</line> <properties /> <option name="timeStamp" value="212" /> </line-breakpoint> @@ -1686,7 +1586,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>645</line> + <line>643</line> <properties /> <option name="timeStamp" value="264" /> </line-breakpoint> @@ -1728,7 +1628,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>527</line> + <line>525</line> <properties /> <option name="timeStamp" value="329" /> </line-breakpoint> @@ -1753,13 +1653,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>295</line> + <line>293</line> <properties /> <option name="timeStamp" value="449" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>275</line> + <line>273</line> <properties /> <option name="timeStamp" value="462" /> </line-breakpoint> @@ -1771,7 +1671,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>417</line> + <line>415</line> <properties /> <option name="timeStamp" value="470" /> </line-breakpoint> @@ -1787,12 +1687,6 @@ <properties /> <option name="timeStamp" value="509" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java</url> - <line>430</line> - <properties /> - <option name="timeStamp" value="510" /> - </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> @@ -1834,7 +1728,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.33333334"> <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" /> - <folding /> </state> </provider> </entry> @@ -1850,7 +1743,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="23" column="8" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="8" /> - <folding /> </state> </provider> </entry> @@ -1897,11 +1789,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="155" column="0" selection-start-line="155" selection-start-column="0" selection-end-line="155" selection-end-column="0" /> - <folding> - <element signature="e#2442#2443#0" expanded="false" /> - <element signature="e#2495#2496#0" expanded="false" /> - <element signature="e#5360#5361#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1932,7 +1819,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.06362672"> <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -1978,7 +1864,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.19088016"> <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> - <folding /> </state> </provider> </entry> @@ -1993,7 +1878,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.27888447"> <caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -2001,14 +1885,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="70" column="41" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="41" /> - <folding> - <element signature="e#0#3688#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3580#3581#0" expanded="false" /> - <element signature="e#3608#3609#0" expanded="false" /> - <element signature="e#3646#3647#0" expanded="false" /> - <element signature="e#3683#3684#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2043,9 +1919,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2053,18 +1927,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" /> - <folding> - <element signature="e#352#353#0" expanded="false" /> - <element signature="e#382#383#0" expanded="false" /> - <element signature="e#425#426#0" expanded="false" /> - <element signature="e#463#464#0" expanded="false" /> - <element signature="e#502#503#0" expanded="false" /> - <element signature="e#533#534#0" expanded="false" /> - <element signature="e#561#562#0" expanded="false" /> - <element signature="e#588#589#0" expanded="false" /> - <element signature="e#631#632#0" expanded="false" /> - <element signature="e#664#665#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2072,17 +1935,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="37" column="62" selection-start-line="37" selection-start-column="62" selection-end-line="37" selection-end-column="62" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#537#538#0" expanded="false" /> - <element signature="e#565#566#0" expanded="false" /> - <element signature="e#613#614#0" expanded="false" /> - <element signature="e#647#648#0" expanded="false" /> - <element signature="e#3023#3024#0" expanded="false" /> - <element signature="e#3069#3070#0" expanded="false" /> - <element signature="e#3123#3124#0" expanded="false" /> - <element signature="e#3157#3158#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2090,11 +1943,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="90" column="46" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#4640#4641#0" expanded="false" /> - <element signature="e#4670#4671#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2102,9 +1951,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="72" column="9" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2123,17 +1970,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="131" column="5" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#5621#5622#0" expanded="false" /> - <element signature="e#5687#5688#0" expanded="false" /> - <element signature="e#8176#8177#0" expanded="false" /> - <element signature="e#8207#8208#0" expanded="false" /> - <element signature="e#8263#8264#0" expanded="false" /> - <element signature="e#8293#8294#0" expanded="false" /> - <element signature="e#8327#8328#0" expanded="false" /> - <element signature="e#8360#8361#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2141,7 +1978,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.1992032"> <caret line="32" column="40" selection-start-line="32" selection-start-column="40" selection-end-line="32" selection-end-column="40" /> - <folding /> </state> </provider> </entry> @@ -2198,7 +2034,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-28.333334"> + <state vertical-scroll-proportion="0.0"> <caret line="916" column="0" selection-start-line="916" selection-start-column="0" selection-end-line="916" selection-end-column="0" /> <folding /> </state> @@ -2222,7 +2058,7 @@ </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="-7.111111"> + <state vertical-scroll-proportion="0.0"> <caret line="166" column="21" selection-start-line="166" selection-start-column="21" selection-end-line="166" selection-end-column="21" /> <folding /> </state> @@ -2267,89 +2103,33 @@ <folding> <element signature="e#0#17368#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#1732#1759#0" expanded="true" /> </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.2271605"> - <caret line="384" column="5" selection-start-line="384" selection-start-column="5" selection-end-line="384" selection-end-column="5" /> + <state vertical-scroll-proportion="0.3625498"> + <caret line="412" column="0" selection-start-line="412" selection-start-column="0" selection-end-line="412" selection-end-column="0" /> <folding> <element signature="e#0#15751#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#3351#3352#0" expanded="true" /> - <element signature="e#3388#3389#0" expanded="true" /> - <element signature="e#3447#3448#0" expanded="true" /> - <element signature="e#3499#3500#0" expanded="true" /> - <element signature="e#13641#13642#0" expanded="true" /> - <element signature="e#13693#13694#0" expanded="true" /> - <element signature="e#13752#13753#0" expanded="true" /> - <element signature="e#13806#13807#0" expanded="true" /> - <element signature="e#13857#13858#0" expanded="true" /> - <element signature="e#13903#13904#0" expanded="true" /> - <element signature="e#13934#13935#0" expanded="true" /> - <element signature="e#13960#13961#0" expanded="true" /> - <element signature="e#13991#13992#0" expanded="true" /> - <element signature="e#14017#14018#0" expanded="true" /> <element signature="e#14055#14056#0" expanded="true" /> <element signature="e#14092#14093#0" expanded="true" /> - <element signature="e#14131#14132#0" expanded="true" /> - <element signature="e#14169#14170#0" expanded="true" /> - <element signature="e#14204#14205#0" expanded="true" /> - <element signature="e#14238#14239#0" expanded="true" /> - <element signature="e#14263#14264#0" expanded="true" /> - <element signature="e#14287#14288#0" expanded="true" /> - <element signature="e#14312#14313#0" expanded="true" /> - <element signature="e#14336#14337#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.962963"> - <caret line="180" column="32" selection-start-line="180" selection-start-column="32" selection-end-line="180" selection-end-column="32" /> + <state vertical-scroll-proportion="0.8347107"> + <caret line="216" column="37" selection-start-line="216" selection-start-column="37" selection-end-line="216" selection-end-column="37" /> <folding> <element signature="imports" expanded="true" /> - <element signature="e#16946#16947#0" expanded="true" /> - <element signature="e#16987#16988#0" expanded="true" /> - <element signature="e#18487#18488#0" expanded="true" /> - <element signature="e#18513#18514#0" expanded="true" /> - <element signature="e#28178#28190#0" expanded="true" /> - <element signature="e#33390#33391#0" expanded="true" /> - <element signature="e#33425#33426#0" expanded="true" /> - <element signature="e#33508#33509#0" expanded="true" /> - <element signature="e#33550#33551#0" expanded="true" /> - <element signature="e#33607#33608#0" expanded="true" /> - <element signature="e#33632#33633#0" expanded="true" /> - <element signature="e#33666#33667#0" expanded="true" /> - <element signature="e#33698#33699#0" expanded="true" /> - <element signature="e#33741#33742#0" expanded="true" /> - <element signature="e#33770#33771#0" expanded="true" /> - <element signature="e#33819#33820#0" expanded="true" /> - <element signature="e#33863#33864#0" expanded="true" /> - <element signature="e#33916#33917#0" expanded="true" /> - <element signature="e#33960#33961#0" expanded="true" /> - <element signature="e#34017#34018#0" expanded="true" /> - <element signature="e#34065#34066#0" expanded="true" /> - <element signature="e#34523#34524#0" expanded="true" /> - <element signature="e#34567#34568#0" expanded="true" /> - <element signature="e#34638#34639#0" expanded="true" /> - <element signature="e#34700#34701#0" expanded="true" /> - <element signature="e#35295#35296#0" expanded="true" /> - <element signature="e#35319#35320#0" expanded="true" /> - <element signature="e#35344#35345#0" expanded="true" /> - <element signature="e#35368#35369#0" expanded="true" /> - <element signature="e#35403#35404#0" expanded="true" /> - <element signature="e#35437#35438#0" expanded="true" /> - <element signature="e#35473#35474#0" expanded="true" /> - <element signature="e#35508#35509#0" expanded="true" /> - <element signature="e#35543#35544#0" expanded="true" /> - <element signature="e#35577#35578#0" expanded="true" /> - <element signature="e#35612#35613#0" expanded="true" /> - <element signature="e#35643#35644#0" expanded="true" /> + <element signature="e#4748#7473#0" expanded="true" /> + <element signature="e#7472#7473#0" expanded="true" /> + <element signature="e#31644#31645#0" expanded="true" /> + <element signature="e#31694#31695#0" expanded="true" /> </folding> </state> </provider>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Feb 01 05:57:18 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Feb 01 15:42:27 2016 +0900 @@ -162,12 +162,11 @@ if (state != 1) { System.out.println("Client died " + myId); System.out.println("task stop"); - String rootHostName = null; int rootHostPort = 0; String myHostName = null; int myHostPort = 0; - + clients = myId; if (!isTreeManager) { rootHostName = getConnectionParam().getHostName(); rootHostPort = getConnectionParam().getPort(); @@ -178,7 +177,6 @@ } else { getTreeManager(intf).fixLostChild1(myId + 1); } - clients--; break; } }