Cleanup linter warnings wherever possible and suppress all linter warnings from Jsch code
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5020 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/com/tigervnc/rfb/CConnection.java b/java/com/tigervnc/rfb/CConnection.java
index 959f813..a923028 100644
--- a/java/com/tigervnc/rfb/CConnection.java
+++ b/java/com/tigervnc/rfb/CConnection.java
@@ -122,7 +122,7 @@
throwConnFailedException();
} else if (secType == Security.secTypeNone || secType == Security.secTypeVncAuth) {
- Iterator i;
+ Iterator<Integer> i;
for (i = secTypes.iterator(); i.hasNext(); ) {
int refType = (Integer)i.next();
if (refType == secType) {
@@ -146,7 +146,7 @@
if (nServerSecTypes == 0)
throwConnFailedException();
- Iterator j;
+ Iterator<Integer> j;
for (int i = 0; i < nServerSecTypes; i++) {
int serverSecType = is.readU8();
diff --git a/java/com/tigervnc/rfb/CMsgWriterV3.java b/java/com/tigervnc/rfb/CMsgWriterV3.java
index 1ac583b..a730698 100644
--- a/java/com/tigervnc/rfb/CMsgWriterV3.java
+++ b/java/com/tigervnc/rfb/CMsgWriterV3.java
@@ -55,7 +55,7 @@
os.writeU8(layout.num_screens());
os.pad(1);
- for (Iterator iter = layout.screens.iterator(); iter.hasNext(); ) {
+ for (Iterator<Screen> iter = layout.screens.iterator(); iter.hasNext(); ) {
Screen refScreen = (Screen)iter.next();
os.writeU32(refScreen.id);
os.writeU16(refScreen.dimensions.tl.x);
diff --git a/java/com/tigervnc/rfb/CSecurityVeNCrypt.java b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
index a1f2231..528158c 100644
--- a/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
+++ b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
@@ -131,7 +131,7 @@
if (!haveChosenType) {
chosenType = Security.secTypeInvalid;
int i;
- Iterator j;
+ Iterator<Integer> j;
List<Integer> secTypes = new ArrayList<Integer>();
secTypes = Security.GetEnabledExtSecTypes();
diff --git a/java/com/tigervnc/rfb/Configuration.java b/java/com/tigervnc/rfb/Configuration.java
index aca8b53..fb635c7 100644
--- a/java/com/tigervnc/rfb/Configuration.java
+++ b/java/com/tigervnc/rfb/Configuration.java
@@ -285,7 +285,7 @@
return;
}
- for (Iterator i = props.stringPropertyNames().iterator(); i.hasNext();) {
+ for (Iterator<String> i = props.stringPropertyNames().iterator(); i.hasNext();) {
String name = (String)i.next();
if (name.startsWith("[")) {
// skip the section delimiters
diff --git a/java/com/tigervnc/rfb/ScreenSet.java b/java/com/tigervnc/rfb/ScreenSet.java
index b848b13..d20374f 100644
--- a/java/com/tigervnc/rfb/ScreenSet.java
+++ b/java/com/tigervnc/rfb/ScreenSet.java
@@ -35,7 +35,7 @@
public final void add_screen(Screen screen) { screens.add(screen); }
public final void remove_screen(int id) {
- for (Iterator iter = screens.iterator(); iter.hasNext(); ) {
+ for (Iterator<Screen> iter = screens.iterator(); iter.hasNext(); ) {
Screen refScreen = (Screen)iter.next();
if (refScreen.id == id)
iter.remove();
@@ -53,7 +53,7 @@
fb_rect.setXYWH(0, 0, fb_width, fb_height);
- for (Iterator iter = screens.iterator(); iter.hasNext(); ) {
+ for (Iterator<Screen> iter = screens.iterator(); iter.hasNext(); ) {
Screen refScreen = (Screen)iter.next();
if (refScreen.dimensions.is_empty())
return false;
@@ -68,7 +68,7 @@
}
public final void debug_print() {
- for (Iterator iter = screens.iterator(); iter.hasNext(); ) {
+ for (Iterator<Screen> iter = screens.iterator(); iter.hasNext(); ) {
Screen refScreen = (Screen)iter.next();
vlog.error(" "+refScreen.id+" (0x"+refScreen.id+"): "+
refScreen.dimensions.width()+"x"+refScreen.dimensions.height()+
diff --git a/java/com/tigervnc/rfb/Security.java b/java/com/tigervnc/rfb/Security.java
index 6d52ede..9df4995 100644
--- a/java/com/tigervnc/rfb/Security.java
+++ b/java/com/tigervnc/rfb/Security.java
@@ -77,7 +77,7 @@
List<Integer> result = new ArrayList<Integer>();
result.add(secTypeVeNCrypt);
- for (Iterator i = enabledSecTypes.iterator(); i.hasNext(); ) {
+ for (Iterator<Integer> i = enabledSecTypes.iterator(); i.hasNext(); ) {
int refType = (Integer)i.next();
if (refType < 0x100)
result.add(refType);
@@ -90,7 +90,7 @@
{
List<Integer> result = new ArrayList<Integer>();
- for (Iterator i = enabledSecTypes.iterator(); i.hasNext(); ) {
+ for (Iterator<Integer> i = enabledSecTypes.iterator(); i.hasNext(); ) {
int refType = (Integer)i.next();
if (refType != secTypeVeNCrypt) /* Do not include VeNCrypt to avoid loops */
result.add(refType);
@@ -102,7 +102,7 @@
public static final void EnableSecType(int secType)
{
- for (Iterator i = enabledSecTypes.iterator(); i.hasNext(); )
+ for (Iterator<Integer> i = enabledSecTypes.iterator(); i.hasNext(); )
if ((Integer)i.next() == secType)
return;
@@ -111,7 +111,7 @@
public boolean IsSupported(int secType)
{
- Iterator i;
+ Iterator<Integer> i;
for (i = enabledSecTypes.iterator(); i.hasNext(); )
if ((Integer)i.next() == secType)