[VBox] separated and made some vmwaremetadata functions abstract in vmmetadata s.t. vboxmetadata also needs to implement them

	implemented said functions in vboxmetadata

1 files changed, 34 insertions, 18 deletions

diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
index f2c6a80..47deb27 100644
--- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
@@ -82,6 +82,20 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 		}
 	}
 
+	public static enum EthernetType
+	{
+		NAT( "vmnet1" ),
+		BRIDGED( "vmnet0" ),
+		HOST_ONLY( "vmnet2" );
+
+		public final String vmnet;
+
+		private EthernetType( String vnet )
+		{
+			this.vmnet = vnet;
+		}
+	}
+
 	private final Map<String, Controller> disks = new HashMap<>();
 
 	public VmwareMetaData( List<OperatingSystem> osList, File file ) throws IOException, UnsupportedVirtualizerFormatException
@@ -308,14 +322,29 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 		return true;
 	}
 
-	public boolean addEthernet( EthernetType type )
+	public boolean addEthernet( VmMetaData.EtherType type )
 	{
+		boolean returnboolean = false;
 		int index = 0;
 		for ( ;; ++index ) {
 			if ( config.get( "ethernet" + index + ".present" ) == null )
 				break;
 		}
-		return addEthernet( index, type );
+		switch ( type ) {
+		case NAT:
+			returnboolean = addEthernet( index, EthernetType.NAT );
+			break;
+		case BRIDGED:
+			returnboolean = addEthernet( index, EthernetType.BRIDGED );
+			break;
+		case HOST_ONLY:
+			returnboolean = addEthernet( index, EthernetType.HOST_ONLY );
+			break;
+		default:
+			// Should not come to this...
+			break;
+		}
+		return returnboolean;
 	}
 
 	public boolean addEthernet( int index, EthernetType type )
@@ -382,18 +411,19 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 		return Integer.toString( val );
 	}
 
+	@Override
 	public boolean disableSuspend()
 	{
 		addFiltered( "suspend.disabled", "TRUE" );
 		return true;
 	}
-
+	@Override
 	public boolean addDisplayName( String name )
 	{
 		addFiltered( "displayName", name );
 		return true;
 	}
-
+	@Override
 	public boolean addRam( int mem )
 	{
 		addFiltered( "memsize", Integer.toString( mem ) );
@@ -449,20 +479,6 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 		}
 	}
 
-	public static enum EthernetType
-	{
-		NAT( "vmnet1" ),
-		BRIDGED( "vmnet0" ),
-		HOST_ONLY( "vmnet2" );
-
-		public final String vmnet;
-
-		private EthernetType( String vnet )
-		{
-			this.vmnet = vnet;
-		}
-	}
-
 	@Override
 	public void enableUsb( boolean enabled )
 	{