From 0447841f3a08890bf746625d0f17976adada6ac8 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 3 Mar 2015 19:02:48 +0100 Subject: bwIDM - Shibboleth login working for Freiburg's SP - more to come rework GUI classes to work with GuiManager: use GuiManager.show() and GuiManager.openPopup() only! static openlinks class (models/links.java deleted). There are keywords to open links, e.g. OpenLinks.openWebpage("faq"). Please see the class. --- .../java/gui/lecture/EditLectureAllgemein_GUI.java | 121 +++------------------ 1 file changed, 16 insertions(+), 105 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java index 597a3539..648406f0 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java @@ -1,6 +1,5 @@ package gui.lecture; -import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -13,22 +12,15 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.net.URI; -import java.net.URISyntaxException; import java.util.Calendar; import java.util.Date; import javax.swing.ButtonGroup; import javax.swing.JButton; -import javax.swing.JFrame; +import javax.swing.JInternalFrame; 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.JRadioButton; @@ -44,21 +36,19 @@ import javax.swing.border.TitledBorder; import models.Image; import models.ItemOwner; import models.Lecture; -import models.Links; import models.SessionData; -//import models.person; import models.person; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server; -import util.OpenLinks; +import thrift.ThriftManager; +import util.GuiManager; import com.toedter.calendar.JDateChooser; -//import server.generated.Server.Client; + @SuppressWarnings("serial") -public class EditLectureAllgemein_GUI extends JFrame { +public class EditLectureAllgemein_GUI extends JInternalFrame { private final JPanel contentPanel = new JPanel(); String[] result; @@ -76,7 +66,7 @@ public class EditLectureAllgemein_GUI extends JFrame { Date endDate; Component c = null; private final ButtonGroup buttonGroup = new ButtonGroup(); - Server.Client client = models.Client.clientcon.getClient(); + private boolean descriptionLengthOK = false; // description may not be // longer than // MAX_DESCRIPTION_LENGTH @@ -87,7 +77,7 @@ public class EditLectureAllgemein_GUI extends JFrame { boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, isAllInformationReady = false; - private static final String HELP_MESSAGE = "
" + + public static final String HELP_MESSAGE = "
" + "Bearbeiten Sie hier Ihre allgemeinen Informationen zu einer Veranstaltung.
" + "Sie können auch den Zeitraum neu wählen und die Beschreibung ändern.
" + "Klicken Sie anschließend auf \"Witer\" um die Daten im nächsten Schritt zu übernehmen." + @@ -96,19 +86,8 @@ public class EditLectureAllgemein_GUI extends JFrame { /** * Create the dialog. */ - public EditLectureAllgemein_GUI(Component formerGUI) { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - try { - client.setSessionInvalid(SessionData.session.getAuthToken()); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - System.exit(0); - } - }); + public EditLectureAllgemein_GUI() { + setResizable(false); try { @@ -121,7 +100,7 @@ public class EditLectureAllgemein_GUI extends JFrame { setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID()); ; setBounds(0, 0, 603, 722); - setLocationRelativeTo(formerGUI); + getContentPane().setLayout(null); { @@ -230,10 +209,7 @@ public class EditLectureAllgemein_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - - EditLectureAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(c); - main.setVisible(true); + GuiManager.show(new MainMenue_GUI()); } }); lblHauptmen.setForeground(Color.BLUE); @@ -418,10 +394,8 @@ public class EditLectureAllgemein_GUI extends JFrame { Lecture.lecture.setEnddate(dateChooserend.getDate()); Lecture.lecture.setStartdate(dateChooserstart.getDate()); Image.image.setImagename(textFieldLaborname.getText().trim()); - - EditLectureSearch_GUI sr = new EditLectureSearch_GUI(c); - sr.setVisible(true); - dispose(); + + GuiManager.show(new EditLectureSearch_GUI()); } }); okButton.setActionCommand("OK"); @@ -506,17 +480,12 @@ public class EditLectureAllgemein_GUI extends JFrame { //check which GUI to open try { - if((client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin")))){ + if((ThriftManager.getSatClient().userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin")))){ //user is admin of the lecture - PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c); - ev.setVisible(true); - dispose(); - + GuiManager.show(new PermissionEditLecture_GUI()); } else { //user is not admin of the lecture - EditLectureLink_GUI el = new EditLectureLink_GUI(c); - el.setVisible(true); - dispose(); + GuiManager.show(new EditLectureLink_GUI()); } } catch (TException e1) { // TODO Auto-generated catch block @@ -546,64 +515,6 @@ public class EditLectureAllgemein_GUI extends JFrame { lblPflichtfelder.setBounds(32, 602, 136, 14); getContentPane().add(lblPflichtfelder); - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnNewMenu_1 = new JMenu("Hilfe"); - menuBar.add(mnNewMenu_1); - - JMenuItem mntmFaq = new JMenuItem("FAQ"); - mntmFaq.addMouseListener(new MouseAdapter() { - @Override - public void mousePressed(MouseEvent arg0) { - URI windows; - try { - windows = new URI(Links.getFAQ()); - OpenLinks.openWebpage(windows); - } catch (URISyntaxException e) { - - e.printStackTrace(); - } - } - }); - mnNewMenu_1.add(mntmFaq); - - JMenuItem mntmOtrs = new JMenuItem("OTRS"); - mntmOtrs.addMouseListener(new MouseAdapter() { - @Override - public void mousePressed(MouseEvent arg0) { - URI windows; - try { - windows = new URI(Links.getOTRS()); - OpenLinks.openWebpage(windows); - } catch (URISyntaxException e) { - - e.printStackTrace(); - } - } - }); - mnNewMenu_1.add(mntmOtrs); - - JMenuItem mntmAbout = new JMenuItem("About"); - mntmAbout.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - About_GUI ab = new About_GUI(); - ab.setVisible(true); - } - }); - mnNewMenu_1.add(mntmAbout); - - JMenu mnNewMenu_Info = new JMenu("Info"); - mnNewMenu_Info.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - 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) { -- cgit v1.2.3-55-g7522