remove request table

[jSite2.git] / src / net / pterodactylus / jsite / gui / MainWindow.java

diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java
index 636193c..cd6b210 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -30,6 +30,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Logger;
 
 import javax.swing.Action;
 import javax.swing.Box;
@@ -39,19 +40,18 @@ 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;
 
-import net.pterodactylus.jsite.core.Project;
 import net.pterodactylus.jsite.i18n.I18n;
 import net.pterodactylus.jsite.i18n.I18nable;
 import net.pterodactylus.jsite.i18n.gui.I18nAction;
 import net.pterodactylus.jsite.i18n.gui.I18nMenu;
 import net.pterodactylus.jsite.main.Version;
+import net.pterodactylus.jsite.project.Project;
+import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.swing.StatusBar;
 import net.pterodactylus.util.swing.SwingUtils;
 
@@ -63,6 +63,10 @@ import net.pterodactylus.util.swing.SwingUtils;
  */
 public class MainWindow extends JFrame implements WindowListener, I18nable, PropertyChangeListener {
 
+       /** Logger. */
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logging.getLogger(MainWindow.class.getName());
+
        /** The swing interface that receives all actions. */
        private final SwingInterface swingInterface;
 
@@ -111,9 +115,6 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
        /** 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.
@@ -244,13 +245,19 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
         * 
         * @param project
         *            The project to add
+        * @param switchToProject
+        *            <code>true</code> to switch to the new panel,
+        *            <code>false</code> to not change the current panel
         */
-       void addProject(Project project) {
+       void addProject(Project project, boolean switchToProject) {
                ProjectPanel projectPanel = new ProjectPanel(swingInterface, project);
                int newTabIndex = projectPane.getTabCount();
                projectPane.add(project.getName(), projectPanel);
                projectPane.setToolTipTextAt(newTabIndex, project.getDescription());
                project.addPropertyChangeListener(this);
+               if (switchToProject) {
+                       projectPane.setSelectedIndex(newTabIndex);
+               }
        }
 
        //
@@ -334,14 +341,9 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
        private void initComponents() {
                super.getContentPane().add(statusBar, BorderLayout.PAGE_END);
 
-               /*
-                * the main window consists of two panels which are vertically oriented.
-                * the upper panel contains of a tabbed pane, the lower panel consists
-                * of a table that lists the running requests.
-                */
-
+               /* TODO - remove upper panel */
                JPanel upperPanel = new JPanel(new BorderLayout(12, 12));
-               getContentPane().add(upperPanel, BorderLayout.PAGE_START);
+               getContentPane().add(upperPanel, BorderLayout.CENTER);
                contentPane.setBorder(new EmptyBorder(12, 12, 12, 12));
 
                projectPane = new JTabbedPane(SwingConstants.TOP, JTabbedPane.SCROLL_TAB_LAYOUT);
@@ -357,9 +359,6 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                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);
        }