diff src/viewer_swing/java/com/glavsoft/viewer/Viewer.java @ 177:8019a393875a

proxy reorganization root display panel is not opened yet
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sun, 22 Jun 2014 16:48:38 +0900
parents fa6cfb85444e
children 34b7558aeffa
line wrap: on
line diff
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Sun Jun 22 15:08:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Sun Jun 22 16:48:38 2014 +0900
@@ -41,7 +41,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.Socket;
-import java.net.UnknownHostException;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import java.util.logging.*;
@@ -292,6 +291,7 @@
 	public void startTreeViewer(String hostName,boolean cui) {
 		MyRfbProtoClient rfb = new MyRfbProtoClient();
 		rfb.setCuiVersion(cui);
+        rfb.createConnectionAndStart(this);
 		CreateConnectionParam cp = new CreateConnectionParam(rfb);
 		if (hostName!=null) {
 		    cp.setHostName(hostName);
@@ -303,8 +303,7 @@
 		        return;
 		    }
 		}
-		rfb.createConnectionAndStart(this);
-		cp.createConnectionParam(this);
+		cp.sendWhereToConnect(this);
 		isTreeVNC = true;
 		rfb.setViewer(this);
 		myRfb =  rfb;
@@ -348,20 +347,6 @@
 	}
 
     @Override
-    public void changeVNCServer(String newHostName, int i, int j, short id) throws UnknownHostException, IOException, InterruptedException {
-        myRfb.changeVNCServer(this, newHostName, i, j, id);
-    }
-
-    @Override
-    public void initRoot(String hostName, MyRfbProto myRfb) {
-        isApplet = false;
-        setIsTreeVNC(true);
-        setConnectionParam(hostName,ConnectionParams.DEFAULT_RFB_PORT);
-        isApplet = true;
-        run();
-    }
-
-    @Override
     public void initRootViewer(String hostName) {
         isApplet = false;
         setIsTreeVNC(true);