diff src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java @ 382:37eb97a23dcf

add variable(is,os) to changeVNCServer
author kkb
date Fri, 04 Sep 2015 15:46:11 +0900
parents b6665f7f18d1
children 7d55adebcacb
line wrap: on
line diff
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Thu Sep 03 19:44:39 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Fri Sep 04 15:46:11 2015 +0900
@@ -106,28 +106,7 @@
     protected void done() { // EDT
         try {
             get();
-            presenter.showMessage("Handshake established");
-            presenter.newVNCConnection(workingProtocol);
-            ClipboardControllerImpl clipboardController;
-            if(!myRfb.getCuiVersion())
-                clipboardController = new ClipboardControllerImpl(workingProtocol, rfbSettings.getRemoteCharsetName());
-            else 
-                clipboardController = new ClipboardControllerImpl(workingProtocol, "cui");
-            clipboardController.setEnabled(rfbSettings.isAllowClipboardTransfer());
-            rfbSettings.addListener(clipboardController);
-            if(!myRfb.getCuiVersion())
-                viewerWindow = viewerWindowFactory.createViewerWindow(workingProtocol, rfbSettings, uiSettings, connectionString, presenter);
-            myRfb.setProtocolContext(workingProtocol);
-            workingProtocol.startNormalHandling(this,viewerWindow.getSurface(), clipboardController, myRfb);
-            presenter.showMessage("Started");
-
-            if(!myRfb.getCuiVersion())
-                presenter.successfulRfbConnection();
-            // hide VNC server's view to prevent video feed back. 
-            if (myRfb.hasViewer()) {
-                viewerWindow.setVisible(true);
-                viewerWindow.zoomToFit();
-            }
+            startVNCConnection();
 
         } catch (CancellationException e) {
             logger.info("Cancelled");
@@ -180,6 +159,31 @@
         }
     }
 
+    public void startVNCConnection() {
+        presenter.showMessage("Handshake established");
+        presenter.newVNCConnection(workingProtocol);
+        ClipboardControllerImpl clipboardController;
+        if(!myRfb.getCuiVersion())
+            clipboardController = new ClipboardControllerImpl(workingProtocol, rfbSettings.getRemoteCharsetName());
+        else
+            clipboardController = new ClipboardControllerImpl(workingProtocol, "cui");
+        clipboardController.setEnabled(rfbSettings.isAllowClipboardTransfer());
+        rfbSettings.addListener(clipboardController);
+        if(!myRfb.getCuiVersion())
+            viewerWindow = viewerWindowFactory.createViewerWindow(workingProtocol, rfbSettings, uiSettings, connectionString, presenter);
+        myRfb.setProtocolContext(workingProtocol);
+        workingProtocol.startNormalHandling(this,viewerWindow.getSurface(), clipboardController, myRfb);
+        presenter.showMessage("Started");
+
+        if(!myRfb.getCuiVersion())
+            presenter.successfulRfbConnection();
+        // hide VNC server's view to prevent video feed back.
+        if (myRfb.hasViewer()) {
+            viewerWindow.setVisible(true);
+            viewerWindow.zoomToFit();
+        }
+    }
+
     @Override
     public void rfbSessionStopped(final String reason) {
         if (workingProtocol != null) {