From 142c71a9efef888e2ff2ed05c5e97fedab834e63 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 23 Oct 2012 19:32:34 -0700 Subject: [PATCH] Use List rather than Set to represent supported mimetypes (as they will be prioritized). --- .../protocol/GuacamoleClientInformation.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) 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 6896947fd..424fc598c 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 @@ -37,7 +37,8 @@ package net.sourceforge.guacamole.protocol; * * ***** END LICENSE BLOCK ***** */ -import java.util.HashSet; +import java.util.ArrayList; +import java.util.List; import java.util.Set; /** @@ -59,14 +60,14 @@ public class GuacamoleClientInformation { private int optimalScreenHeight = 768; /** - * The set of audio mimetypes reported by the client to be supported¾. + * The list of audio mimetypes reported by the client to be supported. */ - private Set audioMimetypes = new HashSet(); + private List audioMimetypes = new ArrayList(); /** - * The set of audio mimetypes reported by the client to be supported¾. + * The list of audio mimetypes reported by the client to be supported. */ - private Set videoMimetypes = new HashSet(); + private List videoMimetypes = new ArrayList(); /** * Returns the optimal screen width requested by the client, in pixels. @@ -101,24 +102,24 @@ public class GuacamoleClientInformation { } /** - * Returns the set of audio mimetypes supported by the client. To add or - * removed supported mimetypes, the set returned by this function can be + * Returns the list of audio mimetypes supported by the client. To add or + * removed supported mimetypes, the list returned by this function can be * modified. * * @return The set of audio mimetypes supported by the client. */ - public Set getAudioMimetypes() { + public List getAudioMimetypes() { return audioMimetypes; } /** - * Returns the set of video mimetypes supported by the client. To add or - * removed supported mimetypes, the set returned by this function can be + * Returns the list of video mimetypes supported by the client. To add or + * removed supported mimetypes, the list returned by this function can be * modified. * * @return The set of video mimetypes supported by the client. */ - public Set getVideoMimetypes() { + public List getVideoMimetypes() { return videoMimetypes; }