[client] Sync to changes in master-sync-changes

2 files changed, 9 insertions, 9 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
index 0bc0e020..fd58debd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
@@ -15,7 +15,7 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.util.ThriftUtil;
 import org.openslx.util.vm.VmwareMetaData;
 import org.openslx.util.vm.VmwareMetaData.DDAcceleration;
-import org.openslx.util.vm.VmwareMetaData.E0VirtDev;
+import org.openslx.util.vm.VmwareMetaData.EthernetDevType;
 import org.openslx.util.vm.VmwareMetaData.HWVersion;
 import org.openslx.util.vm.VmwareMetaData.SoundCardType;
 
@@ -81,8 +81,8 @@ public class VirtDropDownConfigEditorWindow extends VirtDropDownConfigEditorWind
 		cboE0VirtDev.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				E0VirtDev selected = (E0VirtDev) cboE0VirtDev.getSelectedItem();
-				meta.setE0VirtDev(selected);
+				EthernetDevType selected = (EthernetDevType) cboE0VirtDev.getSelectedItem();
+				meta.setEthernetDevType(0, selected);
 				checkForChange();
 			}
 		});
@@ -141,7 +141,7 @@ public class VirtDropDownConfigEditorWindow extends VirtDropDownConfigEditorWind
 		cbo3DAcceleration.setSelectedItem(DDA);
 		HWVersion HWV = m.getHWVersion();
 		cboHWVersion.setSelectedItem(HWV);
-		E0VirtDev E0VD = m.getE0VirtDev();
+		EthernetDevType E0VD = m.getEthernetDevType(0);
 		cboE0VirtDev.setSelectedItem(E0VD);
 	}
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
index 621d6b56..efa6f0e3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
@@ -20,7 +20,7 @@ import org.openslx.dozmod.gui.control.ComboBox;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.util.vm.VmwareMetaData.DDAcceleration;
-import org.openslx.util.vm.VmwareMetaData.E0VirtDev;
+import org.openslx.util.vm.VmwareMetaData.EthernetDevType;
 import org.openslx.util.vm.VmwareMetaData.HWVersion;
 import org.openslx.util.vm.VmwareMetaData.SoundCardType;
 
@@ -36,7 +36,7 @@ public class VirtDropDownConfigEditorWindowLayout extends JDialog {
 	protected final JComboBox<SoundCardType> cboSound;
 	protected final JComboBox<DDAcceleration> cbo3DAcceleration;
 	protected final JComboBox<HWVersion> cboHWVersion;
-	protected final JComboBox<E0VirtDev> cboE0VirtDev;
+	protected final JComboBox<EthernetDevType> cboE0VirtDev;
 
 	protected VirtDropDownConfigEditorWindowLayout(Window modalParent) {
 		super(modalParent, title,
@@ -95,14 +95,14 @@ public class VirtDropDownConfigEditorWindowLayout extends JDialog {
 		}
 
 		// HardwareVersioBox
-		cboE0VirtDev = new ComboBox<>(new ComboBoxRenderer<E0VirtDev>() {
+		cboE0VirtDev = new ComboBox<>(new ComboBoxRenderer<EthernetDevType>() {
 			@Override
-			public String renderItem(E0VirtDev item) {
+			public String renderItem(EthernetDevType item) {
 				return item.displayName;
 			}
 		});
 
-		for (E0VirtDev i : E0VirtDev.values()) {
+		for (EthernetDevType i : EthernetDevType.values()) {
 			cboE0VirtDev.addItem(i);
 		}