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, 16 insertions, 3 deletions

diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 2f88e339..6d68db49 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -73,8 +73,8 @@ public class DeleteImage_GUI extends JFrame {
 	JTabbedPane tabbedPane;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
-	ThriftConnection con = new ThriftConnection();
-	Client client = con.getThriftConnection();
+	ThriftConnection con=new ThriftConnection();
+	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>(
@@ -203,8 +203,12 @@ public class DeleteImage_GUI extends JFrame {
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
+
 				// oeffnet das Fenster Extended GUI
 				con.closeThriftConnection();
+
+				// Öffnet das Fenster Extended GUI
+
 				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
 				es.setVisible(true);
 			}
@@ -252,8 +256,12 @@ public class DeleteImage_GUI extends JFrame {
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
+
 				// oeffnet das Hauuetmenue
 				con.closeThriftConnection();
+
+				// Öffnet das Hauütmenü
+				
 				DeleteImage_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
@@ -423,7 +431,7 @@ public class DeleteImage_GUI extends JFrame {
 										// if (client.deleteImageServer(imageid
 										// ,imageversion)) {
 										
-										con.closeThriftConnection();
+										
 										
 										
 										DeleteImage_GUI di = new DeleteImage_GUI();
@@ -499,8 +507,13 @@ public class DeleteImage_GUI extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
+
 						// oeffnet das Hauptmen\u00FC
 						con.closeThriftConnection();
+
+						// Öffnet das Hauptmenü
+						
+
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
 						dispose();