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, 6 insertions, 23 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 13c83d61..3a78e322 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -300,26 +300,6 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		separator_1.setBounds(0, 627, 597, 2);
 		contentPanel.add(separator_1);
 
-		JButton btnCopyFileTo = new JButton("Copy File to Prod");
-		btnCopyFileTo.setEnabled(false);
-		btnCopyFileTo.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				try {
-					System.out.println("Copying file to " + user.path + "/"
-							+ uploadFile.getName());
-					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);
@@ -447,7 +427,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				+ person.verantwortlicher.getUsername() + "_"
 				+ 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();
@@ -473,8 +453,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			// Fertigstellen erlauben wenn upload abgeschlossen
 			if (progress == 100) {
 				finishButton.setEnabled(true);
+				
 			} else {
 				finishButton.setEnabled(false);
+			
 			}
 
 		}
@@ -520,7 +502,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public boolean writeData() {
 
 		try {
-
+			
 			client.writeVLdata(Image.image.getImagename(),
 					person.verantwortlicher.getUsername(),
 					person.verantwortlicher.getVorname(),
@@ -531,7 +513,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					person.verantwortlicher.getFakultät(),
 					Image.image.isLicensed(), Image.image.isInternet(),
 					Image.image.getRam(), Image.image.getCpu(),
-					"/srv/openslx/nfs/temp/" + Image.image.getNewName());
+					"temp/" + Image.image.getNewName(),false,Image.image.getFilesize());
+			client.startFileCopy(Image.image.getNewName());
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();