• added possibility to change location of application

• set all JOptionPane positions relative to their parent
• known bug: relative position does not work when clicking "back" in ftpcreateimage

1 files changed, 15 insertions, 12 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index a51cdfe0..97128318 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_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.SystemColor;

@@ -97,6 +98,7 @@ public class SearchImage_GUI extends JFrame {
 	private JTextField textFieldName;

 	JTabbedPane tabbedPane;

 	boolean activeSearch = false;

+	Component c = null;

 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",

 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" }; // Angezeigt

 																					// werden

@@ -145,7 +147,7 @@ public class SearchImage_GUI extends JFrame {
 	/**

 	 * Create the dialog.

 	 */

-	public SearchImage_GUI() {

+	public SearchImage_GUI(Component formerGUI) {

 		addWindowListener(new WindowAdapter() {

 			@Override

 			public void windowClosing(WindowEvent arg0) {

@@ -241,7 +243,7 @@ public class SearchImage_GUI extends JFrame {
 		setTitle("bwLehrpool Suite - Image suchen");

 		// 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 SearchImage_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);

 		}

@@ -378,7 +380,7 @@ public class SearchImage_GUI extends JFrame {
 				// oeffnet das Hauuetmenue

 

 				SearchImage_GUI.this.setVisible(false);

-				MainMenue_GUI main = new MainMenue_GUI();

+				MainMenue_GUI main = new MainMenue_GUI(c);

 				main.setVisible(true);

 			}

 		});

@@ -556,7 +558,7 @@ public class SearchImage_GUI extends JFrame {
 

 						Image.image.setVersion(imageversion);

 						SearchImage_GUI.this.setVisible(false);

-						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();

+						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI(c);

 						down.setVisible(true);

 

 					}

@@ -591,7 +593,7 @@ public class SearchImage_GUI extends JFrame {
 						Image.image.setVersion(imageversion);

 

 						SearchImage_GUI.this.setVisible(false);

-						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();

+						FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI(c);

 						down.setVisible(true);

 					}

 				} else if (tabbedPane.getSelectedIndex() == 2) {

@@ -635,12 +637,12 @@ public class SearchImage_GUI extends JFrame {
 							Image.image.setVersion(imageversion);

 

 							SearchImage_GUI.this.setVisible(false);

-							FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI();

+							FTPSearchDownloader_GUI down = new FTPSearchDownloader_GUI(c);

 							down.setVisible(true);

 						} else {

 							JOptionPane

 									.showMessageDialog(

-											null,

+											c,

 											"Sie haben keine Berechtigung fremde Images herunterzuladen.",

 											"Message",

 											JOptionPane.INFORMATION_MESSAGE);

@@ -654,7 +656,7 @@ public class SearchImage_GUI extends JFrame {
 					//

 					JOptionPane

 							.showMessageDialog(

-									null,

+									c,

 									"Bitte wählen Sie ein Image für den Download aus",

 									"Message", JOptionPane.INFORMATION_MESSAGE);

 				}

@@ -674,7 +676,7 @@ public class SearchImage_GUI extends JFrame {
 					public void actionPerformed(ActionEvent e) {

 						// oeffnet das Hauptmenue

 

-						MainMenue_GUI main = new MainMenue_GUI();

+						MainMenue_GUI main = new MainMenue_GUI(c);

 						main.setVisible(true);

 						dispose();

 					}

@@ -879,10 +881,11 @@ public class SearchImage_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;

 

 	}

 

@@ -919,7 +922,7 @@ public class SearchImage_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);

 		}