Es ist nun möglich die Metadaten eines Images über das Dozentenmodul zu updaten

8 files changed, 217 insertions, 142 deletions

diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
index 160a7fb4..58cab4ec 100644
--- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
@@ -20,7 +20,6 @@ import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.JTextArea;
@@ -31,11 +30,12 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
-import server.Server.Client;
-import thrift.ThriftConnection;
+import org.apache.thrift.TException;
 
 import models.Image;
 import models.person;
+import server.Server.Client;
+import thrift.ThriftConnection;
 
 @SuppressWarnings("serial")
 public class EditImageAllgemein_GUI extends JFrame {
@@ -46,11 +46,9 @@ public class EditImageAllgemein_GUI extends JFrame {
 	private JTextField Nachname;
 	private JTextField Hochschule;
 	private JTextField EMail;
-	private JTextField Tel;
-	private JTextField Fak;
 	private JTextField imagename;
-	ThriftConnection thrift=new ThriftConnection();
-	Client client=thrift.getThriftConnection();
+    ThriftConnection con=new ThriftConnection();
+    Client client=con.getThriftConnection();
 
 	/**
 	 * Create the dialog.
@@ -75,13 +73,13 @@ public class EditImageAllgemein_GUI extends JFrame {
 		}
 		//Setzt den Fenstertitel
 		setTitle("bwLehrpool Suite *Prototyp*");
-		
+
 		//Zentriert das Fenster in der Bildmitte
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
 		int top=(screenSize.height - 722) / 2;
 		int left=(screenSize.width - 603) / 2;
 		setBounds(left, top, 603, 722);
-
+		initData();
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -118,76 +116,60 @@ public class EditImageAllgemein_GUI extends JFrame {
 		
 		JLabel label = new JLabel("Vorname: *");
 		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 183, 125, 20);
+		label.setBounds(10, 245, 125, 20);
 		panel_1.add(label);
 		
 		Vorname = new JTextField();
+		Vorname.setEditable(false);
+		Vorname.setEnabled(false);
 		Vorname.setBackground(Color.WHITE);
 		Vorname.setText(person.verantowrtlicher.getVorname());
 		Vorname.setColumns(10);
-		Vorname.setBounds(145, 183, 350, 20);
+		Vorname.setBounds(145, 245, 350, 20);
 		panel_1.add(Vorname);
 		
 		JLabel label_7 = new JLabel("Nachname: *");
 		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 214, 125, 20);
+		label_7.setBounds(10, 276, 125, 20);
 		panel_1.add(label_7);
 		
 		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
 		Nachname.setBackground(Color.WHITE);
 		Nachname.setText(person.verantowrtlicher.getName());
 		Nachname.setColumns(10);
-		Nachname.setBounds(145, 214, 350, 20);
+		Nachname.setBounds(145, 276, 350, 20);
 		panel_1.add(Nachname);
 		
 		JLabel label_8 = new JLabel("Hochschule: *");
 		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 245, 125, 20);
+		label_8.setBounds(10, 307, 125, 20);
 		panel_1.add(label_8);
 		
 		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
 		Hochschule.setBackground(Color.WHITE);
 		Hochschule.setText(person.verantowrtlicher.getHochschule());
 		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 245, 350, 20);
+		Hochschule.setBounds(145, 307, 350, 20);
 		panel_1.add(Hochschule);
 		
 		JLabel label_9 = new JLabel("E-Mail: *");
 		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 276, 125, 20);
+		label_9.setBounds(10, 338, 125, 20);
 		panel_1.add(label_9);
 		
 		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
 		EMail.setBackground(Color.WHITE);
 		EMail.setText(person.verantowrtlicher.getEMail());
 		EMail.setColumns(10);
-		EMail.setBounds(145, 276, 350, 20);
+		EMail.setBounds(145, 338, 350, 20);
 		panel_1.add(EMail);
 		
-		JLabel label_10 = new JLabel("Tel.-Nummer:");
-		label_10.setBackground(SystemColor.menu);
-		label_10.setBounds(10, 307, 125, 20);
-		panel_1.add(label_10);
-		
-		Tel = new JTextField();
-		Tel.setBackground(Color.WHITE);
-		Tel.setText(person.verantowrtlicher.getTel());
-		Tel.setColumns(10);
-		Tel.setBounds(145, 307, 350, 20);
-		panel_1.add(Tel);
-		
-		JLabel lblFakulttinstitution = new JLabel("Fakult\u00E4t/Institution:");
-		lblFakulttinstitution.setBackground(SystemColor.menu);
-		lblFakulttinstitution.setBounds(10, 338, 125, 20);
-		panel_1.add(lblFakulttinstitution);
-		
-		Fak = new JTextField();
-		Fak.setBackground(Color.WHITE);
-		Fak.setText(person.verantowrtlicher.getFakultät());
-		Fak.setColumns(10);
-		Fak.setBounds(145, 338, 350, 20);
-		panel_1.add(Fak);
-		
 		JLabel lblImagename = new JLabel("Imagename: *");
 		lblImagename.setBackground(SystemColor.menu);
 		lblImagename.setBounds(10, 31, 125, 20);
@@ -261,13 +243,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 					public void actionPerformed(ActionEvent e) {
 						
 						//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
-						person.verantowrtlicher.setVorname(Vorname.getText());
-						person.verantowrtlicher.setName(Nachname.getText());
-						person.verantowrtlicher.setEMail(EMail.getText());
-						person.verantowrtlicher.setFakultät(Fak.getText());
-						person.verantowrtlicher.setHochschule(Hochschule.getText());
-						person.verantowrtlicher.setTel(Tel.getText());
-						Image.image.setImagename(imagename.getText());
+						//Image.image.setImagename(imagename.getText());
 						
 						MainMenue_GUI sr=new MainMenue_GUI();
 						sr.setVisible(true);
@@ -283,25 +259,14 @@ public class EditImageAllgemein_GUI extends JFrame {
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						//Prüfung ob alle notwendigen Felder ausgefüllt sind
-						if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false)
-						{
 						//Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar
-						person.verantowrtlicher.setVorname(Vorname.getText());
-						person.verantowrtlicher.setName(Nachname.getText());
-						person.verantowrtlicher.setEMail(EMail.getText());
-						person.verantowrtlicher.setFakultät(Fak.getText());
-						person.verantowrtlicher.setHochschule(Hochschule.getText());
-						person.verantowrtlicher.setTel(Tel.getText());
-						Image.image.setImagename(imagename.getText());
+						System.out.println(imagename.getText());
+						Image.image.setNewName(imagename.getText());
+						con.closeThriftConnection();
 						EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI();
 						ea.setVisible(true);
 						dispose();
-						}
-						else{
-							//Erzeugen einer Fehlermeldung wenn nicht alle notwendigen Felder ausgefüllt sind
-							JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
-									"Error", JOptionPane.ERROR_MESSAGE);	
-						}
+
 					}
 				});
 				cancelButton.setActionCommand("Cancel");
@@ -331,5 +296,30 @@ public class EditImageAllgemein_GUI extends JFrame {
 		
 	}
 	
+	public void initData(){
+		try {
+			System.out.println("initdata1:"+Image.image.getImagename());
+			Map<String,String> map=client.getImageData(Image.image.getImagename());
+			if(map.get("internet").equals("0")){
+				Image.image.setInternet(false);
+			}
+			else
+			{
+				Image.image.setInternet(true);
+			}
+			if(map.get("license").equals("0")){
+				Image.image.setLicensed(false);
+			}
+			else{
+				Image.image.setLicensed(true);
+			}
+			Image.image.setRam(Integer.parseInt(map.get("ram")));
+			Image.image.setCpu(Integer.parseInt(map.get("cpu")));
+		} catch (TException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
 
 }
diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
index f589a091..d8ab833f 100644
--- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
@@ -13,6 +13,8 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
@@ -33,6 +35,11 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
+import org.apache.thrift.TException;
+
+import server.Server.Client;
+import thrift.ThriftConnection;
+
 import models.Image;
 
 @SuppressWarnings("serial")
@@ -60,6 +67,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 				//Beendet die Anwendung bei Klick auf das X 
 				System.exit(0);
 			}
+			
 		});
 		//Verhindert das Vergrößern des Fensters
 		setResizable(false);
@@ -79,7 +87,8 @@ public class EditImageTechnisch_GUI extends JFrame {
 		int top=(screenSize.height - 722) / 2;
 		int left=(screenSize.width - 603) / 2;
 		setBounds(left, top, 603, 722);
-
+	
+		
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -106,7 +115,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		getContentPane().add(contentPanel);
 		contentPanel.setLayout(null);
-		
+
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
@@ -119,7 +128,6 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.add(lblNewLabel_2);
 		
 		rdbtnlicenseJa = new JRadioButton("Ja");
-		rdbtnlicenseJa.setSelected(true);
 		buttonGrouplicense.add(rdbtnlicenseJa);
 		rdbtnlicenseJa.setBounds(266, 29, 109, 23);
 		panel_1.add(rdbtnlicenseJa);
@@ -128,22 +136,37 @@ public class EditImageTechnisch_GUI extends JFrame {
 		buttonGrouplicense.add(rdbtnlicenseNein);
 		rdbtnlicenseNein.setBounds(377, 29, 109, 23);
 		panel_1.add(rdbtnlicenseNein);
+		if(Image.image.isLicensed()==true){
+			rdbtnlicenseJa.setSelected(true);
+		}
+		else
+		{
+			rdbtnlicenseNein.setSelected(true);
+		}
+		
+
 		
 		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
 		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
 		panel_1.add(lblInternetIstInnerhalb);
 		
-		JRadioButton rdbtnInternetJa = new JRadioButton("Ja");
+		rdbtnInternetJa = new JRadioButton("Ja");
 		buttonGroupInternet.add(rdbtnInternetJa);
 		rdbtnInternetJa.setBounds(266, 57, 109, 23);
 		panel_1.add(rdbtnInternetJa);
 		
-		JRadioButton rdbtnInternetNein = new JRadioButton("Nein");
+		rdbtnInternetNein = new JRadioButton("Nein");
 		rdbtnInternetNein.setSelected(true);
 		buttonGroupInternet.add(rdbtnInternetNein);
 		rdbtnInternetNein.setBounds(377, 57, 109, 23);
 		panel_1.add(rdbtnInternetNein);
-		
+		if(Image.image.isInternet()==true){
+			rdbtnInternetJa.setSelected(true);
+		}
+		else
+		{
+			rdbtnInternetNein.setSelected(true);
+		}
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
@@ -200,6 +223,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		spinnerRam = new JSpinner();
 		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
 		spinnerRam.setBounds(385, 88, 29, 20);
+		spinnerRam.setValue(Image.image.getRam());
 		panel_2.add(spinnerRam);
 		
 		JLabel lblGbyte = new JLabel("GByte");
@@ -231,6 +255,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		spinnerCPU = new JSpinner();
 		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
 		spinnerCPU.setBounds(385, 188, 29, 20);
+		spinnerCPU.setValue(Image.image.getCpu());
 		panel_2.add(spinnerCPU);
 		
 		JLabel lblKerne = new JLabel("Kerne");
@@ -249,6 +274,23 @@ public class EditImageTechnisch_GUI extends JFrame {
 						//Setzt die Imagewerte in das Model
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
+						if(rdbtnInternetJa.isSelected()==true)
+						{
+							Image.image.setInternet(true);
+						}
+						else
+						{
+							Image.image.setInternet(false);
+						}
+						
+						if(rdbtnlicenseJa.isSelected()==true)
+						{
+							Image.image.setLicensed(true);
+						}
+						else
+						{
+							Image.image.setLicensed(false);
+						}
 						//Öffnet das vorherige Fenster
 						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
 						sr.setVisible(true);
@@ -263,8 +305,27 @@ public class EditImageTechnisch_GUI extends JFrame {
 				JButton cancelButton = new JButton("Weiter");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
+						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
+						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
+						if(rdbtnInternetJa.isSelected()==true)
+						{
+							Image.image.setInternet(true);
+						}
+						else
+						{
+							Image.image.setInternet(false);
+						}
+						
+						if(rdbtnlicenseJa.isSelected()==true)
+						{
+							Image.image.setLicensed(true);
+						}
+						else
+						{
+							Image.image.setLicensed(false);
+						}
 						//Öffnet das nächste Fenster
-						FTPUploader_GUI ea=new FTPUploader_GUI();
+						FTPEditUploader_GUI ea=new FTPEditUploader_GUI();
 						ea.setVisible(true);
 						dispose();
 						
@@ -296,4 +357,8 @@ public class EditImageTechnisch_GUI extends JFrame {
 		mnNewMenu_1.add(mntmOtrs);
 		
 	}
-}
+	
+	
+
+	}
+
diff --git a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
index bfd4354c..12678e0e 100644
--- a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
@@ -44,8 +44,6 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 	private JTextField Nachname;
 	private JTextField Hochschule;
 	private JTextField EMail;
-	private JTextField Tel;
-	private JTextField Fak;
 	private JTextField imagename;
 
 	/**
@@ -114,76 +112,60 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 		
 		JLabel label = new JLabel("Vorname: *");
 		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 183, 125, 20);
+		label.setBounds(10, 245, 125, 20);
 		panel_1.add(label);
 		
 		Vorname = new JTextField();
+		Vorname.setEnabled(false);
+		Vorname.setEditable(false);
 		Vorname.setBackground(Color.WHITE);
-		Vorname.setText((String) null);
+		Vorname.setText(person.verantowrtlicher.getVorname());
 		Vorname.setColumns(10);
-		Vorname.setBounds(145, 183, 350, 20);
+		Vorname.setBounds(145, 245, 350, 20);
 		panel_1.add(Vorname);
 		
 		JLabel label_7 = new JLabel("Nachname: *");
 		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 214, 125, 20);
+		label_7.setBounds(10, 276, 125, 20);
 		panel_1.add(label_7);
 		
 		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
 		Nachname.setBackground(Color.WHITE);
-		Nachname.setText((String) null);
+		Nachname.setText(person.verantowrtlicher.getName());
 		Nachname.setColumns(10);
-		Nachname.setBounds(145, 214, 350, 20);
+		Nachname.setBounds(145, 276, 350, 20);
 		panel_1.add(Nachname);
 		
 		JLabel label_8 = new JLabel("Hochschule: *");
 		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 245, 125, 20);
+		label_8.setBounds(10, 307, 125, 20);
 		panel_1.add(label_8);
 		
 		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
 		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText((String) null);
+		Hochschule.setText(person.verantowrtlicher.getHochschule());
 		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 245, 350, 20);
+		Hochschule.setBounds(145, 307, 350, 20);
 		panel_1.add(Hochschule);
 		
 		JLabel label_9 = new JLabel("E-Mail: *");
 		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 276, 125, 20);
+		label_9.setBounds(10, 338, 125, 20);
 		panel_1.add(label_9);
 		
 		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
 		EMail.setBackground(Color.WHITE);
-		EMail.setText((String) null);
+		EMail.setText(person.verantowrtlicher.getEMail());
 		EMail.setColumns(10);
-		EMail.setBounds(145, 276, 350, 20);
+		EMail.setBounds(145, 338, 350, 20);
 		panel_1.add(EMail);
 		
-		JLabel label_10 = new JLabel("Tel.-Nummer:");
-		label_10.setBackground(SystemColor.menu);
-		label_10.setBounds(10, 307, 125, 20);
-		panel_1.add(label_10);
-		
-		Tel = new JTextField();
-		Tel.setBackground(Color.WHITE);
-		Tel.setText((String) null);
-		Tel.setColumns(10);
-		Tel.setBounds(145, 307, 350, 20);
-		panel_1.add(Tel);
-		
-		JLabel lblFakulttinstitution = new JLabel("Fakult\u00E4t/Institution:");
-		lblFakulttinstitution.setBackground(SystemColor.menu);
-		lblFakulttinstitution.setBounds(10, 338, 125, 20);
-		panel_1.add(lblFakulttinstitution);
-		
-		Fak = new JTextField();
-		Fak.setBackground(Color.WHITE);
-		Fak.setText((String) null);
-		Fak.setColumns(10);
-		Fak.setBounds(145, 338, 350, 20);
-		panel_1.add(Fak);
-		
 		JLabel lblImagename = new JLabel("Imagename: *");
 		lblImagename.setBackground(SystemColor.menu);
 		lblImagename.setBounds(10, 31, 125, 20);
@@ -255,13 +237,6 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						//schreibt die Daten in das Model
-						person.verantowrtlicher.setVorname(Vorname.getText());
-						person.verantowrtlicher.setName(Nachname.getText());
-						person.verantowrtlicher.setEMail(EMail.getText());
-						person.verantowrtlicher.setFakultät(Fak.getText());
-						person.verantowrtlicher.setHochschule(Hochschule.getText());
-						person.verantowrtlicher.setTel(Tel.getText());
 						Image.image.setImagename(imagename.getText());
 						MainMenue_GUI sr=new MainMenue_GUI();
 						sr.setVisible(true);
@@ -280,12 +255,6 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 						if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false)
 						{
 						//Schreibt die Daten in das Model
-						person.verantowrtlicher.setVorname(Vorname.getText());
-						person.verantowrtlicher.setName(Nachname.getText());
-						person.verantowrtlicher.setEMail(EMail.getText());
-						person.verantowrtlicher.setFakultät(Fak.getText());
-						person.verantowrtlicher.setHochschule(Hochschule.getText());
-						person.verantowrtlicher.setTel(Tel.getText());
 						Image.image.setImagename(imagename.getText());
 						EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI();
 						ea.setVisible(true);
diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
index 1a76b7b3..078f8075 100644
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
@@ -259,6 +259,20 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 		JSeparator separator_1 = new JSeparator();

 		separator_1.setBounds(0, 627, 597, 2);

 		contentPanel.add(separator_1);

+		

+		JButton btnCopyFileTo = new JButton("Copy File to Prod");

+		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();

+				}

+			}

+		});

+		btnCopyFileTo.setBounds(10, 375, 264, 23);

+		contentPanel.add(btnCopyFileTo);

 		{

 			JPanel buttonPane = new JPanel();

 			buttonPane.setBackground(UIManager.getColor("Button.background"));

@@ -276,7 +290,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 						{

 						try {

 							client.DeleteFtpUser(user.userName);

-							

+							thrift.closeThriftConnection();

 						} catch (TException  e1) {

 							// TODO Auto-generated catch block

 							e1.printStackTrace();

@@ -388,6 +402,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
     public boolean writeData(){

     	

     	try {

+			

+				

+

 			client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());

 		} catch (TException e) {

 			// TODO Auto-generated catch block

diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java
index 990500db..cc558261 100644
--- a/Dozentenmodul/src/GUI/Login_GUI.java
+++ b/Dozentenmodul/src/GUI/Login_GUI.java
@@ -4,32 +4,33 @@ package gui;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Image;
+import java.awt.SystemColor;
 import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.File;
+import java.io.IOException;
+
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.JButton;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import javax.swing.JPasswordField;
 
-import org.ini4j.InvalidFileFormatException;
+import models.person;
+
 import org.ini4j.Wini;
 
 import config.config_file;
 
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.SystemColor;
-import java.io.File;
-import java.io.IOException;
-
 
 @SuppressWarnings("serial")
 public class Login_GUI extends JFrame {
@@ -45,7 +46,7 @@ public class Login_GUI extends JFrame {
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
-										
+					//Prüfe und Erzeuge gegebenfalls Config					
 					config_file cf=new config_file();
 					boolean conf=cf.createConfig();
 					if(conf==true)
@@ -149,6 +150,7 @@ public class Login_GUI extends JFrame {
 					
 					try {
 						Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+						//Prüfe ob Bills Of Rights schon akzeptiert wurden, wenn nicht zeige diese an
 						if(ini.get("main", "BillOfRights",boolean.class)==false){
 							//Erstellen einer Instanz der Aktionsauswahl
 							BillOfRights_GUI re=new BillOfRights_GUI();
@@ -158,6 +160,7 @@ public class Login_GUI extends JFrame {
 						}
 						else
 						{
+							//Prüfe ob die Links zu vmware angezeigt werden sollen
 							if(ini.get("main", "vmware",boolean.class)==false){
 								VmWareLink_GUI vm=new VmWareLink_GUI();
 								vm.setVisible(true);
@@ -165,6 +168,11 @@ public class Login_GUI extends JFrame {
 							}
 							else
 							{
+								person.verantowrtlicher.setName("Spitzer");
+								person.verantowrtlicher.setVorname("Tobias");
+								person.verantowrtlicher.setEMail("tspitzer@hs-offenburg.de");
+								person.verantowrtlicher.setHochschule("HS Offenburg");
+								//Öffne das Hauprmenü
 								MainMenue_GUI main=new MainMenue_GUI();
 								main.setVisible(true);
 								setVisible(false);
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
index 0f80d372..ddf89269 100644
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -276,7 +276,8 @@ public class MainMenue_GUI extends JFrame {
 						dispose();

 						} else if(rdbtnImageEdit.isSelected()==true)

 						{

-							SearchImage_GUI si=new SearchImage_GUI();

+							

+							SearchEditImage_GUI si=new SearchEditImage_GUI();

 							si.setVisible(true);

 							dispose();

 						}else if(rdbtnImageSearchDownload.isSelected()==true)

diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java
index 64b37898..ad474768 100644
--- a/Dozentenmodul/src/GUI/SearchImage_GUI.java
+++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java
@@ -45,8 +45,6 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;

 import javax.swing.table.TableRowSorter;

 

-import models.person;

-

 import org.apache.thrift.TException;

 

 import server.Server.Client;

@@ -390,7 +388,8 @@ public class SearchImage_GUI extends JFrame {
 

 						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();

 						ea.setVisible(true);

-						dispose();						

+						dispose();

+						

 					}

 				});

 				cancelButton.setActionCommand("Cancel");

@@ -424,6 +423,7 @@ public class SearchImage_GUI extends JFrame {
 		List<server.Image> images;

 		try {

 			//Hole eine Liste der Images

+			

 			images = client.getImageList();

 			Iterator<server.Image> i=images.iterator();

 			

diff --git a/Dozentenmodul/src/GUI/VmWareLink_GUI.java b/Dozentenmodul/src/GUI/VmWareLink_GUI.java
index b803ee44..43df06a6 100644
--- a/Dozentenmodul/src/GUI/VmWareLink_GUI.java
+++ b/Dozentenmodul/src/GUI/VmWareLink_GUI.java
@@ -23,12 +23,18 @@ import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.swing.JCheckBox;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
+
+import org.ini4j.InvalidFileFormatException;
+import org.ini4j.Wini;
 
 
 @SuppressWarnings("serial")
@@ -36,6 +42,7 @@ public class VmWareLink_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
+	JCheckBox chckbxNewCheckBox;
 	/**
 	 * Launch the application.
 	 */
@@ -123,7 +130,25 @@ public class VmWareLink_GUI extends JFrame {
 		lblNewLabel_1.setBounds(10, 93, 499, 14);
 		contentPanel.add(lblNewLabel_1);
 		
-		JCheckBox chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen.");
+		chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen.");
+		chckbxNewCheckBox.addChangeListener(new ChangeListener() {
+			public void stateChanged(ChangeEvent arg0) {
+				if(chckbxNewCheckBox.isSelected()==true)
+				{
+					try {
+						Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+						ini.put("main", "vmware",true);
+						ini.store();
+					} catch (InvalidFileFormatException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					} catch (IOException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
+				}
+			}
+		});
 		chckbxNewCheckBox.setBounds(6, 472, 555, 23);
 		contentPanel.add(chckbxNewCheckBox);