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/image/EditImageTechnisch_GUI.java | 108 ++------------------- 1 file changed, 9 insertions(+), 99 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index 679b3c62..790665c0 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -1,6 +1,5 @@ package gui.image; -import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -12,21 +11,13 @@ 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.net.URI; -import java.net.URISyntaxException; import java.util.List; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -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.JSeparator; import javax.swing.JSpinner; @@ -39,7 +30,6 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import models.Image; -import models.Links; import models.SessionData; import models.person; @@ -47,10 +37,10 @@ import org.apache.log4j.Logger; import org.apache.thrift.TException; import thrift.ThriftManager; -import util.OpenLinks; +import util.GuiManager; @SuppressWarnings("serial") -public class EditImageTechnisch_GUI extends JFrame { +public class EditImageTechnisch_GUI extends JInternalFrame { /** * Logger instance for this class. @@ -65,7 +55,7 @@ public class EditImageTechnisch_GUI extends JFrame { private JCheckBox chckbxIsInternetBlocked; JComboBox comboBox; Component c = null; - private static final String HELP_MESSAGE = "
" + + public static final String HELP_MESSAGE = "
" + "Bearbeiten Sie hier die technischen Angaben zu Ihrem Image, die Sie beim Erzeugen des Images hinterlegt haben.
" + "Wenn sich die technischen Anforderungen an Ihr Image geändert haben, müssen Sie es nicht erneut hochladen,
" + "sondern können die Angaben direkt hier korrigieren. Die Daten werden dann für Ihr Image übernommen." + @@ -74,21 +64,7 @@ public class EditImageTechnisch_GUI extends JFrame { /** * Create the dialog. */ - public EditImageTechnisch_GUI(Component formerGUI) { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - // Beendet die Anwendung bei Klick auf das X - try { - ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - System.exit(0); - } - - }); + public EditImageTechnisch_GUI() { // Verhindert das Vergrößern des Fensters setResizable(false); @@ -104,7 +80,6 @@ public class EditImageTechnisch_GUI extends JFrame { setTitle("bwLehrpool Suite - Image bearbeiten - "+person.verantwortlicher.getUserID()); // Zentriert das Fenster setBounds(0, 0, 603, 722); - setLocationRelativeTo(formerGUI); getContentPane().setLayout(null); { @@ -234,9 +209,7 @@ public class EditImageTechnisch_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { // Macht dieses Fenster unsichtbar und das vorhergehende Fenster // sichtbar - EditImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(c); - main.setVisible(true); + GuiManager.show(new MainMenue_GUI()); } }); lblHauptmen.setForeground(Color.BLUE); @@ -349,9 +322,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(c); - ei.setVisible(true); - dispose(); + GuiManager.show(new EditImageAllgemein_GUI()); } }); okButton.setActionCommand("OK"); @@ -380,14 +351,10 @@ public class EditImageTechnisch_GUI extends JFrame { //check if user may change permissions and choose window if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(),SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()) == true || (person.verantwortlicher.getRole().equals("Admin"))) { //user has permission, go to permission GUI - PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c); - ea.setVisible(true); - dispose(); + GuiManager.show(new PermissionEditImage_GUI()); } else { // user does not have permission, go straight to upload GUI - FTPEditUploader_GUI ea = new FTPEditUploader_GUI(c); - ea.setVisible(true); - dispose(); + GuiManager.show(new FTPEditUploader_GUI()); } } catch (TException e1) { e1.printStackTrace(); @@ -407,62 +374,5 @@ public class EditImageTechnisch_GUI extends JFrame { JSeparator separator_1 = new JSeparator(); separator_1.setBounds(0, 627, 597, 2); getContentPane().add(separator_1); - - 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) { - // TODO Auto-generated catch block - 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) { - // TODO Auto-generated catch block - 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; } } -- cgit v1.2.3-55-g7522