Fix more unused local variables and static (class) variables and methods being used in instance warnings
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 15e1989..8a47765 100644
--- a/java/com/tigervnc/rfb/CConnection.java
+++ b/java/com/tigervnc/rfb/CConnection.java
@@ -102,7 +102,7 @@
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 c26a198..2b8bf35 100644
--- a/java/com/tigervnc/rfb/CSecurityTLS.java
+++ b/java/com/tigervnc/rfb/CSecurityTLS.java
@@ -56,9 +56,9 @@
}
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 @@
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 ae758e7..75276c7 100644
--- a/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
+++ b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
@@ -131,7 +131,7 @@
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 5cce3a9..d01a8c3 100644
--- a/java/com/tigervnc/rfb/TightDecoder.java
+++ b/java/com/tigervnc/rfb/TightDecoder.java
@@ -63,7 +63,6 @@
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 a375438..d504eb1 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -208,7 +208,7 @@
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 @@
/* 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 @@
/* 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 55ad0d0..f5e5614 100644
--- a/java/com/tigervnc/vncviewer/ServerDialog.java
+++ b/java/com/tigervnc/vncviewer/ServerDialog.java
@@ -107,7 +107,7 @@
}
public void itemStateChanged(ItemEvent e) {
- Object s = e.getSource();
+ //Object s = e.getSource();
}
public void actionPerformed(ActionEvent e) {