Fix more unused local variables and static (class) variables and methods being used...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4718 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/java/com/tigervnc/rfb/CConnection.java b/java/com/tigervnc/rfb/CConnection.java
index 15e198961b56799e51e829b8ce238d05aced2dd7..8a477654b44119e840483f571fb7b0545cb3398c 100644 (file)
--- a/java/com/tigervnc/rfb/CConnection.java
+++ b/java/com/tigervnc/rfb/CConnection.java
@@ -102,7 +102,7 @@ abstract public class CConnection extends CMsgHandler {
     int secType = Security.secTypeInvalid;
 
     List<Integer> secTypes = new ArrayList<Integer>();
-    secTypes = security.GetEnabledSecTypes();
+    secTypes = Security.GetEnabledSecTypes();
     //for (Iterator i = secTypes.iterator(); i.hasNext(); )
     //  vlog.info(((Integer)i.next()).toString());
 

diff --git a/java/com/tigervnc/rfb/CSecurityTLS.java b/java/com/tigervnc/rfb/CSecurityTLS.java
index c26a1986c85908a31c76ca82e11adfa39ae452a4..2b8bf355aee9168134c7cae5119cd956443a6dd7 100644 (file)
--- a/java/com/tigervnc/rfb/CSecurityTLS.java
+++ b/java/com/tigervnc/rfb/CSecurityTLS.java
@@ -56,9 +56,9 @@ public class CSecurityTLS extends CSecurity {
       }
       sslfactory = ctx.getSocketFactory();
       try {
-        ssl = (SSLSocket)sslfactory.createSocket(cc.sock,
-                                                 cc.sock.getInetAddress().getHostName(),
-                                                 cc.sock.getPort(), true);
+        ssl = (SSLSocket)sslfactory.createSocket(CConnection.sock,
+                                                 CConnection.sock.getInetAddress().getHostName(),
+                                                 CConnection.sock.getPort(), true);
       } catch (java.io.IOException e) { 
         throw new Exception(e.toString());
       }
@@ -242,7 +242,6 @@ public class CSecurityTLS extends CSecurity {
   private SSLSession session;
   private String cafile, crlfile;
   private InStream is;
-  private OutStream os;
   private SSLSocket ssl;
 
   static LogWriter vlog = new LogWriter("CSecurityTLS");

diff --git a/java/com/tigervnc/rfb/CSecurityVeNCrypt.java b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
index ae758e7f2d935e4924a76e0b5a155c476fb4b906..75276c77d9c8b005cb25f1bdf3fa1bc3520958fe 100644 (file)
--- a/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
+++ b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
@@ -131,7 +131,7 @@ public class CSecurityVeNCrypt extends CSecurity {
           Iterator j;
           List<Integer> secTypes = new ArrayList<Integer>();
 
-          secTypes = security.GetEnabledExtSecTypes();
+          secTypes = Security.GetEnabledExtSecTypes();
 
           /* Honor server's security type order */
           for (i = 0; i < nAvailableTypes; i++) {

diff --git a/java/com/tigervnc/rfb/TightDecoder.java b/java/com/tigervnc/rfb/TightDecoder.java
index 5cce3a935982047b950c47f57c88ad25bcb44d1c..d01a8c3cc01d9392eb3ba2d864acbaf80e8b99f5 100644 (file)
--- a/java/com/tigervnc/rfb/TightDecoder.java
+++ b/java/com/tigervnc/rfb/TightDecoder.java
@@ -63,7 +63,6 @@ public class TightDecoder extends Decoder {
 
     int comp_ctl = is.readU8();
 
-    int bytesPerPixel = handler.cp.pf().bpp / 8;
     boolean bigEndian = handler.cp.pf().bigEndian;
 
     // Flush zlib streams if we are told by the server to do so.

diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index a375438bb4cdb0b53b37e54d85c44b9d341400f8..d504eb16b4d1661bff80faf3672b0f8b5a754a16 100644 (file)
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -208,7 +208,7 @@ public class CConn extends CConnection
 
   public boolean showMsgBox(int flags, String title, String text)
   {
-    StringBuffer titleText = new StringBuffer("VNC Viewer: "+title);
+    //StringBuffer titleText = new StringBuffer("VNC Viewer: "+title);
     return true;
   }
 
@@ -744,7 +744,7 @@ public class CConn extends CConnection
 
       /* Process non-VeNCrypt sectypes */
       java.util.List<Integer> secTypes = new ArrayList<Integer>();
-      secTypes = security.GetEnabledSecTypes();
+      secTypes = Security.GetEnabledSecTypes();
       for (Iterator i = secTypes.iterator(); i.hasNext();) {
         switch ((Integer)i.next()) {
         case Security.secTypeVeNCrypt:
@@ -764,7 +764,7 @@ public class CConn extends CConnection
       /* Process VeNCrypt subtypes */
       if (options.secVeNCrypt.isSelected()) {
         java.util.List<Integer> secTypesExt = new ArrayList<Integer>();
-        secTypesExt = security.GetEnabledExtSecTypes();
+        secTypesExt = Security.GetEnabledExtSecTypes();
         for (Iterator iext = secTypesExt.iterator(); iext.hasNext();) {
           switch ((Integer)iext.next()) {
           case Security.secTypePlain:

diff --git a/java/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java
index 55ad0d02de6ab65879e675f6a774078a96f84605..f5e5614119072f9122d8a65beaa78bc3a70310e0 100644 (file)
--- a/java/com/tigervnc/vncviewer/ServerDialog.java
+++ b/java/com/tigervnc/vncviewer/ServerDialog.java
@@ -107,7 +107,7 @@ class ServerDialog extends Dialog implements
   }
 
   public void itemStateChanged(ItemEvent e) {
-    Object s = e.getSource();
+    //Object s = e.getSource();
   }
 
   public void actionPerformed(ActionEvent e) {