Mercurial > hg > Members > riono > TreeVNC_ja_comment

changeset 489:f06b0d50e4e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author oshiro
date Wed, 30 Jan 2019 19:20:57 +0900
parents 101b8a3ed8e4 (diff) 59cde26249b1 (current diff)
children 141f627665ab
files .idea/compiler.xml .idea/gradle.xml .idea/misc.xml
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java	Wed Jan 30 18:59:13 2019 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java	Wed Jan 30 19:20:57 2019 +0900
@@ -111,10 +111,10 @@
         rfb.setId(id);
         rfb.setMyAddress(myHostName);
         rfb.setLeader(leader);
-        if (rfb.isTreeManager()) {
+        //if (rfb.isTreeManager()) {
             // markers tree root has a parent on a different network.
-            rfb.setId((short) -1);
-        }
+        //    rfb.setId((short) -1);
+        //}
         try {
             rfb.getViewer().connectToParenet(port, hostname);
         } catch (IOException e) {
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Wed Jan 30 18:59:13 2019 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Wed Jan 30 19:20:57 2019 +0900
@@ -226,6 +226,7 @@
         final boolean hasJsch = checkJsch();
         final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet;
         connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive);
+        connectionPresenter.setReconnectingId(myRfb.getId());
         connectionPresenter.setNoConnection(noConnection);
         connectionPresenter.addModel("ConnectionParamsModel", connectionParams);
         connectionPresenter.startVNCConnection(this, false, null, null);
@@ -388,6 +389,10 @@
                 return;
             }
         }
+
+        if (rfb.isTreeManager()) {
+            rfb.setId((short) rfb.getNewNodeId());
+        }
         cp.sendWhereToConnect(this);
         isTreeVNC = true;
         myRfb =  rfb;