SQL Abfragen auf ID und Version umgestellt

45 files changed, 710 insertions, 21 deletions

diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
index b848f2b1..7dd90d89 100644
--- a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class
index 170bc6c8..a77bfc15 100644
--- a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class
index 66cf8978..968c8af7 100644
--- a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class
index 168722c4..6750763b 100644
--- a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class
index cd15c612..57ddab82 100644
--- a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class
+++ b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
index 5cc49090..58e4c435 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
index 59a0ff9e..89820f94 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
index c52b2e1a..c08f45b9 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class
index fcd1a276..4c70ef81 100644
--- a/Dozentenmodul/bin/Models/Image.class
+++ b/Dozentenmodul/bin/Models/Image.class
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class
index b848f2b1..7dd90d89 100644
--- a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class
new file mode 100644
index 00000000..1000eb91
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class
new file mode 100644
index 00000000..8afdfdf8
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class
new file mode 100644
index 00000000..81a05cf3
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class
new file mode 100644
index 00000000..123338af
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class
new file mode 100644
index 00000000..95bbb104
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$1.class
new file mode 100644
index 00000000..771ce0e4
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$2.class
new file mode 100644
index 00000000..23ca111f
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$3.class
new file mode 100644
index 00000000..955781b8
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$4.class
new file mode 100644
index 00000000..6b562f97
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI.class
new file mode 100644
index 00000000..d1eb7719
--- /dev/null
+++ b/Dozentenmodul/bin/gui/EditVeranstatlungTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class
index 170bc6c8..a77bfc15 100644
--- a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class
+++ b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class
index 66cf8978..968c8af7 100644
--- a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class
+++ b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class
index 168722c4..6750763b 100644
--- a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class
+++ b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class
index cd15c612..57ddab82 100644
--- a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class
index ffe9b318..a1f4b67f 100644
--- a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
index 5cc49090..58e4c435 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
index 59a0ff9e..89820f94 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class
index c52b2e1a..c08f45b9 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
index eaa57353..5b465837 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class
diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
index 616e48d6..e666672d 100644
--- a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/models/Image.class b/Dozentenmodul/bin/models/Image.class
index fcd1a276..4c70ef81 100644
--- a/Dozentenmodul/bin/models/Image.class
+++ b/Dozentenmodul/bin/models/Image.class
diff --git a/Dozentenmodul/bin/thrift/communicate.thrift b/Dozentenmodul/bin/thrift/communicate.thrift
deleted file mode 100644
index e69de29b..00000000
--- a/Dozentenmodul/bin/thrift/communicate.thrift
+++ /dev/null
diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
index 58cab4ec..9eef919a 100644
--- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
@@ -298,8 +298,8 @@ 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());
+			
+			Map<String,String> map=client.getImageData(Image.image.getImageId(),Image.image.getVersion());
 			if(map.get("internet").equals("0")){
 				Image.image.setInternet(false);
 			}
@@ -313,6 +313,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			else{
 				Image.image.setLicensed(true);
 			}
+			Image.image.setImagename(map.get("name"));
 			Image.image.setRam(Integer.parseInt(map.get("ram")));
 			Image.image.setCpu(Integer.parseInt(map.get("cpu")));
 		} catch (TException e) {
diff --git a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
index 86052152..2e2c60c3 100644
--- a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
@@ -121,8 +121,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label);
 		
 		Vorname = new JTextField();
+		Vorname.setEditable(false);
+		Vorname.setEnabled(false);
+		Vorname.setText(person.verantowrtlicher.getVorname());
 		Vorname.setBackground(Color.WHITE);
-		Vorname.setText((String) null);
 		Vorname.setColumns(10);
 		Vorname.setBounds(145, 33, 350, 20);
 		panel_1.add(Vorname);
@@ -133,8 +135,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label_7);
 		
 		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
+		Nachname.setText(person.verantowrtlicher.getName());
 		Nachname.setBackground(Color.WHITE);
-		Nachname.setText((String) null);
 		Nachname.setColumns(10);
 		Nachname.setBounds(145, 64, 350, 20);
 		panel_1.add(Nachname);
@@ -145,8 +149,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label_8);
 		
 		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
+		Hochschule.setText(person.verantowrtlicher.getHochschule());
 		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText((String) null);
 		Hochschule.setColumns(10);
 		Hochschule.setBounds(145, 95, 350, 20);
 		panel_1.add(Hochschule);
@@ -157,8 +163,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label_9);
 		
 		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
+		EMail.setText(person.verantowrtlicher.getEMail());
 		EMail.setBackground(Color.WHITE);
-		EMail.setText((String) null);
 		EMail.setColumns(10);
 		EMail.setBounds(145, 126, 350, 20);
 		panel_1.add(EMail);
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
index 17b94397..0b28433b 100644
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -42,6 +42,7 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnImageSearchDownload;

 	JRadioButton rdbtnVeranstaltungNew;

 	JRadioButton rdbtnImageDelete;

+	JRadioButton rdbtnVeranstaltungEdit;

 	private final ButtonGroup buttonGroup = new ButtonGroup();

 	/**

 	 * Launch the application.

@@ -182,8 +183,7 @@ public class MainMenue_GUI extends JFrame {
 		panelVeranstaltung.add(rdbtnVeranstaltungNew);

 		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);

 		

-		JRadioButton rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");

-		rdbtnVeranstaltungEdit.setEnabled(false);

+		rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");

 		rdbtnVeranstaltungEdit.setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen");

 		rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23);

 		panelVeranstaltung.add(rdbtnVeranstaltungEdit);

@@ -303,6 +303,11 @@ public class MainMenue_GUI extends JFrame {
 							av.setVisible(true);

 							dispose();

 						}

+						else if(rdbtnVeranstaltungEdit.isSelected()==true){

+							EditVeranstaltungAllgemein_GUI ev=new EditVeranstaltungAllgemein_GUI();

+							ev.setVisible(true);

+							dispose();

+						}

 					}

 				});

 				cancelButton.setActionCommand("Cancel");

diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index 2a8c4fcd..cdc8264c 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -1,6 +1,9 @@
 package models;
 
 public class Image {
+	private String ImageId;
+	private String version;
+
 	private String imagename;
 	private String newName;
 	private boolean licensed;
@@ -46,4 +49,16 @@ public class Image {
 	public void setNewName(String newName) {
 		this.newName = newName;
 	}
+	public String getImageId() {
+		return ImageId;
+	}
+	public void setImageId(String imageId) {
+		ImageId = imageId;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
 }
diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
index 58cab4ec..9eef919a 100644
--- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
@@ -298,8 +298,8 @@ 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());
+			
+			Map<String,String> map=client.getImageData(Image.image.getImageId(),Image.image.getVersion());
 			if(map.get("internet").equals("0")){
 				Image.image.setInternet(false);
 			}
@@ -313,6 +313,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			else{
 				Image.image.setLicensed(true);
 			}
+			Image.image.setImagename(map.get("name"));
 			Image.image.setRam(Integer.parseInt(map.get("ram")));
 			Image.image.setCpu(Integer.parseInt(map.get("cpu")));
 		} catch (TException e) {
diff --git a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java
new file mode 100644
index 00000000..ce2130c5
--- /dev/null
+++ b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java
@@ -0,0 +1,295 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+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.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+
+import models.person;
+
+
+@SuppressWarnings("serial")
+public class EditVeranstaltungAllgemein_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField Vorname;
+	private JTextField Nachname;
+	private JTextField Hochschule;
+	private JTextField EMail;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			EditVeranstaltungAllgemein_GUI dialog = new EditVeranstaltungAllgemein_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EditVeranstaltungAllgemein_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		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 Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 66, 557, 369);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel label = new JLabel("Vorname: *");
+		label.setBackground(SystemColor.menu);
+		label.setBounds(10, 33, 125, 20);
+		panel_1.add(label);
+		
+		Vorname = new JTextField();
+		Vorname.setEditable(false);
+		Vorname.setEnabled(false);
+		Vorname.setText(person.verantowrtlicher.getVorname());
+		Vorname.setBackground(Color.WHITE);
+		Vorname.setColumns(10);
+		Vorname.setBounds(145, 33, 350, 20);
+		panel_1.add(Vorname);
+		
+		JLabel label_7 = new JLabel("Nachname: *");
+		label_7.setBackground(SystemColor.menu);
+		label_7.setBounds(10, 64, 125, 20);
+		panel_1.add(label_7);
+		
+		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
+		Nachname.setText(person.verantowrtlicher.getName());
+		Nachname.setBackground(Color.WHITE);
+		Nachname.setColumns(10);
+		Nachname.setBounds(145, 64, 350, 20);
+		panel_1.add(Nachname);
+		
+		JLabel label_8 = new JLabel("Hochschule: *");
+		label_8.setBackground(SystemColor.menu);
+		label_8.setBounds(10, 95, 125, 20);
+		panel_1.add(label_8);
+		
+		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
+		Hochschule.setText(person.verantowrtlicher.getHochschule());
+		Hochschule.setBackground(Color.WHITE);
+		Hochschule.setColumns(10);
+		Hochschule.setBounds(145, 95, 350, 20);
+		panel_1.add(Hochschule);
+		
+		JLabel label_9 = new JLabel("E-Mail: *");
+		label_9.setBackground(SystemColor.menu);
+		label_9.setBounds(10, 126, 125, 20);
+		panel_1.add(label_9);
+		
+		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
+		EMail.setText(person.verantowrtlicher.getEMail());
+		EMail.setBackground(Color.WHITE);
+		EMail.setColumns(10);
+		EMail.setBounds(145, 126, 350, 20);
+		panel_1.add(EMail);
+		
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 402, 577, 33);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		panel.setBackground(SystemColor.menu);
+		
+		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
+		lblPflichtfelder.setBounds(10, 442, 136, 14);
+		contentPanel.add(lblPflichtfelder);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EditVeranstaltungAllgemein_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+
+						
+						MainMenue_GUI sr=new MainMenue_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						/*if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false)
+						{
+						person.verantowrtlicher.setVorname(Vorname.getText());
+						person.verantowrtlicher.setName(Nachname.getText());
+						person.verantowrtlicher.setEMail(EMail.getText());
+		
+						person.verantowrtlicher.setHochschule(Hochschule.getText());
+		
+						
+						EingabeVeranstatlungTechnisch_GUI ea=new EingabeVeranstatlungTechnisch_GUI();
+						ea.setVisible(true);
+						dispose();
+						}
+						else{
+							JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
+									"Error", JOptionPane.ERROR_MESSAGE);	
+						}
+					}*/
+					EditVeranstatlungTechnisch_GUI ev=new EditVeranstatlungTechnisch_GUI();
+					ev.setVisible(true);
+					dispose();
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/gui/EditVeranstatlungTechnisch_GUI.java b/Dozentenmodul/src/gui/EditVeranstatlungTechnisch_GUI.java
new file mode 100644
index 00000000..7e78df26
--- /dev/null
+++ b/Dozentenmodul/src/gui/EditVeranstatlungTechnisch_GUI.java
@@ -0,0 +1,328 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.ScrollPane;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+
+import models.Image;
+import models.Lecture;
+
+
+import com.toedter.calendar.JDateChooser;
+
+@SuppressWarnings("serial")
+public class EditVeranstatlungTechnisch_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField textFieldLaborname;
+	JRadioButton rdbtnJa;
+	JDateChooser dateChooserend;
+	JDateChooser dateChooserstart;
+	JTextArea textAreashort;
+	JTextArea textArealong;
+	private final ButtonGroup buttonGroup = new ButtonGroup();
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			EditVeranstatlungTechnisch_GUI dialog = new EditVeranstatlungTechnisch_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EditVeranstatlungTechnisch_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Dateneingabe f\u00FCr Veranstaltung");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 531);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EditVeranstatlungTechnisch_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("Veranstaltung ");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 74, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(152, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(165, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JLabel lblLabornameanzeigename = new JLabel("Laborname (Anzeigename): *");
+		lblLabornameanzeigename.setBounds(10, 57, 250, 14);
+		contentPanel.add(lblLabornameanzeigename);
+		
+		textFieldLaborname = new JTextField();
+		textFieldLaborname.setBounds(270, 54, 307, 20);
+		contentPanel.add(textFieldLaborname);
+		textFieldLaborname.setColumns(10);
+		
+		JLabel lblKurzbeschreibung = new JLabel("Kurzbeschreibung: *");
+		lblKurzbeschreibung.setBounds(10, 175, 250, 14);
+		contentPanel.add(lblKurzbeschreibung);
+		
+		ScrollPane scrollPane = new ScrollPane();
+		scrollPane.setBounds(270, 175, 307, 137);
+		contentPanel.add(scrollPane);
+		
+		textAreashort = new JTextArea();
+		textAreashort.setLineWrap(true);
+		scrollPane.add(textAreashort);
+		textAreashort.setBounds(0, 0, 4, 22);
+		
+		ScrollPane scrollPane_1 = new ScrollPane();
+		scrollPane_1.setBounds(270, 315, 307, 137);
+		contentPanel.add(scrollPane_1);
+		
+		textArealong = new JTextArea();
+		textArealong.setLineWrap(true);
+		textArealong.setBounds(0, 0, 4, 22);
+		scrollPane_1.add(textArealong);
+		
+		JLabel label = new JLabel("Kurzbeschreibung: *");
+		label.setBounds(0, 318, 250, 14);
+		contentPanel.add(label);
+		
+		JLabel lblGltigkeitsdatum = new JLabel("G\u00FCltigkeitsdatum: *");
+		lblGltigkeitsdatum.setBounds(0, 464, 250, 14);
+		contentPanel.add(lblGltigkeitsdatum);
+		
+		JLabel lblVon = new JLabel("von:");
+		lblVon.setBounds(270, 461, 30, 20);
+		contentPanel.add(lblVon);
+		
+		dateChooserstart = new JDateChooser();
+		dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss");
+		dateChooserstart.setBounds(332, 458, 101, 20);
+		contentPanel.add(dateChooserstart);
+		
+		JLabel lblBis = new JLabel("bis");
+		lblBis.setBounds(443, 461, 24, 20);
+		contentPanel.add(lblBis);
+		
+		dateChooserend = new JDateChooser();
+		dateChooserend.setDateFormatString("dd.MM.yyyy hh:mm:ss");
+		dateChooserend.setBounds(477, 459, 100, 20);
+		contentPanel.add(dateChooserend);
+		
+		JLabel lblAktiv = new JLabel("Aktiv:");
+		lblAktiv.setBounds(0, 492, 250, 14);
+		contentPanel.add(lblAktiv);
+		
+		JLabel lblimVmchooserSichtbar = new JLabel("(Im VMChooser sichtbar)");
+		lblimVmchooserSichtbar.setBounds(0, 517, 250, 14);
+		contentPanel.add(lblimVmchooserSichtbar);
+		
+		rdbtnJa = new JRadioButton("Ja");
+		rdbtnJa.setSelected(true);
+		buttonGroup.add(rdbtnJa);
+		rdbtnJa.setBounds(270, 488, 109, 23);
+		contentPanel.add(rdbtnJa);
+		
+		JRadioButton rdbtnNein = new JRadioButton("Nein");
+		buttonGroup.add(rdbtnNein);
+		rdbtnNein.setBounds(381, 488, 109, 23);
+		contentPanel.add(rdbtnNein);
+		
+		JTextArea txtrGebenSieBitte = new JTextArea();
+		txtrGebenSieBitte.setWrapStyleWord(true);
+		txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
+		txtrGebenSieBitte.setLineWrap(true);
+		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
+		txtrGebenSieBitte.setBackground(SystemColor.menu);
+		txtrGebenSieBitte.setBounds(10, 82, 567, 59);
+		contentPanel.add(txtrGebenSieBitte);
+		//contentPanel.add(textArea);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+						if(rdbtnJa.isSelected()==true)
+						{
+							Lecture.lecture.setActive(true);
+						}
+						else
+						{
+							Lecture.lecture.setActive(false);
+						}
+						
+						Lecture.lecture.setName(textFieldLaborname.getText());
+						Lecture.lecture.setDesc(textArealong.getText());
+						Lecture.lecture.setEnddate(dateChooserend.getDate());
+						Lecture.lecture.setShortDesc(textAreashort.getText());
+						Lecture.lecture.setStartdate(dateChooserstart.getDate());
+						Image.image.setImagename(textFieldLaborname.getText());
+						
+						EingabeVeranstaltungAllgemein_GUI sr=new EingabeVeranstaltungAllgemein_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						if(rdbtnJa.isSelected()==true)
+						{
+							Lecture.lecture.setActive(true);
+						}
+						else
+						{
+							Lecture.lecture.setActive(false);
+						}
+						
+						Lecture.lecture.setName(textFieldLaborname.getText());
+						Lecture.lecture.setDesc(textArealong.getText());
+						Lecture.lecture.setEnddate(dateChooserend.getDate());
+						Lecture.lecture.setShortDesc(textAreashort.getText());
+						Lecture.lecture.setStartdate(dateChooserstart.getDate());
+						Image.image.setImagename(textFieldLaborname.getText());
+						LinkImage_GUI ea=new LinkImage_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java
index 86052152..2e2c60c3 100644
--- a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java
@@ -121,8 +121,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label);
 		
 		Vorname = new JTextField();
+		Vorname.setEditable(false);
+		Vorname.setEnabled(false);
+		Vorname.setText(person.verantowrtlicher.getVorname());
 		Vorname.setBackground(Color.WHITE);
-		Vorname.setText((String) null);
 		Vorname.setColumns(10);
 		Vorname.setBounds(145, 33, 350, 20);
 		panel_1.add(Vorname);
@@ -133,8 +135,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label_7);
 		
 		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
+		Nachname.setText(person.verantowrtlicher.getName());
 		Nachname.setBackground(Color.WHITE);
-		Nachname.setText((String) null);
 		Nachname.setColumns(10);
 		Nachname.setBounds(145, 64, 350, 20);
 		panel_1.add(Nachname);
@@ -145,8 +149,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label_8);
 		
 		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
+		Hochschule.setText(person.verantowrtlicher.getHochschule());
 		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText((String) null);
 		Hochschule.setColumns(10);
 		Hochschule.setBounds(145, 95, 350, 20);
 		panel_1.add(Hochschule);
@@ -157,8 +163,10 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		panel_1.add(label_9);
 		
 		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
+		EMail.setText(person.verantowrtlicher.getEMail());
 		EMail.setBackground(Color.WHITE);
-		EMail.setText((String) null);
 		EMail.setColumns(10);
 		EMail.setBounds(145, 126, 350, 20);
 		panel_1.add(EMail);
diff --git a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
index 0adf2739..fcc804c4 100644
--- a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java
@@ -407,7 +407,7 @@ public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListene
 			
 				
     		System.out.println("Start Update");
-			client.updateImageData(Image.image.getImagename(),Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());
+			client.updateImageData(Image.image.getImagename(),Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(),Image.image.getImageId(),Image.image.getVersion());
 			} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java
index b879ccf1..749fdff4 100644
--- a/Dozentenmodul/src/gui/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/MainMenue_GUI.java
@@ -42,6 +42,7 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnImageSearchDownload;
 	JRadioButton rdbtnVeranstaltungNew;
 	JRadioButton rdbtnImageDelete;
+	JRadioButton rdbtnVeranstaltungEdit;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 	/**
 	 * Launch the application.
@@ -182,8 +183,7 @@ public class MainMenue_GUI extends JFrame {
 		panelVeranstaltung.add(rdbtnVeranstaltungNew);
 		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);
 		
-		JRadioButton rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");
-		rdbtnVeranstaltungEdit.setEnabled(false);
+		rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");
 		rdbtnVeranstaltungEdit.setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen");
 		rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23);
 		panelVeranstaltung.add(rdbtnVeranstaltungEdit);
@@ -303,6 +303,11 @@ public class MainMenue_GUI extends JFrame {
 							av.setVisible(true);
 							dispose();
 						}
+						else if(rdbtnVeranstaltungEdit.isSelected()==true){
+							EditVeranstaltungAllgemein_GUI ev=new EditVeranstaltungAllgemein_GUI();
+							ev.setVisible(true);
+							dispose();
+						}
 					}
 				});
 				cancelButton.setActionCommand("Cancel");
diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
index 840f283c..c2b4b080 100644
--- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java
@@ -66,7 +66,7 @@ public class SearchEditImage_GUI extends JFrame {
 	JTable tablemyImages;
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
-	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
+	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort","ID", "Version"};
     ThriftConnection con=new ThriftConnection();
     Client client=con.getThriftConnection();
     final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
@@ -392,8 +392,15 @@ public class SearchEditImage_GUI extends JFrame {
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						con.closeThriftConnection();
-						String imagename=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 0).toString();
-						Image.image.setImagename(imagename);
+						
+						//Image.image.setImageId(imageid);
+						
+						String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString();
+						
+						Image.image.setImageId(imageid);
+						String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString();
+						
+						Image.image.setVersion(imageversion);
 						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
 						ea.setVisible(true);
 						dispose();						
@@ -439,7 +446,8 @@ public class SearchEditImage_GUI extends JFrame {
 			while(i.hasNext())
 			{
 				//erzeuge Objekte für die Tabelle
-				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()};
+				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime(),"",images.get(x).id,images.get(x).getVersion()};
+				//System.out.println("id:"+images.get(x).getId());
 				//Füge diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
index 2a8c4fcd..cdc8264c 100644
--- a/Dozentenmodul/src/models/Image.java
+++ b/Dozentenmodul/src/models/Image.java
@@ -1,6 +1,9 @@
 package models;
 
 public class Image {
+	private String ImageId;
+	private String version;
+
 	private String imagename;
 	private String newName;
 	private boolean licensed;
@@ -46,4 +49,16 @@ public class Image {
 	public void setNewName(String newName) {
 		this.newName = newName;
 	}
+	public String getImageId() {
+		return ImageId;
+	}
+	public void setImageId(String imageId) {
+		ImageId = imageId;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
 }
diff --git a/Dozentenmodul/src/thrift/communicate.thrift b/Dozentenmodul/src/thrift/communicate.thrift
deleted file mode 100644
index e69de29b..00000000
--- a/Dozentenmodul/src/thrift/communicate.thrift
+++ /dev/null