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 /dozentenmodul/src/main/java/gui/lecture | |
| 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
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture')
9 files changed, 128 insertions, 129 deletions
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;
}
|
