X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FMainWindow.java;h=f582bb2fb35492c8b873b20697d0939fcdd05373;hb=99ef3764897825a3154cb662b2b81f51c16fdbd2;hp=04c51d263d8e9e95bc3ac281ceeea86c3137ac39;hpb=a6d31fa9f170c57ba80b0f5ede4ef9bcbe3c9375;p=jSite2.git
diff --git a/src/net/pterodactylus/jsite/gui/MainWindow.java b/src/net/pterodactylus/jsite/gui/MainWindow.java
index 04c51d2..f582bb2 100644
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -20,13 +20,17 @@
package net.pterodactylus.jsite.gui;
import java.awt.BorderLayout;
+import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
+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;
@@ -36,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;
@@ -58,7 +61,11 @@ import net.pterodactylus.util.swing.SwingUtils;
* @author David âBombeâ Roden <bombe@freenetproject.org>
* @version $Id$
*/
-public class MainWindow extends JFrame implements WindowListener, I18nable {
+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;
@@ -108,9 +115,6 @@ 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.
@@ -236,11 +240,99 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
}
}
+ /**
+ * Adds a project to the project pane.
+ *
+ * @param project
+ * The project to add
+ * @param switchToProject
+ * true to switch to the new panel,
+ * false to not change the current panel
+ */
+ 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);
+ }
+ }
+
+ /**
+ * @param project
+ */
+ void projectInsertStarted(Project project) {
+ int projectIndex = getProjectIndex(project);
+ if (projectIndex == -1) {
+ return;
+ }
+ projectPane.setTitleAt(projectIndex, I18n.get("projectPanel.title.starting", project.getName()));
+ }
+
+ /**
+ * @param project
+ * @param totalBlocks
+ * @param requiredBlocks
+ * @param successfulBlocks
+ * @param failedBlocks
+ * @param fatallyFailedBlocks
+ * @param finalizedTotal
+ */
+ void projectInsertProgressed(Project project, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
+ int projectIndex = getProjectIndex(project);
+ if (projectIndex == -1) {
+ return;
+ }
+ projectPane.setTitleAt(projectIndex, I18n.get("projectPanel.title.progress", project.getName(), requiredBlocks / (double) successfulBlocks));
+ }
+
+ /**
+ * @param project
+ */
+ void projectInsertGeneratedURI(Project project) {
+ /* TODO - update panel. */
+ }
+
+ /**
+ * @param project
+ * @param success
+ */
+ void projectInsertFinished(Project project, boolean success) {
+ int projectIndex = getProjectIndex(project);
+ if (projectIndex == -1) {
+ return;
+ }
+ projectPane.setTitleAt(projectIndex, project.getName());
+ }
+
//
// PRIVATE METHODS
//
/**
+ * Returns the index of the project panel that contains the given project.
+ *
+ * @param project
+ * The wanted project
+ * @return The index of {@link #projectPane}âs tab that contains the given
+ * project, or -1 if the project can not be found
+ */
+ private int getProjectIndex(Project project) {
+ int tabCount = projectPane.getTabCount();
+ for (int tabIndex = 1; tabIndex < tabCount; tabIndex++) {
+ Component tabComponent = projectPane.getComponentAt(tabIndex);
+ if (tabComponent instanceof ProjectPanel) {
+ if (((ProjectPanel) tabComponent).getProject() == project) {
+ return tabIndex;
+ }
+ }
+ }
+ return -1;
+ }
+
+ /**
* Initializes the window by creating all its components.
*/
private void initWindow() {
@@ -317,14 +409,9 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
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);
@@ -340,11 +427,8 @@ 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);
+ // JPanel lowerPanel = new JPanel(new BorderLayout(12, 12));
+ // getContentPane().add(lowerPanel, BorderLayout.CENTER);
}
//
@@ -375,9 +459,12 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
}
helpMenu.updateI18n();
getJMenuBar().revalidate();
- projectOverviewPanel.setName(I18n.get("mainWindow.pane.overview.title"));
+ projectPane.setTitleAt(0, I18n.get("mainWindow.pane.overview.title"));
for (int componentIndex = 0; componentIndex < projectPane.getTabCount(); componentIndex++) {
- projectPane.setTitleAt(componentIndex, projectPane.getComponentAt(componentIndex).getName());
+ Component tabComponent = projectPane.getComponentAt(componentIndex);
+ if (tabComponent instanceof ProjectPanel) {
+ ((ProjectPanel) tabComponent).updateI18n();
+ }
}
refreshNodeMenuItems();
SwingUtils.repackCentered(this);
@@ -436,4 +523,34 @@ public class MainWindow extends JFrame implements WindowListener, I18nable {
/* do nothing. */
}
+ //
+ // INTERFACE PropertyChangeListener
+ //
+
+ /**
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
+ Object eventSource = propertyChangeEvent.getSource();
+ String propertyName = propertyChangeEvent.getPropertyName();
+ if (eventSource instanceof Project) {
+ /* if a project was changed, update the tab title and tooltip. */
+ if (Project.PROPERTY_NAME.equals(propertyName) || Project.PROPERTY_DESCRIPTION.equals(propertyName)) {
+ Project project = (Project) eventSource;
+ int tabCount = projectPane.getTabCount();
+ for (int tabIndex = 0; tabIndex < tabCount; tabIndex++) {
+ Component tabComponent = projectPane.getComponentAt(tabIndex);
+ if (tabComponent instanceof ProjectPanel) {
+ Project tabProject = ((ProjectPanel) tabComponent).getProject();
+ if (tabProject.equals(project)) {
+ projectPane.setTitleAt(tabIndex, project.getName());
+ projectPane.setToolTipTextAt(tabIndex, project.getDescription());
+ projectPane.repaint();
+ }
+ }
+ }
+ }
+ }
+ }
+
}