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/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index 8fc7d164..73f0b9bb 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -70,7 +70,7 @@ public class SearchImage_GUI extends JFrame {
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
 	ThriftConnection con = new ThriftConnection();
-	Client client = con.getThriftConnection();
+	Client client = models.Client.clientcon.getClient();
 	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
 	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0);
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
@@ -191,7 +191,7 @@ public class SearchImage_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);
 			}
@@ -240,7 +240,7 @@ public class SearchImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// Öffnet das Hauütmenü
-				con.closeThriftConnection();
+				
 				SearchImage_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
@@ -376,7 +376,7 @@ public class SearchImage_GUI extends JFrame {
 					SearchImage_GUI.this.setVisible(false);
 					FTPDownloader_GUI down = new FTPDownloader_GUI();
 					down.setVisible(true);
-					con.closeThriftConnection();
+					
 
 				} else {
 					JOptionPane.showMessageDialog(null,
@@ -398,7 +398,7 @@ public class SearchImage_GUI extends JFrame {
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						// Öffnet das Hauptmenü
-						con.closeThriftConnection();
+					
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
 						dispose();