[client] Update project structure, related to container model.

- import container model from master-sync-shared subproject
- container model and dependencies removed

2 files changed, 4 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
index 7d6e4899..6d2078f8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
@@ -9,13 +9,13 @@ import org.openslx.dozmod.gui.helper.QFileChooser;
 import org.openslx.dozmod.gui.helper.TextChangeListener;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.ContainerUploadPageLayout;
-import org.openslx.dozmod.model.ContainerBuildContextMethod;
 import org.openslx.dozmod.model.ContainerDefinition;
-import org.openslx.dozmod.model.ContainerMeta;
 import org.openslx.dozmod.state.UploadWizardState;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.virtualization.configuration.VirtualizationConfigurationDocker;
+import org.openslx.virtualization.configuration.container.ContainerBuildContextMethod;
+import org.openslx.virtualization.configuration.container.ContainerMeta;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -305,8 +305,8 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
 		// -- create image to get uuid --
 		if (existingImage == null) {
 			if (state.uuid == null) {
-				state.uuid = ThriftActions.createImage(JOptionPane.getFrameForComponent(this), state.name);
 				state.name = txtImageName.getText();
+				state.uuid = ThriftActions.createImage(JOptionPane.getFrameForComponent(this), state.name);
 				if (state.uuid == null)
 					return false;
 				txtImageName.setEnabled(false);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index a604c167..97ade77f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -8,7 +8,6 @@ import org.openslx.dozmod.gui.helper.TextChangeListener;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.ImageMetaDataPageLayout;
 import org.openslx.dozmod.model.ContainerDefinition;
-import org.openslx.dozmod.model.ContainerMeta;
 import org.openslx.dozmod.state.UploadWizardState;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
@@ -16,6 +15,7 @@ import org.openslx.thrifthelper.Comparators;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 import org.openslx.virtualization.configuration.VirtualizationConfigurationDocker;
+import org.openslx.virtualization.configuration.container.ContainerMeta;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;