From 75408f5224ed3a108d32cf105d6618f494bf4f8a Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 21 Feb 2013 11:52:47 -0800 Subject: [PATCH] Fix style issues. --- .../guacamole/io/ReaderGuacamoleReader.java | 3 ++- .../protocol/GuacamoleClientInformation.java | 1 - .../servlet/GuacamoleHTTPTunnelServlet.java | 13 +++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java index 2d7bf685e..257c8ba96 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java +++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java @@ -39,6 +39,7 @@ package net.sourceforge.guacamole.io; import java.io.IOException; import java.io.Reader; +import java.util.Deque; import java.util.LinkedList; import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.GuacamoleServerException; @@ -210,7 +211,7 @@ public class ReaderGuacamoleReader implements GuacamoleReader { int elementStart = 0; // Build list of elements - LinkedList elements = new LinkedList(); + Deque elements = new LinkedList(); while (elementStart < instructionBuffer.length) { // Find end of length diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java index c2fc48c48..78f9f031b 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java +++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleClientInformation.java @@ -39,7 +39,6 @@ package net.sourceforge.guacamole.protocol; import java.util.ArrayList; import java.util.List; -import java.util.Set; /** * An abstract representation of Guacamole client information, including all diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java index 1c178e063..039e91565 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java +++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java @@ -36,13 +36,22 @@ package net.sourceforge.guacamole.servlet; * * ***** END LICENSE BLOCK ***** */ -import java.io.*; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import net.sourceforge.guacamole.*; +import net.sourceforge.guacamole.GuacamoleClientException; +import net.sourceforge.guacamole.GuacamoleException; +import net.sourceforge.guacamole.GuacamoleResourceNotFoundException; +import net.sourceforge.guacamole.GuacamoleSecurityException; +import net.sourceforge.guacamole.GuacamoleServerException; import net.sourceforge.guacamole.io.GuacamoleReader; import net.sourceforge.guacamole.io.GuacamoleWriter; import net.sourceforge.guacamole.net.GuacamoleTunnel;