1 files changed, 17 insertions, 14 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index fc9fa1e7..595a97d0 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -4,6 +4,7 @@ import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.HeadlessException;
@@ -89,6 +90,7 @@ public class DeleteImage_GUI extends JFrame {
 	JTable tablemyImages;
 	private JTextField textFieldName;
 	boolean activeSearch = false;
+	Component c = null;
 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" }; // Angezeigt
 																					// werden
@@ -138,7 +140,7 @@ public class DeleteImage_GUI extends JFrame {
 	/**
 	 * Create the dialog.
 	 */
-	public DeleteImage_GUI() {
+	public DeleteImage_GUI(Component formerGUI) {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -241,7 +243,7 @@ public class DeleteImage_GUI extends JFrame {
 		setTitle("bwLehrpool Suite - Image löschen");
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 918, 722);
-		GuiOrganizer.centerGUI(this);
+		setLocationRelativeTo(formerGUI);
 
 		final DefaultTableModel model = new DefaultTableModel(titles, 0);
 
@@ -339,7 +341,7 @@ public class DeleteImage_GUI extends JFrame {
 		} catch (TException e2) {
 			// TODO Auto-generated catch block
 			e2.printStackTrace();
-			JOptionPane.showMessageDialog(null,
+			JOptionPane.showMessageDialog(c,
 					e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 		}
@@ -382,7 +384,7 @@ public class DeleteImage_GUI extends JFrame {
 				// oeffnet das Hauuetmenue
 
 				DeleteImage_GUI.this.setVisible(false);
-				MainMenue_GUI main = new MainMenue_GUI();
+				MainMenue_GUI main = new MainMenue_GUI(c);
 				main.setVisible(true);
 			}
 		});
@@ -419,7 +421,7 @@ public class DeleteImage_GUI extends JFrame {
 				if (tablemyImages.getSelectedRowCount() != 0) {
 
 					// frage, soll das selektierte Daten geloescht werden?
-					eingabe = JOptionPane.showConfirmDialog(null,
+					eingabe = JOptionPane.showConfirmDialog(c,
 							"Wollen Sie diese Daten löschen?", "Löschen?",
 							JOptionPane.YES_NO_OPTION);
 
@@ -453,7 +455,7 @@ public class DeleteImage_GUI extends JFrame {
 										// if (client.deleteImageServer(imageid
 										// ,imageversion)) {
 
-										DeleteImage_GUI di = new DeleteImage_GUI();
+										DeleteImage_GUI di = new DeleteImage_GUI(c);
 										di.setVisible(true);
 										dispose();
 
@@ -461,7 +463,7 @@ public class DeleteImage_GUI extends JFrame {
 
 										JOptionPane
 												.showConfirmDialog(
-														null,
+														c,
 														"Löschen von der DB hat leider nicht geklappt!!",
 														"Fehler",
 														JOptionPane.INFORMATION_MESSAGE);
@@ -470,7 +472,7 @@ public class DeleteImage_GUI extends JFrame {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
 									JOptionPane.showMessageDialog(
-											null,
+											c,
 											e.getCause() + "\n"
 													+ e.getStackTrace(),
 											"Debug-Message",
@@ -479,7 +481,7 @@ public class DeleteImage_GUI extends JFrame {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
 									JOptionPane.showMessageDialog(
-											null,
+											c,
 											e.getCause() + "\n"
 													+ e.getStackTrace(),
 											"Debug-Message",
@@ -490,7 +492,7 @@ public class DeleteImage_GUI extends JFrame {
 
 								JOptionPane
 										.showMessageDialog(
-												null,
+												c,
 												"Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
 												"Verlinkung vorhanden",
 												JOptionPane.INFORMATION_MESSAGE);
@@ -498,7 +500,7 @@ public class DeleteImage_GUI extends JFrame {
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-							JOptionPane.showMessageDialog(null, e.getCause()
+							JOptionPane.showMessageDialog(c, e.getCause()
 									+ "\n" + e.getStackTrace(),
 									"Debug-Message", JOptionPane.ERROR_MESSAGE);
 						}
@@ -685,7 +687,7 @@ public class DeleteImage_GUI extends JFrame {
 
 						// oeffnet das Hauptmenue
 
-						MainMenue_GUI main = new MainMenue_GUI();
+						MainMenue_GUI main = new MainMenue_GUI(c);
 						main.setVisible(true);
 						dispose();
 					}
@@ -891,11 +893,12 @@ public class DeleteImage_GUI extends JFrame {
 		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				JOptionPane.showMessageDialog(null, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
+				JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
 
+		c = this;
 	}
 
 	// Initiale Beffuelung eines Table models
@@ -932,7 +935,7 @@ public class DeleteImage_GUI extends JFrame {
 		} catch (TException | ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
-			JOptionPane.showMessageDialog(null,
+			JOptionPane.showMessageDialog(c,
 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 		}