From 78d655a85ae946f020ef321abc0da8b47f28cd6a Mon Sep 17 00:00:00 2001 From: Victor Mocanu Date: Fri, 27 Oct 2017 09:30:02 +0200 Subject: [VBox] added sorting to the keysarrays --- src/main/java/org/openslx/util/vm/VmMetaData.java | 29 ++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/openslx/util/vm/VmMetaData.java b/src/main/java/org/openslx/util/vm/VmMetaData.java index 1130f9b..36ecd4c 100644 --- a/src/main/java/org/openslx/util/vm/VmMetaData.java +++ b/src/main/java/org/openslx/util/vm/VmMetaData.java @@ -80,7 +80,7 @@ public abstract class VmMetaData this.displayName = dName; } } - + // Virtual network adapter public static enum EthernetDevType { @@ -137,21 +137,34 @@ public abstract class VmMetaData */ public List getSupportedSoundCards() { - return new ArrayList( soundCards.keySet() ); + ArrayList availables = new ArrayList( soundCards.keySet() ); + // availables must be sorted else the user always gets another order of the dropdown list at startup + Collections.sort( availables ); + return availables; } public List getSupportedDDAccs() { - return new ArrayList( ddacc.keySet() ); + ArrayList availables = new ArrayList( ddacc.keySet() ); + // availables must be sorted else the user always gets another order of the dropdown list at startup + Collections.sort( availables ); + return availables; } public List getSupportedHWVersions() { - return new ArrayList( hwversion.keySet() ); + ArrayList availables = new ArrayList( hwversion.keySet() ); + // availables must be sorted else the user always gets another order of the dropdown list at startup + Collections.sort( availables ); + return availables; } - - public List getSupportedEthernetDevices() { - return new ArrayList( networkCards.keySet() ); + + public List getSupportedEthernetDevices() + { + ArrayList availables = new ArrayList( networkCards.keySet() ); + // availables must be sorted else the user always gets another order of the dropdown list at startup + Collections.sort( availables ); + return availables; } /** @@ -299,7 +312,6 @@ public abstract class VmMetaData public abstract SoundCardType getSoundCard(); - public abstract void setDDAcceleration( DDAcceleration type ); public abstract DDAcceleration getDDAcceleration(); @@ -307,6 +319,7 @@ public abstract class VmMetaData public abstract void setHWVersion( HWVersion type ); public abstract HWVersion getHWVersion(); + // TODO export to VmMetaData like SoundCardType public abstract void setEthernetDevType( int cardIndex, EthernetDevType type ); -- cgit v1.2.3-55-g7522