Neue Suchfenster

11 files changed, 571 insertions, 211 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 423e46e6..44da3ba3 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index b803c315..6e4a7cde 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index c1d0a9eb..5a8e0dbc 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index fb7a2c34..de98b04d 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -857,115 +857,111 @@ public class DeleteImage_GUI extends JFrame {
 		getContentPane().add(panel);
 		
 		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 73, 130, 14);
+		lblName.setBounds(10, 87, 130, 14);
 		panel.add(lblName);
 		
 		labelName = new JLabel("");
-		labelName.setBounds(150, 73, 130, 14);
+		labelName.setBounds(10, 102, 296, 14);
 		panel.add(labelName);
 		
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 224, 130, 14);
+		lblVerantwortlicher.setBounds(10, 259, 130, 14);
 		panel.add(lblVerantwortlicher);
 		
 		labelOS = new JLabel("");
-		labelOS.setBounds(150, 174, 130, 14);
+		labelOS.setBounds(10, 216, 296, 14);
 		panel.add(labelOS);
 		
 		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 174, 130, 14);
+		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
 		panel.add(lblWeitereVerantwortliche);
 		
 		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(150, 224, 130, 14);
+		labelVerantwortlicher.setBounds(10, 272, 296, 14);
 		panel.add(labelVerantwortlicher);
 		
 		JLabel label = new JLabel("Weitere Verantwortliche:");
-		label.setBounds(10, 249, 130, 14);
+		label.setBounds(10, 284, 130, 14);
 		panel.add(label);
 		
 		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setBounds(150, 249, 130, 14);
+		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
 		panel.add(labelWeitereVerantwortliche);
 		
-		JLabel label_5 = new JLabel("");
-		label_5.setBounds(150, 130, 130, 14);
-		panel.add(label_5);
-		
 		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(150, 199, 130, 14);
+		labelUpdate.setBounds(10, 245, 296, 14);
 		panel.add(labelUpdate);
 		
 		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 199, 130, 14);
+		lblLetztesUpdate.setBounds(10, 231, 130, 14);
 		panel.add(lblLetztesUpdate);
 		
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 331, 130, 14);
+		lblImageIstVorlage.setBounds(10, 336, 130, 14);
 		panel.add(lblImageIstVorlage);
 		
 		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(150, 331, 130, 14);
+		labelVorlage.setBounds(10, 350, 296, 14);
 		panel.add(labelVorlage);
 		
 		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(150, 356, 130, 14);
+		labelLizenzSoftware.setBounds(10, 383, 296, 14);
 		panel.add(labelLizenzSoftware);
 		
 		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 356, 130, 14);
+		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
 		JLabel lblInternet = new JLabel("Internet:");
-		lblInternet.setBounds(10, 381, 130, 14);
+		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
 		
 		labelInternet = new JLabel("");
-		labelInternet.setBounds(150, 381, 130, 14);
+		labelInternet.setBounds(10, 417, 296, 14);
 		panel.add(labelInternet);
 		
 		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 406, 130, 14);
+		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
 		panel.add(lblEmpfehlungRam);
 		
 		labelRam = new JLabel("");
-		labelRam.setBounds(150, 406, 130, 14);
+		labelRam.setBounds(10, 455, 296, 14);
 		panel.add(labelRam);
 		
 		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 431, 130, 14);
+		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
 		panel.add(lblEmpfehlungCpu);
 		
 		labelCPU = new JLabel("");
-		labelCPU.setBounds(150, 431, 130, 14);
+		labelCPU.setBounds(10, 487, 296, 14);
 		panel.add(labelCPU);
 		
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 295, 296, 14);
+		lblTechnischeDaten.setBounds(10, 322, 296, 14);
 		panel.add(lblTechnischeDaten);
 		
 		JLabel lblId = new JLabel("ID:");
-		lblId.setBounds(10, 23, 130, 14);
+		lblId.setBounds(10, 23, 296, 14);
 		panel.add(lblId);
 		
 		labelID = new JLabel("");
-		labelID.setBounds(150, 23, 130, 14);
+		labelID.setBounds(10, 37, 296, 14);
 		panel.add(labelID);
 		
 		labelVersion = new JLabel("");
-		labelVersion.setBounds(150, 48, 130, 14);
+		labelVersion.setBounds(10, 73, 296, 14);
 		panel.add(labelVersion);
 		
 		JLabel lblVersion = new JLabel("Version:");
-		lblVersion.setBounds(10, 48, 130, 14);
+		lblVersion.setBounds(10, 57, 296, 14);
 		panel.add(lblVersion);
 		
 		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 98, 130, 14);
+		lblBeschreibung.setBounds(10, 119, 130, 14);
 		panel.add(lblBeschreibung);
 		
 		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(148, 98, 158, 65);
+		scrollPane.setBounds(10, 135, 296, 65);
 		panel.add(scrollPane);
 		
 		textAreadesc = new JTextArea();
@@ -1109,8 +1105,8 @@ public class DeleteImage_GUI extends JFrame {
 			labelRam.setText(res.get("ram"));
 			labelCPU.setText(res.get("cpu"));
 			labelID.setText(res.get("id"));
-			labelVersion.setText("version");
-			textAreadesc.setText("desc");
+			labelVersion.setText(res.get("version"));
+			textAreadesc.setText(res.get("desc"));
 		} catch (TException | ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index be864ba7..7c4b654e 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -37,6 +37,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.RowFilter;
@@ -77,6 +78,9 @@ public class SearchEditImage_GUI extends JFrame {
 	JLabel labelInternet;
 	JLabel labelRam;
 	JLabel labelCPU;
+	JLabel labelID;
+	JLabel labelVersion;
+	JTextArea textAreadesc;
 	private JLabel labelOS;
 	String[] result;
 	JRadioButton rdbtnInternetJa;
@@ -709,93 +713,117 @@ public class SearchEditImage_GUI extends JFrame {
 		getContentPane().add(panel);
 		
 		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 30, 130, 14);
+		lblName.setBounds(10, 87, 130, 14);
 		panel.add(lblName);
 		
 		labelName = new JLabel("");
-		labelName.setBounds(150, 30, 130, 14);
+		labelName.setBounds(10, 102, 296, 14);
 		panel.add(labelName);
 		
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 105, 130, 14);
+		lblVerantwortlicher.setBounds(10, 259, 130, 14);
 		panel.add(lblVerantwortlicher);
 		
 		labelOS = new JLabel("");
-		labelOS.setBounds(150, 55, 130, 14);
+		labelOS.setBounds(10, 216, 296, 14);
 		panel.add(labelOS);
 		
 		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 55, 130, 14);
+		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
 		panel.add(lblWeitereVerantwortliche);
 		
 		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(150, 105, 130, 14);
+		labelVerantwortlicher.setBounds(10, 272, 296, 14);
 		panel.add(labelVerantwortlicher);
 		
 		JLabel label = new JLabel("Weitere Verantwortliche:");
-		label.setBounds(10, 130, 130, 14);
+		label.setBounds(10, 284, 130, 14);
 		panel.add(label);
 		
 		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setBounds(150, 130, 130, 14);
+		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
 		panel.add(labelWeitereVerantwortliche);
 		
-		JLabel label_5 = new JLabel("");
-		label_5.setBounds(150, 130, 130, 14);
-		panel.add(label_5);
-		
 		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(150, 80, 130, 14);
+		labelUpdate.setBounds(10, 245, 296, 14);
 		panel.add(labelUpdate);
 		
 		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 80, 130, 14);
+		lblLetztesUpdate.setBounds(10, 231, 130, 14);
 		panel.add(lblLetztesUpdate);
 		
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 259, 130, 14);
+		lblImageIstVorlage.setBounds(10, 336, 130, 14);
 		panel.add(lblImageIstVorlage);
 		
 		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(150, 259, 130, 14);
+		labelVorlage.setBounds(10, 350, 296, 14);
 		panel.add(labelVorlage);
 		
 		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(150, 284, 130, 14);
+		labelLizenzSoftware.setBounds(10, 383, 296, 14);
 		panel.add(labelLizenzSoftware);
 		
 		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 284, 130, 14);
+		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
 		JLabel lblInternet = new JLabel("Internet:");
-		lblInternet.setBounds(10, 309, 130, 14);
+		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
 		
 		labelInternet = new JLabel("");
-		labelInternet.setBounds(150, 309, 130, 14);
+		labelInternet.setBounds(10, 417, 296, 14);
 		panel.add(labelInternet);
 		
 		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 334, 130, 14);
+		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
 		panel.add(lblEmpfehlungRam);
 		
 		labelRam = new JLabel("");
-		labelRam.setBounds(150, 334, 130, 14);
+		labelRam.setBounds(10, 455, 296, 14);
 		panel.add(labelRam);
 		
 		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 359, 130, 14);
+		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
 		panel.add(lblEmpfehlungCpu);
 		
 		labelCPU = new JLabel("");
-		labelCPU.setBounds(150, 359, 130, 14);
+		labelCPU.setBounds(10, 487, 296, 14);
 		panel.add(labelCPU);
 		
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 223, 296, 14);
+		lblTechnischeDaten.setBounds(10, 322, 296, 14);
 		panel.add(lblTechnischeDaten);
 		
+		JLabel lblId = new JLabel("ID:");
+		lblId.setBounds(10, 23, 296, 14);
+		panel.add(lblId);
+		
+		labelID = new JLabel("");
+		labelID.setBounds(10, 37, 296, 14);
+		panel.add(labelID);
+		
+		labelVersion = new JLabel("");
+		labelVersion.setBounds(10, 73, 296, 14);
+		panel.add(labelVersion);
+		
+		JLabel lblVersion = new JLabel("Version:");
+		lblVersion.setBounds(10, 57, 296, 14);
+		panel.add(lblVersion);
+		
+		JLabel lblBeschreibung = new JLabel("Beschreibung:");
+		lblBeschreibung.setBounds(10, 119, 130, 14);
+		panel.add(lblBeschreibung);
+		
+		JScrollPane scrollPane = new JScrollPane();
+		scrollPane.setBounds(10, 135, 296, 65);
+		panel.add(scrollPane);
+		
+		textAreadesc = new JTextArea();
+		textAreadesc.setLineWrap(true);
+		textAreadesc.setBackground(SystemColor.menu);
+		scrollPane.setViewportView(textAreadesc);
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
 
@@ -928,6 +956,9 @@ public class SearchEditImage_GUI extends JFrame {
 			}
 			labelRam.setText(res.get("ram"));
 			labelCPU.setText(res.get("cpu"));
+			labelID.setText(res.get("id"));
+			labelVersion.setText(res.get("version"));
+			textAreadesc.setText(res.get("desc"));
 		} catch (TException | ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index 2c9d7704..cb27e82a 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -37,6 +37,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JSeparator;

 import javax.swing.JTabbedPane;

 import javax.swing.JTable;

+import javax.swing.JTextArea;

 import javax.swing.JTextField;

 import javax.swing.JTextPane;

 import javax.swing.RowFilter;

@@ -80,6 +81,9 @@ public class SearchImage_GUI extends JFrame {
 	JLabel labelInternet;

 	JLabel labelRam;

 	JLabel labelCPU;

+	JLabel labelID;

+	JLabel labelVersion;

+	JTextArea textAreadesc;

 	private JLabel labelOS;

 	String[] result;

 	JRadioButton rdbtnInternetJa;

@@ -662,93 +666,117 @@ public class SearchImage_GUI extends JFrame {
 		getContentPane().add(panel);

 		

 		JLabel lblName = new JLabel("Name:");

-		lblName.setBounds(10, 30, 130, 14);

+		lblName.setBounds(10, 87, 130, 14);

 		panel.add(lblName);

 		

 		labelName = new JLabel("");

-		labelName.setBounds(150, 30, 130, 14);

+		labelName.setBounds(10, 102, 296, 14);

 		panel.add(labelName);

 		

 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");

-		lblVerantwortlicher.setBounds(10, 105, 130, 14);

+		lblVerantwortlicher.setBounds(10, 259, 130, 14);

 		panel.add(lblVerantwortlicher);

 		

 		labelOS = new JLabel("");

-		labelOS.setBounds(150, 55, 130, 14);

+		labelOS.setBounds(10, 216, 296, 14);

 		panel.add(labelOS);

 		

 		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");

-		lblWeitereVerantwortliche.setBounds(10, 55, 130, 14);

+		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);

 		panel.add(lblWeitereVerantwortliche);

 		

 		labelVerantwortlicher = new JLabel("");

-		labelVerantwortlicher.setBounds(150, 105, 130, 14);

+		labelVerantwortlicher.setBounds(10, 272, 296, 14);

 		panel.add(labelVerantwortlicher);

 		

 		JLabel label = new JLabel("Weitere Verantwortliche:");

-		label.setBounds(10, 130, 130, 14);

+		label.setBounds(10, 284, 130, 14);

 		panel.add(label);

 		

 		labelWeitereVerantwortliche = new JLabel("");

-		labelWeitereVerantwortliche.setBounds(150, 130, 130, 14);

+		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);

 		panel.add(labelWeitereVerantwortliche);

 		

-		JLabel label_5 = new JLabel("");

-		label_5.setBounds(150, 130, 130, 14);

-		panel.add(label_5);

-		

 		labelUpdate = new JLabel("");

-		labelUpdate.setBounds(150, 80, 130, 14);

+		labelUpdate.setBounds(10, 245, 296, 14);

 		panel.add(labelUpdate);

 		

 		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");

-		lblLetztesUpdate.setBounds(10, 80, 130, 14);

+		lblLetztesUpdate.setBounds(10, 231, 130, 14);

 		panel.add(lblLetztesUpdate);

 		

 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");

-		lblImageIstVorlage.setBounds(10, 259, 130, 14);

+		lblImageIstVorlage.setBounds(10, 336, 130, 14);

 		panel.add(lblImageIstVorlage);

 		

 		labelVorlage = new JLabel("");

-		labelVorlage.setBounds(150, 259, 130, 14);

+		labelVorlage.setBounds(10, 350, 296, 14);

 		panel.add(labelVorlage);

 		

 		labelLizenzSoftware = new JLabel("");

-		labelLizenzSoftware.setBounds(150, 284, 130, 14);

+		labelLizenzSoftware.setBounds(10, 383, 296, 14);

 		panel.add(labelLizenzSoftware);

 		

 		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");

-		lblLizenzpflichtigeSoftware.setBounds(10, 284, 130, 14);

+		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);

 		panel.add(lblLizenzpflichtigeSoftware);

 		

 		JLabel lblInternet = new JLabel("Internet:");

-		lblInternet.setBounds(10, 309, 130, 14);

+		lblInternet.setBounds(10, 400, 130, 14);

 		panel.add(lblInternet);

 		

 		labelInternet = new JLabel("");

-		labelInternet.setBounds(150, 309, 130, 14);

+		labelInternet.setBounds(10, 417, 296, 14);

 		panel.add(labelInternet);

 		

 		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");

-		lblEmpfehlungRam.setBounds(10, 334, 130, 14);

+		lblEmpfehlungRam.setBounds(10, 432, 130, 14);

 		panel.add(lblEmpfehlungRam);

 		

 		labelRam = new JLabel("");

-		labelRam.setBounds(150, 334, 130, 14);

+		labelRam.setBounds(10, 455, 296, 14);

 		panel.add(labelRam);

 		

 		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");

-		lblEmpfehlungCpu.setBounds(10, 359, 130, 14);

+		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);

 		panel.add(lblEmpfehlungCpu);

 		

 		labelCPU = new JLabel("");

-		labelCPU.setBounds(150, 359, 130, 14);

+		labelCPU.setBounds(10, 487, 296, 14);

 		panel.add(labelCPU);

 		

 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");

-		lblTechnischeDaten.setBounds(10, 223, 296, 14);

+		lblTechnischeDaten.setBounds(10, 322, 296, 14);

 		panel.add(lblTechnischeDaten);

-

+		

+		JLabel lblId = new JLabel("ID:");

+		lblId.setBounds(10, 23, 296, 14);

+		panel.add(lblId);

+		

+		labelID = new JLabel("");

+		labelID.setBounds(10, 37, 296, 14);

+		panel.add(labelID);

+		

+		labelVersion = new JLabel("");

+		labelVersion.setBounds(10, 73, 296, 14);

+		panel.add(labelVersion);

+		

+		JLabel lblVersion = new JLabel("Version:");

+		lblVersion.setBounds(10, 57, 296, 14);

+		panel.add(lblVersion);

+		

+		JLabel lblBeschreibung = new JLabel("Beschreibung:");

+		lblBeschreibung.setBounds(10, 119, 130, 14);

+		panel.add(lblBeschreibung);

+		

+		JScrollPane scrollPane = new JScrollPane();

+		scrollPane.setBounds(10, 135, 296, 65);

+		panel.add(scrollPane);

+		

+		textAreadesc = new JTextArea();

+		textAreadesc.setLineWrap(true);

+		textAreadesc.setBackground(SystemColor.menu);

+		scrollPane.setViewportView(textAreadesc);

 		JMenuBar menuBar = new JMenuBar();

 		setJMenuBar(menuBar);

 

@@ -880,6 +908,9 @@ public class SearchImage_GUI extends JFrame {
 			}

 			labelRam.setText(res.get("ram"));

 			labelCPU.setText(res.get("cpu"));

+			labelID.setText(res.get("id"));

+			labelVersion.setText(res.get("version"));

+			textAreadesc.setText(res.get("desc"));

 		} catch (TException | ParseException e1) {

 			// TODO Auto-generated catch block

 			e1.printStackTrace();

diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 62613905..76503286 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -18,9 +18,11 @@ import java.awt.event.WindowEvent;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -36,6 +38,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.RowFilter;
@@ -59,6 +62,8 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ChangeEvent;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 
 @SuppressWarnings("serial")
 public class CreateLectureLink_GUI extends JFrame {
@@ -69,10 +74,22 @@ public class CreateLectureLink_GUI extends JFrame {
 	JRadioButton rdbtnInternetNein;
 	JComboBox<String> comboBox;
 	JTabbedPane tabbedPane;
+	JLabel labelName;
+	JLabel labelUpdate;
+	JLabel labelVerantwortlicher;
+	JLabel labelWeitereVerantwortliche;
+	JLabel labelVorlage;
+	JLabel labelLizenzSoftware;
+	JLabel labelInternet;
+	JLabel labelRam;
+	JLabel labelCPU;
+	JLabel labelID;
+	JLabel labelVersion;
+	JTextArea textAreadesc;
+	private JLabel labelOS;
 	JTable tableAllImages = new JTable();
 	JTable tablemyImages = new JTable();
 	JTable tableCoopImages = new JTable();
-	JTable tablePublicImages = new JTable();
 	JTable tablePublicVorlagen = new JTable();
 	boolean activeSearch=false;
 	private JTextField textFieldName;
@@ -115,9 +132,54 @@ public class CreateLectureLink_GUI extends JFrame {
 
 			@Override
 			public void windowOpened(WindowEvent arg0) {
-				initTableModel(modelAll);
-				initTableModel(modelMyImages);
-				initTableModel(modelPublicVorlagen);
+				try {
+					initTableModel(modelMyImages);
+					initTableModel(modelAll);
+					initTableModel(modelPublicVorlagen);
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+
+				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
+				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
+				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
 				textFieldName.requestFocusInWindow();
 			}
 		});
@@ -131,7 +193,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite - Veranstaltung erzeugen");
-		setBounds(0, 0, 603, 722);
+		setBounds(0, 0, 918, 722);
 		GuiOrganizer.centerGUI(this);
 
 		
@@ -141,7 +203,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		{
 			JPanel panel = new JPanel();
 			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
+			panel.setBounds(10, 11, 892, 57);
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
@@ -313,7 +375,35 @@ public class CreateLectureLink_GUI extends JFrame {
 		contentPanel.add(tabbedPane);
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
-
+	    tablemyImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+	    {
+	        public void valueChanged(ListSelectionEvent e)
+	        {
+	        	String imageid = modelMyImages
+						.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 6)
+						.toString();
+	        	System.out.println(imageid);
+	        	String version = modelMyImages
+						.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 7)
+						.toString();
+	        	System.out.println(version);
+	        	try {
+					writeImageData(imageid, version);
+				} catch (TException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				} catch (ParseException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+	        }
+	    });
 		tablemyImages.setModel(modelMyImages);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -336,7 +426,35 @@ public class CreateLectureLink_GUI extends JFrame {
 
 				
 						JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-						
+					    tablePublicVorlagen.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+					    {
+					        public void valueChanged(ListSelectionEvent e)
+					        {
+					        	String imageid = modelPublicVorlagen
+										.getValueAt(
+												tablePublicVorlagen
+														.convertRowIndexToModel(tablePublicVorlagen
+																.getSelectedRow()), 6)
+										.toString();
+					        	System.out.println(imageid);
+					        	String version = modelPublicVorlagen
+										.getValueAt(
+												tablePublicVorlagen
+														.convertRowIndexToModel(tablePublicVorlagen
+																.getSelectedRow()), 7)
+										.toString();
+					        	System.out.println(version);
+					        	try {
+									writeImageData(imageid, version);
+								} catch (TException e1) {
+									// TODO Auto-generated catch block
+									e1.printStackTrace();
+								} catch (ParseException e1) {
+									// TODO Auto-generated catch block
+									e1.printStackTrace();
+								}
+					        }
+					    });
 								tablePublicVorlagen.setModel(modelPublicVorlagen);
 								tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
 								tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -345,11 +463,42 @@ public class CreateLectureLink_GUI extends JFrame {
 								tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
 								tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
 								scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-								tabbedPane.addTab("\u00D6ffentliche Vorlagen", null,
+								tabbedPane.addTab("Vorlagen", null,
 										scrollPanePublicVorlagen, null);
 		
 				JScrollPane scrollPaneAllImages = new JScrollPane();
 				tableAllImages = new JTable();
+			    tableAllImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
+			    {
+			        public void valueChanged(ListSelectionEvent e)
+			        {
+
+			        	String imageid = modelAll
+								.getValueAt(
+										tableAllImages
+												.convertRowIndexToModel(tableAllImages
+														.getSelectedRow()), 6)
+								.toString();
+			        	System.out.println(imageid);
+			        	String version = modelAll
+								.getValueAt(
+										tableAllImages
+												.convertRowIndexToModel(tableAllImages
+														.getSelectedRow()), 7)
+								.toString();
+			        	System.out.println(version);
+			        	try {
+							writeImageData(imageid, version);
+						} catch (TException e1) {
+							// TODO Auto-generated catch block
+							e1.printStackTrace();
+						} catch (ParseException e1) {
+							// TODO Auto-generated catch block
+							e1.printStackTrace();
+						}
+
+			        }
+			    });
 				tableAllImages.setModel(modelAll);
 				tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
 				tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -364,27 +513,13 @@ public class CreateLectureLink_GUI extends JFrame {
 			
 
 		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages,
+		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages,
 				null);
 		tabbedPane.setEnabledAt(3, false);
 
-		JScrollPane scrollPanePublicImages = new JScrollPane();
-
-		tablePublicImages.setModel(model);
-		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null,
-				scrollPanePublicImages, null);
-		tabbedPane.setEnabledAt(4, false);
-
 		{
 			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBounds(0, 640, 902, 33);
 			buttonPane.setBackground(SystemColor.menu);
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
@@ -586,13 +721,135 @@ public class CreateLectureLink_GUI extends JFrame {
 		}
 
 		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 78, 597, 2);
+		separator.setBounds(0, 79, 912, 1);
 		getContentPane().add(separator);
 
 		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
+		separator_1.setBounds(0, 627, 912, 2);
 		getContentPane().add(separator_1);
 
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Detailinformationen",
+
+						TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(586, 85, 316, 531);
+		getContentPane().add(panel);
+		
+		JLabel lblName = new JLabel("Name:");
+		lblName.setBounds(10, 87, 130, 14);
+		panel.add(lblName);
+		
+		labelName = new JLabel("");
+		labelName.setBounds(10, 102, 296, 14);
+		panel.add(labelName);
+		
+		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
+		lblVerantwortlicher.setBounds(10, 259, 130, 14);
+		panel.add(lblVerantwortlicher);
+		
+		labelOS = new JLabel("");
+		labelOS.setBounds(10, 216, 296, 14);
+		panel.add(labelOS);
+		
+		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
+		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
+		panel.add(lblWeitereVerantwortliche);
+		
+		labelVerantwortlicher = new JLabel("");
+		labelVerantwortlicher.setBounds(10, 272, 296, 14);
+		panel.add(labelVerantwortlicher);
+		
+		JLabel label = new JLabel("Weitere Verantwortliche:");
+		label.setBounds(10, 284, 130, 14);
+		panel.add(label);
+		
+		labelWeitereVerantwortliche = new JLabel("");
+		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
+		panel.add(labelWeitereVerantwortliche);
+		
+		labelUpdate = new JLabel("");
+		labelUpdate.setBounds(10, 245, 296, 14);
+		panel.add(labelUpdate);
+		
+		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
+		lblLetztesUpdate.setBounds(10, 231, 130, 14);
+		panel.add(lblLetztesUpdate);
+		
+		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
+		lblImageIstVorlage.setBounds(10, 336, 130, 14);
+		panel.add(lblImageIstVorlage);
+		
+		labelVorlage = new JLabel("");
+		labelVorlage.setBounds(10, 350, 296, 14);
+		panel.add(labelVorlage);
+		
+		labelLizenzSoftware = new JLabel("");
+		labelLizenzSoftware.setBounds(10, 383, 296, 14);
+		panel.add(labelLizenzSoftware);
+		
+		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
+		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
+		panel.add(lblLizenzpflichtigeSoftware);
+		
+		JLabel lblInternet = new JLabel("Internet:");
+		lblInternet.setBounds(10, 400, 130, 14);
+		panel.add(lblInternet);
+		
+		labelInternet = new JLabel("");
+		labelInternet.setBounds(10, 417, 296, 14);
+		panel.add(labelInternet);
+		
+		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
+		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
+		panel.add(lblEmpfehlungRam);
+		
+		labelRam = new JLabel("");
+		labelRam.setBounds(10, 455, 296, 14);
+		panel.add(labelRam);
+		
+		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
+		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
+		panel.add(lblEmpfehlungCpu);
+		
+		labelCPU = new JLabel("");
+		labelCPU.setBounds(10, 487, 296, 14);
+		panel.add(labelCPU);
+		
+		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
+		lblTechnischeDaten.setBounds(10, 322, 296, 14);
+		panel.add(lblTechnischeDaten);
+		
+		JLabel lblId = new JLabel("ID:");
+		lblId.setBounds(10, 23, 296, 14);
+		panel.add(lblId);
+		
+		labelID = new JLabel("");
+		labelID.setBounds(10, 37, 296, 14);
+		panel.add(labelID);
+		
+		labelVersion = new JLabel("");
+		labelVersion.setBounds(10, 73, 296, 14);
+		panel.add(labelVersion);
+		
+		JLabel lblVersion = new JLabel("Version:");
+		lblVersion.setBounds(10, 57, 296, 14);
+		panel.add(lblVersion);
+		
+		JLabel lblBeschreibung = new JLabel("Beschreibung:");
+		lblBeschreibung.setBounds(10, 119, 130, 14);
+		panel.add(lblBeschreibung);
+		
+		JScrollPane scrollPane = new JScrollPane();
+		scrollPane.setBounds(10, 135, 296, 65);
+		panel.add(scrollPane);
+		
+		textAreadesc = new JTextArea();
+		textAreadesc.setLineWrap(true);
+		textAreadesc.setBackground(SystemColor.menu);
+		scrollPane.setViewportView(textAreadesc);
+		
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
 
@@ -661,14 +918,15 @@ public class CreateLectureLink_GUI extends JFrame {
 	}
 
 	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
+	public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException {
 		List<server.Image> images;
-		try {
+		
 			// Hole eine Liste der Images
 			images = client.getImageList();
 
 			Iterator<server.Image> i = images.iterator();
-
+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
 			int x = 0;
 
 			while (i.hasNext()) {
@@ -678,10 +936,11 @@ public class CreateLectureLink_GUI extends JFrame {
 						images.get(x).getOsName(),
 						images.get(x).getLectureName(),
 						images.get(x).getUserData(),
-						images.get(x).getUpdateTime(), images.get(x).id,
+						out.format(in.parse(images.get(x).updateTime)), images.get(x).id,
 						images.get(x).getVersion(),
 						images.get(x).getIsTemplate()};
 				// Fuege diese Objekte der Tabelle hinzu
+				
 				model.addRow(obj);
 				x++;
 				i.next();
@@ -689,14 +948,43 @@ public class CreateLectureLink_GUI extends JFrame {
 			}
 
 			return model;
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					e1.getCause()+"\n"+e1.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
-		}
-		return model;
+
+		
 	}
+	public void writeImageData(String id, String version) throws TException, ParseException{
+    	
+			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			Map<String,String> res=client.getImageData(id,version);
+			labelName.setText(res.get("name"));
+			labelOS.setText(res.get("os"));
+			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
+			labelVerantwortlicher.setText(res.get("owner"));
+			labelWeitereVerantwortliche.setText("Noch nicht Verf�gbar");
+			if(res.get("template").equals("true")){
+				labelVorlage.setText("Ja");
+			}else{
+				labelVorlage.setText("Nein");
+			}
+			if(res.get("license").equals("1")){
+				labelLizenzSoftware.setText("Ja");
+			}
+			else
+			{
+				labelLizenzSoftware.setText("Nein");
+			}
+			if(res.get("internet").equals("1")){
+				labelInternet.setText("Ja");
+			}
+			else
+			{
+				labelInternet.setText("Nein");
+			}
+			labelRam.setText(res.get("ram"));
+			labelCPU.setText(res.get("cpu"));
+			labelID.setText(res.get("id"));
+			labelVersion.setText(res.get("version"));
+			textAreadesc.setText(res.get("desc"));
 
+	}
 }
diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
index 4cf7c618..ac3317a8 100644
--- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
@@ -417,51 +417,51 @@ public class DeleteLecture_GUI extends JFrame {
 		panel.add(lblNewLabel_3);
 		
 		JLabel lblAktiv = new JLabel("Aktiv:");
-		lblAktiv.setBounds(10, 88, 104, 14);
+		lblAktiv.setBounds(10, 98, 104, 14);
 		panel.add(lblAktiv);
 		
 		labelAktiv = new JLabel("");
-		labelAktiv.setBounds(124, 88, 104, 14);
+		labelAktiv.setBounds(10, 114, 218, 14);
 		panel.add(labelAktiv);
 		
 		labelstartdate = new JLabel("");
-		labelstartdate.setBounds(124, 113, 104, 14);
+		labelstartdate.setBounds(10, 147, 218, 14);
 		panel.add(labelstartdate);
 		
 		JLabel lblStartdatum = new JLabel("Startdatum:");
-		lblStartdatum.setBounds(10, 113, 104, 14);
+		lblStartdatum.setBounds(10, 129, 104, 14);
 		panel.add(lblStartdatum);
 		
 		labelenddate = new JLabel("");
-		labelenddate.setBounds(124, 138, 104, 14);
+		labelenddate.setBounds(10, 175, 218, 14);
 		panel.add(labelenddate);
 		
 		JLabel lblEnddatum = new JLabel("Enddatum:");
-		lblEnddatum.setBounds(10, 138, 104, 14);
+		lblEnddatum.setBounds(10, 161, 104, 14);
 		panel.add(lblEnddatum);
 		
 		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 163, 104, 14);
+		lblBeschreibung.setBounds(10, 189, 104, 14);
 		panel.add(lblBeschreibung);
 		
 		JLabel lblImage = new JLabel("Image:");
-		lblImage.setBounds(10, 284, 104, 14);
+		lblImage.setBounds(10, 293, 104, 14);
 		panel.add(lblImage);
 		
 		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(124, 401, 104, 14);
+		labelVerantwortlicher.setBounds(10, 426, 218, 14);
 		panel.add(labelVerantwortlicher);
 		
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 401, 104, 14);
+		lblVerantwortlicher.setBounds(10, 411, 104, 14);
 		panel.add(lblVerantwortlicher);
 		
 		JLabel lblImageversion = new JLabel("Imageversion:");
-		lblImageversion.setBounds(10, 376, 104, 14);
+		lblImageversion.setBounds(10, 381, 104, 14);
 		panel.add(lblImageversion);
 		
 		labelimageversion = new JLabel("");
-		labelimageversion.setBounds(124, 376, 104, 14);
+		labelimageversion.setBounds(10, 399, 218, 14);
 		panel.add(labelimageversion);
 		
 	
@@ -472,9 +472,7 @@ public class DeleteLecture_GUI extends JFrame {
 		labeldesc.setBackground(SystemColor.menu);
 		labeldesc.setBounds(124, 127, 104, 110);
 		JScrollPane scrollPane = new JScrollPane(labeldesc);
-		scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
-		scrollPane.setBounds(124, 163, 104, 110);
+		scrollPane.setBounds(10, 209, 218, 81);
 		panel.add(scrollPane);
 		//panel.add(labeldesc);
 		
@@ -485,9 +483,7 @@ public class DeleteLecture_GUI extends JFrame {
 		labelimage.setBackground(SystemColor.menu);
 		labelimage.setBounds(124, 248, 101, 81);
 		JScrollPane scrollPaneImage = new JScrollPane(labelimage);
-		scrollPaneImage.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-		scrollPaneImage.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
-		scrollPaneImage.setBounds(124, 284, 101, 81);
+		scrollPaneImage.setBounds(10, 309, 215, 69);
 		panel.add(scrollPaneImage);
 		
 		labelName = new JTextArea();
@@ -495,9 +491,7 @@ public class DeleteLecture_GUI extends JFrame {
 		labelName.setBackground(SystemColor.menu);
 		labelName.setBounds(124, 22, 101, 55);
 		JScrollPane scrollPaneName = new JScrollPane(labelName);
-		scrollPaneName.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-		scrollPaneName.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
-		scrollPaneName.setBounds(124, 22, 101, 55);
+		scrollPaneName.setBounds(10, 40, 218, 55);
 		panel.add(scrollPaneName);
 		
 				button = new JButton("L\u00F6schen");
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 6ef6749f..f36e161e 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -39,6 +39,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.RowFilter;
@@ -81,6 +82,9 @@ public class EditLectureLink_GUI extends JFrame {
 	JLabel labelLizenzSoftware;
 	JLabel labelInternet;
 	JLabel labelRam;
+	JLabel labelID;
+	JLabel labelVersion;
+	JTextArea textAreadesc;
 	JLabel labelCPU;
 	private JLabel labelOS;
 	JTable tableAllImages = new JTable();
@@ -741,92 +745,117 @@ public class EditLectureLink_GUI extends JFrame {
 		getContentPane().add(panel);
 		
 		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 30, 130, 14);
+		lblName.setBounds(10, 87, 130, 14);
 		panel.add(lblName);
 		
 		labelName = new JLabel("");
-		labelName.setBounds(150, 30, 130, 14);
+		labelName.setBounds(10, 102, 296, 14);
 		panel.add(labelName);
 		
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 105, 130, 14);
+		lblVerantwortlicher.setBounds(10, 259, 130, 14);
 		panel.add(lblVerantwortlicher);
 		
 		labelOS = new JLabel("");
-		labelOS.setBounds(150, 55, 130, 14);
+		labelOS.setBounds(10, 216, 296, 14);
 		panel.add(labelOS);
 		
 		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 55, 130, 14);
+		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
 		panel.add(lblWeitereVerantwortliche);
 		
 		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(150, 105, 130, 14);
+		labelVerantwortlicher.setBounds(10, 272, 296, 14);
 		panel.add(labelVerantwortlicher);
 		
 		JLabel label = new JLabel("Weitere Verantwortliche:");
-		label.setBounds(10, 130, 130, 14);
+		label.setBounds(10, 284, 130, 14);
 		panel.add(label);
 		
 		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setBounds(150, 130, 130, 14);
+		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
 		panel.add(labelWeitereVerantwortliche);
 		
-		JLabel label_5 = new JLabel("");
-		label_5.setBounds(150, 130, 130, 14);
-		panel.add(label_5);
-		
 		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(150, 80, 130, 14);
+		labelUpdate.setBounds(10, 245, 296, 14);
 		panel.add(labelUpdate);
 		
 		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 80, 130, 14);
+		lblLetztesUpdate.setBounds(10, 231, 130, 14);
 		panel.add(lblLetztesUpdate);
 		
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 259, 130, 14);
+		lblImageIstVorlage.setBounds(10, 336, 130, 14);
 		panel.add(lblImageIstVorlage);
 		
 		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(150, 259, 130, 14);
+		labelVorlage.setBounds(10, 350, 296, 14);
 		panel.add(labelVorlage);
 		
 		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(150, 284, 130, 14);
+		labelLizenzSoftware.setBounds(10, 383, 296, 14);
 		panel.add(labelLizenzSoftware);
 		
 		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 284, 130, 14);
+		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
 		JLabel lblInternet = new JLabel("Internet:");
-		lblInternet.setBounds(10, 309, 130, 14);
+		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
 		
 		labelInternet = new JLabel("");
-		labelInternet.setBounds(150, 309, 130, 14);
+		labelInternet.setBounds(10, 417, 296, 14);
 		panel.add(labelInternet);
 		
 		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 334, 130, 14);
+		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
 		panel.add(lblEmpfehlungRam);
 		
 		labelRam = new JLabel("");
-		labelRam.setBounds(150, 334, 130, 14);
+		labelRam.setBounds(10, 455, 296, 14);
 		panel.add(labelRam);
 		
 		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 359, 130, 14);
+		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
 		panel.add(lblEmpfehlungCpu);
 		
 		labelCPU = new JLabel("");
-		labelCPU.setBounds(150, 359, 130, 14);
+		labelCPU.setBounds(10, 487, 296, 14);
 		panel.add(labelCPU);
 		
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 223, 296, 14);
+		lblTechnischeDaten.setBounds(10, 322, 296, 14);
 		panel.add(lblTechnischeDaten);
+		
+		JLabel lblId = new JLabel("ID:");
+		lblId.setBounds(10, 23, 296, 14);
+		panel.add(lblId);
+		
+		labelID = new JLabel("");
+		labelID.setBounds(10, 37, 296, 14);
+		panel.add(labelID);
+		
+		labelVersion = new JLabel("");
+		labelVersion.setBounds(10, 73, 296, 14);
+		panel.add(labelVersion);
+		
+		JLabel lblVersion = new JLabel("Version:");
+		lblVersion.setBounds(10, 57, 296, 14);
+		panel.add(lblVersion);
+		
+		JLabel lblBeschreibung = new JLabel("Beschreibung:");
+		lblBeschreibung.setBounds(10, 119, 130, 14);
+		panel.add(lblBeschreibung);
+		
+		JScrollPane scrollPane = new JScrollPane();
+		scrollPane.setBounds(10, 135, 296, 65);
+		panel.add(scrollPane);
+		
+		textAreadesc = new JTextArea();
+		textAreadesc.setLineWrap(true);
+		textAreadesc.setBackground(SystemColor.menu);
+		scrollPane.setViewportView(textAreadesc);
 
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
@@ -959,6 +988,9 @@ public class EditLectureLink_GUI extends JFrame {
 			}
 			labelRam.setText(res.get("ram"));
 			labelCPU.setText(res.get("cpu"));
+			labelID.setText(res.get("id"));
+			labelVersion.setText(res.get("version"));
+			textAreadesc.setText(res.get("desc"));
 		} catch (TException | ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
index 36a163e9..5a89ea48 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
@@ -614,51 +614,51 @@ public class EditLectureSearch_GUI extends JFrame {
 		panel.add(lblNewLabel_3);
 		
 		JLabel lblAktiv = new JLabel("Aktiv:");
-		lblAktiv.setBounds(10, 88, 104, 14);
+		lblAktiv.setBounds(10, 98, 104, 14);
 		panel.add(lblAktiv);
 		
 		labelAktiv = new JLabel("");
-		labelAktiv.setBounds(124, 88, 104, 14);
+		labelAktiv.setBounds(10, 114, 218, 14);
 		panel.add(labelAktiv);
 		
 		labelstartdate = new JLabel("");
-		labelstartdate.setBounds(124, 113, 104, 14);
+		labelstartdate.setBounds(10, 147, 218, 14);
 		panel.add(labelstartdate);
 		
 		JLabel lblStartdatum = new JLabel("Startdatum:");
-		lblStartdatum.setBounds(10, 113, 104, 14);
+		lblStartdatum.setBounds(10, 129, 104, 14);
 		panel.add(lblStartdatum);
 		
 		labelenddate = new JLabel("");
-		labelenddate.setBounds(124, 138, 104, 14);
+		labelenddate.setBounds(10, 175, 218, 14);
 		panel.add(labelenddate);
 		
 		JLabel lblEnddatum = new JLabel("Enddatum:");
-		lblEnddatum.setBounds(10, 138, 104, 14);
+		lblEnddatum.setBounds(10, 161, 104, 14);
 		panel.add(lblEnddatum);
 		
 		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 163, 104, 14);
+		lblBeschreibung.setBounds(10, 189, 104, 14);
 		panel.add(lblBeschreibung);
 		
 		JLabel lblImage = new JLabel("Image:");
-		lblImage.setBounds(10, 284, 104, 14);
+		lblImage.setBounds(10, 293, 104, 14);
 		panel.add(lblImage);
 		
 		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(124, 401, 104, 14);
+		labelVerantwortlicher.setBounds(10, 426, 218, 14);
 		panel.add(labelVerantwortlicher);
 		
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 401, 104, 14);
+		lblVerantwortlicher.setBounds(10, 411, 104, 14);
 		panel.add(lblVerantwortlicher);
 		
 		JLabel lblImageversion = new JLabel("Imageversion:");
-		lblImageversion.setBounds(10, 376, 104, 14);
+		lblImageversion.setBounds(10, 381, 104, 14);
 		panel.add(lblImageversion);
 		
 		labelimageversion = new JLabel("");
-		labelimageversion.setBounds(124, 376, 104, 14);
+		labelimageversion.setBounds(10, 399, 218, 14);
 		panel.add(labelimageversion);
 		
 	
@@ -669,9 +669,7 @@ public class EditLectureSearch_GUI extends JFrame {
 		labeldesc.setBackground(SystemColor.menu);
 		labeldesc.setBounds(124, 127, 104, 110);
 		JScrollPane scrollPane = new JScrollPane(labeldesc);
-		scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
-		scrollPane.setBounds(124, 163, 104, 110);
+		scrollPane.setBounds(10, 209, 218, 81);
 		panel.add(scrollPane);
 		//panel.add(labeldesc);
 		
@@ -682,9 +680,7 @@ public class EditLectureSearch_GUI extends JFrame {
 		labelimage.setBackground(SystemColor.menu);
 		labelimage.setBounds(124, 248, 101, 81);
 		JScrollPane scrollPaneImage = new JScrollPane(labelimage);
-		scrollPaneImage.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-		scrollPaneImage.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
-		scrollPaneImage.setBounds(124, 284, 101, 81);
+		scrollPaneImage.setBounds(10, 309, 215, 69);
 		panel.add(scrollPaneImage);
 		
 		labelName = new JTextArea();
@@ -692,9 +688,7 @@ public class EditLectureSearch_GUI extends JFrame {
 		labelName.setBackground(SystemColor.menu);
 		labelName.setBounds(124, 22, 101, 55);
 		JScrollPane scrollPaneName = new JScrollPane(labelName);
-		scrollPaneName.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-		scrollPaneName.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
-		scrollPaneName.setBounds(124, 22, 101, 55);
+		scrollPaneName.setBounds(10, 40, 218, 55);
 		panel.add(scrollPaneName);
 		//panel.add(labelName);
 		//panel.add(labelimage);
diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
index 3e54ec65..707534f4 100644
--- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
@@ -420,51 +420,51 @@ public class SearchLecture_GUI extends JFrame {
 		panel.add(lblNewLabel_3);

 		

 		JLabel lblAktiv = new JLabel("Aktiv:");

-		lblAktiv.setBounds(10, 88, 104, 14);

+		lblAktiv.setBounds(10, 98, 104, 14);

 		panel.add(lblAktiv);

 		

 		labelAktiv = new JLabel("");

-		labelAktiv.setBounds(124, 88, 104, 14);

+		labelAktiv.setBounds(10, 114, 218, 14);

 		panel.add(labelAktiv);

 		

 		labelstartdate = new JLabel("");

-		labelstartdate.setBounds(124, 113, 104, 14);

+		labelstartdate.setBounds(10, 147, 218, 14);

 		panel.add(labelstartdate);

 		

 		JLabel lblStartdatum = new JLabel("Startdatum:");

-		lblStartdatum.setBounds(10, 113, 104, 14);

+		lblStartdatum.setBounds(10, 129, 104, 14);

 		panel.add(lblStartdatum);

 		

 		labelenddate = new JLabel("");

-		labelenddate.setBounds(124, 138, 104, 14);

+		labelenddate.setBounds(10, 175, 218, 14);

 		panel.add(labelenddate);

 		

 		JLabel lblEnddatum = new JLabel("Enddatum:");

-		lblEnddatum.setBounds(10, 138, 104, 14);

+		lblEnddatum.setBounds(10, 161, 104, 14);

 		panel.add(lblEnddatum);

 		

 		JLabel lblBeschreibung = new JLabel("Beschreibung:");

-		lblBeschreibung.setBounds(10, 163, 104, 14);

+		lblBeschreibung.setBounds(10, 189, 104, 14);

 		panel.add(lblBeschreibung);

 		

 		JLabel lblImage = new JLabel("Image:");

-		lblImage.setBounds(10, 284, 104, 14);

+		lblImage.setBounds(10, 293, 104, 14);

 		panel.add(lblImage);

 		

 		labelVerantwortlicher = new JLabel("");

-		labelVerantwortlicher.setBounds(124, 401, 104, 14);

+		labelVerantwortlicher.setBounds(10, 426, 218, 14);

 		panel.add(labelVerantwortlicher);

 		

 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");

-		lblVerantwortlicher.setBounds(10, 401, 104, 14);

+		lblVerantwortlicher.setBounds(10, 411, 104, 14);

 		panel.add(lblVerantwortlicher);

 		

 		JLabel lblImageversion = new JLabel("Imageversion:");

-		lblImageversion.setBounds(10, 376, 104, 14);

+		lblImageversion.setBounds(10, 381, 104, 14);

 		panel.add(lblImageversion);

 		

 		labelimageversion = new JLabel("");

-		labelimageversion.setBounds(124, 376, 104, 14);

+		labelimageversion.setBounds(10, 399, 218, 14);

 		panel.add(labelimageversion);

 		

 	

@@ -475,9 +475,7 @@ public class SearchLecture_GUI extends JFrame {
 		labeldesc.setBackground(SystemColor.menu);

 		labeldesc.setBounds(124, 127, 104, 110);

 		JScrollPane scrollPane = new JScrollPane(labeldesc);

-		scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);

-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);

-		scrollPane.setBounds(124, 163, 104, 110);

+		scrollPane.setBounds(10, 209, 218, 81);

 		panel.add(scrollPane);

 		//panel.add(labeldesc);

 		

@@ -488,9 +486,7 @@ public class SearchLecture_GUI extends JFrame {
 		labelimage.setBackground(SystemColor.menu);

 		labelimage.setBounds(124, 248, 101, 81);

 		JScrollPane scrollPaneImage = new JScrollPane(labelimage);

-		scrollPaneImage.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);

-		scrollPaneImage.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);

-		scrollPaneImage.setBounds(124, 284, 101, 81);

+		scrollPaneImage.setBounds(10, 309, 215, 69);

 		panel.add(scrollPaneImage);

 		

 		labelName = new JTextArea();

@@ -498,9 +494,7 @@ public class SearchLecture_GUI extends JFrame {
 		labelName.setBackground(SystemColor.menu);

 		labelName.setBounds(124, 22, 101, 55);

 		JScrollPane scrollPaneName = new JScrollPane(labelName);

-		scrollPaneName.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);

-		scrollPaneName.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);

-		scrollPaneName.setBounds(124, 22, 101, 55);

+		scrollPaneName.setBounds(10, 40, 218, 55);

 		panel.add(scrollPaneName);

 		//panel.add(labelName);

 		//panel.add(labelimage);