Mercurial > hg > Applications > TreeVNC

changeset 141:1fa40e04f099

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author oc
date Thu, 12 Jun 2014 05:38:36 +0900
parents ba30010d0dd1
children d2af9edb1803
files src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java src/main/java/jp/ac/u_ryukyu/treevnc/client/FindRoot.java src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java
diffstat 3 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java	Wed Jun 11 18:07:20 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java	Thu Jun 12 05:38:36 2014 +0900
@@ -20,14 +20,8 @@
 	public void findTreeVncRoot() throws InterruptedException {
 		FindRoot getBcast = new FindRoot(rfb.acceptPort,this);
 		getBcast.findRoot();
-
 		// wait for RootSelection
-		Thread runBcast = new Thread (getBcast, "TreeVNC-root-finder");
-		runBcast.start();
-		hostName = getBcast.textAddress();
-		portNumber = Integer.parseInt(getBcast.textPort());
-	    getBcast.interrupt();
-
+		wait();
 	}
 
 	/**
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/FindRoot.java	Wed Jun 11 18:07:20 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/FindRoot.java	Thu Jun 12 05:38:36 2014 +0900
@@ -25,7 +25,6 @@
     private ServerSocket server = null;
     private BufferedReader is;
     private int port;
-    private int port_server_socket = ConnectionParams.DEFAULT_VNC_FIND_ROOT_REPLY;
     private boolean stopFlag;
     private TreeVncRootSelectionPanel rootSelectionPanel = new TreeVncRootSelectionPanel();
     private String proxyAddr;
@@ -44,7 +43,6 @@
 
 	public void createSocket() {		
 		try {
-			server = new ServerSocket(port_server_socket);
 			mAddr = InetAddress.getByName(TreeRootFinderListener.McastAddr);
 			soc = new MulticastSocket();
 			soc.setTimeToLive(1);
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java	Wed Jun 11 18:07:20 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java	Thu Jun 12 05:38:36 2014 +0900
@@ -35,7 +35,6 @@
 	public static final int DEFAULT_RFB_PORT = 5900;
     public static final int DEFAULT_VNC_ROOT = 5950;
     public static final int DEFAULT_VNC_ROOT_FINDER = DEFAULT_RFB_PORT;
-    public static final int DEFAULT_VNC_FIND_ROOT_REPLY = 5940;
 
     
 	public String hostName;