bwIDM - Shibboleth login working for Freiburg's SP - more to come

rework GUI classes to work with GuiManager: use GuiManager.show(<GUI to show>) and GuiManager.openPopup(<popup like About_GUI or ListAllOtherUsers_GUI>) only! static openlinks class (models/links.java deleted). There are keywords to open links, e.g. OpenLinks.openWebpage("faq"). Please see the class.
author: Jonathan Bauer 2015-03-03 19:02:48 +0100
committer: Jonathan Bauer 2015-03-03 19:02:48 +0100
commit: 0447841f3a08890bf746625d0f17976adada6ac8 (patch)
tree: f63bd9f2ac8d77f4732b70cac8e5c0497f4d3a45 /dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
parent: warnings fix (diff)
download: tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.gz
tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.xz
tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.zip
1 files changed, 65 insertions, 105 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 231fd82f..74205377 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -10,13 +10,9 @@ 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 java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -24,6 +20,7 @@ import java.util.Date;
 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;
@@ -37,10 +34,11 @@ 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 javax.swing.filechooser.FileNameExtensionFilter;
 
 import models.Image;
-import models.Links;
 import models.RightsManagement;
 import models.SessionData;
 import models.person;
@@ -50,6 +48,7 @@ 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.UploadTask;
@@ -57,7 +56,7 @@ import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
 @SuppressWarnings("serial")
-public class FTPEditUploader_GUI extends JFrame implements
+public class FTPEditUploader_GUI extends JInternalFrame implements
 		PropertyChangeListener {
 
 	/**
@@ -99,7 +98,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 												// file
 	private boolean isAborted = false; // down- or upload was manually aborted
 	Component c = null;
-	private static final String HELP_MESSAGE = "<html><div align = \"center\">"
+	public 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 />"
 			+ "Wenn Sie die Datei hochgeladen haben, dann aber auf \"zurück\" klicken, oder die Anwendung beenden,<br />"
@@ -109,16 +108,14 @@ public class FTPEditUploader_GUI extends JFrame implements
 	/**
 	 * Create the frame.
 	 */
-	public FTPEditUploader_GUI(Component formerGUI) {
+	public FTPEditUploader_GUI() {
 		
 
 
 		final Object[] options = { "Beenden", "Abbrechen" };
-
-		addWindowListener(new WindowAdapter() {
+		addInternalFrameListener(new InternalFrameAdapter() {
 			@Override
-			public void windowClosing(WindowEvent arg0) {
-
+			public void internalFrameClosing(InternalFrameEvent arg0) {
 				if (taskrun == true) {
 					// check if user wants to quit.
 					int choice = JOptionPane
@@ -151,18 +148,57 @@ public class FTPEditUploader_GUI extends JFrame implements
 						}
 						System.exit(0);
 					}// end if choice
-				} else {
-					// no upload running, close window
-					try {
-						ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
-					} catch (TException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-					System.exit(0);
-				}// end if taskrun
-			}// end window closing
+				}
+			}
 		});
+//		addWindowListener(new WindowAdapter() {
+//			@Override
+//			public void windowClosing(WindowEvent arg0) {
+//
+//				if (taskrun == true) {
+//					// check if user wants to quit.
+//					int choice = JOptionPane
+//							.showOptionDialog(
+//									c,
+//									"Aktuell ist ein Upload 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());
+//						} catch (TException e1) {
+//							e1.printStackTrace();
+//						}
+//						task.cancel(true);
+//						try {
+//							ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//						} catch (TException e) {
+//							// TODO Auto-generated catch block
+//							e.printStackTrace();
+//						}
+//						try {
+//							ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//						} catch (TException e) {
+//							// TODO Auto-generated catch block
+//							e.printStackTrace();
+//						}
+//						System.exit(0);
+//					}// end if choice
+//				} else {
+//					// no upload running, close window
+//					try {
+//						ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
+//					} catch (TException e) {
+//						// TODO Auto-generated catch block
+//						e.printStackTrace();
+//					}
+//					System.exit(0);
+//				}// end if taskrun
+//			}// end window closing
+//		});
 		setResizable(false);
 		// Aktion die beim Schliessen durchgefuehrt werden soll
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -179,7 +215,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 		setTitle("Dozentenmodul - Image bearbeiten  - "+person.verantwortlicher.getUserID());
 
 		setBounds(0, 0, 603, 722);
-		setLocationRelativeTo(formerGUI);
 
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBackground(SystemColor.menu);
@@ -322,10 +357,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 		lblNewLabel_1.addMouseListener(new MouseAdapter() {
 			@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());
 			}
 		});
 		
@@ -439,9 +471,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 						Config.store();
 
-						dispose();
-						MainMenue_GUI m = new MainMenue_GUI(c);
-						m.setVisible(true);
+						GuiManager.show(new MainMenue_GUI());
 
 						if (taskrun == true) {
 							try {
@@ -487,14 +517,10 @@ public class FTPEditUploader_GUI extends JFrame implements
 									if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){
 
 										//user is admin and may change permissions
-										PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c);
-										ei.setVisible(true);
-										dispose();
+										GuiManager.show(new PermissionEditImage_GUI());
 									} else {
 										//user may not change permissions
-										EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI(c);
-										ei.setVisible(true);
-										dispose();
+										GuiManager.show(new EditImageTechnisch_GUI());
 									}
 								} catch (TException e) {
 									// TODO Auto-generated catch block
@@ -518,14 +544,10 @@ public class FTPEditUploader_GUI extends JFrame implements
 									if(ThriftManager.getSatClient().userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true)
 									{
 										//user is admin and may change permissions
-										PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c);
-										ei.setVisible(true);
-										dispose();
+										GuiManager.show(new PermissionEditImage_GUI());
 									} else {
 										//user may not change permissions
-										EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI(c);
-										ei.setVisible(true);
-										dispose();
+										GuiManager.show(new EditImageTechnisch_GUI());
 									}
 								} catch (TException e) {
 									// TODO Auto-generated catch block
@@ -546,68 +568,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 			}
 		}
 
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(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);
-
-		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);
-
-		setVisible(true);
-
 	}
 
 	private void buttonUploadActionPerformed(ActionEvent event) {
author	Jonathan Bauer	2015-03-03 19:02:48 +0100
committer	Jonathan Bauer	2015-03-03 19:02:48 +0100
commit	0447841f3a08890bf746625d0f17976adada6ac8 (patch)
tree	f63bd9f2ac8d77f4732b70cac8e5c0497f4d3a45 /dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
parent	warnings fix (diff)
download	tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.gz tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.xz tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.zip