Fixes for bug #3418258. Cleans up all of the 'unchecked' and 'deprecated' linter...

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

diff --git a/java/src/com/tigervnc/rfb/CSecurityTLS.java b/java/src/com/tigervnc/rfb/CSecurityTLS.java
index 355d08f4d4651cde654788b5f4af261dd538a4d8..2fbd5aab3f448f6bf3a5eb01af02c4c230a6c4fd 100644 (file)
--- a/java/src/com/tigervnc/rfb/CSecurityTLS.java
+++ b/java/src/com/tigervnc/rfb/CSecurityTLS.java
@@ -66,7 +66,7 @@ public class CSecurityTLS extends CSecurity {
 
       if (anon) {
         String[] supported;
-        ArrayList enabled = new ArrayList();
+        ArrayList<String> enabled = new ArrayList<String>();
 
         supported = ssl.getSupportedCipherSuites();
 
@@ -74,7 +74,7 @@ public class CSecurityTLS extends CSecurity {
           if (supported[i].matches("TLS_DH_anon.*"))
                  enabled.add(supported[i]);
 
-        ssl.setEnabledCipherSuites((String[])enabled.toArray(new String[0]));
+        ssl.setEnabledCipherSuites(enabled.toArray(new String[0]));
       } else {
         ssl.setEnabledCipherSuites(ssl.getSupportedCipherSuites());
       }

diff --git a/java/src/com/tigervnc/rfb/TightDecoder.java b/java/src/com/tigervnc/rfb/TightDecoder.java
index 529b904d1180806ab94a9f7518756725c3934b2c..5cce3a935982047b950c47f57c88ad25bcb44d1c 100644 (file)
--- a/java/src/com/tigervnc/rfb/TightDecoder.java
+++ b/java/src/com/tigervnc/rfb/TightDecoder.java
@@ -271,7 +271,7 @@ public class TightDecoder extends Decoder {
   }
   private static int[] convertByteArrayToIntArray(byte[] bytes) {
     vlog.info("convertByteArrayToIntArray");
-    ArrayList integers = new ArrayList();
+    ArrayList<Integer> integers = new ArrayList<Integer>();
     for (int index = 0; index < bytes.length; index += 4) {
       byte[] fourBytes = new byte[4];
       fourBytes[0] = bytes[index];
@@ -283,7 +283,7 @@ public class TightDecoder extends Decoder {
     }
     int[] ints = new int[bytes.length/4];
     for (int index = 0; index < integers.size() ; index++) {
-      ints[index] = ((Integer)integers.get(index)).intValue();
+      ints[index] = (integers.get(index)).intValue();
     }
     return ints;
   }

diff --git a/java/src/com/tigervnc/vncviewer/CConn.java b/java/src/com/tigervnc/vncviewer/CConn.java
index 636bfacf65a4677e4ee9bc0b75fac0f591928da6..878475015a7f9877d460ce67417654f267a32f6d 100644 (file)
--- a/java/src/com/tigervnc/vncviewer/CConn.java
+++ b/java/src/com/tigervnc/vncviewer/CConn.java
@@ -942,8 +942,8 @@ public class CConn extends CConnection
     }
 
     clipboardDialog.setSendingEnabled(viewer.sendClipboard.getValue());
-    menuKey = (int)(options.menuKey.getSelectedIndex()+0xFFBE);
-    F8Menu.f8.setLabel("Send F"+(menuKey-Keysyms.F1+1));
+    menuKey = (options.menuKey.getSelectedIndex()+0xFFBE);
+    F8Menu.f8.setText("Send F"+(menuKey-Keysyms.F1+1));
 
     shared = options.shared.isSelected();
     setShared(shared);
@@ -1185,9 +1185,9 @@ public class CConn extends CConnection
     if (cp.width != desktop.scaledWidth || 
         cp.height != desktop.scaledHeight) {
       int sx = (desktop.scaleWidthRatio == 1.00) 
-        ? ev.getX() : (int)Math.floor(ev.getX()/(float)desktop.scaleWidthRatio);
+        ? ev.getX() : (int)Math.floor(ev.getX()/desktop.scaleWidthRatio);
       int sy = (desktop.scaleHeightRatio == 1.00) 
-        ? ev.getY() : (int)Math.floor(ev.getY()/(float)desktop.scaleHeightRatio);
+        ? ev.getY() : (int)Math.floor(ev.getY()/desktop.scaleHeightRatio);
       ev.translatePoint(sx - ev.getX(), sy - ev.getY());
       writer().writePointerEvent(new Point(ev.getX(),ev.getY()), buttonMask);
     } else {

diff --git a/java/src/com/tigervnc/vncviewer/DesktopWindow.java b/java/src/com/tigervnc/vncviewer/DesktopWindow.java
index b1457c33f8b6f6eda6abbb3687c40edd3e79b489..d6704e0136ddf960335ce4229dd854337609bd26 100644 (file)
--- a/java/src/com/tigervnc/vncviewer/DesktopWindow.java
+++ b/java/src/com/tigervnc/vncviewer/DesktopWindow.java
@@ -339,8 +339,8 @@ class DesktopWindow extends JPanel implements
         }
       }
     }
-    scaleWidthRatio = (float)((float)scaledWidth / (float)cc.cp.width);
-    scaleHeightRatio = (float)((float)scaledHeight / (float)cc.cp.height);
+    scaleWidthRatio = (float)scaledWidth / (float)cc.cp.width;
+    scaleHeightRatio = (float)scaledHeight / (float)cc.cp.height;
   }
 
   synchronized public void paintComponent(Graphics g) {
@@ -475,8 +475,8 @@ class DesktopWindow extends JPanel implements
       cursorVisible = true;
       if (softCursor != null) return;
 
-      int cursorLeft = (int)cursor.hotspot.x;
-      int cursorTop = (int)cursor.hotspot.y;
+      int cursorLeft = cursor.hotspot.x;
+      int cursorTop = cursor.hotspot.y;
       int cursorRight = cursorLeft + cursor.width();
       int cursorBottom = cursorTop + cursor.height();
 

diff --git a/java/src/com/tigervnc/vncviewer/Makefile b/java/src/com/tigervnc/vncviewer/Makefile
index 136899b43f020e2d11ff789771dc163fae510930..614057b585f222d86b2968c348230d1245320bca 100644 (file)
--- a/java/src/com/tigervnc/vncviewer/Makefile
+++ b/java/src/com/tigervnc/vncviewer/Makefile
@@ -4,7 +4,7 @@
 
 CP = cp
 JC = javac
-JCFLAGS = -target 1.5 -classpath ../../../
+JCFLAGS = -target 1.5 -Xlint:all,-serial,-cast -classpath ../../../
 JAR = jar
 ARCHIVE = VncViewer.jar
 MANIFEST = MANIFEST.MF