[client,server] Refactor disk image representation

2 files changed, 6 insertions, 7 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index c07a0ed9..fb69feac 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -30,8 +30,8 @@ import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.util.Json;
 import org.openslx.util.Util;
-import org.openslx.util.vm.VmMetaData;
-import org.openslx.util.vm.VmMetaData.UsbSpeed;
+import org.openslx.vm.VmMetaData;
+import org.openslx.vm.VmMetaData.UsbSpeed;
 
 import com.google.gson.JsonParseException;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
index 02a5eb3d..3c663bd0 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
@@ -6,7 +6,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -37,8 +36,8 @@ import org.openslx.filetransfer.util.FileChunk;
 import org.openslx.filetransfer.util.HashChecker;
 import org.openslx.filetransfer.util.IncomingTransferBase;
 import org.openslx.util.ThriftUtil;
-import org.openslx.util.vm.DiskImage;
-import org.openslx.util.vm.DiskImage.UnknownImageFormatException;
+import org.openslx.vm.disk.DiskImage;
+import org.openslx.vm.disk.DiskImageException;
 
 public class IncomingDataTransfer extends IncomingTransferBase {
 
@@ -231,8 +230,8 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 		// Ready to go. First step: Rename temp file to something usable
 		String ext = "img";
 		try {
-			ext = new DiskImage(getTmpFileName()).format.extension;
-		} catch (IOException | UnknownImageFormatException e1) {
+			ext = DiskImage.newInstance(getTmpFileName()).getFormat().getExtension();
+		} catch (IOException | DiskImageException e1) {
 		}
 		File destination = new File(getTmpFileName().getParent(), Formatter.vmName(owner, image.imageName,
 				ext));