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

Conflicts:
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/server/startServer.class
	Dozentenmodulserver/src/server/startServer.java

1 files changed, 52 insertions, 32 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 49fcf0d0..3adb426a 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -15,6 +15,7 @@ import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -34,6 +35,8 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import models.Image;
+import models.Links;
+import models.SessionData;
 import models.person;
 import org.apache.thrift.TException;
 import server.Server.Client;
@@ -41,6 +44,9 @@ import thrift.ThriftConnection;
 //import util.XMLCreator;
 import ftp.UploadTask;
 import gui.intro.MainMenue_GUI;
+import javax.swing.JMenuItem;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 @SuppressWarnings("serial")
 public class FTPCreateUploader_GUI extends JFrame implements
@@ -51,8 +57,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	private final JPanel contentPanel = new JPanel();
 	JLabel lblPath;
 	JProgressBar progressBar;
-	//String host = "141.79.128.121";
-	String host = "141.79.128.102";
+	String host = SessionData.session.getServerAdress();
 	int port = 21;
 	server.User user;
 	String filename = "";
@@ -68,8 +73,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	double speed;
 	long bytesread;
 	boolean taskrun = false;
-	ThriftConnection thrift = new ThriftConnection();
-	Client client = thrift.getThriftConnection();
+	ThriftConnection con = new ThriftConnection();
+	Client client = models.Client.clientcon.getClient();
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnUploadStarten = new JButton("Upload auf Server starten");
 	JButton btnZurck = new JButton("Zur\u00FCck");
@@ -110,6 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					}
 					task.cancel(true);
 				}
+				con.closeThriftConnection();
 				System.exit(0);
 			}// end window closing
 		});
@@ -295,26 +301,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);
@@ -347,7 +333,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						if (taskrun == true) {
 							try {
 								client.DeleteFtpUser(user.userName);
-								thrift.closeThriftConnection();
+								
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
@@ -364,7 +350,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				btnZurck.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						dispose();
-						thrift.closeThriftConnection();
+						
 						CreateImageTechnisch_GUI m = new CreateImageTechnisch_GUI();
 						m.setVisible(true);
 					}
@@ -378,9 +364,37 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
+		
+		JMenu menu = new JMenu("Hilfe");
+		menuBar.add(menu);
+		
+		JMenuItem menuItem = new JMenuItem("FAQ");
+		menuItem.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				String otrs;
+				
+				otrs = Links.getOTRS();
+				
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs );
+				} catch (IOException f) {
+					// TODO Auto-generated catch block
+					f.printStackTrace();
+				}
 
-		JMenu mnHillfe = new JMenu("Hillfe");
-		menuBar.add(mnHillfe);
+			}
+		});
+
+		menu.add(menuItem);
+		
+		JMenuItem menuItem_1 = new JMenuItem("OTRS");
+		menuItem_1.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+			}
+		});
+		menu.add(menuItem_1);
 		setVisible(true);
 
 	}
@@ -392,6 +406,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
+			System.out.println("Test");
 			user = client.getFtpUser();
 			System.out.println("FTP name" + user.userName);
 			System.out.println("FTP path" + user.path);
@@ -413,8 +428,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
+		System.out.println("Uploading to host: "+host);
+		
 		task = new UploadTask(host, port, user.userName, user.password,
-				user.path, uploadFile);
+				user.path+"temp/", uploadFile);
 
 		task.addPropertyChangeListener(this);
 		task.execute();
@@ -440,8 +457,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			// Fertigstellen erlauben wenn upload abgeschlossen
 			if (progress == 100) {
 				finishButton.setEnabled(true);
+				
 			} else {
 				finishButton.setEnabled(false);
+			
 			}
 
 		}
@@ -487,7 +506,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public boolean writeData() {
 
 		try {
-
+			
 			client.writeVLdata(Image.image.getImagename(),
 					person.verantwortlicher.getUsername(),
 					person.verantwortlicher.getVorname(),
@@ -495,10 +514,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					person.verantwortlicher.getHochschule(),
 					person.verantwortlicher.getEMail(),
 					person.verantwortlicher.getTel(),
-					person.verantwortlicher.getFakultät(),
+					person.verantwortlicher.getFakultaet(),
 					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();