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

Conflicts:
	fdghf
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/src/gui/image/DeleteImage_GUI.java

1 files changed, 5 insertions, 5 deletions

diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
index da30680c..33192436 100644
--- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
@@ -69,7 +69,7 @@ public class DeleteLecture_GUI extends JFrame {
 			"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
 			"Verantwortlicher", "Image", "Schlagwort", "ID" };
 	ThriftConnection con = new ThriftConnection();
-	Client client = con.getThriftConnection();
+	Client client = models.Client.clientcon.getClient();
 	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
 	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
@@ -195,7 +195,7 @@ public class DeleteLecture_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// Öffnet das Fenster Extended GUI
-				con.closeThriftConnection();
+				
 				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
 				es.setVisible(true);
 			}
@@ -210,7 +210,7 @@ public class DeleteLecture_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// Öffnet das Hauptmenü
-				con.closeThriftConnection();
+				
 				DeleteLecture_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
@@ -350,7 +350,7 @@ public class DeleteLecture_GUI extends JFrame {
 							if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){
 								System.out.println("Löschen erfolgreich");
 								//delete successful
-								con.closeThriftConnection();
+								
 								DeleteLecture_GUI dl = new DeleteLecture_GUI();
 								dl.setVisible(true);
 								dispose();
@@ -386,7 +386,7 @@ public class DeleteLecture_GUI extends JFrame {
 				btnBack.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						// Öffnet das Hauptmenü
-						con.closeThriftConnection();
+						
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
 						dispose();