X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FMainWindow.java;h=cd6b2101675295e61be885e080bcbce08421033a;hb=aa1515aa54583b8e46d90581df4ae7f247f6ccab;hp=7eea5cf846633ade0abf669dca8f8a46c08a48ba;hpb=ad11717224be5736a9edead8ae355f54a8b98902;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java index 7eea5cf..cd6b210 100644 --- a/src/net/pterodactylus/jsite/gui/MainWindow.java +++ b/src/net/pterodactylus/jsite/gui/MainWindow.java @@ -40,9 +40,7 @@ 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; @@ -117,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. @@ -346,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); @@ -369,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); }