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/SearchEditImage_GUI.java
parent: warnings fix (diff)
download: tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.gz
tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.xz
tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.zip
1 files changed, 47 insertions, 141 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 3ad45213..37512f2f 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -1,6 +1,5 @@
 package gui.image;
 
-import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -14,10 +13,6 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 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.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -28,11 +23,8 @@ import java.util.Map;
 
 import javax.swing.JButton;
 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.JRadioButton;
@@ -48,6 +40,8 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
+import javax.swing.event.InternalFrameAdapter;
+import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
@@ -56,18 +50,17 @@ import javax.swing.table.TableRowSorter;
 
 import models.Image;
 import models.ItemOwner;
-import models.Links;
 import models.SessionData;
 import models.person;
 
 import org.apache.thrift.TException;
 
 import thrift.ThriftManager;
-import util.OpenLinks;
+import util.GuiManager;
 //import models.person;
 
 @SuppressWarnings("serial")
-public class SearchEditImage_GUI extends JFrame {
+public class SearchEditImage_GUI extends JInternalFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	JLabel labelName;
@@ -108,7 +101,7 @@ public class SearchEditImage_GUI extends JFrame {
 																				// Update
 																				// (5)
 
-	private static final String HELP_MESSAGE = "<html><div align=\"center\">"
+	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
 			+ "Suchen Sie Images und laden Sie sie direkt herunter.<br />"
 			+ "Sie können die Volltextsuche nutzen und nach Betriebssystemen filtern.<br />"
 			+ "Die Volltextsuche sucht in den Feldern Name und Beschreibung.<br />"
@@ -134,61 +127,49 @@ public class SearchEditImage_GUI extends JFrame {
 	/**
 	 * Create the dialog. 
 	 */
-	public SearchEditImage_GUI(Component formerGUI) {
+	public SearchEditImage_GUI() {
 		
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
 		
-		
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				// Beendet die Anwendung nach klick auf X
-				try {
-					ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken());
-				} catch (TException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				System.exit(0);
-			}
-
+		addInternalFrameListener(new InternalFrameAdapter() {
 			@Override
-			public void windowOpened(WindowEvent arg0) {
-				initTableModel(modelMyImages);
-
-				// auszublendende Angaben
-				// 1=Lizenzpflichtig
-				// 3=Veranstaltung
-				// 6=ID
-				// 7=Version
-				// 8=Template
-				// 9=Beschreibung (needed for full text search)
-				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
-				
-				tablemyImages.getTableHeader().setReorderingAllowed(false);
-				tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-				textFieldName.requestFocusInWindow();
+			public void internalFrameActivated(InternalFrameEvent arg0) {
+					initTableModel(modelMyImages);
+
+					// auszublendende Angaben
+					// 1=Lizenzpflichtig
+					// 3=Veranstaltung
+					// 6=ID
+					// 7=Version
+					// 8=Template
+					// 9=Beschreibung (needed for full text search)
+					tablemyImages.getColumnModel().getColumn(1).setWidth(0);
+					tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
+					tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
+					tablemyImages.getColumnModel().getColumn(3).setWidth(0);
+					tablemyImages.getColumnModel().getColumn(3).setMinWidth(0);
+					tablemyImages.getColumnModel().getColumn(3).setMaxWidth(0);
+					tablemyImages.getColumnModel().getColumn(8).setWidth(0);
+					tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
+					tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
+					tablemyImages.getColumnModel().getColumn(6).setWidth(0);
+					tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
+					tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
+					tablemyImages.getColumnModel().getColumn(7).setWidth(0);
+					tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
+					tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
+					tablemyImages.getColumnModel().getColumn(9).setWidth(0);
+					tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
+					tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
+					
+					tablemyImages.getTableHeader().setReorderingAllowed(false);
+					tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+					textFieldName.requestFocusInWindow();
 			}
 		});
+
 		// Verhindert das Vergroessern Des Fensters
 		setResizable(false);
 
@@ -203,7 +184,7 @@ public class SearchEditImage_GUI extends JFrame {
 		setTitle("bwLehrpool Suite - Image bearbeiten - "+person.verantwortlicher.getUserID());
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 918, 722);
-		setLocationRelativeTo(formerGUI);
+
 
 		//final DefaultTableModel model = new DefaultTableModel(titles, 0);
 
@@ -355,10 +336,8 @@ public class SearchEditImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Hauuetmenue
-
-				SearchEditImage_GUI.this.setVisible(false);
-				MainMenue_GUI main = new MainMenue_GUI(c);
-				main.setVisible(true);
+				GuiManager.show(new MainMenue_GUI());
+				
 			}
 		});
 		lblHauptmen.setForeground(Color.BLUE);
@@ -402,9 +381,7 @@ public class SearchEditImage_GUI extends JFrame {
 
 					Image.image.setVersion(imageversion);
 
-					FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI(c);
-					ea.setVisible(true);
-					dispose();
+					GuiManager.show(new FTPEditDownloader_GUI());
 
 				} else {
 					JOptionPane.showMessageDialog(c,
@@ -483,10 +460,7 @@ public class SearchEditImage_GUI extends JFrame {
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						// oeffnet das Hauptmenue
-
-						MainMenue_GUI main = new MainMenue_GUI(c);
-						main.setVisible(true);
-						dispose();
+						GuiManager.show(new MainMenue_GUI());
 					}
 				});
 				okButton.setActionCommand("OK");
@@ -518,11 +492,7 @@ public class SearchEditImage_GUI extends JFrame {
 											7).toString();
 
 							Image.image.setVersion(imageversion);
-
-							EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(
-									c);
-							ea.setVisible(true);
-							dispose();
+							GuiManager.show(new EditImageAllgemein_GUI());
 						}
 						
 						}// end actionPerformed
@@ -665,70 +635,6 @@ public class SearchEditImage_GUI extends JFrame {
 		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		textAreadesc.setBackground(SystemColor.menu);
 		scrollPane.setViewportView(textAreadesc);
-		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;
 	
 	}
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/SearchEditImage_GUI.java
parent	warnings fix (diff)
download	tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.gz tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.xz tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.zip