safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-10 07:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1053 Fixed problems highlighted in pull request comments.

Browse Source
This commit is contained in:
James Muehlner
2015-04-22 22:52:23 -07:00
parent c2b2302708
commit 8e3e27b8cd
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/language/LanguageRESTService.java
View File

@@ -62,7 +62,7 @@ public class LanguageRESTService {
/**
* The path to the translation folder within the webapp.
*/
private static final String TRANSLATION_PATHS = "/translations";
private static final String TRANSLATION_PATH = "/translations";
/**
* The JSON property for the human readable display name.
@@ -92,8 +92,8 @@ public class LanguageRESTService {
* The ServletContext associated with the request.
*
* @return
* A list of languages defined in the system, consisting of
* language display name and key.
* A map of languages defined in the system, of language key to
* display name.
*
* @throws GuacamoleException
* If an error occurs while retrieving the available languages.
@@ -104,7 +104,7 @@ public class LanguageRESTService {
@Context ServletContext servletContext) throws GuacamoleException {
// Get the paths of all the translation files
Set<String> resourcePaths = servletContext.getResourcePaths(TRANSLATION_PATHS);
Set<String> resourcePaths = servletContext.getResourcePaths(TRANSLATION_PATH);
// If no translation files found, return an empty map
if (resourcePaths == null)
@@ -113,7 +113,7 @@ public class LanguageRESTService {
Map<String, String> languageMap = new HashMap<String, String>();
// Iterate through all the found language files and add them to the return map
for(String resourcePath : resourcePaths) {
for (String resourcePath : resourcePaths) {
// Get input stream for language file
InputStream languageFileStream = servletContext.getResourceAsStream(resourcePath);