# HG changeset patch # User Tatsuki IHA # Date 1444725916 -32400 # Node ID 845698fd6fb684f34c3ea22919c68e233cadf63f # Parent 28d67bbfa9f1c7202b821c4e34aa5774b1ea2c49 Remove synchronized diff -r 28d67bbfa9f1 -r 845698fd6fb6 .idea/workspace.xml --- a/.idea/workspace.xml Tue Oct 13 05:05:04 2015 +0900 +++ b/.idea/workspace.xml Tue Oct 13 17:45:16 2015 +0900 @@ -2,8 +2,6 @@ - - @@ -29,7 +27,7 @@ - + @@ -44,21 +42,11 @@ - - - - - - - - - - - + - - + + @@ -67,27 +55,32 @@ - - + + - - - - - + - - + + - + + + + + + + + + + @@ -97,7 +90,7 @@ - + @@ -108,7 +101,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,30 +159,26 @@ - - + + - - - - - - + + + + - - - - - - + + + + @@ -157,27 +191,61 @@ - - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + @@ -225,7 +293,7 @@ - + @@ -555,7 +623,6 @@ @@ -589,8 +657,9 @@ + @@ -616,7 +685,6 @@ - @@ -714,11 +782,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1010,7 +1177,7 @@ - + @@ -1029,9 +1196,9 @@ - + + - @@ -1089,7 +1256,7 @@ file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java - 486 + 489 @@ -1101,7 +1268,7 @@ file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java - 417 + 420 @@ -1155,18 +1322,6 @@ file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java - 60 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java - 64 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java 122 - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java - 37 - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java 42 - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java - 46 - - - - file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java - 369 - - - @@ -1392,9 +1529,6 @@ - - - @@ -1448,19 +1582,10 @@ - - - - - - - - - @@ -1468,7 +1593,6 @@ - @@ -1476,7 +1600,6 @@ - @@ -1492,7 +1615,6 @@ - @@ -1600,9 +1722,6 @@ - - - @@ -1610,7 +1729,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1621,30 +1785,26 @@ - - + + - - - - - - + + + + - - - - - - + + + + @@ -1653,11 +1813,6 @@ - - - - - @@ -1665,7 +1820,6 @@ - @@ -1673,7 +1827,6 @@ - @@ -1689,7 +1842,6 @@ - @@ -1704,19 +1856,10 @@ - - - - - - - - - @@ -1728,27 +1871,10 @@ - - - - - - - - - - - - - - - - - @@ -1756,6 +1882,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1771,78 +1955,60 @@ - + - + - + - + - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + - - - - - + + - + - - - - - - + + + - - + + + + diff -r 28d67bbfa9f1 -r 845698fd6fb6 src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Tue Oct 13 05:05:04 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Tue Oct 13 17:45:16 2015 +0900 @@ -49,10 +49,9 @@ unVisible(); } }); - startDisplayButton.addActionListener(new ActionListener() { @Override - public synchronized void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { cp.setDisplayMode(); findRoot.findRoot(); } diff -r 28d67bbfa9f1 -r 845698fd6fb6 src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Tue Oct 13 05:05:04 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Tue Oct 13 17:45:16 2015 +0900 @@ -73,8 +73,10 @@ v.startTreeViewer(hostName,cui, addSerialNum); // selected "Start as TreeVNC Root" for start selection panel - noConnection = true; - rootStart(args, v); + if (v.getRfb().getConnectionParam().isRootMode()) { + noConnection = true; + rootStart(args, v); + } } } } diff -r 28d67bbfa9f1 -r 845698fd6fb6 src/viewer_swing/java/com/glavsoft/viewer/Viewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Oct 13 05:05:04 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Oct 13 17:45:16 2015 +0900 @@ -366,7 +366,10 @@ cp.setHostName(hostName); } else { cp.findTreeVncRoot(); + + // selected "Start as TreeVNC Root" for start selection panel if (cp.isRootMode()) { + myRfb = rfb; return; } }