X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FMainWindow.java;h=04c51d263d8e9e95bc3ac281ceeea86c3137ac39;hb=cef853e1dfc369abafa2626e9f4d657df22b180c;hp=4eb7ab71d319e11b0b3914d2b7a5e7f0213105de;hpb=ebd531bc775036dd66a7e20abebbcb480af35491;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java
index 4eb7ab7..04c51d2 100644
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -25,6 +25,8 @@ import java.awt.Dimension;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import javax.swing.Action;
 import javax.swing.Box;
@@ -34,7 +36,9 @@ import javax.swing.JFrame;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.JTable;
 import javax.swing.JToolBar;
 import javax.swing.SwingConstants;
 import javax.swing.border.EmptyBorder;
@@ -50,7 +54,7 @@ import net.pterodactylus.util.swing.SwingUtils;
 
 /**
  * Defines the main window of the application.
- *
+ * 
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  * @version $Id$
  */
@@ -62,6 +66,15 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
 	/** The status bar. */
 	private StatusBar statusBar = new StatusBar();
 
+	/** Timer for clearing the status bar. */
+	private Timer statusBarClearTimer = new Timer("StatusBar Cleaner", true);
+
+	/** Object for status bar clearing ticker event. */
+	private TimerTask statusBarClearTimerTask;
+
+	/** Delay (in seconds) after which to clear status bar. */
+	private int statusBarClearDelay = 5000;
+
 	/** The content pane. */
 	private JPanel contentPane = new JPanel(new BorderLayout(12, 12));
 
@@ -95,10 +108,13 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
 	/** The project overview panel. */
 	private Box projectOverviewPanel;
 
+	/** The request table. */
+	private JTable requestTable;
+	
 	/**
 	 * Creates a new main window that redirects all actions to the given swing
 	 * interface.
-	 *
+	 * 
 	 * @param swingInterface
 	 *            The swing interface to receive all actions
 	 */
@@ -119,17 +135,51 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
 
 	/**
 	 * Sets the text of the status bar.
-	 *
+	 * 
 	 * @param text
 	 *            The text of the status bar
 	 */
 	public void setStatusBarText(String text) {
 		statusBar.setText(text);
+		synchronized (statusBar) {
+			if (statusBarClearTimerTask != null) {
+				statusBarClearTimerTask.cancel();
+			}
+			statusBarClearTimerTask = new TimerTask() {
+
+				@SuppressWarnings("synthetic-access")
+				@Override
+				public void run() {
+					statusBar.setText("\u00a0");
+				}
+
+			};
+			statusBarClearTimer.schedule(statusBarClearTimerTask, statusBarClearDelay);
+		}
+	}
+
+	/**
+	 * Returns the status bar clear delay (in milliseconds).
+	 * 
+	 * @return The status bar clear delay
+	 */
+	public int getStatusBarClearDelay() {
+		return statusBarClearDelay;
+	}
+
+	/**
+	 * Sets the status bar clear delay (in milliseconds).
+	 * 
+	 * @param statusBarClearDelay
+	 *            The status bar clear delay
+	 */
+	public void setStatusBarClearDelay(int statusBarClearDelay) {
+		this.statusBarClearDelay = statusBarClearDelay;
 	}
 
 	/**
 	 * Sets whether the advanced mode is activated.
-	 *
+	 * 
 	 * @param advancedMode
 	 *            <code>true</code> if the advanced mode is activated,
 	 *            <code>false</code> if the simple mode is activated
@@ -151,7 +201,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
 
 	/**
 	 * Returns the currently selected project.
-	 *
+	 * 
 	 * @return The currently selected project
 	 */
 	public Project getSelectedProject() {
@@ -290,6 +340,9 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
 		projectOverviewPanel.add(addProjectButton);
 		projectOverviewPanel.add(Box.createVerticalGlue());
 
+		requestTable = new JTable(swingInterface.getRequestTableModel());
+		getContentPane().add(new JScrollPane(requestTable), BorderLayout.CENTER);
+		
 // JPanel lowerPanel = new JPanel(new BorderLayout(12, 12));
 // getContentPane().add(lowerPanel, BorderLayout.CENTER);
 	}
@@ -333,7 +386,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
 	//
 	// INTERFACE WindowListener
 	//
-	
+
 	/**
 	 * {@inheritDoc}
 	 */