Mercurial > hg > trac > TreeVNC > TreeVNC

changeset 89:1503a373ab73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
close client correctly in -d mode.
author oc
date Fri, 09 May 2014 19:20:33 +0900
parents a719aa609e14
children a40b887a9234
files build.gradle src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/com/glavsoft/transport/Reader.java src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java
diffstat 6 files changed, 13 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Thu May 01 19:12:05 2014 +0900
+++ b/build.gradle	Fri May 09 19:20:33 2014 +0900
@@ -1,8 +1,8 @@
 apply plugin:'java'
 apply plugin: 'eclipse'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 version = '2.7.2'
 
 project.ext.baseName = 'tightvnc-jviewer'
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Thu May 01 19:12:05 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Fri May 09 19:20:33 2014 +0900
@@ -269,15 +269,11 @@
 		rfb.setReadyReconnect(true);
 	}
 	
-	private void getLost(Reader reader) {
-		try {
-			long num = reader.readInt64();
-			if(num != ++checkCounter) {
-				System.out.println("LostData" + (num - checkCounter));
-				checkCounter = num;
-			}
-		} catch (TransportException e) {
-			e.printStackTrace();
+	private void getLost(Reader reader) throws Exception {
+		long num = reader.readInt64();
+		if(num != ++checkCounter) {
+			System.out.println("LostData" + (num - checkCounter));
+			checkCounter = num;
 		}
 	}
 }
--- a/src/main/java/com/glavsoft/transport/Reader.java	Thu May 01 19:12:05 2014 +0900
+++ b/src/main/java/com/glavsoft/transport/Reader.java	Fri May 09 19:20:33 2014 +0900
@@ -171,15 +171,10 @@
 		is.mark(readLimit);
 	}
 
-	public int readByte(byte[] b) throws TransportException {
+	public int readByte(byte[] b) throws IOException {
 		int result = 0;
-		try {
-			result = is.read(b);
-			return result;
-		} catch (IOException e) {
-			return 0;
-//			throw new TransportException("Cannot readByte", e);
-		}
+		result = is.read(b);
+		return result;
 	}
 
 	public void close() throws TransportException {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Thu May 01 19:12:05 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Fri May 09 19:20:33 2014 +0900
@@ -102,7 +102,7 @@
 						if (c <= 0)
 							throw new IOException();
 						// System.out.println("client read "+c);
-					} catch (IOException e) {
+					} catch (Exception e) {
 						try {
 							writerRunning.set(2);
 							os.close();
@@ -113,8 +113,6 @@
 							e1.printStackTrace();
 						}
 						return;
-					} catch (TransportException e) {
-						e.printStackTrace();
 					}
 				}
 			}
@@ -161,15 +159,13 @@
 						writeToClient(os, bufs, inputIndex);
 						writerRunning.set(1); // yes my client is awaking.
 					}
-				} catch (IOException e) {
+				} catch (Exception e) {
 					try {
 						writerRunning.set(2);
 						os.close();
 					} catch (IOException e1) {
 					}
 					/* if socket closed cliList.remove(newCli); */
-				} catch (TransportException e) {
-					e.printStackTrace();
 				}
 			}
 
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Thu May 01 19:12:05 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Fri May 09 19:20:33 2014 +0900
@@ -60,7 +60,6 @@
 			} else if ("--retina".equals(args[i])) {
 				// retina display too large for TreeVNC.
 				// restrict display size.
-				treeProxy = true;
 				width = 1280;
 				height = 800;
 			} else if ("--width".equals(args[i])) {
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Thu May 01 19:12:05 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Fri May 09 19:20:33 2014 +0900
@@ -236,7 +236,7 @@
         
         connectionPresenter.setConnectionWorkerFactory(
                 new SwingConnectionWorkerFactory(connectionView.getFrame(), passwordFromParams, connectionPresenter, viewerWindowFactory, myRfb));
-
+        connectionPresenter.setNeedReconnection(!noConnection);
         connectionPresenter.startConnection(settings, uiSettings, paramsMask);
 	}