Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class

1 files changed, 7 insertions, 22 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 8b14dc4c..68bd4bb1 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -76,7 +76,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 	Client client = thrift.getThriftConnection();
 	JButton btnUploadStarten = new JButton("Upload auf Server starten");
 	JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
-	JButton btnCopyFileTo = new JButton("Copy File to Prod");
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 
@@ -290,23 +289,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 		separator_1.setBounds(0, 627, 597, 2);
 		contentPanel.add(separator_1);
 
-		btnCopyFileTo.setEnabled(false);
-		btnCopyFileTo.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				try {
-					client.startFileCopy(user.path + "/" + uploadFile.getName());
-				} catch (TException e1) {
-					// TODO Auto-generated catch block
-					e1.printStackTrace();
-					JOptionPane.showMessageDialog(null,
-							e1.getCause()+"\n"+e1.getMessage(),
-							"Debug-Message", JOptionPane.ERROR_MESSAGE);
-				}
-			}
-		});
-		btnCopyFileTo.setBounds(102, 375, 173, 23);
-		contentPanel.add(btnCopyFileTo);
-
 		JLabel lblSchritt_1 = new JLabel("Schritt 1:");
 		lblSchritt_1.setBounds(24, 128, 57, 14);
 		contentPanel.add(lblSchritt_1);
@@ -437,12 +419,13 @@ 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);
+				user.path+"temp/", uploadFile);
 
 		task.addPropertyChangeListener(this);
 		task.execute();
@@ -514,11 +497,13 @@ 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(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(),
 					Image.image.isInternet(), Image.image.getRam(),
 					Image.image.getCpu(), Image.image.getImageId(),
-					Image.image.getVersion());
+					Image.image.getVersion(), false,Image.image.getFilesize());
+			client.startFileCopy(Image.image.getNewName());
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();