Problem beim bearbeiten eines Image behoben.

DB pk's auf UUID umgestellt

12 files changed, 24 insertions, 3 deletions

diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class
index 4c70ef81..92835598 100644
--- a/Dozentenmodul/bin/Models/Image.class
+++ b/Dozentenmodul/bin/Models/Image.class
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
index 8a8771d9..5f49649b 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class
index 780e5fd1..0f948630 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class
index 6ecad17e..37d3827f 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class
index 6ff76a07..50bac1aa 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index 73bacfd2..e45c4bb5 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/bin/models/Image.class b/Dozentenmodul/bin/models/Image.class
index 4c70ef81..92835598 100644
--- a/Dozentenmodul/bin/models/Image.class
+++ b/Dozentenmodul/bin/models/Image.class
diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index cdc8264c..33a9a558 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -6,6 +6,7 @@ public class Image {
 
 	private String imagename;
 	private String newName;
+	private String imagepath;
 	private boolean licensed;
 	private boolean internet;
 	private int ram;
@@ -13,6 +14,13 @@ public class Image {
 	
 	public static Image image =new Image();
 	
+	
+	public String getImagepath() {
+		return imagepath;
+	}
+	public void setImagepath(String imagepath) {
+		this.imagepath = imagepath;
+	}
 	public String getImagename() {
 		return imagename;
 	}
diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index 0c50cc2b..da3a29e4 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -283,7 +283,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 						} else {
 
 							// setze Namen, egal ob alt oder nicht
-							Image.image.setNewName(imagename.getText());
+							Image.image.setImagename(imagename.getText());
 							System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName());
 
 							con.closeThriftConnection();
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 8d14458a..ebeec090 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -392,10 +392,11 @@ public class FTPEditUploader_GUI extends JFrame implements
 					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
+		
 		Image.image.setNewName(formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
-				+ Image.image.getImagename() + ".vmdk");
+				+ Image.image.getImagename()+ ".vmdk");
 		task = new UploadTask(host, port, user.userName, user.password,
 				user.path, uploadFile);
 
@@ -469,8 +470,9 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		try {
 			System.out.println("NewName="+Image.image.getNewName());
+			System.out.println("OldName="+Image.image.getImagename());
 			client.updateImageData(Image.image.getImagename(),
-					Image.image.getNewName(), Image.image.isLicensed(),
+					Image.image.getImagename(),"/srv/openslx/nfs/temp/" + Image.image.getNewName(), Image.image.isLicensed(),
 					Image.image.isInternet(), Image.image.getRam(),
 					Image.image.getCpu(), Image.image.getImageId(),
 					Image.image.getVersion());
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 019a2ec7..3d882da0 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -12,6 +12,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
+import java.util.UUID;
+
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -89,6 +91,7 @@ public class Login_GUI extends JFrame {
 
 		// Fenster darf nicht vergrößert werden
 		setResizable(false);
+		
 		try {
 			// Setzt das Look and Feel auf System
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
index cdc8264c..33a9a558 100644
--- a/Dozentenmodul/src/models/Image.java
+++ b/Dozentenmodul/src/models/Image.java
@@ -6,6 +6,7 @@ public class Image {
 
 	private String imagename;
 	private String newName;
+	private String imagepath;
 	private boolean licensed;
 	private boolean internet;
 	private int ram;
@@ -13,6 +14,13 @@ public class Image {
 	
 	public static Image image =new Image();
 	
+	
+	public String getImagepath() {
+		return imagepath;
+	}
+	public void setImagepath(String imagepath) {
+		this.imagepath = imagepath;
+	}
 	public String getImagename() {
 		return imagename;
 	}