Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 418:0543c380308c
Move bottleneck Node to outside node list
author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
---|---|
date | Fri, 18 Dec 2015 13:48:21 +0900 |
parents | c225c7963778 |
children | 7e811f33b99d |
files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java |
diffstat | 3 files changed, 76 insertions(+), 99 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Mon Dec 14 16:20:20 2015 +0900 +++ b/.idea/workspace.xml Fri Dec 18 13:48:21 2015 +0900 @@ -2,11 +2,9 @@ <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/com/glavsoft/rfb/protocol/ReceiverTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ScreenChangeRequest.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/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/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -68,11 +66,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="481" column="0" selection-start-line="481" selection-start-column="0" selection-end-line="481" selection-end-column="0" /> - <folding> - <element signature="e#15666#15667#0" expanded="true" /> - <element signature="e#15691#15692#0" expanded="true" /> - <element signature="e#16329#16340#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -103,26 +97,25 @@ <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.38134205"> - <caret line="201" column="0" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" /> + <state vertical-scroll-proportion="0.700491"> + <caret line="252" column="48" selection-start-line="252" selection-start-column="48" selection-end-line="252" selection-end-column="48" /> <folding> <element signature="imports" expanded="true" /> - <element signature="e#27867#27879#0" expanded="true" /> - <element signature="e#35223#35224#0" expanded="true" /> - <element signature="e#35247#35248#0" expanded="true" /> - <element signature="e#35272#35273#0" expanded="true" /> - <element signature="e#35296#35297#0" expanded="true" /> - <element signature="e#35331#35332#0" expanded="true" /> - <element signature="e#35365#35366#0" expanded="true" /> - <element signature="e#35401#35402#0" expanded="true" /> - <element signature="e#35436#35437#0" expanded="true" /> - <element signature="e#35553#35554#0" expanded="true" /> - <element signature="e#35587#35588#0" expanded="true" /> </folding> </state> </provider> </entry> </file> + <file leaf-file-name="TreeManagement.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="133" column="10" selection-start-line="133" selection-start-column="10" selection-end-line="133" selection-end-column="10" /> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </split-first> <split-second> @@ -130,7 +123,7 @@ <file leaf-file-name="SwingNetworkConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-16.333334"> + <state vertical-scroll-proportion="0.0"> <caret line="175" column="39" selection-start-line="175" selection-start-column="39" selection-end-line="175" selection-end-column="39" /> <folding> <element signature="imports" expanded="true" /> @@ -162,14 +155,9 @@ <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.023510972"> - <caret line="870" column="0" selection-start-line="870" selection-start-column="0" selection-end-line="912" selection-end-column="40" /> - <folding> - <element signature="e#32602#33052#0" expanded="true" /> - <element signature="e#33051#33052#0" expanded="true" /> - <element signature="e#33227#33948#0" expanded="true" /> - <element signature="e#33947#33948#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.31034482"> + <caret line="889" column="0" selection-start-line="889" selection-start-column="0" selection-end-line="889" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -209,7 +197,7 @@ <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-21.037037"> + <state vertical-scroll-proportion="0.0"> <caret line="360" column="77" selection-start-line="360" selection-start-column="77" selection-end-line="360" selection-end-column="77" /> <folding> <element signature="e#0#17911#0" expanded="true" /> @@ -559,16 +547,17 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CheckDelayReply.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.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/ScreenChangeRequest.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="4" /> - <option name="y" value="23" /> + <option name="x" value="1956" /> + <option name="y" value="54" /> <option name="width" value="1916" /> <option name="height" value="1057" /> </component> @@ -597,7 +586,9 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scratches" /> <pane id="Scope" /> + <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -912,8 +903,6 @@ </PATH> </subPane> </pane> - <pane id="Scratches" /> - <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -933,7 +922,7 @@ <property name="settings.editor.selected.configurable" value="preferences.editor" /> <property name="settings.editor.splitter.proportion" value="0.2" /> </component> - <component name="RunManager" selected="Application.TreeeViewer -d"> + <component name="RunManager" selected="Application.TreeeViewer -d --checkDelay"> <configuration default="false" name="TreeViewer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> <pattern> @@ -1348,8 +1337,8 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="1916" height="1057" extended-state="6" /> - <editor active="false" /> + <frame x="1956" y="54" width="1916" height="1057" extended-state="0" /> + <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" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> @@ -1368,7 +1357,7 @@ <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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30769232" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30769232" 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" /> @@ -1453,7 +1442,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>532</line> + <line>540</line> <properties /> <option name="timeStamp" value="76" /> </line-breakpoint> @@ -1561,13 +1550,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>960</line> + <line>968</line> <properties /> <option name="timeStamp" value="186" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>980</line> + <line>988</line> <properties /> <option name="timeStamp" value="187" /> </line-breakpoint> @@ -1621,13 +1610,13 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>964</line> + <line>972</line> <properties /> <option name="timeStamp" value="209" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>498</line> + <line>506</line> <properties /> <option name="timeStamp" value="212" /> </line-breakpoint> @@ -1639,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>991</line> + <line>999</line> <properties /> <option name="timeStamp" value="217" /> </line-breakpoint> @@ -1651,7 +1640,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>824</line> + <line>832</line> <properties /> <option name="timeStamp" value="230" /> </line-breakpoint> @@ -1681,7 +1670,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>646</line> + <line>654</line> <properties /> <option name="timeStamp" value="264" /> </line-breakpoint> @@ -1711,7 +1700,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>743</line> + <line>751</line> <properties /> <option name="timeStamp" value="290" /> </line-breakpoint> @@ -1735,15 +1724,21 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> - <line>206</line> + <line>208</line> <properties /> <option name="timeStamp" value="304" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>253</line> + <properties /> + <option name="timeStamp" value="308" /> + </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="308" /> + <option name="time" value="309" /> </breakpoint-manager> <watches-manager /> </component> @@ -1752,13 +1747,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/ClientToServerMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.10477299"> - <caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/MessageQueue.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -1892,7 +1880,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.22648084"> <caret line="39" column="25" selection-start-line="39" selection-start-column="25" selection-end-line="39" selection-end-column="25" /> - <folding /> </state> </provider> </entry> @@ -1943,7 +1930,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" /> - <folding /> </state> </provider> </entry> @@ -1975,7 +1961,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.020188425"> <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -1983,9 +1968,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2045,7 +2027,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.20134228"> <caret line="36" column="9" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" /> - <folding /> </state> </provider> </entry> @@ -2062,7 +2043,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-16.333334"> + <state vertical-scroll-proportion="0.0"> <caret line="175" column="39" selection-start-line="175" selection-start-column="39" selection-end-line="175" selection-end-column="39" /> <folding> <element signature="imports" expanded="true" /> @@ -2133,7 +2114,7 @@ </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="-21.037037"> + <state vertical-scroll-proportion="0.0"> <caret line="360" column="77" selection-start-line="360" selection-start-column="77" selection-end-line="360" selection-end-column="77" /> <folding> <element signature="e#0#17911#0" expanded="true" /> @@ -2144,48 +2125,36 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="133" column="10" selection-start-line="133" selection-start-column="10" selection-end-line="133" selection-end-column="10" /> + <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.0"> <caret line="481" column="0" selection-start-line="481" selection-start-column="0" selection-end-line="481" selection-end-column="0" /> - <folding> - <element signature="e#15666#15667#0" expanded="true" /> - <element signature="e#15691#15692#0" expanded="true" /> - <element signature="e#16329#16340#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.023510972"> - <caret line="870" column="0" selection-start-line="870" selection-start-column="0" selection-end-line="912" selection-end-column="40" /> - <folding> - <element signature="e#32602#33052#0" expanded="true" /> - <element signature="e#33051#33052#0" expanded="true" /> - <element signature="e#33227#33948#0" expanded="true" /> - <element signature="e#33947#33948#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.31034482"> + <caret line="889" column="0" selection-start-line="889" selection-start-column="0" selection-end-line="889" selection-end-column="0" /> + <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.38134205"> - <caret line="201" column="0" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" /> + <state vertical-scroll-proportion="0.700491"> + <caret line="252" column="48" selection-start-line="252" selection-start-column="48" selection-end-line="252" selection-end-column="48" /> <folding> <element signature="imports" expanded="true" /> - <element signature="e#27867#27879#0" expanded="true" /> - <element signature="e#35223#35224#0" expanded="true" /> - <element signature="e#35247#35248#0" expanded="true" /> - <element signature="e#35272#35273#0" expanded="true" /> - <element signature="e#35296#35297#0" expanded="true" /> - <element signature="e#35331#35332#0" expanded="true" /> - <element signature="e#35365#35366#0" expanded="true" /> - <element signature="e#35401#35402#0" expanded="true" /> - <element signature="e#35436#35437#0" expanded="true" /> - <element signature="e#35553#35554#0" expanded="true" /> - <element signature="e#35587#35588#0" expanded="true" /> </folding> </state> </provider>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java Mon Dec 14 16:20:20 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java Fri Dec 18 13:48:21 2015 +0900 @@ -41,7 +41,7 @@ * @param nodeNum * parent value */ - private void moveLastNodeToLostNodePosition(int nodeNum) { + public void moveLastNodeToLostNodePosition(int nodeNum) { nodeList.remove(nodeNum); if (nodeNum != nodeList.size()) { TreeVNCNode node = nodeList.removeLast(); @@ -131,7 +131,7 @@ * send reconnect to all children * @param deadNode */ - private void lostNodeConnection(TreeVNCNode deadNode) { + public void lostNodeConnection(TreeVNCNode deadNode) { if (nodeList.size() < deadNode.getTreeNum()+1) { return; }
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Dec 14 16:20:20 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Fri Dec 18 13:48:21 2015 +0900 @@ -51,6 +51,7 @@ private TreeVNCNetwork nets = new TreeVNCNetwork(); private TreeVncRootSelectionPanel rootSelectionPanel; private String vncInterface; + private TreeManagement treeManager; public LinkedList<TreeVNCNode> nodeList; protected boolean readyReconnect = false; @@ -85,6 +86,7 @@ private int x; private int y; + public TreeRFBProto(boolean isTreeManager, ViewerInterface viewer) { rThread = new RequestScreenThread(this); nets.setMyRfb(this); @@ -248,6 +250,12 @@ String address = new String(byteAddress, "UTF-8"); int nodeNum = getNodeNum(port, address); Long delay = System.currentTimeMillis() - time; + if (delay > 3000) { + TreeVNCNode deadNode = nodeList.get(nodeNum); + treeManager.moveLastNodeToLostNodePosition(deadNode.getTreeNum()); + treeManager.lostNodeConnection(deadNode); + treeManager.showTreeNode(); + } System.out.println(System.currentTimeMillis() + " : receive checkDelay : nodeNum" + nodeNum + ", port : " + port + ", address : " + address + ", delay : " + delay + ", size : " + dataLen); } // case of client node. @@ -799,9 +807,9 @@ } public TreeManagement getTreeManager(String intf) { - TreeManagement tm = nets.getTreeManager(intf); - this.nodeList = tm.getList(); - return tm; + this.treeManager = nets.getTreeManager(intf); + this.nodeList = treeManager.getList(); + return treeManager; } /**