diff options
| author | Nino Breuer | 2014-10-09 14:52:01 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-09 14:52:01 +0200 |
| commit | 39833fd5db8f92dcc4a34a623b6e4f59cde2e74f (patch) | |
| tree | e4db6866847c11ac27a339a58f2f220bf836490c | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-39833fd5db8f92dcc4a34a623b6e4f59cde2e74f.tar.gz tutor-module-39833fd5db8f92dcc4a34a623b6e4f59cde2e74f.tar.xz tutor-module-39833fd5db8f92dcc4a34a623b6e4f59cde2e74f.zip | |
• 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
27 files changed, 361 insertions, 329 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index 6bc6681d..4a00f1ec 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_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; @@ -61,6 +62,7 @@ public class CreateImageAllgemein_GUI extends JFrame { private JTextArea textAreadesc; private final int MAX_DESCRIPTION_LENGTH = 254; private JTextArea txtrGebenSieBitte_1; + Component c = null; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Hier legen Sie zunächst ein Image an. <br />" + "Dieses stellt die Grundlage Ihres Labors dar. Das Image ist der \"PC\", mit dem die Studenten arbeiten. <br />" + @@ -72,7 +74,7 @@ public class CreateImageAllgemein_GUI extends JFrame { /** * Create the dialog. */ - public CreateImageAllgemein_GUI() { + public CreateImageAllgemein_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -95,7 +97,7 @@ public class CreateImageAllgemein_GUI extends JFrame { | IllegalAccessException | UnsupportedLookAndFeelException e) { LOGGER.error("Setting look and feel from system failed."); e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Konnte das Farbschema des Systems nicht übernehmen.", "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -103,7 +105,7 @@ public class CreateImageAllgemein_GUI extends JFrame { setTitle("bwLehrpool Suite - Image erzeugen"); // Zentriert das Fenster setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -276,7 +278,7 @@ public class CreateImageAllgemein_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { // oeffnet das Hauptmenue CreateImageAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -312,7 +314,7 @@ public class CreateImageAllgemein_GUI extends JFrame { public void actionPerformed(ActionEvent e) { Image.image.setImagename(imagename.getText()); Image.image.setDesc(textAreadesc.getText()); - MainMenue_GUI sr = new MainMenue_GUI(); + MainMenue_GUI sr = new MainMenue_GUI(c); sr.setVisible(true); dispose(); } @@ -336,7 +338,7 @@ public class CreateImageAllgemein_GUI extends JFrame { + Image.image.getDesc()+"\""); // Zeige nächsten Schritt an - CreateImageTechnisch_GUI ea = new CreateImageTechnisch_GUI(); + CreateImageTechnisch_GUI ea = new CreateImageTechnisch_GUI(c); ea.setVisible(true); dispose(); } @@ -372,7 +374,7 @@ public class CreateImageAllgemein_GUI extends JFrame { OpenLinks.openWebpage(windows); } catch (URISyntaxException e) { e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Konnte die URL '" + Links.getFAQ() + "' nicht öffnen!", "Fehler", JOptionPane.ERROR_MESSAGE); @@ -391,7 +393,7 @@ public class CreateImageAllgemein_GUI extends JFrame { OpenLinks.openWebpage(windows); } catch (URISyntaxException e) { e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Konnte die URL '" + Links.getOTRS() + "' nicht öffnen!", "Fehler", JOptionPane.ERROR_MESSAGE); @@ -414,11 +416,11 @@ public class CreateImageAllgemein_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; }// end main /** @@ -438,7 +440,7 @@ public class CreateImageAllgemein_GUI extends JFrame { || EMail.getText().isEmpty()) { // missing some fields LOGGER.info("Form has missing fields, warning user."); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Bitte geben Sie alle notwendigen Daten an!", "Daten unvollständig", JOptionPane.ERROR_MESSAGE); @@ -449,7 +451,7 @@ public class CreateImageAllgemein_GUI extends JFrame { if (!imagename.getText().matches("[a-zA-Z0-9]+")) { LOGGER.info("Image name not alpha-numerical, warning user."); JOptionPane.showMessageDialog( - null, + c, "Der Imagename darf keine Leer- oder Sonderzeichen enthalten.", "Unerlaubte Zeichen", JOptionPane.ERROR_MESSAGE); @@ -458,7 +460,7 @@ public class CreateImageAllgemein_GUI extends JFrame { // max length for image description is 254 chars if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) { - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().length()+".", "Beschreibung zu umfangreich", JOptionPane.ERROR_MESSAGE); diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index cd3cca87..b2fb21fd 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -6,6 +6,7 @@ import gui.intro.Login_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; @@ -72,6 +73,7 @@ public class CreateImageTechnisch_GUI extends JFrame { private final ButtonGroup buttonGroupVorlage = new ButtonGroup(); ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); + Component c = null; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Geben Sie hier bitte einige technische Daten an, die dann mit dem Image angezeigt werden.<br />" + "Dies wird beispielsweise benötigt, wenn ein Dozent eine Veranstaltung hat,<br />" + @@ -83,7 +85,7 @@ public class CreateImageTechnisch_GUI extends JFrame { /** * Create the dialog. */ - public CreateImageTechnisch_GUI() { + public CreateImageTechnisch_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -102,7 +104,7 @@ public class CreateImageTechnisch_GUI extends JFrame { setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -264,7 +266,7 @@ public class CreateImageTechnisch_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { CreateImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + MainMenue_GUI main=new MainMenue_GUI(c); main.setVisible(true); } }); @@ -305,7 +307,7 @@ public class CreateImageTechnisch_GUI extends JFrame { Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); Image.image.setOS(comboBox.getSelectedItem().toString()); - CreateImageAllgemein_GUI sr=new CreateImageAllgemein_GUI(); + CreateImageAllgemein_GUI sr=new CreateImageAllgemein_GUI(c); sr.setVisible(true); dispose(); } @@ -325,7 +327,7 @@ public class CreateImageTechnisch_GUI extends JFrame { Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); Image.image.setOS(comboBox.getSelectedItem().toString()); LOGGER.info("Betriebssystem: "+Image.image.getOS()+", istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+", RAM: "+Image.image.getRam()); - PermissionCreateImage_GUI ea=new PermissionCreateImage_GUI(); + PermissionCreateImage_GUI ea=new PermissionCreateImage_GUI(c); ea.setVisible(true); dispose(); } @@ -396,10 +398,11 @@ public class CreateImageTechnisch_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; } } 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); } diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index c9504135..91770b26 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -5,6 +5,7 @@ import gui.intro.Login_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; @@ -77,6 +78,7 @@ public class EditImageAllgemein_GUI extends JFrame { private boolean nameIsOK = false; //imagename only contains letters private boolean descriptionLengthOK = false; //description may not be longer than MAX_DESCRIPTION_LENGTH private final int MAX_DESCRIPTION_LENGTH = 254; + Component c = null; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Bearbeiten Sie hier die allgemeinen Angaben, die Sie beim Erzeugen des Images hinterlegt haben.<br />" + "Sie können sowohl den Anzeigenamen als auch die Beschreibung ändern.<br />" + @@ -86,7 +88,7 @@ public class EditImageAllgemein_GUI extends JFrame { /** * Create the dialog. */ - public EditImageAllgemein_GUI() { + public EditImageAllgemein_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -110,7 +112,7 @@ public class EditImageAllgemein_GUI extends JFrame { // Zentriert das Fenster in der Bildmitte setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); initData(); getContentPane().setLayout(null); { @@ -274,7 +276,7 @@ public class EditImageAllgemein_GUI extends JFrame { // unsichtbar und das Hauptmenue sichtbar EditImageAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -313,7 +315,7 @@ public class EditImageAllgemein_GUI extends JFrame { // Daten bei einem erneuten Aufruf verfuegbar // Image.image.setImagename(imagename.getText()); - SearchEditImage_GUI se = new SearchEditImage_GUI(); + SearchEditImage_GUI se = new SearchEditImage_GUI(c); se.setVisible(true); dispose(); } @@ -340,7 +342,7 @@ public class EditImageAllgemein_GUI extends JFrame { + Image.image.getDesc()+"\""); - EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(); + EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(c); ea.setVisible(true); dispose(); @@ -434,11 +436,11 @@ public class EditImageAllgemein_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; } public void initData() { @@ -481,7 +483,7 @@ public class EditImageAllgemein_GUI extends JFrame { } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -496,7 +498,7 @@ public class EditImageAllgemein_GUI extends JFrame { } else { JOptionPane .showMessageDialog( - null, + c, "Der Imagename darf keine Leer- oder Sonderzeichen enthalten.", "Unerlaubte Zeichen", JOptionPane.INFORMATION_MESSAGE); @@ -520,7 +522,7 @@ public class EditImageAllgemein_GUI extends JFrame { } else { JOptionPane .showMessageDialog( - null, + c, "Bitte geben Sie alle notwendigen Daten an!", "Daten unvollständig", JOptionPane.INFORMATION_MESSAGE); @@ -536,7 +538,7 @@ public class EditImageAllgemein_GUI extends JFrame { if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) { descriptionLengthOK=false; JOptionPane - .showMessageDialog(null, + .showMessageDialog(c, "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().length()+".", "Beschreibung zu umfangreich", JOptionPane.ERROR_MESSAGE); diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index cf9cb9d2..7f97601e 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_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; @@ -66,6 +67,7 @@ public class EditImageTechnisch_GUI extends JFrame { JComboBox<String> comboBox; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); + Component c = null; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Bearbeiten Sie hier die technischen Angaben zu Ihrem Image, die Sie beim Erzeugen des Images hinterlegt haben.<br />" + "Wenn sich die technischen Anforderungen an Ihr Image geändert haben, müssen Sie es nicht erneut hochladen,<br />" + @@ -75,7 +77,7 @@ public class EditImageTechnisch_GUI extends JFrame { /** * Create the dialog. */ - public EditImageTechnisch_GUI() { + public EditImageTechnisch_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -100,7 +102,7 @@ public class EditImageTechnisch_GUI extends JFrame { setTitle("bwLehrpool Suite - Image bearbeiten"); // Zentriert das Fenster setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -199,7 +201,7 @@ public class EditImageTechnisch_GUI extends JFrame { // Macht dieses Fenster unsichtbar und das vorhergehende Fenster // sichtbar EditImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -313,7 +315,7 @@ public class EditImageTechnisch_GUI extends JFrame { Image.image.setLicensed(chckbxIsLicensed.isSelected()); Image.image.setOS(comboBox.getSelectedItem().toString()); // oeffnet das vorherige Fenster - EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI(); + EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI(c); ei.setVisible(true); dispose(); } @@ -340,7 +342,7 @@ public class EditImageTechnisch_GUI extends JFrame { ", CPU: " + Image.image.getCpu() + ", RAM: " + Image.image.getRam()); // oeffnet das naechste Fenster - PermissionEditImage_GUI ea=new PermissionEditImage_GUI(); + PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c); ea.setVisible(true); dispose(); @@ -410,10 +412,10 @@ public class EditImageTechnisch_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; } } diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index a4300f97..9d65d42e 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -2,6 +2,7 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -14,7 +15,6 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.text.DateFormat; @@ -47,18 +47,14 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; import server.generated.Server.Client; import thrift.ThriftConnection; -import util.GuiOrganizer; import util.OpenLinks; +import config.Config; import ftp.UploadTask; import gui.intro.About_GUI; -import gui.intro.Login_GUI; import gui.intro.MainMenue_GUI; -import config.Config; @SuppressWarnings("serial") public class FTPCreateUploader_GUI extends JFrame implements @@ -103,7 +99,7 @@ public class FTPCreateUploader_GUI extends JFrame implements int progress = 0; // progress of upload private boolean isCurrentlyLoading = false; // currently up or downloading // file - + Component c = null; private boolean isAborted = false; //down- or upload was manually aborted private static final String HELP_MESSAGE = "<html><div align = \"center\">" + @@ -119,7 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements /** * Create the frame. */ - public FTPCreateUploader_GUI() { + public FTPCreateUploader_GUI(final Component formerGUI) { final Object[] options = { "Beenden", "Abbrechen" }; @@ -132,7 +128,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // check if user wants to quit. int choice = JOptionPane .showOptionDialog( - null, + c, "Aktuell ist ein Upload aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?", "Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, @@ -157,14 +153,14 @@ public class FTPCreateUploader_GUI extends JFrame implements }// end window closing }); setResizable(false); - + try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -176,7 +172,8 @@ public class FTPCreateUploader_GUI extends JFrame implements setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); + getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); @@ -409,9 +406,8 @@ public class FTPCreateUploader_GUI extends JFrame implements } // save configuration Config.store(); - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); if (taskrun == true) { try { @@ -421,7 +417,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane.showMessageDialog( - null, + c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", @@ -439,7 +435,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (isCurrentlyLoading() == true) { int choice = JOptionPane .showOptionDialog( - null, + c, "Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?", "Warnung", JOptionPane.YES_NO_CANCEL_OPTION, @@ -456,25 +452,32 @@ public class FTPCreateUploader_GUI extends JFrame implements task.cancel(true); // not loading files, go back one page dispose(); - PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); - m.setVisible(true); + PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(c); + //m.setVisible(true); }// end if choice } else { + int selectedOption = JOptionPane .showConfirmDialog( - null, + c, "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>", "Abbrechen und zurück", JOptionPane.YES_NO_OPTION); if (selectedOption == JOptionPane.YES_OPTION) { + System.out.println("CreateUploader X:"+formerGUI.getLocation().getX()); + System.out.println("CreateUploader X:"+formerGUI.getLocation().getY()); dispose(); - PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); + PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(formerGUI); + m.setLocationRelativeTo(formerGUI); + m.setVisible(true); + } else { // for actions if "no" is selected. tbd. } + }// end else }// end action @@ -541,11 +544,12 @@ public class FTPCreateUploader_GUI extends JFrame implements 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; } private void buttonUploadActionPerformed(ActionEvent event) { @@ -565,7 +569,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // TODO Auto-generated catch block LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!"); e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Konnte vom Satellit keinen FTP-User erhalten!", "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -698,7 +702,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); return false; diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index 34150b21..bd4c0d32 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -2,6 +2,7 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Component; import java.awt.Cursor; import java.awt.FlowLayout; import java.awt.Font; @@ -93,6 +94,7 @@ public class FTPEditDownloader_GUI extends JFrame implements JButton btnDownloadStarten = new JButton("Download starten"); JButton btnDownloadStoppen = new JButton("Download abbrechen"); private JLabel lblAnleitung; + Component c = null; private boolean isCurrentlyLoading = false; // currently up or downloading // file private boolean isAborted = false; // down- or upload was manually aborted @@ -104,7 +106,7 @@ public class FTPEditDownloader_GUI extends JFrame implements /** * Create the frame. */ - public FTPEditDownloader_GUI() { + public FTPEditDownloader_GUI(Component formerGUI) { final Object[] options = { "Beenden", "Abbrechen" }; @@ -115,7 +117,7 @@ public class FTPEditDownloader_GUI extends JFrame implements // check if user wants to quit. int choice = JOptionPane .showOptionDialog( - null, + c, "Aktuell ist ein Download aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?", "Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, @@ -154,7 +156,7 @@ public class FTPEditDownloader_GUI extends JFrame implements setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); @@ -440,7 +442,7 @@ public class FTPEditDownloader_GUI extends JFrame implements if (isCurrentlyLoading() == true) { int choice = JOptionPane .showOptionDialog( - null, + c, "Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?", "Warnung", JOptionPane.YES_NO_CANCEL_OPTION, @@ -457,7 +459,7 @@ public class FTPEditDownloader_GUI extends JFrame implements } // go back one page - SearchEditImage_GUI se = new SearchEditImage_GUI(); + SearchEditImage_GUI se = new SearchEditImage_GUI(c); se.setVisible(true); dispose(); }// end choice @@ -465,7 +467,7 @@ public class FTPEditDownloader_GUI extends JFrame implements } else { // go back one page - SearchEditImage_GUI se = new SearchEditImage_GUI(); + SearchEditImage_GUI se = new SearchEditImage_GUI(c); se.setVisible(true); dispose(); @@ -492,12 +494,12 @@ public class FTPEditDownloader_GUI extends JFrame implements 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; } @@ -519,7 +521,7 @@ public class FTPEditDownloader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 0f07acd3..89be34ca 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -2,6 +2,7 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -102,6 +103,7 @@ public class FTPEditUploader_GUI extends JFrame implements private boolean isCurrentlyLoading = false; // currently up or downloading // file private boolean isAborted = false; // down- or upload was manually aborted + Component c = null; private static final String HELP_MESSAGE = "<html><div align = \"center\">" + "Laden Sie hier Ihre bearbeitete .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />" + "Wichtig ist, dass Sie zum Schluss auf \"Fertigstellen\" klicken, damit die Daten übernommen werden.<br />" + @@ -112,7 +114,7 @@ public class FTPEditUploader_GUI extends JFrame implements /** * Create the frame. */ - public FTPEditUploader_GUI() { + public FTPEditUploader_GUI(Component formerGUI) { final Object[] options = { "Beenden", "Abbrechen" }; @@ -124,7 +126,7 @@ public class FTPEditUploader_GUI extends JFrame implements // check if user wants to quit. int choice = JOptionPane .showOptionDialog( - null, + c, "Aktuell ist ein Upload aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?", "Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, @@ -165,7 +167,7 @@ public class FTPEditUploader_GUI extends JFrame implements setTitle("Dozentenmodul - Image bearbeiten"); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); @@ -384,7 +386,7 @@ public class FTPEditUploader_GUI extends JFrame implements Config.store(); dispose(); - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); if (taskrun == true) { @@ -395,7 +397,7 @@ public class FTPEditUploader_GUI extends JFrame implements // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane.showMessageDialog( - null, + c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", @@ -413,7 +415,7 @@ public class FTPEditUploader_GUI extends JFrame implements if (isCurrentlyLoading() == true) { int choice = JOptionPane .showOptionDialog( - null, + c, "Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?", "Warnung", JOptionPane.YES_NO_CANCEL_OPTION, @@ -430,21 +432,21 @@ public class FTPEditUploader_GUI extends JFrame implements task.cancel(true); // not loading files, go back one page dispose(); - PermissionEditImage_GUI ei = new PermissionEditImage_GUI(); + PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); ei.setVisible(true); }// end if coice } else { - int selectedOption = JOptionPane.showConfirmDialog(null, + int selectedOption = JOptionPane.showConfirmDialog(c, "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>", "Abbrechen und zurück", JOptionPane.YES_NO_OPTION); if (selectedOption == JOptionPane.YES_OPTION) { dispose(); - PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); + PermissionEditImage_GUI m = new PermissionEditImage_GUI(c); m.setVisible(true); } else @@ -526,7 +528,7 @@ public class FTPEditUploader_GUI extends JFrame implements 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); @@ -555,7 +557,7 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Konnte vom Satelliten keine FTP-User erhalten!", "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -671,7 +673,7 @@ public class FTPEditUploader_GUI extends JFrame implements e.printStackTrace(); JOptionPane .showMessageDialog( - null, + c, "Konnte die Metadaten des Images nicht in die Datenbank speichern!", "Debug-Message", JOptionPane.ERROR_MESSAGE); return false; diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java index 49098677..17981c0e 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java @@ -2,6 +2,7 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -90,6 +91,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements JButton btnMainMenu = new JButton("Hauptmenü"); JButton btnDownloadStoppen = new JButton("Download abbrechen"); private JLabel lblAnleitung; + Component c = null; private boolean isCurrentlyLoading = false; // currently up or downloading // file private boolean isAborted = false; // down- or upload was manually aborted @@ -101,7 +103,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements /** * Create the frame. */ - public FTPSearchDownloader_GUI() { + public FTPSearchDownloader_GUI(Component formerGUI) { final Object[] options = { "Beenden", "Abbrechen" }; @@ -112,7 +114,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements // check if user wants to quit. int choice = JOptionPane .showOptionDialog( - null, + c, "Aktuell ist ein Download aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?", "Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, @@ -153,7 +155,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); @@ -450,7 +452,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements if (isCurrentlyLoading() == true) { int choice = JOptionPane .showOptionDialog( - null, + c, "Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?", "Warnung", JOptionPane.YES_NO_CANCEL_OPTION, @@ -466,14 +468,14 @@ public class FTPSearchDownloader_GUI extends JFrame implements e1.printStackTrace(); } // go back one page - SearchImage_GUI si = new SearchImage_GUI(); + SearchImage_GUI si = new SearchImage_GUI(c); si.setVisible(true); dispose(); }// end choice } else { // go back one page - SearchImage_GUI si = new SearchImage_GUI(); + SearchImage_GUI si = new SearchImage_GUI(c); si.setVisible(true); dispose(); }// end else @@ -491,7 +493,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements Config.setLastDownloadPath(lblPath.getText()); Config.store(); - MainMenue_GUI mm = new MainMenue_GUI(); + MainMenue_GUI mm = new MainMenue_GUI(c); mm.setVisible(true); dispose(); } @@ -504,11 +506,11 @@ public class FTPSearchDownloader_GUI extends JFrame implements 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; setVisible(true); } @@ -531,7 +533,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java index 63323969..21ad40f5 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java @@ -63,7 +63,7 @@ import org.apache.thrift.TException; import server.generated.Server.Client; import server.generated.Person; import models.person; -import util.GuiOrganizer; + import util.OpenLinks; @SuppressWarnings("serial") @@ -77,6 +77,7 @@ public class PermissionCreateImage_GUI extends JFrame { private Class[] classes; Object[] titles = { "Name", "Read", "Write", "Link", "Admin", "userID" }; private List<Person> map = null; + Component c = null; // Map<String,String> ogUsers = new HashMap(); final DefaultTableModel model = new DefaultTableModel(titles, 0) { @@ -118,7 +119,7 @@ public class PermissionCreateImage_GUI extends JFrame { "für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten." + "</div></html>"; - public PermissionCreateImage_GUI() { + public PermissionCreateImage_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -137,7 +138,17 @@ public class PermissionCreateImage_GUI extends JFrame { setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); + + + // + //System.out.println("formergui X oben:"+formerGUI.getLocation().getX()); + //System.out.println("formergui Y oben:"+formerGUI.getLocation().getY()); + + System.out.println("this oben: "+this.getLocation().getX()); + System.out.println("this oben: "+this.getLocation().getY()); + + System.out.println("------------------------------------------"); getContentPane().setLayout(null); { @@ -321,7 +332,7 @@ public class PermissionCreateImage_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { PermissionCreateImage_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -429,7 +440,7 @@ public class PermissionCreateImage_GUI extends JFrame { public void actionPerformed(ActionEvent e) { - CreateImageTechnisch_GUI ci = new CreateImageTechnisch_GUI(); + CreateImageTechnisch_GUI ci = new CreateImageTechnisch_GUI(c); ci.setVisible(true); dispose(); } @@ -446,7 +457,7 @@ public class PermissionCreateImage_GUI extends JFrame { saveTableToList(); Image.image.setShareMode(comboBox_1.getSelectedIndex()); - FTPCreateUploader_GUI ea = new FTPCreateUploader_GUI(); + FTPCreateUploader_GUI ea = new FTPCreateUploader_GUI(c); ea.setVisible(true); dispose(); @@ -528,11 +539,26 @@ public class PermissionCreateImage_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; + //System.out.println("formergui unten X:"+formerGUI.getLocation().getX()); + //System.out.println("formergui unten Y:"+formerGUI.getLocation().getY()); + + //System.out.println("this unten X: "+this.getLocation().getX()); + //System.out.println("this unten Y: "+this.getLocation().getY()); + + + this.setLocationRelativeTo(formerGUI); + + //this.setLocation(1238, 53); + + this.setVisible(true); + + //System.out.println("this on screen unten X: "+this.getLocationOnScreen().getX()); + //System.out.println("this on screen unten Y: "+this.getLocationOnScreen().getY()); } class MyItemListener1 implements ItemListener { diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java index 0f94c499..a8ddaf03 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java @@ -3,7 +3,6 @@ package gui.image; import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import java.awt.Checkbox; import java.awt.Color; import java.awt.Component; import java.awt.FlowLayout; @@ -15,17 +14,13 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; -import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; @@ -36,32 +31,24 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JScrollPane; import javax.swing.JSeparator; +import javax.swing.JTable; +import javax.swing.JTextField; import javax.swing.JTextPane; +import javax.swing.ScrollPaneConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; import models.Image; import models.Links; import util.GuiOrganizer; import util.OpenLinks; -import javax.swing.JTable; -import javax.swing.JScrollPane; -import javax.swing.ScrollPaneConstants; -import javax.swing.JTextField; - -import org.eclipse.jface.viewers.CheckboxCellEditor; - -import java.awt.Choice; @SuppressWarnings("serial") public class PermissionEditImage_GUI extends JFrame { @@ -71,6 +58,7 @@ public class PermissionEditImage_GUI extends JFrame { private JTable table; private Class[] classes; Object[] titles = { "Name", "Read", "Write", "Link","Admin"}; + Component c = null; final DefaultTableModel model = new DefaultTableModel(titles, 0) { @@ -104,7 +92,7 @@ public class PermissionEditImage_GUI extends JFrame { "für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten." + "</div></html>"; - public PermissionEditImage_GUI() { + public PermissionEditImage_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -123,7 +111,7 @@ public class PermissionEditImage_GUI extends JFrame { setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -232,7 +220,7 @@ public class PermissionEditImage_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { PermissionEditImage_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -338,7 +326,7 @@ public class PermissionEditImage_GUI extends JFrame { public void actionPerformed(ActionEvent e) { //EditImageFreigabe_GUI sr = new EditImageFreigabe_GUI(); - EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI(); + EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI(c); ei.setVisible(true); dispose(); } @@ -353,7 +341,7 @@ public class PermissionEditImage_GUI extends JFrame { public void actionPerformed(ActionEvent e) { Image.image.setShareMode(comboBox_1.getSelectedIndex()); - FTPEditUploader_GUI ea = new FTPEditUploader_GUI(); + FTPEditUploader_GUI ea = new FTPEditUploader_GUI(c); ea.setVisible(true); dispose(); @@ -435,11 +423,11 @@ public class PermissionEditImage_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; } class MyItemListener1 implements ItemListener { diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index a0116e40..f295a1c4 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_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; @@ -96,6 +97,7 @@ public class SearchEditImage_GUI extends JFrame { JTable tablemyImages; boolean activeSearch = false; private JTextField textFieldName; + Component c = null; String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };// Angezeigt // werden @@ -141,7 +143,7 @@ public class SearchEditImage_GUI extends JFrame { /** * Create the dialog. */ - public SearchEditImage_GUI() { + public SearchEditImage_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -238,7 +240,7 @@ public class SearchEditImage_GUI extends JFrame { setTitle("bwLehrpool Suite - Image bearbeiten"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 918, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -335,7 +337,7 @@ public class SearchEditImage_GUI extends JFrame { } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Konnte die Liste der Betriebssysteme vom Server nicht abfragen!", "Fehlermeldung", JOptionPane.ERROR_MESSAGE); } @@ -375,7 +377,7 @@ public class SearchEditImage_GUI extends JFrame { // oeffnet das Hauuetmenue SearchEditImage_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -426,7 +428,7 @@ public class SearchEditImage_GUI extends JFrame { Image.image.setVersion(imageversion); - FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI(); + FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI(c); ea.setVisible(true); dispose(); /* } @@ -518,7 +520,7 @@ public class SearchEditImage_GUI extends JFrame { } else { JOptionPane .showMessageDialog( - null, + c, "Bitte wählen Sie ein Image für den Download aus", "Message", JOptionPane.INFORMATION_MESSAGE); } @@ -568,7 +570,7 @@ public class SearchEditImage_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(); } @@ -605,7 +607,7 @@ public class SearchEditImage_GUI extends JFrame { Image.image.setVersion(imageversion); - EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(c); ea.setVisible(true); dispose(); } @@ -876,11 +878,12 @@ public class SearchEditImage_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 @@ -919,7 +922,7 @@ public class SearchEditImage_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); } 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);
}
diff --git a/dozentenmodul/src/main/java/gui/intro/About_GUI.java b/dozentenmodul/src/main/java/gui/intro/About_GUI.java index 85de07b9..420a7235 100644 --- a/dozentenmodul/src/main/java/gui/intro/About_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/About_GUI.java @@ -40,7 +40,7 @@ public class About_GUI extends JFrame { | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(this, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message ", JOptionPane.ERROR_MESSAGE); } diff --git a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java b/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java index 1ae73608..a4fa2db7 100644 --- a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java @@ -10,8 +10,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -22,7 +20,6 @@ import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSeparator; @@ -36,13 +33,9 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import models.Links; - -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; - -import config.Config; import util.GuiOrganizer; import util.OpenLinks; +import config.Config; diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 42fa9409..3f0b99c5 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -1,6 +1,7 @@ package gui.intro; import java.awt.Color; +import java.awt.Component; import java.awt.Image; import java.awt.SystemColor; import java.awt.event.ActionEvent; @@ -36,8 +37,6 @@ import thrift.ThriftConnection; import util.GuiOrganizer; import util.ResourceLoader; import config.Config; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class Login_GUI extends JFrame { @@ -54,6 +53,7 @@ public class Login_GUI extends JFrame { boolean isClientReturnedCorrectly = false; JCheckBox chckbxBenutzernameSpeichern; private static final String HELP_MESSAGE = ""; + Component c = null; /** * Create the frame. @@ -170,8 +170,10 @@ public class Login_GUI extends JFrame { BtnLogin.setBounds(292, 252, 237, 23); contentPane.add(BtnLogin); - - // GuiOrganizer.centerGUI(this); + + GuiOrganizer.centerGUI(this); + c = this; + }// end LoginGUI() // Versuche den Benutzer einzuloggen @@ -284,7 +286,7 @@ public class Login_GUI extends JFrame { } else { // oeffne das Hauptmenue - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); setVisible(false); } @@ -308,7 +310,7 @@ public class Login_GUI extends JFrame { lblConnectionInfo.setForeground(color); lblConnectionInfo.setText(shortMessage); if (longMessage != null) - JOptionPane.showMessageDialog(null, longMessage, + JOptionPane.showMessageDialog(c, longMessage, "Anmeldung fehlgeschlagen", JOptionPane.ERROR_MESSAGE); } diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index d4bb2fd8..fe49ef06 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -9,6 +9,7 @@ import gui.lecture.DeleteLecture_GUI; import gui.lecture.EditLectureSearch_GUI; import gui.lecture.SearchLecture_GUI; +import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.Rectangle; @@ -76,6 +77,8 @@ public class MainMenue_GUI extends JFrame { JRadioButton rdbtnLectureSearch; private final ButtonGroup buttonGroup = new ButtonGroup(); private JMenuItem mntmAbout; + Component c = null; + private static final String HELP_MESSAGE = "<html><div align=\"center\">" + " " + @@ -87,7 +90,7 @@ public class MainMenue_GUI extends JFrame { /** * Create the dialog. */ - public MainMenue_GUI() { + public MainMenue_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override @@ -105,7 +108,7 @@ public class MainMenue_GUI extends JFrame { setTitle("bwLehrpool Suite - Connected Server: " + SessionData.session.getServerAdress()); setBounds(0, 0, 603, 722); - //this.setLocationRelativeTo(formerGUI); + this.setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -374,42 +377,42 @@ public class MainMenue_GUI extends JFrame { // Images if (rdbtnImageNew.isSelected() == true) { - CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI(); + CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI(c); sr.setVisible(true); dispose(); } else if (rdbtnImageEdit.isSelected() == true) { - SearchEditImage_GUI si = new SearchEditImage_GUI(); + SearchEditImage_GUI si = new SearchEditImage_GUI(c); si.setVisible(true); dispose(); } else if (rdbtnImageDelete.isSelected() == true) { - DeleteImage_GUI di = new DeleteImage_GUI(); + DeleteImage_GUI di = new DeleteImage_GUI(c); di.setVisible(true); dispose(); } else if (rdbtnImageSearchDownload.isSelected() == true) { // SearchMethodLecture_GUI sm = new // SearchMethodLecture_GUI(); - SearchImage_GUI si = new SearchImage_GUI(); + SearchImage_GUI si = new SearchImage_GUI(c); si.setVisible(true); dispose(); // Lectures } else if (rdbtnLectureNew.isSelected() == true) { - CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI(); + CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI(c); av.setVisible(true); dispose(); } else if (rdbtnLectureEdit.isSelected() == true) { - EditLectureSearch_GUI el = new EditLectureSearch_GUI(); + EditLectureSearch_GUI el = new EditLectureSearch_GUI(c); el.setVisible(true); dispose(); } else if (rdbtnLectureDelete.isSelected() == true) { - DeleteLecture_GUI dl = new DeleteLecture_GUI(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(c); dl.setVisible(true); dispose(); } else if (rdbtnLectureSearch.isSelected() == true) { - SearchLecture_GUI sl = new SearchLecture_GUI(); + SearchLecture_GUI sl = new SearchLecture_GUI(c); sl.setVisible(true); dispose(); } else - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Keine Auswahl getroffen.", "Auswahl fehlt", JOptionPane.ERROR_MESSAGE); } @@ -491,7 +494,7 @@ public class MainMenue_GUI extends JFrame { }); mnNewMenu_1.add(mntmAbout); - + c = this; }// end main /** diff --git a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java index b52709c0..2d50fd8b 100644 --- a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java @@ -1,7 +1,8 @@ package gui.intro; -import java.awt.Desktop; +import java.awt.Color; +import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -11,8 +12,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -23,7 +22,6 @@ import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.JTextPane; @@ -34,14 +32,9 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import models.Links; - -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; - -import config.Config; import util.GuiOrganizer; import util.OpenLinks; -import java.awt.Color; +import config.Config; @SuppressWarnings("serial") @@ -51,7 +44,7 @@ public class VmWareLink_GUI extends JFrame { String[] result; JCheckBox chckbxNewCheckBox; private JButton btnWindows; - + Component c = null; /** * Create the dialog. @@ -196,7 +189,7 @@ public class VmWareLink_GUI extends JFrame { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - MainMenue_GUI ea=new MainMenue_GUI(); + MainMenue_GUI ea=new MainMenue_GUI(c); ea.setVisible(true); dispose(); } @@ -272,7 +265,7 @@ public class VmWareLink_GUI extends JFrame { } } - + c = this; }//end constructor }// end class diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java index 376369d1..a46431bc 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_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.ScrollPane; @@ -66,6 +67,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JDateChooser dateChooserstart; Date startDate = new Date(); Date endDate; + Component c = null; private boolean descriptionLengthOK = false; // description may not be // longer than // MAX_DESCRIPTION_LENGTH @@ -84,7 +86,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { /** * Create the dialog. */ - public CreateLectureAllgemein_GUI() { + public CreateLectureAllgemein_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -107,7 +109,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { } setTitle("bwLehrpool Suite - Veranstaltung erzeugen"); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -214,7 +216,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { CreateLectureAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -389,7 +391,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { Image.image.setImagename(txtFldVeranstaltungsname .getText()); - MainMenue_GUI sr = new MainMenue_GUI(); + MainMenue_GUI sr = new MainMenue_GUI(c); sr.setVisible(true); dispose(); } @@ -409,7 +411,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { isDateOrderCorrect = false; JOptionPane .showMessageDialog( - null, + c, "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); @@ -422,7 +424,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { if (dateChooserend.getDate().after(endDate)) { // Datum zu weit weg isDateMaxLifeTimeCorrect = false; - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" + endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); @@ -440,7 +442,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { isAllInformationReady = false; JOptionPane .showMessageDialog( - null, + c, "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); @@ -472,7 +474,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { Image.image.setImagename(txtFldVeranstaltungsname .getText()); - PermissionCreateLecture_GUI ev = new PermissionCreateLecture_GUI(); + PermissionCreateLecture_GUI ev = new PermissionCreateLecture_GUI(c); ev.setVisible(true); dispose(); } @@ -551,11 +553,12 @@ public class CreateLectureAllgemein_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; } public Date addDays(Date date, int days) { @@ -571,7 +574,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // max length is 254 chars if (description.getText().length() >= MAX_DESCRIPTION_LENGTH) { descriptionLengthOK = false; - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie " + description.getText().length() + ".", "Beschreibung zu umfangreich", diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index b874b9c2..5205c41c 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_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; @@ -92,6 +93,7 @@ public class CreateLectureLink_GUI extends JFrame { JTable tableCoopImages = new JTable(); JTable tablePublicVorlagen = new JTable(); boolean activeSearch=false; + Component c = null; private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version","Template" }; @@ -129,7 +131,7 @@ public class CreateLectureLink_GUI extends JFrame { /** * Create the dialog. */ - public CreateLectureLink_GUI() { + public CreateLectureLink_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -218,7 +220,7 @@ public class CreateLectureLink_GUI extends JFrame { } setTitle("bwLehrpool Suite - Veranstaltung erzeugen"); setBounds(0, 0, 918, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -313,7 +315,7 @@ public class CreateLectureLink_GUI extends JFrame { } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e.getCause()+"\n"+e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -349,7 +351,7 @@ public class CreateLectureLink_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { CreateLectureLink_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -544,7 +546,7 @@ public class CreateLectureLink_GUI extends JFrame { cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - PermissionCreateLecture_GUI eVAG = new PermissionCreateLecture_GUI(); + PermissionCreateLecture_GUI eVAG = new PermissionCreateLecture_GUI(c); eVAG.setVisible(true); dispose(); } @@ -592,23 +594,23 @@ public class CreateLectureLink_GUI extends JFrame { client.writeLectureRights(Lecture.lecture.getName(), person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getRole()); JOptionPane .showMessageDialog( - null, + c, "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane .showMessageDialog( - null, + c, "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -646,23 +648,23 @@ public class CreateLectureLink_GUI extends JFrame { client.writeLectureRights(Lecture.lecture.getName(), person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getRole()); JOptionPane .showMessageDialog( - null, + c, "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane .showMessageDialog( - null, + c, "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -700,23 +702,23 @@ public class CreateLectureLink_GUI extends JFrame { client.writeLectureRights(Lecture.lecture.getName(), person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getRole()); JOptionPane .showMessageDialog( - null, + c, "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane .showMessageDialog( - null, + c, "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -726,7 +728,7 @@ public class CreateLectureLink_GUI extends JFrame { } else { // nothing selected - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Bitte wählen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); @@ -934,11 +936,12 @@ public class CreateLectureLink_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 diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index 014b9f71..fa03a7ff 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -5,6 +5,7 @@ import gui.intro.Login_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; @@ -100,6 +101,7 @@ public class DeleteLecture_GUI extends JFrame { private JButton button; private JTextField textField; + Component c = null; private static final String HELP_MESSAGE = "<html><div align=\"center\">" + "In der Übersicht sehen Sie primär alle Veranstaltungen, die Sie erzeugt haben.<br />" + @@ -112,7 +114,7 @@ public class DeleteLecture_GUI extends JFrame { /** * Create the dialog. */ - public DeleteLecture_GUI() { + public DeleteLecture_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -195,7 +197,7 @@ public class DeleteLecture_GUI extends JFrame { setTitle("bwLehrpool Suite - Veranstaltung löschen"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); @@ -277,7 +279,7 @@ public class DeleteLecture_GUI extends JFrame { // oeffnet das Hauptmenue DeleteLecture_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -349,7 +351,7 @@ public class DeleteLecture_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(); } @@ -474,7 +476,7 @@ public class DeleteLecture_GUI extends JFrame { if (tablemyLectures.getSelectedRowCount() !=0){ //a row is selected //ask for confirmation - eingabe = JOptionPane.showConfirmDialog(null, + eingabe = JOptionPane.showConfirmDialog(c, "Wollen Sie diese Daten löschen?", "Löschen?", JOptionPane.YES_NO_OPTION); @@ -487,7 +489,7 @@ public class DeleteLecture_GUI extends JFrame { LOGGER.info("Löschen erfolgreich."); //delete successful - DeleteLecture_GUI dl = new DeleteLecture_GUI(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(c); dl.setVisible(true); dispose(); } else { @@ -495,7 +497,7 @@ public class DeleteLecture_GUI extends JFrame { LOGGER.error("Konnte Veranstaltung '" + lectureID + "' nicht aus der Datenbank löschen!"); JOptionPane .showMessageDialog( - null, + c, "Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.", "Fehler", JOptionPane.INFORMATION_MESSAGE); @@ -617,10 +619,12 @@ public class DeleteLecture_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; } diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java index 4a3dc744..6ccd0831 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_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.ScrollPane; @@ -42,7 +43,7 @@ import models.Image; import models.Lecture; import models.Links; import models.person; -import util.GuiOrganizer; + import util.OpenLinks; import com.toedter.calendar.JDateChooser; @@ -66,6 +67,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JRadioButton radioButtonno; Date startDate = new Date(); Date endDate; + Component c = null; private final ButtonGroup buttonGroup = new ButtonGroup(); private boolean descriptionLengthOK = false; // description may not be // longer than @@ -86,7 +88,7 @@ public class EditLectureAllgemein_GUI extends JFrame { /** * Create the dialog. */ - public EditLectureAllgemein_GUI() { + public EditLectureAllgemein_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -105,7 +107,7 @@ public class EditLectureAllgemein_GUI extends JFrame { setTitle("bwLehrpool Suite - Veranstaltung bearbeiten"); ; setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -212,7 +214,7 @@ public class EditLectureAllgemein_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { EditLectureAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -388,7 +390,7 @@ public class EditLectureAllgemein_GUI extends JFrame { Lecture.lecture.setStartdate(dateChooserstart.getDate()); Image.image.setImagename(textFieldLaborname.getText()); - MainMenue_GUI sr = new MainMenue_GUI(); + MainMenue_GUI sr = new MainMenue_GUI(c); sr.setVisible(true); dispose(); } @@ -426,7 +428,7 @@ public class EditLectureAllgemein_GUI extends JFrame { isDateOrderCorrect = false; JOptionPane .showMessageDialog( - null, + c, "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); @@ -439,7 +441,7 @@ public class EditLectureAllgemein_GUI extends JFrame { if (dateChooserend.getDate().after(endDate)) { // Datum zu weit weg isDateMaxLifeTimeCorrect = false; - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" + endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); @@ -457,7 +459,7 @@ public class EditLectureAllgemein_GUI extends JFrame { isAllInformationReady = false; JOptionPane .showMessageDialog( - null, + c, "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); @@ -489,7 +491,7 @@ public class EditLectureAllgemein_GUI extends JFrame { Image.image.setImagename(textFieldLaborname .getText()); - PermissionCreateLecture_GUI ev = new PermissionCreateLecture_GUI(); + PermissionCreateLecture_GUI ev = new PermissionCreateLecture_GUI(c); ev.setVisible(true); dispose(); } @@ -567,11 +569,13 @@ public class EditLectureAllgemein_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; + setLocationRelativeTo(formerGUI); } public Date addDays(Date date, int days) { @@ -587,7 +591,7 @@ public class EditLectureAllgemein_GUI extends JFrame { // max length is 254 chars if (description.getText().length() >= MAX_DESCRIPTION_LENGTH) { descriptionLengthOK = false; - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie " + description.getText().length() + ".", "Beschreibung zu umfangreich", diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index 63827070..dbacf997 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_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; @@ -94,6 +95,7 @@ public class EditLectureLink_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; boolean activeSearch=false; + Component c = null; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version","Template" }; ThriftConnection con = new ThriftConnection(); @@ -129,7 +131,7 @@ public class EditLectureLink_GUI extends JFrame { /** * Create the dialog. */ - public EditLectureLink_GUI() { + public EditLectureLink_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -218,7 +220,7 @@ public class EditLectureLink_GUI extends JFrame { setTitle("bwLehrpool Suite - Veranstaltung bearbeiten"); setBounds(0, 0, 918, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -345,7 +347,7 @@ public class EditLectureLink_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { EditLectureLink_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -517,7 +519,7 @@ public class EditLectureLink_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - PermissionEditLecture_GUI el = new PermissionEditLecture_GUI(); + PermissionEditLecture_GUI el = new PermissionEditLecture_GUI(c); el.setVisible(true); dispose(); } @@ -576,23 +578,23 @@ public class EditLectureLink_GUI extends JFrame { Lecture.lecture.getid()); JOptionPane .showMessageDialog( - null, + c, "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane .showMessageDialog( - null, + c, "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -640,23 +642,23 @@ public class EditLectureLink_GUI extends JFrame { Lecture.lecture.getid()); JOptionPane .showMessageDialog( - null, + c, "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane .showMessageDialog( - null, + c, "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } @@ -706,19 +708,19 @@ public class EditLectureLink_GUI extends JFrame { Lecture.lecture.getid()); JOptionPane .showMessageDialog( - null, + c, "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(); + MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane .showMessageDialog( - null, + c, "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); @@ -732,7 +734,7 @@ public class EditLectureLink_GUI extends JFrame { } else { // nothing selected - JOptionPane.showMessageDialog(null, + JOptionPane.showMessageDialog(c, "Bitte wählen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); @@ -938,11 +940,13 @@ public class EditLectureLink_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 diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index 2ef05d15..c88f3f9b 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_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; @@ -35,19 +36,15 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JSeparator; -import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.RowFilter; -import javax.swing.ScrollPaneConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableModel; @@ -83,6 +80,7 @@ public class EditLectureSearch_GUI extends JFrame { JTable tablemyLectures; private JTextField textFieldName; boolean activeSearch = false; + Component c = null; String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; @@ -112,7 +110,7 @@ public class EditLectureSearch_GUI extends JFrame { /** * Create the dialog. */ - public EditLectureSearch_GUI() { + public EditLectureSearch_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -196,7 +194,7 @@ public class EditLectureSearch_GUI extends JFrame { setTitle("bwLehrpool Suite - Veranstaltung bearbeiten"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -285,7 +283,7 @@ public class EditLectureSearch_GUI extends JFrame { // oeffnet das Hauptmenue EditLectureSearch_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(c); main.setVisible(true); } }); @@ -356,7 +354,7 @@ public class EditLectureSearch_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(); } @@ -451,7 +449,7 @@ public class EditLectureSearch_GUI extends JFrame { // EditImageAllgemein_GUI ea=new // EditImageAllgemein_GUI(); - EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(); + EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(c); el.setVisible(true); dispose(); } @@ -718,11 +716,13 @@ public class EditLectureSearch_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 diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index d63a220a..74df74ff 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -4,7 +4,6 @@ package gui.lecture; import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import java.awt.Checkbox; import java.awt.Color; import java.awt.Component; import java.awt.FlowLayout; @@ -19,14 +18,12 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import javax.swing.AbstractButton; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; -import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; @@ -37,33 +34,25 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; import javax.swing.JSeparator; +import javax.swing.JTable; +import javax.swing.JTextField; import javax.swing.JTextPane; +import javax.swing.ScrollPaneConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; import javax.swing.table.JTableHeader; -import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; -import models.Image; import models.Links; -import util.GuiOrganizer; import util.OpenLinks; -import javax.swing.JTable; -import javax.swing.JScrollPane; -import javax.swing.ScrollPaneConstants; -import javax.swing.JTextField; - -import org.eclipse.jface.viewers.CheckboxCellEditor; - -import java.awt.Choice; -import javax.swing.JRadioButton; @SuppressWarnings("serial") public class PermissionCreateLecture_GUI extends JFrame { @@ -73,6 +62,7 @@ public class PermissionCreateLecture_GUI extends JFrame { private JTable table; private Class[] classes; Object[] titles = { "Name","Read", "Write","Admin"}; + Component c = null; private static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Hier können Sie die Berechtigungen für Ihre Veranstaltung ändern.<br />" + "Es wird unterschieden, ob innerhalb der Suite (dieses Programm) Änderungen vorgenommen werden dürfen, <br />" + @@ -105,7 +95,7 @@ public class PermissionCreateLecture_GUI extends JFrame { private JTable table_1; private final ButtonGroup buttonGroup = new ButtonGroup(); - public PermissionCreateLecture_GUI() { + public PermissionCreateLecture_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -124,7 +114,7 @@ public class PermissionCreateLecture_GUI extends JFrame { setTitle("bwLehrpool Suite - Berechtigungen"); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -212,7 +202,7 @@ public class PermissionCreateLecture_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { PermissionCreateLecture_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + MainMenue_GUI main=new MainMenue_GUI(c); main.setVisible(true); } }); @@ -334,7 +324,7 @@ public class PermissionCreateLecture_GUI extends JFrame { public void actionPerformed(ActionEvent e) { - CreateLectureAllgemein_GUI sr=new CreateLectureAllgemein_GUI(); + CreateLectureAllgemein_GUI sr=new CreateLectureAllgemein_GUI(c); sr.setVisible(true); dispose(); } @@ -348,7 +338,7 @@ public class PermissionCreateLecture_GUI extends JFrame { continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - CreateLectureLink_GUI ea=new CreateLectureLink_GUI(); + CreateLectureLink_GUI ea=new CreateLectureLink_GUI(c); ea.setVisible(true); dispose(); @@ -448,12 +438,12 @@ public class PermissionCreateLecture_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; } class MyItemListener1 implements ItemListener diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index 0f06ec9d..c146d42b 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -4,7 +4,6 @@ package gui.lecture; import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import java.awt.Checkbox; import java.awt.Color; import java.awt.Component; import java.awt.FlowLayout; @@ -16,19 +15,14 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; -import javax.swing.Icon; import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JFrame; import javax.swing.JLabel; @@ -37,33 +31,23 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; import javax.swing.JSeparator; +import javax.swing.JTable; +import javax.swing.JTextField; import javax.swing.JTextPane; +import javax.swing.ScrollPaneConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; -import models.Image; import models.Links; -import util.GuiOrganizer; import util.OpenLinks; -import javax.swing.JTable; -import javax.swing.JScrollPane; -import javax.swing.ScrollPaneConstants; -import javax.swing.JTextField; - -import org.eclipse.jface.viewers.CheckboxCellEditor; - -import java.awt.Choice; -import javax.swing.JRadioButton; @SuppressWarnings("serial") public class PermissionEditLecture_GUI extends JFrame { @@ -73,6 +57,7 @@ public class PermissionEditLecture_GUI extends JFrame { private JTable table; private Class[] classes; Object[] titles = { "Name","Read", "Write","Admin"}; + Component c = null; private static final String HELP_MESSAGE = "<html><div align=\"center\">" + "Hier können Sie die Berechtigungen für Ihre Veranstaltung festlegen.<br />" + "Es wird unterschieden, ob innerhalb der Suite (dieses Programm) Änderungen vorgenommen werden dürfen, <br />" + @@ -103,7 +88,7 @@ public class PermissionEditLecture_GUI extends JFrame { }; private JTextField textField; - public PermissionEditLecture_GUI() { + public PermissionEditLecture_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -122,7 +107,7 @@ public class PermissionEditLecture_GUI extends JFrame { setTitle("bwLehrpool Suite - Berechtigungen"); setBounds(0, 0, 603, 722); - GuiOrganizer.centerGUI(this); + setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -241,7 +226,7 @@ public class PermissionEditLecture_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { PermissionEditLecture_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + MainMenue_GUI main=new MainMenue_GUI(c); main.setVisible(true); } }); @@ -329,7 +314,7 @@ public class PermissionEditLecture_GUI extends JFrame { public void actionPerformed(ActionEvent e) { - EditLectureAllgemein_GUI sr=new EditLectureAllgemein_GUI(); + EditLectureAllgemein_GUI sr=new EditLectureAllgemein_GUI(c); sr.setVisible(true); dispose(); } @@ -343,7 +328,7 @@ public class PermissionEditLecture_GUI extends JFrame { continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - EditLectureLink_GUI ea=new EditLectureLink_GUI(); + EditLectureLink_GUI ea=new EditLectureLink_GUI(c); ea.setVisible(true); dispose(); @@ -443,11 +428,13 @@ public class PermissionEditLecture_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; + } class MyItemListener1 implements ItemListener { diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java index 4a8b9fd9..1f597cb3 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_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.Point;
@@ -83,6 +84,7 @@ public class SearchLecture_GUI extends JFrame { private JTextField textFieldName;
JTabbedPane tabbedPane;
boolean activeSearch=false;
+ Component c = null;
String[] titles = { "Veranstaltungsname", "Beschreibung",
"Gültigkeitsdatum", "Aktiv", "Letzte Benutzung",
"Verantwortlicher", "Image", "Schlagwort", "ID" };
@@ -107,7 +109,7 @@ public class SearchLecture_GUI extends JFrame { /**
* Create the dialog.
*/
- public SearchLecture_GUI() {
+ public SearchLecture_GUI(Component formerGUI) {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent arg0) {
@@ -178,7 +180,7 @@ public class SearchLecture_GUI extends JFrame { setTitle("bwLehrpool Suite - Veranstaltung suchen");
// Zentriert das Fenster in die Bildmitte 2;
setBounds(0, 0, 842, 722);
- GuiOrganizer.centerGUI(this);
+ setLocationRelativeTo(formerGUI);
getContentPane().setLayout(null);
{
@@ -258,7 +260,7 @@ public class SearchLecture_GUI extends JFrame { // oeffnet das Hauptmenue
SearchLecture_GUI.this.setVisible(false);
- MainMenue_GUI main = new MainMenue_GUI();
+ MainMenue_GUI main = new MainMenue_GUI(c);
main.setVisible(true);
}
});
@@ -386,7 +388,7 @@ public class SearchLecture_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();
}
@@ -558,6 +560,8 @@ public class SearchLecture_GUI extends JFrame { }
});
mnNewMenu_1.add(mntmAbout);
+
+ c = this;
}
|