Mercurial > hg > trac > TreeVNC > TreeVNC

changeset 83:40d400a7ec84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove warnings
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 30 Apr 2014 18:07:20 +0900
parents cc72fdbb7c72
children c063d32fd983
files src/main/java/com/glavsoft/rfb/protocol/state/InitState.java src/main/java/jp/ac/u_ryukyu/treevnc/client/WaitReply.java src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java src/main/java/jp/ac/u_ryukyu/treevnc/server/GetBroadCastProxy.java src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ReconnectionRequest.java src/viewer_swing/java/com/glavsoft/viewer/CancelConnectionException.java src/viewer_swing/java/com/glavsoft/viewer/ConnectionErrorException.java src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java src/viewer_swing/java/com/glavsoft/viewer/cli/Parser.java src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java src/viewer_swing/java/com/glavsoft/viewer/swing/ParametersHandler.java src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java src/viewer_swing/java/com/glavsoft/viewer/swing/WrongParameterException.java
diffstat 18 files changed, 42 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java	Wed Apr 30 18:07:20 2014 +0900
@@ -33,8 +33,6 @@
 import com.glavsoft.rfb.protocol.ProtocolContext;
 import com.glavsoft.rfb.protocol.ProtocolSettings;
 
-import java.util.logging.Logger;
-
 /**
  * ClientInit
  *
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/WaitReply.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/WaitReply.java	Wed Apr 30 18:07:20 2014 +0900
@@ -1,6 +1,5 @@
 package jp.ac.u_ryukyu.treevnc.client;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.BindException;
 import java.net.ServerSocket;
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Wed Apr 30 18:07:20 2014 +0900
@@ -12,7 +12,6 @@
 	private boolean addrRegistor = true;
 	// private int passNumber=0,numberZone;
 	boolean runflag = false;
-	private int passCheck = 0;
 	private final int treebranch = 2;
 	private String newparent, request, myAddress;
 	private String leaderflag = "0", sendleaderflag = "0";
@@ -146,7 +145,6 @@
 		}
 		replyNodeInformation(port);
 		nodeCounter--;
-		passCheck = 1;
 		reportLastNode(lastNode, newparent, port, String.valueOf(parentnum), sendleaderflag);
 		listupdate(port);
 		if(lastNode != checkSameHost) {
@@ -236,10 +234,8 @@
 	void reportLastNode(String newchild, String newparent, String newtreenum,
 			String newpnum, String newleaderflag) throws IOException {
 		try {
-			Socket echoSocket;
 			System.out.println(newchild + "connect");
-			// echoSocket = new Socket(newchild, 10001 + (i + 1));
-			echoSocket = new Socket(newchild, 10001);
+			Socket echoSocket = new Socket(newchild, 10001);
 			DataOutputStream os = new DataOutputStream(echoSocket.getOutputStream());
 			BufferedReader is = new BufferedReader(new InputStreamReader(echoSocket.getInputStream()));
 			os.writeBytes(newparent + "\n");
@@ -251,6 +247,7 @@
 			is.readLine();
 			is.close();
 			os.close();
+			echoSocket.close();
 		} catch (UnknownHostException e) {
 			System.err.println("Don't know about host: localhost");
 		} catch (IOException e) {
@@ -292,19 +289,6 @@
 		replyLeaderNode(os, is, port, treeNum);
 	}
 
-	private void waitThread() {
-		final int TIMEOUT = 3000;
-		try {
-			wait(TIMEOUT);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void notifyThread() {
-		notifyAll();
-	}
-
 	public LinkedList<String> getList() {
 		return ls;
 	}
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/GetBroadCastProxy.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/GetBroadCastProxy.java	Wed Apr 30 18:07:20 2014 +0900
@@ -1,6 +1,5 @@
 package jp.ac.u_ryukyu.treevnc.server;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.DatagramPacket;
@@ -17,7 +16,6 @@
 public class GetBroadCastProxy implements Runnable {
 	public static final String McastAddr = "224.0.0.1";
 	static final int BufSize = 1024;
-	private ByteArrayInputStream inputStream;
 	private boolean stopFlag = false;
 	private VncProxyService vps;
 	public static String MULTICAST_FIND_TREEVNC_ROOT = "TREEVNC-who:";
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/MyRfbProtoProxy.java	Wed Apr 30 18:07:20 2014 +0900
@@ -14,6 +14,7 @@
 import com.glavsoft.rfb.encoding.EncodingType;
 import com.glavsoft.transport.Reader;
 import com.glavsoft.transport.Writer;
+
 import java.util.concurrent.ExecutorService;
 import java.util.zip.DataFormatException;
 import java.util.zip.Deflater;
@@ -65,7 +66,6 @@
 	private int rangeY = 256; // screenRange YPosition
 	private int rangeWidth = 512; // screenRange Width
 	private int rangeHeight = 256; // screenRange Height
-	private int i = 0;  //chekc_delay use in to readandsend.
 	private int counter = 0; // add serialnum.
 	
 	public MyRfbProtoProxy() {
@@ -347,27 +347,6 @@
 		// But we have do inflation for all input data, so we have to do it
 		// here.
 	}
-	
-	/**
-	 * 
-	 * @param header image position.
-	 * @return 0 notsend. 
-	 * 		   1 Send image as it is.
-	 * 		   2 Transmission by processing the image 
-	 */
-	private int checkScreenRange(ByteBuffer header) {
-		if(rangeWidth==0) // if image width set, rangeWidth not 0;
-			return 1;
-		if(header.getShort(4) > rangeX  +rangeWidth)
-			return 0;
-		if(header.getShort(6) > rangeY + rangeHeight) 
-			return 0;
-		if(header.getShort(4) >= rangeX && header.getShort(4)+header.getShort(8) < rangeX+rangeWidth)
-			return 1;
-		if(header.getShort(6) >= rangeX && header.getShort(6)+header.getShort(10) < rangeX+rangeWidth)
-			return 1;
-		return 2;
-	}
 
 	public void dump32(LinkedList<ByteBuffer> bufs) {
 		int len = 0;
@@ -571,7 +550,8 @@
 	}
 	*/
 	
-	private void testScreenSize(LinkedList<ByteBuffer> list, ByteBuffer header) {
+	@SuppressWarnings("unused")
+    private void testScreenSize(LinkedList<ByteBuffer> list, ByteBuffer header) {
 		int block = (64*64*3)+1; // size of one-block.
 		int skip; // skip-byte
 		int xBlock = (header.getShort(8)-header.getShort(4))/64; //xBlockNum
@@ -603,7 +583,8 @@
 
 	}
 	
-	private void createHeader(ByteBuffer buf) {
+	@SuppressWarnings("unused")
+    private void createHeader(ByteBuffer buf) {
 			buf.putShort(4, (short)256);	
 			buf.putShort(6, (short)256);
 			buf.putShort(8, (short)512);	
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ReconnectionRequest.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ReconnectionRequest.java	Wed Apr 30 18:07:20 2014 +0900
@@ -31,6 +31,7 @@
 				os.writeBytes("reconnection\n");
 				os.writeBytes(port+"\n");
 				os.close();
+				echoSocket.close();
 			}
 			i++;
 		}
--- a/src/viewer_swing/java/com/glavsoft/viewer/CancelConnectionException.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/CancelConnectionException.java	Wed Apr 30 18:07:20 2014 +0900
@@ -31,6 +31,11 @@
  */
 public class CancelConnectionException extends CommonException {
 
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -3237565322958563096L;
+
     public CancelConnectionException(String message) {
         super(message);
     }
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionErrorException.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionErrorException.java	Wed Apr 30 18:07:20 2014 +0900
@@ -31,6 +31,11 @@
  */
 public class ConnectionErrorException extends CommonException {
 
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public ConnectionErrorException(String message) {
         super(message);
     }
--- a/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java	Wed Apr 30 18:07:20 2014 +0900
@@ -24,10 +24,8 @@
 
 package com.glavsoft.viewer;
 
-import com.glavsoft.rfb.protocol.Protocol;
 import com.glavsoft.rfb.protocol.ProtocolSettings;
 
-import javax.swing.*;
 import java.net.Socket;
 
 /**
--- a/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java	Wed Apr 30 18:07:20 2014 +0900
@@ -42,7 +42,6 @@
 	public static final int MAX_SCALE_PERCENT = 500;
     private static final int SCALE_PERCENT_ZOOMING_STEP = 10;
 	
-	@SuppressWarnings("PointlessBitwiseExpression")
     public static final int CHANGED_SCALE_FACTOR = 1 << 0;
     public static final int CHANGED_MOUSE_CURSOR_SHAPE = 1 << 1;
     public static final int CHANGED_FULL_SCREEN = 1 << 2;
--- a/src/viewer_swing/java/com/glavsoft/viewer/cli/Parser.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/cli/Parser.java	Wed Apr 30 18:07:20 2014 +0900
@@ -89,11 +89,10 @@
 	 * Command line interface option
 	 */
 	private static class Option {
-		protected String opName, defaultValue, desc, value;
+		protected String opName, desc, value;
 		protected boolean isSet = false;
 		public Option(String opName, String defaultValue, String desc) {
 			this.opName = opName;
-			this.defaultValue = defaultValue;
 			this.desc = desc;
 			this.value = defaultValue;
 		}
--- a/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java	Wed Apr 30 18:07:20 2014 +0900
@@ -227,6 +227,11 @@
     }
 
     protected class PropertyNotFoundException extends CommonException {
+        /**
+         * 
+         */
+        private static final long serialVersionUID = 1L;
+
         public PropertyNotFoundException(String message) {
             super(message);
         }
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/ParametersHandler.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/ParametersHandler.java	Wed Apr 30 18:07:20 2014 +0900
@@ -64,6 +64,7 @@
     public static boolean allowAppletInteractiveConnections;
 	public static Object showControls;
 
+    @SuppressWarnings("unused")
     public static void completeParserOptions(Parser parser) {
 		parser.addOption(ARG_HELP, null, "Print this help.");
 		parser.addOption(ARG_HOST, "", "Server host name.");
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java	Wed Apr 30 18:07:20 2014 +0900
@@ -34,7 +34,6 @@
 import com.glavsoft.rfb.protocol.ProtocolSettings;
 import com.glavsoft.transport.Reader;
 import com.glavsoft.viewer.UiSettings;
-import com.glavsoft.viewer.Viewer;
 
 import javax.swing.*;
 import java.awt.*;
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java	Wed Apr 30 18:07:20 2014 +0900
@@ -36,6 +36,7 @@
 import com.glavsoft.viewer.swing.gui.PasswordDialog;
 
 import javax.swing.*;
+
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.Socket;
@@ -254,9 +255,9 @@
         PasswordDialog passwordDialog;
         private String connectionString;
         private final JFrame owner;
-        private final ConnectionWorker onCancel;
+        private final ConnectionWorker<Void> onCancel;
 
-        private PasswordChooser(String connectionString, JFrame parentWindow, ConnectionWorker onCancel) {
+        private PasswordChooser(String connectionString, JFrame parentWindow, ConnectionWorker<Void> onCancel) {
             this.connectionString = connectionString;
             this.owner = parentWindow;
             this.onCancel = onCancel;
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Wed Apr 30 18:07:20 2014 +0900
@@ -133,7 +133,11 @@
 
 	private void createContainer(final Surface surface, boolean isApplet, JApplet appletWindow) {
 		outerPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)) {
-			@Override
+			/**
+             * 
+             */
+            private static final long serialVersionUID = 1L;
+            @Override
 			public Dimension getSize() {
 				return surface.getPreferredSize();
 			}
@@ -144,7 +148,11 @@
 		};
         outerPanel.setBackground(Color.DARK_GRAY);
 		lpane = new JLayeredPane() {
-			@Override
+			/**
+             * 
+             */
+            private static final long serialVersionUID = 1L;
+            @Override
 			public Dimension getSize() {
 				return surface.getPreferredSize();
 			}
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindowFactory.java	Wed Apr 30 18:07:20 2014 +0900
@@ -4,7 +4,6 @@
 import com.glavsoft.rfb.protocol.ProtocolSettings;
 import com.glavsoft.viewer.ConnectionPresenter;
 import com.glavsoft.viewer.UiSettings;
-import com.glavsoft.viewer.Viewer;
 import com.glavsoft.viewer.ViewerImpl;
 
 /**
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/WrongParameterException.java	Wed Apr 30 17:45:45 2014 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/WrongParameterException.java	Wed Apr 30 18:07:20 2014 +0900
@@ -31,6 +31,10 @@
  */
 public class WrongParameterException extends CommonException {
 
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
     private String propertyName;
 
     public WrongParameterException(String message) {