# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1404485457 -32400
# Node ID 619abe65e4ff37716ee7bb3189fcd0bd6fef8ad0
# Parent  1edc11b2e8e62d396326b07305300fb479fdfa52
minor fix

diff -r 1edc11b2e8e6 -r 619abe65e4ff src/main/java/jp/ac/u_ryukyu/treevnc/MyVncClient.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/MyVncClient.java	Fri Jul 04 23:35:42 2014 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-package jp.ac.u_ryukyu.treevnc;
-
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.util.logging.Logger;
-
-import com.glavsoft.core.SettingsChangedEvent;
-import com.glavsoft.rfb.IChangeSettingsListener;
-import com.glavsoft.rfb.IRfbSessionListener;
-import com.glavsoft.rfb.protocol.ProtocolSettings;
-import com.glavsoft.viewer.Viewer;
-import com.glavsoft.viewer.cli.Parser;
-import com.glavsoft.viewer.swing.ParametersHandler;
-
-// "Viewer.java" location is src/viewer_swing/java/com/glavsoft/viewer.
-public class MyVncClient extends Viewer implements IRfbSessionListener,
-	WindowListener, IChangeSettingsListener {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	public static Logger logger = Logger.getLogger("com.glavsoft");
-	private final ProtocolSettings settings;
-	
-	
-	public MyVncClient() {
-		settings = ProtocolSettings.getDefaultSettings();
-		//treeConnectionManager = new TreeConnectionManager(this, isApplet);
-	}
-	
-	public MyVncClient(Parser parser) {
-		this();
-		ParametersHandler.completeSettingsFromCLI(parser, connectionParams, settings, uiSettings);
-		passwordFromParams = parser.getValueFor(ParametersHandler.ARG_PASSWORD);
-		logger.info("TightVNC Viewer version " + ver());
-		isApplet = false;
-	}
-
-	public void treeVncClient(String[] argv) {
-		new MyVncClient();
-	}
-
-	public static void main(String[] argv) {
-		String[] mainArgs = argv;
-		System.out.println(mainArgs.length);
-		Parser parser = new Parser();
-		ParametersHandler.completeParserOptions(parser);
-
-		parser.parse(argv);
-		if (parser.isSet(ParametersHandler.ARG_HELP)) {
-			printUsage(parser.optionsUsage());
-			System.exit(0);
-		}
-		MyVncClient myClient = new MyVncClient(parser);
-		new Thread(myClient).start();
-	}
-	
-	public void startClient(String[] argv) {
-		String[] mainArgs = argv;
-		System.out.println(mainArgs.length);
-		Parser parser = new Parser();
-		ParametersHandler.completeParserOptions(parser);
-
-		parser.parse(argv);
-		if (parser.isSet(ParametersHandler.ARG_HELP)) {
-			Viewer.printUsage(parser.optionsUsage());
-			System.exit(0);
-		}
-		MyVncClient myClient = new MyVncClient(parser);
-		new Thread(myClient).start();
-	}
-	
-
-	@Override
-	public void windowClosing(WindowEvent e) {
-		if (e != null && e.getComponent() != null) {
-			e.getWindow().setVisible(false);
-		}
-		closeApp();
-	}
-
-	@Override
-	public void windowActivated(WindowEvent e) { /*nop*/ }
-
-	@Override
-	public void windowClosed(WindowEvent e) { /*nop*/ }
-
-	@Override
-	public void windowDeactivated(WindowEvent e) { /*nop*/ }
-
-	@Override
-	public void windowDeiconified(WindowEvent e) { /*nop*/ }
-
-	@Override
-	public void windowIconified(WindowEvent e) { /*nop*/ }
-
-	@Override
-	public void windowOpened(WindowEvent e) { /*nop*/ }
-
-	@Override
-	public void settingsChanged(SettingsChangedEvent event) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void rfbSessionStopped(String reason) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff -r 1edc11b2e8e6 -r 619abe65e4ff src/viewer_swing/java/com/glavsoft/viewer/Viewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri Jul 04 23:35:42 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri Jul 04 23:50:57 2014 +0900
@@ -363,10 +363,6 @@
     public void proxyStart(String[] argv, int width, int height, boolean showTree) {
     	fbWidth = width;
     	this.showTree = showTree;
-    	proxyStart(argv, showTree);
-    }
-
-    public void proxyStart(String[] argv, boolean showTree) {
         // input into arguments Decision
         Parser parser = new Parser();
         ParametersHandler.completeParserOptions(parser);
@@ -382,7 +378,7 @@
         rfb.setShowTree(showTree);
         rfb.setViewer(this);
         rfb.setCuiVersion(false);
-        rfb.setHasViewer(true);
+        rfb.setHasViewer(true); // this flag will be overwrited after this method. Do we have to set here?
         rfb.createConnectionAndStart(this);
         setIsTreeVNC(true);
         connectionParams.setConnectionParam(hostname, vncport);