From 05a6127fca70ab0994edbb171769279726b481a4 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 26 Apr 2015 15:28:20 -0700 Subject: [PATCH] GUAC-1170: Fix unchecked cast warnings. --- .../glyptodon/guacamole/net/basic/GuacamoleSession.java | 2 +- .../org/glyptodon/guacamole/net/basic/TunnelModule.java | 5 ++--- .../net/basic/rest/language/LanguageRESTService.java | 9 ++++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleSession.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleSession.java index bed05a97d..ed2223436 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleSession.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleSession.java @@ -112,7 +112,7 @@ public class GuacamoleSession { // Add an instance of each class to the list if (listenerClasses != null) { - for (Class listenerClass : listenerClasses) { + for (Class listenerClass : listenerClasses) { // Instantiate listener Object listener = listenerClass.getConstructor().newInstance(); diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java index afce169b5..baabf99a7 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/TunnelModule.java @@ -55,11 +55,10 @@ public class TunnelModule extends ServletModule { try { // Attempt to find WebSocket module - Class module = (Class) - GuacamoleClassLoader.getInstance().findClass(classname); + Class module = (Class) GuacamoleClassLoader.getInstance().findClass(classname); // Create loader - TunnelLoader loader = module.getConstructor().newInstance(); + TunnelLoader loader = (TunnelLoader) module.getConstructor().newInstance(); // Install module, if supported if (loader.isSupported()) { diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java index 02357f270..80917a395 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java @@ -79,7 +79,7 @@ public class LanguageRESTService { * filename. */ private static final Pattern LANGUAGE_KEY_PATTERN = Pattern.compile(".*/([a-z]+_[A-Z]+)\\.json"); - + /** * Returns a map of all available language keys to their corresponding * human-readable names. @@ -104,7 +104,7 @@ public class LanguageRESTService { @Context ServletContext servletContext) throws GuacamoleException { // Get the paths of all the translation files - Set resourcePaths = servletContext.getResourcePaths(TRANSLATION_PATH); + Set resourcePaths = servletContext.getResourcePaths(TRANSLATION_PATH); // If no translation files found, return an empty map if (resourcePaths == null) @@ -113,7 +113,10 @@ public class LanguageRESTService { Map languageMap = new HashMap(); // Iterate through all the found language files and add them to the return map - for (String resourcePath : resourcePaths) { + for (Object resourcePathObject : resourcePaths) { + + // Each resource path is guaranteed to be a string + String resourcePath = (String) resourcePathObject; // Get input stream for language file InputStream languageFileStream = servletContext.getResourceAsStream(resourcePath);