changeset 20:20c53b836ff8

delete warning
author one
date Fri, 13 Jan 2012 16:22:58 +0900
parents 3faae4215cb3
children 810c53d66376
files src/treeVnc/AuthPanel.java src/treeVnc/BroadCastClient.java src/treeVnc/ButtonPanel.java src/treeVnc/CapsContainer.java src/treeVnc/ClipboardFrame.java src/treeVnc/CreateHtmlFile.java src/treeVnc/CuiMyVncClient.java src/treeVnc/RfbProto.java src/treeVnc/VncProxyService.java
diffstat 9 files changed, 28 insertions(+), 75 deletions(-) [+]
line wrap: on
line diff
--- a/src/treeVnc/AuthPanel.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/AuthPanel.java	Fri Jan 13 16:22:58 2012 +0900
@@ -28,7 +28,11 @@
 
 class AuthPanel extends Panel implements ActionListener {
 
-  TextField passwordField;
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+TextField passwordField;
   Button okButton;
 
   //
--- a/src/treeVnc/BroadCastClient.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/BroadCastClient.java	Fri Jan 13 16:22:58 2012 +0900
@@ -4,7 +4,6 @@
 import java.net.DatagramPacket;
 import java.net.InetAddress;
 import java.net.MulticastSocket;
-import java.net.UnknownHostException;
 
 public class BroadCastClient {
 	final int BUFSIZE = 1024;
--- a/src/treeVnc/ButtonPanel.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/ButtonPanel.java	Fri Jan 13 16:22:58 2012 +0900
@@ -30,7 +30,11 @@
 
 class ButtonPanel extends Panel implements ActionListener {
 
-  VncViewer viewer;
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+VncViewer viewer;
   Button disconnectButton;
   Button optionsButton;
   Button recordButton;
@@ -138,11 +142,11 @@
         final int modifiers = InputEvent.CTRL_MASK | InputEvent.ALT_MASK;
 
         KeyEvent ctrlAltDelEvent =
-          new KeyEvent(this, KeyEvent.KEY_PRESSED, 0, modifiers, 127);
+          new KeyEvent(this, KeyEvent.KEY_PRESSED, 0, modifiers, 127,KeyEvent.CHAR_UNDEFINED);
         viewer.rfb.writeKeyEvent(ctrlAltDelEvent);
 
         ctrlAltDelEvent =
-          new KeyEvent(this, KeyEvent.KEY_RELEASED, 0, modifiers, 127);
+          new KeyEvent(this, KeyEvent.KEY_RELEASED, 0, modifiers, 127,KeyEvent.CHAR_UNDEFINED);
         viewer.rfb.writeKeyEvent(ctrlAltDelEvent);
 
       } catch (IOException e) {
--- a/src/treeVnc/CapsContainer.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/CapsContainer.java	Fri Jan 13 16:22:58 2012 +0900
@@ -31,8 +31,8 @@
   // Public methods
 
   public CapsContainer() {
-    infoMap = new Hashtable(64, (float)0.25);
-    orderedList = new Vector(32, 8);
+    infoMap = new Hashtable<Integer,CapabilityInfo>(64, (float)0.25);
+    orderedList = new Vector<Integer>(32, 8);
   }
 
   public void add(CapabilityInfo capinfo) {
@@ -98,7 +98,7 @@
 
   // Protected data
 
-  protected Hashtable infoMap;
-  protected Vector orderedList;
+  protected Hashtable<Integer,CapabilityInfo> infoMap;
+  protected Vector<Integer> orderedList;
 }
 
--- a/src/treeVnc/ClipboardFrame.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/ClipboardFrame.java	Fri Jan 13 16:22:58 2012 +0900
@@ -29,7 +29,11 @@
 class ClipboardFrame extends Frame
   implements WindowListener, ActionListener {
 
-  TextArea textArea;
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+TextArea textArea;
   Button clearButton, closeButton;
   String selection;
   VncViewer viewer;
--- a/src/treeVnc/CreateHtmlFile.java	Fri Jan 13 16:02:26 2012 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-package treeVnc;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-
-public class CreateHtmlFile {
-
-	String header="<HTML><TITLE>hbpVNC desktop</TITLE>\n";
-	String footer="</APPLET>\n<BR>\n<A href=\"http://ie.u-ryukyu.ac.jp/\">University of the Ryukyu </A>\n</HTML>\n";
-
-	String host;
-	String user;
-	int port;
-	int width;
-	int height;
-	
-	File file;
-	
-	MyRfbProtoProxy rfb;
-	
-	CreateHtmlFile(MyRfbProtoProxy _rfb, String _host, String _user){
-		rfb = _rfb;
-		host = _host;
-		user = _user;
-		port = rfb.getAcceptPort();
-		width = rfb.framebufferWidth;
-		height = rfb.framebufferHeight;
-
-	}
-
-	void createHtml(){
-		try{
-//			String html_file = "/var/www/html/hbpVNC/view/"+ user +".html";
-			String html_file = "./"+ user +".html";
-		    file = new File(html_file);
-		    PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(file)));
-		    
-		    InetAddress addr = InetAddress.getLocalHost();
-		    
-		    String contents = "<APPLET CODE=\"VncViewer.class\" ARCHIVE=\"VncViewer.jar\"\n " +
-					"WIDTH=\""+width+"\" HEIGHT=\""+height+"\">\n";
-		    contents = contents+"<PARAM NAME=\"PORT\" VALUE=\""+port+"\">\n";
-		    contents = contents+"<PARAM NAME=\"HOST\" VALUE=\""+addr.getHostAddress()+"\">\n";
-		    
-		    pw.println(header+contents+footer);
-		    pw.close();
-		}
-		catch (Exception e) {
-		    e.printStackTrace();
-		}
-	}
-	
-	
-}
--- a/src/treeVnc/CuiMyVncClient.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/CuiMyVncClient.java	Fri Jan 13 16:22:58 2012 +0900
@@ -337,7 +337,7 @@
 					rfb.changeParent(host, port);
 					rfb.readVersionMsg();
 					rfb.writeVersionMsg();
-					boolean flag = rfb.readProxyFlag();
+					//boolean flag = rfb.readProxyFlag();
 				}
 			}
 		}	
@@ -405,7 +405,7 @@
 					rfb.changeParent(host, port);
 					rfb.readVersionMsg();
 					rfb.writeVersionMsg();
-					boolean flag = rfb.readProxyFlag();
+					//boolean flag = rfb.readProxyFlag();
 				}
 			}
 		}	
@@ -767,7 +767,7 @@
 	// then decrypt the password into the passwordParam string. Otherwise,
 	// try to read the "PASSWORD" parameter directly to passwordParam.
 	//
-
+/*
 	private void readPasswordParameters() {
 		String encPasswordParam = readParameter("ENCPASSWORD", false);
 
@@ -792,7 +792,7 @@
 
 		}
 	}
-
+*/
 	public String readParameter(String name, boolean required) {
 		for (int i = 0; i < mainArgs.length; i += 2) {
 			if (mainArgs[i].equalsIgnoreCase(name)) {
@@ -972,7 +972,7 @@
 		if (rfb != null)
 			disconnect();
 
-		vncContainer.hide();
+		vncContainer.setVisible(false);
 
 	}
 
@@ -1016,7 +1016,7 @@
 				if (mainArgs.length > 0)
 					pHost = mainArgs[0];
 				else
-					pHost = "cls080.ie.u-ryukyu.ac.jp";
+					pHost = "localhost";
 //				echo = new EchoClient(pHost, this);
 				echoValue = new EchoClient(pHost, this, echoPort);
 				echoValue.openport();
--- a/src/treeVnc/RfbProto.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/RfbProto.java	Fri Jan 13 16:22:58 2012 +0900
@@ -28,7 +28,6 @@
 import java.io.*;
 import java.awt.event.*;
 import java.net.Socket;
-import java.net.UnknownHostException;
 import java.util.zip.*;
 
 class RfbProto {
--- a/src/treeVnc/VncProxyService.java	Fri Jan 13 16:02:26 2012 +0900
+++ b/src/treeVnc/VncProxyService.java	Fri Jan 13 16:22:58 2012 +0900
@@ -22,7 +22,7 @@
 	String[] mainArgs;
 	String username;
 
-	CreateHtmlFile hgtmlFile;
+	//CreateHtmlFile hgtmlFile;
 
 	// RfbProto rfb;
 	MyRfbProtoProxy rfb;