6 files changed, 9 insertions, 17 deletions
diff --git a/java/com/tigervnc/rfb/CSecurityIdent.java b/java/com/tigervnc/rfb/CSecurityIdent.java
index 6523e411..f989262b 100644
--- a/java/com/tigervnc/rfb/CSecurityIdent.java
+++ b/java/com/tigervnc/rfb/CSecurityIdent.java
@@ -18,8 +18,6 @@
 
 package com.tigervnc.rfb;
 
-import java.io.IOException;
-
 import com.tigervnc.rdr.*;
 import com.tigervnc.vncviewer.*;
 
@@ -28,7 +26,6 @@ public class CSecurityIdent extends CSecurity {
   public CSecurityIdent() { }
 
   public boolean processMsg(CConnection cc) {
-    InStream is = cc.getInStream();
     OutStream os = cc.getOutStream();
 
     StringBuffer username = new StringBuffer();
diff --git a/java/com/tigervnc/rfb/CSecurityTLS.java b/java/com/tigervnc/rfb/CSecurityTLS.java
index 73eb6199..c26a1986 100644
--- a/java/com/tigervnc/rfb/CSecurityTLS.java
+++ b/java/com/tigervnc/rfb/CSecurityTLS.java
@@ -20,7 +20,6 @@
 package com.tigervnc.rfb;
 
 import javax.net.ssl.*;
-import java.security.*;
 import java.security.cert.*;
 import java.security.KeyStore;
 import java.io.File;
@@ -119,7 +118,6 @@ public class CSecurityTLS extends CSecurity {
 
   public boolean processMsg(CConnection cc) {
     is = cc.getInStream();
-    os = cc.getOutStream();
 
     initGlobal();
 
diff --git a/java/com/tigervnc/rfb/Cursor.java b/java/com/tigervnc/rfb/Cursor.java
index 420eb82a..375a9c9d 100644
--- a/java/com/tigervnc/rfb/Cursor.java
+++ b/java/com/tigervnc/rfb/Cursor.java
@@ -18,8 +18,6 @@
 
 package com.tigervnc.rfb;
 
-import java.awt.*;
-
 public class Cursor extends ManagedPixelBuffer {
 
   public void setSize(int w, int h) {
diff --git a/java/com/tigervnc/rfb/RawDecoder.java b/java/com/tigervnc/rfb/RawDecoder.java
index 79db8260..f7e5d46a 100644
--- a/java/com/tigervnc/rfb/RawDecoder.java
+++ b/java/com/tigervnc/rfb/RawDecoder.java
@@ -29,7 +29,6 @@ public class RawDecoder extends Decoder {
     int h = r.height();
     int[] imageBuf = reader.getImageBuf(w * h);
     int nPixels = imageBuf.length / (reader.bpp() / 8);
-    int bytesPerRow = w * (reader.bpp() / 8);
     while (h > 0) {
       int nRows = nPixels / w;
       if (nRows > h) nRows = h;
diff --git a/java/com/tigervnc/rfb/Screen.java b/java/com/tigervnc/rfb/Screen.java
index 90b22b6d..174d4ace 100644
--- a/java/com/tigervnc/rfb/Screen.java
+++ b/java/com/tigervnc/rfb/Screen.java
@@ -31,7 +31,7 @@ public class Screen {
       flags = flags_;
     }
 
-    public final static boolean operator(Screen r) {
+    public final boolean operator(Screen r) {
       if (id != r.id)
         return false;
       if (!dimensions.equals(r.dimensions))
@@ -41,8 +41,8 @@ public class Screen {
       return true;
     }
 
-    public static int id;
-    public static Rect dimensions;
-    public static int flags;
+    public int id;
+    public Rect dimensions;
+    public int flags;
 
 }
diff --git a/java/com/tigervnc/rfb/ScreenSet.java b/java/com/tigervnc/rfb/ScreenSet.java
index 071282ff..905d77e5 100644
--- a/java/com/tigervnc/rfb/ScreenSet.java
+++ b/java/com/tigervnc/rfb/ScreenSet.java
@@ -31,10 +31,10 @@ public class ScreenSet {
     screens = new ArrayList<Screen>();
   }
 
-  public static final int num_screens() { return screens.size(); }
+  public final int num_screens() { return screens.size(); }
 
-  public static final void add_screen(Screen screen) { screens.add(screen); }
-  public static final void remove_screen(int id) { 
+  public final void add_screen(Screen screen) { screens.add(screen); }
+  public final void remove_screen(int id) { 
     for (Iterator iter = screens.iterator(); iter.hasNext(); ) {
       Screen refScreen = (Screen)iter.next();
       if (refScreen.id == id)
@@ -42,7 +42,7 @@ public class ScreenSet {
     }
   }
 
-  public static final boolean validate(int fb_width, int fb_height) {
+  public final boolean validate(int fb_width, int fb_height) {
       List<Integer> seen_ids = new ArrayList<Integer>();
       Rect fb_rect = new Rect();
 
@@ -81,7 +81,7 @@ public class ScreenSet {
   //inline bool operator(const ScreenSet& r) const { return screens == r.screens; }
   //inline bool operator(const ScreenSet& r) const { return screens != r.screens; }
 
-  public static List<Screen> screens;
+  public ArrayList<Screen> screens;
 
   static LogWriter vlog = new LogWriter("ScreenSet");