fix code formatting

4 files changed, 425 insertions, 346 deletions

diff --git a/src/main/java/org/openslx/util/vm/VboxConfig.java b/src/main/java/org/openslx/util/vm/VboxConfig.java
index 6c6a487..86c5c3d 100644
--- a/src/main/java/org/openslx/util/vm/VboxConfig.java
+++ b/src/main/java/org/openslx/util/vm/VboxConfig.java
@@ -21,17 +21,14 @@ import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
 import org.apache.log4j.Logger;
-import org.apache.log4j.varia.StringMatchFilter;
-import org.openslx.util.vm.VmwareConfig.ConfigEntry;
-import org.w3c.dom.Attr;
+import org.openslx.util.vm.VmMetaData.DriveBusType;
+import org.openslx.util.vm.VmMetaData.HardDisk;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.openslx.util.vm.VmMetaData.DriveBusType;
-import org.openslx.util.vm.VmMetaData.HardDisk;
 
 /**
  * @author victorm
diff --git a/src/main/java/org/openslx/util/vm/VboxMetaData.java b/src/main/java/org/openslx/util/vm/VboxMetaData.java
index 9ea59d2..fc34ee1 100644
--- a/src/main/java/org/openslx/util/vm/VboxMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VboxMetaData.java
@@ -19,186 +19,205 @@ import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 
-public class VboxMetaData extends VmMetaData {
+public class VboxMetaData extends VmMetaData
+{
 
-	private static final Logger LOGGER = Logger.getLogger(VboxMetaData.class);
+	private static final Logger LOGGER = Logger.getLogger( VboxMetaData.class );
 
-	private static final Virtualizer virtualizer = new Virtualizer("virtualbox", "VirtualBox");
+	private static final Virtualizer virtualizer = new Virtualizer( "virtualbox", "VirtualBox" );
 
 	private final VboxConfig config;
 
-	public VboxMetaData(List<OperatingSystem> osList, File file)
-			throws IOException, UnsupportedVirtualizerFormatException {
+	public VboxMetaData( List<OperatingSystem> osList, File file )
+			throws IOException, UnsupportedVirtualizerFormatException
+	{
 
-		super(osList);
-		this.config = new VboxConfig(file);
+		super( osList );
+		this.config = new VboxConfig( file );
 		init();
 	}
 
-	public VboxMetaData(List<OperatingSystem> osList, byte[] vmContent, int length)
-			throws IOException, UnsupportedVirtualizerFormatException {
+	public VboxMetaData( List<OperatingSystem> osList, byte[] vmContent, int length )
+			throws IOException, UnsupportedVirtualizerFormatException
+	{
 
-		super(osList);
-		this.config = new VboxConfig(vmContent, length);
+		super( osList );
+		this.config = new VboxConfig( vmContent, length );
 		init();
 	}
 
-	private void init() {
+	private void init()
+	{
 		this.config.init();
 		displayName = config.getDisplayName();
-		setOs("virtualbox", config.getOsName());
+		setOs( "virtualbox", config.getOsName() );
 
-		for (HardDisk hardDisk : config.getHdds()) {
-			hdds.add(hardDisk);
+		for ( HardDisk hardDisk : config.getHdds() ) {
+			hdds.add( hardDisk );
 		}
 
 		// DEBUG Code???? mark such code please!
 		try {
-			addFloppy(0, null, true);
+			addFloppy( 0, null, true );
 			WriteToFile();
-		} catch (TransformerFactoryConfigurationError | TransformerException e) {
+		} catch ( TransformerFactoryConfigurationError | TransformerException e ) {
 			// WriteToFile exceptions here...not important for the the LOGGER
 			e.printStackTrace();
 		}
 	}
 
 	// --TODO will be needed later again
-	private void WriteToFile() throws TransformerFactoryConfigurationError, TransformerException {
+	private void WriteToFile() throws TransformerFactoryConfigurationError, TransformerException
+	{
 		Transformer transformer = TransformerFactory.newInstance().newTransformer();
-		StreamResult output = new StreamResult(new File("output.xml"));
-		Source input = new DOMSource(config.getConfigDoc());
-		transformer.transform(input, output);
+		StreamResult output = new StreamResult( new File( "output.xml" ) );
+		Source input = new DOMSource( config.getConfigDoc() );
+		transformer.transform( input, output );
 	}
 
 	@Override
-	public Virtualizer getVirtualizer() {
+	public Virtualizer getVirtualizer()
+	{
 		return virtualizer;
 	}
 
 	@Override
-	public void enableUsb(boolean enabled) {
+	public void enableUsb( boolean enabled )
+	{
 		// TODO Auto-generated method stub
 	}
 
 	@Override
-	public void applySettingsForLocalEdit() {
+	public void applySettingsForLocalEdit()
+	{
 		// TODO Auto-generated method stub
 	}
 
 	@Override
-	public byte[] getFilteredDefinitionArray() {
-		return config.toString().getBytes(StandardCharsets.UTF_8);
+	public byte[] getFilteredDefinitionArray()
+	{
+		return config.toString().getBytes( StandardCharsets.UTF_8 );
 	}
 
 	@Override
-	public boolean addHddTemplate(String diskImage, String hddMode, String redoDir) {
-		config.changeAttribute("HardDisk", "location", diskImage);
+	public boolean addHddTemplate( String diskImage, String hddMode, String redoDir )
+	{
+		config.changeAttribute( "HardDisk", "location", diskImage );
 		return true;
 	}
 
 	@Override
-	public boolean addHddTemplate(File diskImage, String hddMode, String redoDir) {
+	public boolean addHddTemplate( File diskImage, String hddMode, String redoDir )
+	{
 		String diskImagePath = diskImage.getName();
-		config.changeAttribute("HardDisk", "location", diskImagePath);
+		config.changeAttribute( "HardDisk", "location", diskImagePath );
 
 		UUID newhdduuid = UUID.randomUUID();
-		LOGGER.debug(newhdduuid);
+		LOGGER.debug( newhdduuid );
 
 		// patching the new uuid in the vbox config file here
 		String vboxUUid = "{" + newhdduuid.toString() + "}";
-		config.changeAttribute("HardDisk", "uuid", vboxUUid);
-		config.changeAttribute("Image", "uuid", vboxUUid);
+		config.changeAttribute( "HardDisk", "uuid", vboxUUid );
+		config.changeAttribute( "Image", "uuid", vboxUUid );
 
 		// write the new hdd uuid in the vdi file
-		byte[] bytesToWrite = new byte[16];
+		byte[] bytesToWrite = new byte[ 16 ];
 
 		int[] bytesOffset = { 32, 40, 48, 56, 16, 24, 0, 8, 56, 48, 40, 32, 24, 16, 8, 0 };
 
 		int offset = 0;
-		for (int i = 0; i < 2; i++) {
+		for ( int i = 0; i < 2; i++ ) {
 			Long uuidlong = null;
-			if (i == 0) {
+			if ( i == 0 ) {
 				uuidlong = newhdduuid.getMostSignificantBits();
 			} else {
 				uuidlong = newhdduuid.getLeastSignificantBits();
 			}
 
-			for (int j = 0; j < 8; j++) {
+			for ( int j = 0; j < 8; j++ ) {
 				int index = j + offset;
-				bytesToWrite[index] = (byte) (uuidlong >>> bytesOffset[index]);
+				bytesToWrite[index] = (byte) ( uuidlong >>> bytesOffset[index] );
 			}
 			offset = 8;
 		}
-		try (RandomAccessFile file = new RandomAccessFile(diskImage, "rw")) {
+		try ( RandomAccessFile file = new RandomAccessFile( diskImage, "rw" ) ) {
 
-			file.seek(392);
-			file.write(bytesToWrite, 0, 16);
-		} catch (Exception e) {
-			LOGGER.warn("could not patch new uuid in the vdi", e);
+			file.seek( 392 );
+			file.write( bytesToWrite, 0, 16 );
+		} catch ( Exception e ) {
+			LOGGER.warn( "could not patch new uuid in the vdi", e );
 		}
 
 		// we need a new machine uuid
 		UUID newMachineUuid = UUID.randomUUID();
-		if (newMachineUuid.equals(newhdduuid)) {
-			LOGGER.warn("The new Machine UUID is the same as the new HDD UUID; tying again...this vm might not start");
+		if ( newMachineUuid.equals( newhdduuid ) ) {
+			LOGGER.warn( "The new Machine UUID is the same as the new HDD UUID; tying again...this vm might not start" );
 			newMachineUuid = UUID.randomUUID();
 		}
 		String machineUUid = "{" + newMachineUuid.toString() + "}";
-		config.changeAttribute("Machine", "uuid", machineUUid);
+		config.changeAttribute( "Machine", "uuid", machineUUid );
 		return true;
 	}
 
 	@Override
-	public boolean addDefaultNat() {
-		config.addNewNode("Adapter", "NAT", false);
+	public boolean addDefaultNat()
+	{
+		config.addNewNode( "Adapter", "NAT", false );
 		return true;
 	}
 
-	public void reWrite() {
+	public void reWrite()
+	{
 		try {
 			WriteToFile();
-		} catch (TransformerFactoryConfigurationError | TransformerException e) {
+		} catch ( TransformerFactoryConfigurationError | TransformerException e ) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void setOs(String vendorOsId) {
+	public void setOs( String vendorOsId )
+	{
 		// TODO Auto-generated method stub
 
 	}
 
 	@Override
-	public boolean addDisplayName(String name) {
-		config.changeAttribute("Machine", "name", name);
+	public boolean addDisplayName( String name )
+	{
+		config.changeAttribute( "Machine", "name", name );
 		return true;
 	}
 
 	@Override
-	public boolean addRam(int mem) {
-		config.changeAttribute("Memory", "RAMSize", Integer.toString(mem));
+	public boolean addRam( int mem )
+	{
+		config.changeAttribute( "Memory", "RAMSize", Integer.toString( mem ) );
 		return true;
 	}
 
 	@Override
-	public void addFloppy(int index, String image, boolean readOnly) {
+	public void addFloppy( int index, String image, boolean readOnly )
+	{
 
-		if (image == null) {
+		if ( image == null ) {
 		} else {
 		}
 
 	}
 
 	@Override
-	public boolean addCdrom(String image) {
+	public boolean addCdrom( String image )
+	{
 		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
-	public boolean addCpuCoreCount(int nrOfCores) {
-		config.changeAttribute("CPU", "count", "1");
+	public boolean addCpuCoreCount( int nrOfCores )
+	{
+		config.changeAttribute( "CPU", "count", "1" );
 		return true;
 	}
 }
diff --git a/src/main/java/org/openslx/util/vm/VmMetaData.java b/src/main/java/org/openslx/util/vm/VmMetaData.java
index dc93dc9..a32da4e 100644
--- a/src/main/java/org/openslx/util/vm/VmMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmMetaData.java
@@ -16,22 +16,26 @@ import org.openslx.bwlp.thrift.iface.Virtualizer;
  * Describes a configured virtual machine. This class is parsed from a machine
  * description, like a *.vmx for VMware machines.
  */
-public abstract class VmMetaData {
-	private static final Logger LOGGER = Logger.getLogger(VmMetaData.class);
+public abstract class VmMetaData
+{
+	private static final Logger LOGGER = Logger.getLogger( VmMetaData.class );
 	/*
 	 * Helper types
 	 */
 
-	public static enum DriveBusType {
+	public static enum DriveBusType
+	{
 		SCSI, IDE, SATA;
 	}
 
-	public static class HardDisk {
+	public static class HardDisk
+	{
 		public final String chipsetDriver;
 		public final DriveBusType bus;
 		public final String diskImage;
 
-		public HardDisk(String chipsetDriver, DriveBusType bus, String diskImage) {
+		public HardDisk( String chipsetDriver, DriveBusType bus, String diskImage )
+		{
 			this.chipsetDriver = chipsetDriver;
 			this.bus = bus;
 			this.diskImage = diskImage;
@@ -56,21 +60,24 @@ public abstract class VmMetaData {
 	/**
 	 * Get operating system of this VM.
 	 */
-	public OperatingSystem getOs() {
+	public OperatingSystem getOs()
+	{
 		return os;
 	}
 
 	/**
 	 * Get all hard disks of this VM.
 	 */
-	public List<HardDisk> getHdds() {
-		return Collections.unmodifiableList(hdds);
+	public List<HardDisk> getHdds()
+	{
+		return Collections.unmodifiableList( hdds );
 	}
 
 	/**
 	 * Get display name of VM.
 	 */
-	public String getDisplayName() {
+	public String getDisplayName()
+	{
 		return displayName;
 	}
 
@@ -83,15 +90,17 @@ public abstract class VmMetaData {
 	 */
 	public abstract byte[] getFilteredDefinitionArray();
 
-	public final ByteBuffer getFilteredDefinition() {
-		return ByteBuffer.wrap(getFilteredDefinitionArray());
+	public final ByteBuffer getFilteredDefinition()
+	{
+		return ByteBuffer.wrap( getFilteredDefinitionArray() );
 	}
 
 	/*
 	 * Methods
 	 */
 
-	public VmMetaData(List<OperatingSystem> osList) {
+	public VmMetaData( List<OperatingSystem> osList )
+	{
 		this.osList = osList;
 	}
 
@@ -100,20 +109,21 @@ public abstract class VmMetaData {
 	 * given parameters, it will not be set.
 	 * 
 	 * @param virtId
-	 *            virtualizer, eg "vmware" for VMware
+	 *           virtualizer, eg "vmware" for VMware
 	 * @param virtOsId
-	 *            the os identifier used by the virtualizer, eg. windows7-64 for
-	 *            64bit Windows 7 on VMware
+	 *           the os identifier used by the virtualizer, eg. windows7-64 for
+	 *           64bit Windows 7 on VMware
 	 */
-	protected final void setOs(String virtId, String virtOsId) {
+	protected final void setOs( String virtId, String virtOsId )
+	{
 		OperatingSystem lazyMatch = null;
-		for (OperatingSystem os : osList) {
-			if (os.getVirtualizerOsId() == null)
+		for ( OperatingSystem os : osList ) {
+			if ( os.getVirtualizerOsId() == null )
 				continue;
-			for (Entry<String, String> entry : os.getVirtualizerOsId().entrySet()) {
-				if (!entry.getValue().equals(virtOsId))
+			for ( Entry<String, String> entry : os.getVirtualizerOsId().entrySet() ) {
+				if ( !entry.getValue().equals( virtOsId ) )
 					continue;
-				if (entry.getKey().equals(virtId)) {
+				if ( entry.getKey().equals( virtId ) ) {
 					this.os = os;
 					return;
 				} else {
@@ -128,7 +138,7 @@ public abstract class VmMetaData {
 
 	public abstract Virtualizer getVirtualizer();
 
-	public abstract void enableUsb(boolean enabled);
+	public abstract void enableUsb( boolean enabled );
 
 	/**
 	 * Apply config options that are desired when locally editing a VM. for vmware,
@@ -137,54 +147,56 @@ public abstract class VmMetaData {
 	public abstract void applySettingsForLocalEdit();
 
 	// meta object needed when reading vm from file
-	public static VmMetaData getInstance(List<OperatingSystem> osList, File file) throws IOException {
+	public static VmMetaData getInstance( List<OperatingSystem> osList, File file ) throws IOException
+	{
 		try {
-			return new VmwareMetaData(osList, file);
-		} catch (UnsupportedVirtualizerFormatException e) {
-			LOGGER.debug("Disk file not .vmdk");
+			return new VmwareMetaData( osList, file );
+		} catch ( UnsupportedVirtualizerFormatException e ) {
+			LOGGER.debug( "Disk file not .vmdk" );
 		}
 		try {
-			return new VboxMetaData(osList, file);
-		} catch (UnsupportedVirtualizerFormatException e) {
-			LOGGER.debug("Disk file not .vdi");
+			return new VboxMetaData( osList, file );
+		} catch ( UnsupportedVirtualizerFormatException e ) {
+			LOGGER.debug( "Disk file not .vdi" );
 		}
-		LOGGER.error("Unsupported disk file format!");
+		LOGGER.error( "Unsupported disk file format!" );
 		return null;
 	}
 
 	// meta object needed when reading from configarray
-	public static VmMetaData getInstance(List<OperatingSystem> osList, byte[] vmContent, int length)
-			throws IOException {
+	public static VmMetaData getInstance( List<OperatingSystem> osList, byte[] vmContent, int length )
+			throws IOException
+	{
 		try {
-			return new VmwareMetaData(osList, vmContent, length);
-		} catch (UnsupportedVirtualizerFormatException e) {
-			LOGGER.debug("Machine description not in .vmx format.", e);
+			return new VmwareMetaData( osList, vmContent, length );
+		} catch ( UnsupportedVirtualizerFormatException e ) {
+			LOGGER.debug( "Machine description not in .vmx format.", e );
 		}
 		try {
-			return new VboxMetaData(osList, vmContent, length);
-		} catch (UnsupportedVirtualizerFormatException e) {
-			LOGGER.debug("Machine description not in .vbox format.", e);
+			return new VboxMetaData( osList, vmContent, length );
+		} catch ( UnsupportedVirtualizerFormatException e ) {
+			LOGGER.debug( "Machine description not in .vbox format.", e );
 		}
-		LOGGER.error("Machine description has an unknown format!");
+		LOGGER.error( "Machine description has an unknown format!" );
 		return null;
 	}
 
-	public abstract boolean addHddTemplate(File diskImage, String hddMode, String redoDir);
+	public abstract boolean addHddTemplate( File diskImage, String hddMode, String redoDir );
 
-	public abstract boolean addHddTemplate(String diskImagePath, String hddMode, String redoDir);
+	public abstract boolean addHddTemplate( String diskImagePath, String hddMode, String redoDir );
 
 	public abstract boolean addDefaultNat();
 
-	public abstract void setOs(String vendorOsId);
+	public abstract void setOs( String vendorOsId );
 
-	public abstract boolean addDisplayName(String name);
+	public abstract boolean addDisplayName( String name );
 
-	public abstract boolean addRam(int mem);
+	public abstract boolean addRam( int mem );
 
-	public abstract void addFloppy(int index, String image, boolean readOnly);
+	public abstract void addFloppy( int index, String image, boolean readOnly );
 
-	public abstract boolean addCdrom(String image);
+	public abstract boolean addCdrom( String image );
 
-	public abstract boolean addCpuCoreCount(int nrOfCores);
+	public abstract boolean addCpuCoreCount( int nrOfCores );
 
 }
diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
index 1c84a72..379bbd7 100644
--- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
@@ -16,14 +16,15 @@ import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.util.Util;
 import org.openslx.util.vm.VmwareConfig.ConfigEntry;
 
-public class VmwareMetaData extends VmMetaData {
+public class VmwareMetaData extends VmMetaData
+{
 
-	private static final Logger LOGGER = Logger.getLogger(VmwareMetaData.class);
+	private static final Logger LOGGER = Logger.getLogger( VmwareMetaData.class );
 
-	private static final Virtualizer virtualizer = new Virtualizer("vmware", "VMware");
+	private static final Virtualizer virtualizer = new Virtualizer( "vmware", "VMware" );
 
-	private static final Pattern hddKey = Pattern.compile("^(ide\\d|scsi\\d|sata\\d):?(\\d)?\\.(.*)",
-			Pattern.CASE_INSENSITIVE);
+	private static final Pattern hddKey = Pattern.compile( "^(ide\\d|scsi\\d|sata\\d):?(\\d)?\\.(.*)",
+			Pattern.CASE_INSENSITIVE );
 
 	// Lowercase list of allowed settings for upload (as regex)
 	private static final Pattern[] whitelist;
@@ -35,281 +36,295 @@ public class VmwareMetaData extends VmMetaData {
 		String[] list = { "^guestos", "^uuid\\.bios", "^config\\.version", "^ehci\\.", "^mks\\.enable3d",
 				"^virtualhw\\.", "^sound\\.", "\\.pcislotnumber$", "^pcibridge", "\\.virtualdev$", "^tools\\.syncTime$",
 				"^time\\.synchronize", "^bios\\.bootDelay", "^rtc\\.", "^xhci\\." };
-		whitelist = new Pattern[list.length];
-		for (int i = 0; i < list.length; ++i) {
-			whitelist[i] = Pattern.compile(list[i].toLowerCase());
+		whitelist = new Pattern[ list.length ];
+		for ( int i = 0; i < list.length; ++i ) {
+			whitelist[i] = Pattern.compile( list[i].toLowerCase() );
 		}
 	}
 
 	private final Map<String, Controller> disks = new HashMap<>();
 
-	public VmwareMetaData(List<OperatingSystem> osList, File file)
-			throws IOException, UnsupportedVirtualizerFormatException {
-		super(osList);
-		this.config = new VmwareConfig(file);
+	public VmwareMetaData( List<OperatingSystem> osList, File file )
+			throws IOException, UnsupportedVirtualizerFormatException
+	{
+		super( osList );
+		this.config = new VmwareConfig( file );
 		init();
 	}
 
-	public VmwareMetaData(List<OperatingSystem> osList, byte[] vmxContent, int length)
-			throws UnsupportedVirtualizerFormatException {
-		super(osList);
-		this.config = new VmwareConfig(vmxContent, length); // still unfiltered
+	public VmwareMetaData( List<OperatingSystem> osList, byte[] vmxContent, int length )
+			throws UnsupportedVirtualizerFormatException
+	{
+		super( osList );
+		this.config = new VmwareConfig( vmxContent, length ); // still unfiltered
 		init(); // now filtered
 	}
 
-	private void init() {
-		for (Entry<String, ConfigEntry> entry : config.entrySet()) {
-			handleLoadEntry(entry);
+	private void init()
+	{
+		for ( Entry<String, ConfigEntry> entry : config.entrySet() ) {
+			handleLoadEntry( entry );
 		}
 		// if we find this tag, we already went through the hdd's - so we're done.
-		if (config.get("#SLX_HDD_BUS") != null) {
+		if ( config.get( "#SLX_HDD_BUS" ) != null ) {
 			return;
 		}
 		// Now find the HDDs and add to list
-		for (Entry<String, Controller> cEntry : disks.entrySet()) {
+		for ( Entry<String, Controller> cEntry : disks.entrySet() ) {
 			Controller controller = cEntry.getValue();
 			String controllerType = cEntry.getKey();
-			if (!controller.present)
+			if ( !controller.present )
 				continue;
-			for (Entry<String, Device> dEntry : controller.devices.entrySet()) {
+			for ( Entry<String, Device> dEntry : controller.devices.entrySet() ) {
 				Device device = dEntry.getValue();
-				if (!device.present)
+				if ( !device.present )
 					continue; // Not present
-				if (device.deviceType != null && !device.deviceType.toLowerCase().endsWith("disk"))
+				if ( device.deviceType != null && !device.deviceType.toLowerCase().endsWith( "disk" ) )
 					continue; // Not a HDD
 				DriveBusType bus = null;
-				if (controllerType.startsWith("ide")) {
+				if ( controllerType.startsWith( "ide" ) ) {
 					bus = DriveBusType.IDE;
-				} else if (controllerType.startsWith("scsi")) {
+				} else if ( controllerType.startsWith( "scsi" ) ) {
 					bus = DriveBusType.SCSI;
-				} else if (controllerType.startsWith("sata")) {
+				} else if ( controllerType.startsWith( "sata" ) ) {
 					bus = DriveBusType.SATA;
 				}
-				hdds.add(new HardDisk(controller.virtualDev, bus, device.filename));
+				hdds.add( new HardDisk( controller.virtualDev, bus, device.filename ) );
 			}
 		}
 
 		// Add HDD to cleaned vmx
-		if (!hdds.isEmpty()) {
-			HardDisk hdd = hdds.get(0);
-			addFiltered("#SLX_HDD_BUS", hdd.bus.toString());
-			if (hdd.chipsetDriver != null) {
-				addFiltered("#SLX_HDD_CHIP", hdd.chipsetDriver);
+		if ( !hdds.isEmpty() ) {
+			HardDisk hdd = hdds.get( 0 );
+			addFiltered( "#SLX_HDD_BUS", hdd.bus.toString() );
+			if ( hdd.chipsetDriver != null ) {
+				addFiltered( "#SLX_HDD_CHIP", hdd.chipsetDriver );
 			}
 		}
 	}
 
-	private void addFiltered(String key, String value) {
-		config.set(key, value).filtered(true);
+	private void addFiltered( String key, String value )
+	{
+		config.set( key, value ).filtered( true );
 	}
 
-	private boolean isSetAndTrue(String key) {
-		String value = config.get(key);
-		return value != null && value.equalsIgnoreCase("true");
+	private boolean isSetAndTrue( String key )
+	{
+		String value = config.get( key );
+		return value != null && value.equalsIgnoreCase( "true" );
 	}
 
-	private void handleLoadEntry(Entry<String, ConfigEntry> entry) {
+	private void handleLoadEntry( Entry<String, ConfigEntry> entry )
+	{
 		String lowerKey = entry.getKey().toLowerCase();
 		// Cleaned vmx construction
-		for (Pattern exp : whitelist) {
-			if (exp.matcher(lowerKey).find()) {
-				entry.getValue().filtered(true);
+		for ( Pattern exp : whitelist ) {
+			if ( exp.matcher( lowerKey ).find() ) {
+				entry.getValue().filtered( true );
 				break;
 			}
 		}
 		//
 		// Dig Usable meta data
 		String value = entry.getValue().getValue();
-		if (lowerKey.equals("guestos")) {
-			setOs("vmware", value);
+		if ( lowerKey.equals( "guestos" ) ) {
+			setOs( "vmware", value );
 			return;
 		}
-		if (lowerKey.equals("displayname")) {
+		if ( lowerKey.equals( "displayname" ) ) {
 			displayName = value;
 			return;
 		}
-		Matcher hdd = hddKey.matcher(entry.getKey());
-		if (hdd.find()) {
-			handleHddEntry(hdd.group(1).toLowerCase(), hdd.group(2), hdd.group(3), value);
+		Matcher hdd = hddKey.matcher( entry.getKey() );
+		if ( hdd.find() ) {
+			handleHddEntry( hdd.group( 1 ).toLowerCase(), hdd.group( 2 ), hdd.group( 3 ), value );
 		}
 	}
 
-	private void handleHddEntry(String controllerStr, String deviceStr, String property, String value) {
-		Controller controller = disks.get(controllerStr);
-		if (controller == null) {
+	private void handleHddEntry( String controllerStr, String deviceStr, String property, String value )
+	{
+		Controller controller = disks.get( controllerStr );
+		if ( controller == null ) {
 			controller = new Controller();
-			disks.put(controllerStr, controller);
+			disks.put( controllerStr, controller );
 		}
-		if (deviceStr == null || deviceStr.isEmpty()) {
+		if ( deviceStr == null || deviceStr.isEmpty() ) {
 			// Controller property
-			if (property.equalsIgnoreCase("present")) {
-				controller.present = Boolean.parseBoolean(value);
-			} else if (property.equalsIgnoreCase("virtualDev")) {
+			if ( property.equalsIgnoreCase( "present" ) ) {
+				controller.present = Boolean.parseBoolean( value );
+			} else if ( property.equalsIgnoreCase( "virtualDev" ) ) {
 				controller.virtualDev = value;
 			}
 			return;
 		}
 		// Device property
-		Device device = controller.devices.get(deviceStr);
-		if (device == null) {
+		Device device = controller.devices.get( deviceStr );
+		if ( device == null ) {
 			device = new Device();
-			controller.devices.put(deviceStr, device);
+			controller.devices.put( deviceStr, device );
 		}
-		if (property.equalsIgnoreCase("deviceType")) {
+		if ( property.equalsIgnoreCase( "deviceType" ) ) {
 			device.deviceType = value;
-		} else if (property.equalsIgnoreCase("filename")) {
+		} else if ( property.equalsIgnoreCase( "filename" ) ) {
 			device.filename = value;
-		} else if (property.equalsIgnoreCase("present")) {
-			device.present = Boolean.parseBoolean(value);
+		} else if ( property.equalsIgnoreCase( "present" ) ) {
+			device.present = Boolean.parseBoolean( value );
 		}
 	}
 
 	@Override
-	public boolean addHddTemplate(File diskImage, String hddMode, String redoDir) {
+	public boolean addHddTemplate( File diskImage, String hddMode, String redoDir )
+	{
 		String diskImagePath = diskImage.getName();
 		DriveBusType bus;
 		try {
-			bus = DriveBusType.valueOf(config.get("#SLX_HDD_BUS"));
-		} catch (Exception e) {
-			LOGGER.warn("Unknown bus type: " + config.get("#SLX_HDD_BUS") + ". Cannot add hdd config.");
+			bus = DriveBusType.valueOf( config.get( "#SLX_HDD_BUS" ) );
+		} catch ( Exception e ) {
+			LOGGER.warn( "Unknown bus type: " + config.get( "#SLX_HDD_BUS" ) + ". Cannot add hdd config." );
 			return false;
 		}
-		String chipset = config.get("#SLX_HDD_CHIP");
+		String chipset = config.get( "#SLX_HDD_CHIP" );
 		String prefix;
-		switch (bus) {
+		switch ( bus ) {
 		case IDE:
 			prefix = "ide0:0";
-			addFiltered("ide0.present", "TRUE");
+			addFiltered( "ide0.present", "TRUE" );
 			break;
 		case SATA:
 			// Cannot happen?... use lsisas1068
 		case SCSI:
 			prefix = "scsi0:0";
-			addFiltered("scsi0.present", "TRUE");
-			if (chipset != null) {
-				addFiltered("scsi0.virtualDev", chipset);
+			addFiltered( "scsi0.present", "TRUE" );
+			if ( chipset != null ) {
+				addFiltered( "scsi0.virtualDev", chipset );
 			}
 			break;
 		default:
-			LOGGER.warn("Unknown HDD bus type: " + bus.toString());
+			LOGGER.warn( "Unknown HDD bus type: " + bus.toString() );
 			return false;
 		}
 		// Gen
-		addFiltered(prefix + ".present", "TRUE");
-		addFiltered(prefix + ".deviceType", "disk");
-		addFiltered(prefix + ".fileName", diskImagePath);
-		if (hddMode != null) {
-			addFiltered(prefix + ".mode", hddMode);
-			addFiltered(prefix + ".redo", "");
-			addFiltered(prefix + ".redoLogDir", redoDir);
-		}
-		config.remove("#SLX_HDD_BUS");
-		config.remove("#SLX_HDD_CHIP");
+		addFiltered( prefix + ".present", "TRUE" );
+		addFiltered( prefix + ".deviceType", "disk" );
+		addFiltered( prefix + ".fileName", diskImagePath );
+		if ( hddMode != null ) {
+			addFiltered( prefix + ".mode", hddMode );
+			addFiltered( prefix + ".redo", "" );
+			addFiltered( prefix + ".redoLogDir", redoDir );
+		}
+		config.remove( "#SLX_HDD_BUS" );
+		config.remove( "#SLX_HDD_CHIP" );
 		return true;
 	}
 
 	@Override
-	public boolean addHddTemplate(String diskImagePath, String hddMode, String redoDir) {
+	public boolean addHddTemplate( String diskImagePath, String hddMode, String redoDir )
+	{
 		DriveBusType bus;
 		try {
-			bus = DriveBusType.valueOf(config.get("#SLX_HDD_BUS"));
-		} catch (Exception e) {
-			LOGGER.warn("Unknown bus type: " + config.get("#SLX_HDD_BUS") + ". Cannot add hdd config.");
+			bus = DriveBusType.valueOf( config.get( "#SLX_HDD_BUS" ) );
+		} catch ( Exception e ) {
+			LOGGER.warn( "Unknown bus type: " + config.get( "#SLX_HDD_BUS" ) + ". Cannot add hdd config." );
 			return false;
 		}
-		String chipset = config.get("#SLX_HDD_CHIP");
+		String chipset = config.get( "#SLX_HDD_CHIP" );
 		String prefix;
-		switch (bus) {
+		switch ( bus ) {
 		case IDE:
 			prefix = "ide0:0";
-			addFiltered("ide0.present", "TRUE");
+			addFiltered( "ide0.present", "TRUE" );
 			break;
 		case SATA:
 			// Cannot happen?... use lsisas1068
 		case SCSI:
 			prefix = "scsi0:0";
-			addFiltered("scsi0.present", "TRUE");
-			if (chipset != null) {
-				addFiltered("scsi0.virtualDev", chipset);
+			addFiltered( "scsi0.present", "TRUE" );
+			if ( chipset != null ) {
+				addFiltered( "scsi0.virtualDev", chipset );
 			}
 			break;
 		default:
-			LOGGER.warn("Unknown HDD bus type: " + bus.toString());
+			LOGGER.warn( "Unknown HDD bus type: " + bus.toString() );
 			return false;
 		}
 		// Gen
-		addFiltered(prefix + ".present", "TRUE");
-		addFiltered(prefix + ".deviceType", "disk");
-		addFiltered(prefix + ".fileName", diskImagePath);
-		if (hddMode != null) {
-			addFiltered(prefix + ".mode", hddMode);
-			addFiltered(prefix + ".redo", "");
-			addFiltered(prefix + ".redoLogDir", redoDir);
-		}
-		config.remove("#SLX_HDD_BUS");
-		config.remove("#SLX_HDD_CHIP");
+		addFiltered( prefix + ".present", "TRUE" );
+		addFiltered( prefix + ".deviceType", "disk" );
+		addFiltered( prefix + ".fileName", diskImagePath );
+		if ( hddMode != null ) {
+			addFiltered( prefix + ".mode", hddMode );
+			addFiltered( prefix + ".redo", "" );
+			addFiltered( prefix + ".redoLogDir", redoDir );
+		}
+		config.remove( "#SLX_HDD_BUS" );
+		config.remove( "#SLX_HDD_CHIP" );
 		return true;
 	}
 
-	public boolean addDefaultNat() {
-		addFiltered("ethernet0.present", "TRUE");
-		addFiltered("ethernet0.connectionType", "nat");
+	public boolean addDefaultNat()
+	{
+		addFiltered( "ethernet0.present", "TRUE" );
+		addFiltered( "ethernet0.connectionType", "nat" );
 		return true;
 	}
 
-	public boolean addEthernet(EthernetType type) {
+	public boolean addEthernet( EthernetType type )
+	{
 		int index = 0;
-		for (;; ++index) {
-			if (config.get("ethernet" + index + ".present") == null)
+		for ( ;; ++index ) {
+			if ( config.get( "ethernet" + index + ".present" ) == null )
 				break;
 		}
-		return addEthernet(index, type);
+		return addEthernet( index, type );
 	}
 
-	public boolean addEthernet(int index, EthernetType type) {
+	public boolean addEthernet( int index, EthernetType type )
+	{
 		String ether = "ethernet" + index;
-		addFiltered(ether + ".present", "TRUE");
-		addFiltered(ether + ".connectionType", "custom");
-		addFiltered(ether + ".vnet", type.vmnet);
-		if (config.get(ether + ".virtualDev") == null) {
-			String dev = config.get("ethernet0.virtualDev");
-			if (dev != null) {
-				addFiltered(ether + ".virtualDev", dev);
+		addFiltered( ether + ".present", "TRUE" );
+		addFiltered( ether + ".connectionType", "custom" );
+		addFiltered( ether + ".vnet", type.vmnet );
+		if ( config.get( ether + ".virtualDev" ) == null ) {
+			String dev = config.get( "ethernet0.virtualDev" );
+			if ( dev != null ) {
+				addFiltered( ether + ".virtualDev", dev );
 			}
 		}
 		return true;
 	}
 
-	public void addFloppy(int index, String image, boolean readOnly) {
+	public void addFloppy( int index, String image, boolean readOnly )
+	{
 		String pre = "floppy" + index;
-		addFiltered(pre + ".present", "TRUE");
-		if (image == null) {
-			addFiltered(pre + ".startConnected", "FALSE");
-			addFiltered(pre + ".fileType", "device");
-			config.remove(pre + ".fileName");
-			config.remove(pre + ".readonly");
-			addFiltered(pre + ".autodetect", "TRUE");
+		addFiltered( pre + ".present", "TRUE" );
+		if ( image == null ) {
+			addFiltered( pre + ".startConnected", "FALSE" );
+			addFiltered( pre + ".fileType", "device" );
+			config.remove( pre + ".fileName" );
+			config.remove( pre + ".readonly" );
+			addFiltered( pre + ".autodetect", "TRUE" );
 		} else {
-			addFiltered(pre + ".startConnected", "TRUE");
-			addFiltered(pre + ".fileType", "file");
-			addFiltered(pre + ".fileName", image);
-			addFiltered(pre + ".readonly", vmBoolean(readOnly));
-			config.remove(pre + ".autodetect");
-		}
-	}
-
-	public boolean addCdrom(String image) {
-		for (String port : new String[] { "ide0:0", "ide0:1", "ide1:0", "ide1:1", "scsi0:1" }) {
-			if (!isSetAndTrue(port + ".present")) {
-				addFiltered(port + ".present", "TRUE");
-				if (image == null) {
-					addFiltered(port + ".autodetect", "TRUE");
-					addFiltered(port + ".deviceType", "cdrom-raw");
-					config.remove(port + ".fileName");
+			addFiltered( pre + ".startConnected", "TRUE" );
+			addFiltered( pre + ".fileType", "file" );
+			addFiltered( pre + ".fileName", image );
+			addFiltered( pre + ".readonly", vmBoolean( readOnly ) );
+			config.remove( pre + ".autodetect" );
+		}
+	}
+
+	public boolean addCdrom( String image )
+	{
+		for ( String port : new String[] { "ide0:0", "ide0:1", "ide1:0", "ide1:1", "scsi0:1" } ) {
+			if ( !isSetAndTrue( port + ".present" ) ) {
+				addFiltered( port + ".present", "TRUE" );
+				if ( image == null ) {
+					addFiltered( port + ".autodetect", "TRUE" );
+					addFiltered( port + ".deviceType", "cdrom-raw" );
+					config.remove( port + ".fileName" );
 				} else {
-					config.remove(port + ".autodetect");
-					addFiltered(port + ".deviceType", "cdrom-image");
-					addFiltered(port + ".fileName", image);
+					config.remove( port + ".autodetect" );
+					addFiltered( port + ".deviceType", "cdrom-image" );
+					addFiltered( port + ".fileName", image );
 				}
 				return true;
 			}
@@ -317,129 +332,151 @@ public class VmwareMetaData extends VmMetaData {
 		return false;
 	}
 
-	private static String vmBoolean(boolean var) {
-		return Boolean.toString(var).toUpperCase();
+	private static String vmBoolean( boolean var )
+	{
+		return Boolean.toString( var ).toUpperCase();
 	}
 
-	private static String vmInteger(int val) {
-		return Integer.toString(val);
+	private static String vmInteger( int val )
+	{
+		return Integer.toString( val );
 	}
 
-	public boolean disableSuspend() {
-		addFiltered("suspend.disabled", "TRUE");
+	public boolean disableSuspend()
+	{
+		addFiltered( "suspend.disabled", "TRUE" );
 		return true;
 	}
 
-	public boolean addDisplayName(String name) {
-		addFiltered("displayName", name);
+	public boolean addDisplayName( String name )
+	{
+		addFiltered( "displayName", name );
 		return true;
 	}
 
-	public boolean addRam(int mem) {
-		addFiltered("memsize", Integer.toString(mem));
+	public boolean addRam( int mem )
+	{
+		addFiltered( "memsize", Integer.toString( mem ) );
 		return true;
 	}
 
-	public void setOs(String vendorOsId) {
-		addFiltered("guestOS", vendorOsId);
-		setOs("vmware", vendorOsId);
+	public void setOs( String vendorOsId )
+	{
+		addFiltered( "guestOS", vendorOsId );
+		setOs( "vmware", vendorOsId );
 	}
 
 	@Override
-	public byte[] getFilteredDefinitionArray() {
-		return config.toString(true, false).getBytes(StandardCharsets.UTF_8);
+	public byte[] getFilteredDefinitionArray()
+	{
+		return config.toString( true, false ).getBytes( StandardCharsets.UTF_8 );
 	}
 
-	public byte[] getDefinitionArray() {
-		return config.toString(false, false).getBytes(StandardCharsets.UTF_8);
+	public byte[] getDefinitionArray()
+	{
+		return config.toString( false, false ).getBytes( StandardCharsets.UTF_8 );
 	}
 
 	@Override
-	public Virtualizer getVirtualizer() {
+	public Virtualizer getVirtualizer()
+	{
 		return virtualizer;
 	}
 
-	private static class Device {
+	private static class Device
+	{
 		public boolean present = false;
 		public String deviceType = null;
 		public String filename = null;
 
 		@Override
-		public String toString() {
+		public String toString()
+		{
 			return filename + " is " + deviceType + " (present: " + present + ")";
 		}
 	}
 
-	private static class Controller {
+	private static class Controller
+	{
 		public boolean present = true; // Seems to be implicit, seen at least for IDE...
 		public String virtualDev = null;
 		Map<String, Device> devices = new HashMap<>();
 
 		@Override
-		public String toString() {
+		public String toString()
+		{
 			return virtualDev + " is (present: " + present + "): " + devices.toString();
 		}
 	}
 
-	public static enum EthernetType {
-		NAT("vmnet1"), BRIDGED("vmnet0"), HOST_ONLY("vmnet2");
+	public static enum EthernetType
+	{
+		NAT( "vmnet1" ), BRIDGED( "vmnet0" ), HOST_ONLY( "vmnet2" );
 
 		public final String vmnet;
 
-		private EthernetType(String vnet) {
+		private EthernetType( String vnet )
+		{
 			this.vmnet = vnet;
 		}
 	}
 
 	@Override
-	public void enableUsb(boolean enabled) {
-		addFiltered("usb.present", vmBoolean(enabled));
-		addFiltered("ehci.present", vmBoolean(enabled));
+	public void enableUsb( boolean enabled )
+	{
+		addFiltered( "usb.present", vmBoolean( enabled ) );
+		addFiltered( "ehci.present", vmBoolean( enabled ) );
 	}
 
 	@Override
-	public void applySettingsForLocalEdit() {
-		addFiltered("gui.applyHostDisplayScalingToGuest", "FALSE");
+	public void applySettingsForLocalEdit()
+	{
+		addFiltered( "gui.applyHostDisplayScalingToGuest", "FALSE" );
 	}
 
-	public String getValue(String key) {
-		return config.get(key);
+	public String getValue( String key )
+	{
+		return config.get( key );
 	}
 
 	// SOUND
-	public static enum SoundCardType {
-		NONE(false, null, "None"), DEFAULT(true, null, "(default)"), SOUND_BLASTER(true, "sb16",
-				"Sound Blaster 16"), ES(true, "es1371",
-						"ES 1371"), HD_AUDIO(true, "hdaudio", "Intel Integrated HD Audio");
+	public static enum SoundCardType
+	{
+		NONE( false, null, "None" ), DEFAULT( true, null, "(default)" ), SOUND_BLASTER( true, "sb16",
+				"Sound Blaster 16" ), ES( true, "es1371",
+						"ES 1371" ), HD_AUDIO( true, "hdaudio", "Intel Integrated HD Audio" );
 
 		public final boolean isPresent;
 		public final String value;
 		public final String displayName;
 
-		private SoundCardType(boolean present, String value, String dName) {
+		private SoundCardType( boolean present, String value, String dName )
+		{
 			this.isPresent = present;
 			this.value = value;
 			this.displayName = dName;
 		}
 	}
 
-	public void setSoundCard(SoundCardType type) {
-		addFiltered("sound.present", vmBoolean(type.isPresent));
-		if (type.value != null) {
-			addFiltered("sound.virtualDev", type.value);
+	public void setSoundCard( SoundCardType type )
+	{
+		addFiltered( "sound.present", vmBoolean( type.isPresent ) );
+		if ( type.value != null ) {
+			addFiltered( "sound.virtualDev", type.value );
 		} else {
-			config.remove("sound.virtualDev");
+			config.remove( "sound.virtualDev" );
 		}
 	}
 
-	public SoundCardType getSoundCard() {
-		if (!isSetAndTrue("sound.present") || !isSetAndTrue("sound.autodetect")) {
+	public SoundCardType getSoundCard()
+	{
+		if ( !isSetAndTrue( "sound.present" ) || !isSetAndTrue( "sound.autodetect" ) ) {
 			return SoundCardType.NONE;
 		}
-		String current = config.get("sound.virtualDev");
-		if (current != null) {
-			for (SoundCardType type : SoundCardType.values()) {
-				if (current.equals(type.value)) {
+		String current = config.get( "sound.virtualDev" );
+		if ( current != null ) {
+			for ( SoundCardType type : SoundCardType.values() ) {
+				if ( current.equals( type.value ) ) {
 					return type;
 				}
 			}
@@ -448,24 +485,28 @@ public class VmwareMetaData extends VmMetaData {
 	}
 
 	// 3DAcceleration
-	public static enum DDAcceleration {
-		OFF(false, "Off"), ON(true, "On");
+	public static enum DDAcceleration
+	{
+		OFF( false, "Off" ), ON( true, "On" );
 
 		public final boolean isPresent;
 		public final String displayName;
 
-		private DDAcceleration(boolean present, String dName) {
+		private DDAcceleration( boolean present, String dName )
+		{
 			this.isPresent = present;
 			this.displayName = dName;
 		}
 	}
 
-	public void setDDAcceleration(DDAcceleration type) {
-		addFiltered("mks.enable3d", vmBoolean(type.isPresent));
+	public void setDDAcceleration( DDAcceleration type )
+	{
+		addFiltered( "mks.enable3d", vmBoolean( type.isPresent ) );
 	}
 
-	public DDAcceleration getDDAcceleration() {
-		if (isSetAndTrue("mks.enable3d")) {
+	public DDAcceleration getDDAcceleration()
+	{
+		if ( isSetAndTrue( "mks.enable3d" ) ) {
 			return DDAcceleration.ON;
 		} else {
 			return DDAcceleration.OFF;
@@ -473,33 +514,37 @@ public class VmwareMetaData extends VmMetaData {
 	}
 
 	// Virtual hardware version
-	public static enum HWVersion {
-		NONE(0, "(invalid)"), THREE(3, "  3 (Workstation 4/5, Player 1)"), FOUR(4,
-				"  4 (Workstation 4/5, Player 1/2, Fusion 1)"), SIX(6, "  6 (Workstation 6)"), SEVEN(7,
-						"  7 (Workstation 6.5/7, Player 3, Fusion 2/3)"), EIGHT(8,
-								"  8 (Workstation 8, Player/Fusion 4)"), NINE(9,
-										"  9 (Workstation 9, Player/Fusion 5)"), TEN(10,
-												"10 (Workstation 10, Player/Fusion 6)"), ELEVEN(11,
-														"11 (Workstation 11, Player/Fusion 7)"), TWELVE(12,
-																"12 (Workstation/Player 12, Fusion 8)");
+	public static enum HWVersion
+	{
+		NONE( 0, "(invalid)" ), THREE( 3, "  3 (Workstation 4/5, Player 1)" ), FOUR( 4,
+				"  4 (Workstation 4/5, Player 1/2, Fusion 1)" ), SIX( 6, "  6 (Workstation 6)" ), SEVEN( 7,
+						"  7 (Workstation 6.5/7, Player 3, Fusion 2/3)" ), EIGHT( 8,
+								"  8 (Workstation 8, Player/Fusion 4)" ), NINE( 9,
+										"  9 (Workstation 9, Player/Fusion 5)" ), TEN( 10,
+												"10 (Workstation 10, Player/Fusion 6)" ), ELEVEN( 11,
+														"11 (Workstation 11, Player/Fusion 7)" ), TWELVE( 12,
+																"12 (Workstation/Player 12, Fusion 8)" );
 
 		public final int version;
 		public final String displayName;
 
-		private HWVersion(int vers, String dName) {
+		private HWVersion( int vers, String dName )
+		{
 			this.version = vers;
 			this.displayName = dName;
 		}
 	}
 
-	public void setHWVersion(HWVersion type) {
-		addFiltered("virtualHW.version", vmInteger(type.version));
+	public void setHWVersion( HWVersion type )
+	{
+		addFiltered( "virtualHW.version", vmInteger( type.version ) );
 	}
 
-	public HWVersion getHWVersion() {
-		int currentValue = Util.parseInt(config.get("virtualHW.version"), -1);
-		for (HWVersion ver : HWVersion.values()) {
-			if (currentValue == ver.version) {
+	public HWVersion getHWVersion()
+	{
+		int currentValue = Util.parseInt( config.get( "virtualHW.version" ), -1 );
+		for ( HWVersion ver : HWVersion.values() ) {
+			if ( currentValue == ver.version ) {
 				return ver;
 			}
 		}
@@ -507,33 +552,37 @@ public class VmwareMetaData extends VmMetaData {
 	}
 
 	// Virtual network adapter
-	public static enum EthernetDevType {
-		AUTO(null, "(default)"), PCNET32("vlance", "AMD PCnet32"), E1000("e1000", "Intel E1000 (PCI)"), E1000E("e1000e",
-				"Intel E1000e (PCI-Express)"), VMXNET("vmxnet", "VMXnet"), VMXNET3("vmxnet3", "VMXnet 3");
+	public static enum EthernetDevType
+	{
+		AUTO( null, "(default)" ), PCNET32( "vlance", "AMD PCnet32" ), E1000( "e1000", "Intel E1000 (PCI)" ), E1000E( "e1000e",
+				"Intel E1000e (PCI-Express)" ), VMXNET( "vmxnet", "VMXnet" ), VMXNET3( "vmxnet3", "VMXnet 3" );
 
 		public final String value;
 		public final String displayName;
 
-		private EthernetDevType(String value, String dName) {
+		private EthernetDevType( String value, String dName )
+		{
 			this.value = value;
 			this.displayName = dName;
 		}
 	}
 
-	public void setEthernetDevType(int cardIndex, EthernetDevType type) {
-		if (type.value != null) {
-			addFiltered("ethernet" + cardIndex + ".virtualDev", type.value);
+	public void setEthernetDevType( int cardIndex, EthernetDevType type )
+	{
+		if ( type.value != null ) {
+			addFiltered( "ethernet" + cardIndex + ".virtualDev", type.value );
 		} else {
-			config.remove("ethernet" + cardIndex + ".virtualDev");
+			config.remove( "ethernet" + cardIndex + ".virtualDev" );
 		}
 	}
 
-	public EthernetDevType getEthernetDevType(int cardIndex) {
-		String temp = config.get("ethernet" + cardIndex + ".virtualDev");
-		if (temp != null) {
+	public EthernetDevType getEthernetDevType( int cardIndex )
+	{
+		String temp = config.get( "ethernet" + cardIndex + ".virtualDev" );
+		if ( temp != null ) {
 
-			for (EthernetDevType type : EthernetDevType.values()) {
-				if (temp.equals(type.value)) {
+			for ( EthernetDevType type : EthernetDevType.values() ) {
+				if ( temp.equals( type.value ) ) {
 					return type;
 				}
 			}
@@ -542,13 +591,15 @@ public class VmwareMetaData extends VmMetaData {
 	}
 
 	@Override
-	public void reWrite() {
+	public void reWrite()
+	{
 		// TODO Auto-generated method stub
 
 	}
 
 	@Override
-	public boolean addCpuCoreCount(int nrOfCores) {
+	public boolean addCpuCoreCount( int nrOfCores )
+	{
 		// TODO Auto-generated method stub
 		return false;
 	}