Mercurial > hg > Members > you > TreeVNC

changeset 21:810c53d66376

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove warning (Before the modifying)
author Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
date Sun, 15 Jan 2012 16:13:09 +0900
parents 20c53b836ff8
children 24112133a0d9
files bin/treeVnc/MyRfbProtoClient$1.class bin/treeVnc/MyRfbProtoClient$2.class bin/treeVnc/MyRfbProtoClient$3.class bin/treeVnc/MyRfbProtoClient$4.class bin/treeVnc/MyRfbProtoClient.class src/treeVnc/AcceptClient.java src/treeVnc/CapsContainer.java src/treeVnc/CreateThread.java src/treeVnc/CuiVncCanvas.java src/treeVnc/DesCipher.java src/treeVnc/EchoClient.java src/treeVnc/GetBroadCastClient.java src/treeVnc/GetBroadCastProxy.java src/treeVnc/MyRfbProtoClient.java src/treeVnc/OptionsFrame.java src/treeVnc/ProxyVncCanvas.java src/treeVnc/RecordingFrame.java src/treeVnc/ReloginPanel.java src/treeVnc/SelectType.java src/treeVnc/TextBoxClient.java src/treeVnc/TextBoxProxy.java src/treeVnc/VncCanvas.java src/treeVnc/VncCanvas2.java src/treeVnc/VncProxyService.java src/treeVnc/VncViewer.java
diffstat 25 files changed, 86 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
Binary file bin/treeVnc/MyRfbProtoClient$1.class has changed
Binary file bin/treeVnc/MyRfbProtoClient$2.class has changed
Binary file bin/treeVnc/MyRfbProtoClient$3.class has changed
Binary file bin/treeVnc/MyRfbProtoClient$4.class has changed
Binary file bin/treeVnc/MyRfbProtoClient.class has changed
--- a/src/treeVnc/AcceptClient.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/AcceptClient.java	Sun Jan 15 16:13:09 2012 +0900
@@ -10,7 +10,7 @@
 	int counter = 0, parentnum = 0/* 落ちたときの親の番号をカウントするためのもの */;
 	LinkedList<String> ls = new LinkedList<String>();
 	boolean runflag = false;
-	private String name;
+//	private String name;
 	boolean addrRegistor = true;
 	int passCheck = 0;
 	int treebranch = 2;// treeの子ノードの数 
@@ -21,7 +21,7 @@
 
 
 	public AcceptClient(String name) {
-		this.name = name;
+//		this.name = name;
 	}
 
 
@@ -65,6 +65,8 @@
 							break;
 						}
 					}
+				} else {
+					
 				}
 			}
 		} catch (IOException e) {
@@ -110,8 +112,8 @@
 	}
 
 	private void checkParameter(int parent, int counter, String leaderflag) {
-		System.out.println("pの値=" + parentnum);
-		System.out.println("iの値=" + counter);
+		System.out.println("p value=" + parentnum);
+		System.out.println("i value=" + counter);
 		System.out.println("leaderflag=" + leaderflag + "\n");
 	}
 
@@ -125,7 +127,7 @@
 	private void displyLinkedList( LinkedList<String> ls) {
 		int g = 0;
 		for (String bs : ls) {
-			System.out.println(g + "番目" + bs);
+			System.out.println(g + "number" + bs);
 			g++;
 		}
 	}
--- a/src/treeVnc/CapsContainer.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/CapsContainer.java	Sun Jan 15 16:13:09 2012 +0900
@@ -50,11 +50,11 @@
   }
 
   public CapabilityInfo getInfo(int code) {
-    return (CapabilityInfo)infoMap.get(new Integer(code));
+    return infoMap.get(new Integer(code));
   }
 
   public String getDescription(int code) {
-    CapabilityInfo capinfo = (CapabilityInfo)infoMap.get(new Integer(code));
+    CapabilityInfo capinfo = infoMap.get(new Integer(code));
     if (capinfo == null)
       return null;
 
@@ -63,7 +63,7 @@
 
   public boolean enable(CapabilityInfo other) {
     Integer key = new Integer(other.getCode());
-    CapabilityInfo capinfo = (CapabilityInfo)infoMap.get(key);
+    CapabilityInfo capinfo = infoMap.get(key);
     if (capinfo == null)
       return false;
 
@@ -75,7 +75,7 @@
   }
 
   public boolean isEnabled(int code) {
-    CapabilityInfo capinfo = (CapabilityInfo)infoMap.get(new Integer(code));
+    CapabilityInfo capinfo = infoMap.get(new Integer(code));
     if (capinfo == null)
       return false;
 
@@ -89,7 +89,7 @@
   public int getByOrder(int idx) {
     int code;
     try {
-      code = ((Integer)orderedList.elementAt(idx)).intValue();
+      code = (orderedList.elementAt(idx)).intValue();
     } catch (ArrayIndexOutOfBoundsException e) {
       code = 0;
     }
--- a/src/treeVnc/CreateThread.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/CreateThread.java	Sun Jan 15 16:13:09 2012 +0900
@@ -26,6 +26,7 @@
 	void newEchoClient(final BufferedReader is,final PrintStream os) {
 		Runnable echoSender = new Runnable() {
 			public void run() {
+				// acceptClient new
 				acceptClient.transferParentAddrerss(is,os);
 			}
 		};
--- a/src/treeVnc/CuiVncCanvas.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/CuiVncCanvas.java	Sun Jan 15 16:13:09 2012 +0900
@@ -3,11 +3,8 @@
 import java.awt.event.*;
 import java.awt.image.*;
 import java.io.*;
-import java.lang.*;
-import java.nio.ByteBuffer;
 import java.util.zip.*;
 
-import java.net.Socket;
 
 import javax.imageio.ImageIO;
 
@@ -18,6 +15,10 @@
 class CuiVncCanvas extends Canvas implements KeyListener, MouseListener,
 		MouseMotionListener {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	CuiMyVncClient viewer;
 	MyRfbProtoClient rfb;
 	ColorModel cm8, cm24;
@@ -79,7 +80,7 @@
 
 	// True if we process keyboard and mouse events.
 	boolean inputEnabled;
-	private int b = 0;
+	//private int b = 0;
 	
 
 	
--- a/src/treeVnc/DesCipher.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/DesCipher.java	Sun Jan 15 16:13:09 2012 +0900
@@ -71,7 +71,7 @@
 // fine Java utilities: http://www.acme.com/java/
 
 
-import java.io.*;
+//import java.io.*;
 
 /// The DES encryption method.
 // <P>
--- a/src/treeVnc/EchoClient.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/EchoClient.java	Sun Jan 15 16:13:09 2012 +0900
@@ -19,8 +19,8 @@
 	private InterfaceForViewer client;
 	private int echoPort = 9999;
 	//private IpV6 ipV6;
-	private MyVncClient checkMove;
-	private VncViewer vncV;
+	//private MyVncClient checkMove;
+	//private VncViewer vncV;
 	String responseLine;
 	String parent;// 親の番号
 	String treenum;// 自分の番号
@@ -40,7 +40,7 @@
 		this.treenum = echo.treenum;
 		this.client = echo.client;
 		this.waitReply = echo.waitReply;
-		checkMove = (MyVncClient)echo.client;
+		//checkMove = (MyVncClient)echo.client;
 	}
 	// VncViewerから引数をもらってきてproxy役を認識する
 	public EchoClient(String name,MyVncClient client) {
--- a/src/treeVnc/GetBroadCastClient.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/GetBroadCastClient.java	Sun Jan 15 16:13:09 2012 +0900
@@ -1,13 +1,10 @@
 package treeVnc;
 
 import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
+//import java.io.ByteArrayInputStream;
+//import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
 import java.net.ServerSocket;
 import java.net.Socket;
 
@@ -47,7 +44,7 @@
 		}
 	}
 	
-	
+/*	
 	private int castInt(byte[] a) {
 		int value = 0;
 		ByteArrayInputStream bais = new ByteArrayInputStream(a);
@@ -67,7 +64,7 @@
 		System.out.println(recover);
 		return recover;
 	}
-	
+	*/
 	
 	@Override
 	public void run() {
--- a/src/treeVnc/GetBroadCastProxy.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/GetBroadCastProxy.java	Sun Jan 15 16:13:09 2012 +0900
@@ -1,7 +1,6 @@
 package treeVnc;
 
 import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
@@ -53,7 +52,7 @@
 		str = str.substring(1,str.indexOf(":"));
 		return str;
 	}
-	
+/*	
 	private int castInt(byte[] a) {
 		int value = 0;
 		ByteArrayInputStream bais = new ByteArrayInputStream(a);
@@ -65,7 +64,7 @@
 		System.out.println(value);
 		return value;
 	}
-
+*/
 	private String castString(byte[] a) {
 		String recover = new String(a);
 		recover = recover.replace("¥n", "");
--- a/src/treeVnc/MyRfbProtoClient.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/MyRfbProtoClient.java	Sun Jan 15 16:13:09 2012 +0900
@@ -17,7 +17,6 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.ByteBuffer;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 import javax.imageio.ImageIO;
@@ -26,7 +25,6 @@
 
 
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.DataFormatException;
 import java.util.zip.Deflater;
@@ -55,7 +53,7 @@
 	private int rectH;
 	private int encoding;
 	private int zLen;
-	private boolean clicomp = false;
+	//private boolean clicomp = false;
 
 	private ServerSocket servSock;
 	private int acceptPort;
@@ -924,7 +922,7 @@
 		}
 		System.err.println();
 	}
-
+/*
 	private Iterable<Byte> byteBufferIterator(final LinkedList<ByteBuffer> in) {
 		return new Iterable<Byte>() {
 			public Iterator<Byte> iterator() {
@@ -956,6 +954,7 @@
 			}
 		};
 	}
+	*/
 
 }
 
--- a/src/treeVnc/OptionsFrame.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/OptionsFrame.java	Sun Jan 15 16:13:09 2012 +0900
@@ -34,7 +34,12 @@
 class OptionsFrame extends Frame
   implements WindowListener, ActionListener, ItemListener {
 
-  static String[] names = {
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+static String[] names = {
     "Encoding",
     "Compression level",
     "JPEG image quality",
--- a/src/treeVnc/ProxyVncCanvas.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/ProxyVncCanvas.java	Sun Jan 15 16:13:09 2012 +0900
@@ -14,6 +14,10 @@
 class ProxyVncCanvas extends Canvas implements KeyListener, MouseListener,
 		MouseMotionListener {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	VncProxyService viewer;
 	MyRfbProtoProxy rfb;
 	ColorModel cm8, cm24;
@@ -75,7 +79,7 @@
 
 	// True if we process keyboard and mouse events.
 	boolean inputEnabled;
-	private int b = 0;
+//	private int b = 0;
 	
 
 	
@@ -373,7 +377,7 @@
 			
 			rfb.sendDataToClient();
 
-			long kbitsPerSecond = rfb.kbitsPerSecond();
+//			long kbitsPerSecond = rfb.kbitsPerSecond();
 //			System.out.println("Throughput " + kbitsPerSecond + " kbit/s");
 
 
--- a/src/treeVnc/RecordingFrame.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/RecordingFrame.java	Sun Jan 15 16:13:09 2012 +0900
@@ -30,7 +30,12 @@
 class RecordingFrame extends Frame
   implements WindowListener, ActionListener {
 
-  boolean recording;
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+boolean recording;
 
   TextField fnameField;
   Button browseButton;
--- a/src/treeVnc/ReloginPanel.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/ReloginPanel.java	Sun Jan 15 16:13:09 2012 +0900
@@ -27,14 +27,17 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.*;
 
 //
 // The panel which implements the Relogin button
 //
 
 class ReloginPanel extends Panel implements ActionListener {
-  Button reloginButton;
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+Button reloginButton;
   Button closeButton;
   VncViewer viewer;
 
--- a/src/treeVnc/SelectType.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/SelectType.java	Sun Jan 15 16:13:09 2012 +0900
@@ -45,7 +45,7 @@
 		pack();
 		setVisible(true);
 	}
-	
+/*	
 	private void init(){
 		frameInit();
 //		panel = null;
@@ -53,6 +53,7 @@
 //		label = null;
 		setVisible(false);
 	}
+	*/
 	
     private void setButton(){
         panel.add(button);
--- a/src/treeVnc/TextBoxClient.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/TextBoxClient.java	Sun Jan 15 16:13:09 2012 +0900
@@ -7,6 +7,10 @@
 
 public class TextBoxClient extends JFrame implements ActionListener, ItemListener {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private JPanel panel = new JPanel();
 	private JButton button = new JButton("Connect");
 	private TextField t1;
--- a/src/treeVnc/TextBoxProxy.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/TextBoxProxy.java	Sun Jan 15 16:13:09 2012 +0900
@@ -6,6 +6,10 @@
 
 public class TextBoxProxy extends JFrame implements ActionListener {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private JPanel panel;
 	private JButton button;
 	private JButton button1;
--- a/src/treeVnc/VncCanvas.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/VncCanvas.java	Sun Jan 15 16:13:09 2012 +0900
@@ -26,15 +26,12 @@
 import java.awt.event.*;
 import java.awt.image.*;
 import java.io.*;
-import java.lang.*;
 import java.util.zip.*;
-import java.net.*;
 
 import javax.imageio.ImageIO;
 
 //import test.TestComet;
 
-import javax.imageio.ImageIO;
 
 //
 // VncCanvas is a subclass of Canvas which draws a VNC desktop on it.
@@ -43,6 +40,10 @@
 class VncCanvas extends Canvas implements KeyListener, MouseListener,
 		MouseMotionListener {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	VncViewer viewer;
 	MyRfbProtoClient rfbc;
 	MyRfbProtoProxy rfbp;
--- a/src/treeVnc/VncCanvas2.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/VncCanvas2.java	Sun Jan 15 16:13:09 2012 +0900
@@ -27,7 +27,12 @@
 
 class VncCanvas2 extends VncCanvas {
 
-  public VncCanvas2(VncViewer v) throws IOException {
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+public VncCanvas2(VncViewer v) throws IOException {
     super(v);
     disableFocusTraversalKeys();
   }
--- a/src/treeVnc/VncProxyService.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/VncProxyService.java	Sun Jan 15 16:13:09 2012 +0900
@@ -527,7 +527,7 @@
 
 		int preferredEncoding = options.preferredEncoding;
 		if (preferredEncoding == -1) {
-			long kbitsPerSecond = rfb.kbitsPerSecond();
+		//	long kbitsPerSecond = rfb.kbitsPerSecond();
 			/*
 			 * if (nEncodingsSaved < 1) { // Choose Tight or ZRLE encoding for
 			 * the very first update.
@@ -748,12 +748,14 @@
 			getHost = new TextBoxProxy(this);
 			port = 5900;
 		}
+		/*
 		if(getHost==null){
-			getHost = new TextBoxProxy(this);
+//			getHost = new TextBoxProxy(this);
 			//getHost.changeHost();
 		} else {	
 			//getHost.changeHost();
 		} 
+		*/
 
 		// Read "ENCPASSWORD" or "PASSWORD" parameter if specified.
 		// readPasswordParameters();
@@ -797,7 +799,7 @@
 	// then decrypt the password into the passwordParam string. Otherwise,
 	// try to read the "PASSWORD" parameter directly to passwordParam.
 	//
-
+/*
 	private void readPasswordParameters() {
 		String encPasswordParam;
 		// String encPasswordParam = readParameter("ENCPASSWORD", false);
@@ -828,7 +830,7 @@
 
 		}
 	}
-
+*/
 	public String readParameter(String name, boolean required) {
 		if(mainArgs!=null){
 			for (int i = 0; i < mainArgs.length; i += 2) {
@@ -1010,7 +1012,7 @@
 		if (rfb != null)
 			disconnect();
 
-		vncContainer.hide();
+		vncContainer.setVisible(false);
 
 	}
 
--- a/src/treeVnc/VncViewer.java	Fri Jan 13 16:22:58 2012 +0900
+++ b/src/treeVnc/VncViewer.java	Sun Jan 15 16:13:09 2012 +0900
@@ -34,6 +34,10 @@
 public class VncViewer extends java.applet.Applet implements
 		java.lang.Runnable, WindowListener {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	boolean inAnApplet = true;
 	boolean inSeparateFrame = false;
 	protected String[] mainArgs;
@@ -1006,7 +1010,7 @@
 		if (rfb != null)
 			disconnect();
 
-		vncContainer.hide();
+		vncContainer.setVisible(false);
 
 		if (!inAnApplet) {
 			System.exit(0);