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. --- .../main/java/gui/image/FTPEditDownloader_GUI.java | 157 ++++++++------------- 1 file changed, 57 insertions(+), 100 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index 6db115fb..273005e7 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -10,21 +10,17 @@ 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.io.File; -import java.net.URI; -import java.net.URISyntaxException; import javax.swing.JButton; import javax.swing.JFileChooser; 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.JProgressBar; @@ -34,9 +30,10 @@ import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; +import javax.swing.event.InternalFrameAdapter; +import javax.swing.event.InternalFrameEvent; import models.Image; -import models.Links; import models.SessionData; import models.person; @@ -45,14 +42,14 @@ import org.apache.thrift.TException; import org.openslx.sat.thrift.iface.User; import thrift.ThriftManager; +import util.GuiManager; import util.OpenLinks; import config.Config; import ftp.DownloadTask; -import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; @SuppressWarnings("serial") -public class FTPEditDownloader_GUI extends JFrame implements +public class FTPEditDownloader_GUI extends JInternalFrame implements PropertyChangeListener { /** @@ -91,7 +88,7 @@ public class FTPEditDownloader_GUI extends JFrame implements private boolean isCurrentlyLoading = false; // currently up or downloading // file private boolean isAborted = false; // down- or upload was manually aborted - private static final String HELP_MESSAGE = "
" + public static final String HELP_MESSAGE = "
" + "Hier können Sie Images herunterladen.
" + "Klicken Sie anschließend auf \"Zurück\", um zu Ihrer vorherigen Auswahl zurückzugelangen.
" + "
"; @@ -99,14 +96,13 @@ public class FTPEditDownloader_GUI extends JFrame implements /** * Create the frame. */ - public FTPEditDownloader_GUI(Component formerGUI) { + public FTPEditDownloader_GUI() { final Object[] options = { "Beenden", "Abbrechen" }; - - addWindowListener(new WindowAdapter() { + addInternalFrameListener(new InternalFrameAdapter() { @Override - public void windowClosing(WindowEvent e) { + public void internalFrameClosing(InternalFrameEvent arg0) { if (taskrun == true) { // check if user wants to quit. int choice = JOptionPane @@ -134,18 +130,51 @@ public class FTPEditDownloader_GUI extends JFrame implements task.cancel(true); System.exit(0); }// end if coice - } else { - // no download running, close window - try { - ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - System.exit(0); - }// end if taskrun - }// end window closing + } + } }); +// addWindowListener(new WindowAdapter() { +// @Override +// public void windowClosing(WindowEvent e) { +// if (taskrun == true) { +// // check if user wants to quit. +// int choice = JOptionPane +// .showOptionDialog( +// c, +// "Aktuell ist ein Download aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?", +// "Upload aktiv", +// JOptionPane.YES_NO_CANCEL_OPTION, +// JOptionPane.QUESTION_MESSAGE, null, +// options, options[1]); +// // 0=beenden, 1=abbrechen +// if (choice == 0) { +// try { +// ThriftManager.getSatClient().DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); +// try { +// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// } catch (TException e1) { +// // TODO Auto-generated catch block +// e1.printStackTrace(); +// } +// } catch (TException e1) { +// +// e1.printStackTrace(); +// } +// task.cancel(true); +// System.exit(0); +// }// end if coice +// } else { +// // no download running, close window +// try { +// ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); +// } catch (TException e1) { +// // TODO Auto-generated catch block +// e1.printStackTrace(); +// } +// System.exit(0); +// }// end if taskrun +// }// end window closing +// }); setResizable(false); try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -161,7 +190,6 @@ public class FTPEditDownloader_GUI extends JFrame implements setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); setBounds(0, 0, 603, 722); - setLocationRelativeTo(formerGUI); getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); @@ -306,9 +334,7 @@ public class FTPEditDownloader_GUI extends JFrame implements @Override public void mouseClicked(MouseEvent arg0) { // oeffnet das Hauptmenue - dispose(); - MainMenue_GUI main = new MainMenue_GUI(c); - main.setVisible(true); + GuiManager.show(new MainMenue_GUI()); } }); @@ -353,51 +379,6 @@ public class FTPEditDownloader_GUI extends JFrame implements menuBar.setBounds(0, 0, 597, 21); contentPanel.add(menuBar); - JMenu menu = new JMenu("Hilfe"); - menuBar.add(menu); - - JMenuItem menuItem = new JMenuItem("FAQ"); - menuItem.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(); - } - } - }); - - menu.add(menuItem); - - JMenuItem menuItem_1 = new JMenuItem("OTRS"); - menuItem_1.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(); - } - } - }); - - menu.add(menuItem_1); - - JMenuItem mntmAbout = new JMenuItem("About"); - mntmAbout.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - About_GUI ab = new About_GUI(); - ab.setVisible(true); - } - }); - menu.add(mntmAbout); lblAnleitung = new JLabel( "Anleitung zum Erstellen einer virtuellen Maschine herunterladen"); @@ -405,14 +386,7 @@ public class FTPEditDownloader_GUI extends JFrame implements lblAnleitung.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - URI anleitung; - try { - anleitung = new URI(Links.getAnleitungVMDK()); - OpenLinks.openWebpage(anleitung); - } catch (URISyntaxException e) { - - e.printStackTrace(); - } + OpenLinks.openWebpage("intro"); } }); lblAnleitung.setBounds(102, 448, 311, 14); @@ -468,18 +442,13 @@ public class FTPEditDownloader_GUI extends JFrame implements } // go back one page - SearchEditImage_GUI se = new SearchEditImage_GUI( - c); - se.setVisible(true); - dispose(); + GuiManager.show(new SearchEditImage_GUI()); }// end choice } else { // go back one page - SearchEditImage_GUI se = new SearchEditImage_GUI(c); - se.setVisible(true); - dispose(); + GuiManager.show(new SearchEditImage_GUI()); }// end else // always save download path @@ -500,18 +469,6 @@ public class FTPEditDownloader_GUI extends JFrame implements } setVisible(true); - 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