import java.awt.event.WindowListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import java.util.logging.Logger;
-import javax.swing.Action;
import javax.swing.Box;
import javax.swing.BoxLayout;
+import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JFrame;
+import javax.swing.JMenu;
import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.JToolBar;
import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;
+import net.pterodactylus.jsite.core.Node;
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.image.IconLoader;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.swing.StatusBar;
import net.pterodactylus.util.swing.SwingUtils;
/** Delay (in seconds) after which to clear status bar. */
private int statusBarClearDelay = 5000;
+ /** The icon for offline nodes. */
+ private Icon offlineIcon;
+
+ /** The icon for online nodes. */
+ private Icon onlineIcon;
+
+ /** The icon for error nodes. */
+ private Icon errorIcon;
+
/** The content pane. */
private JPanel contentPane = new JPanel(new BorderLayout(12, 12));
/** The node menu. */
private I18nMenu nodeMenu;
- /** The “connect” (advanced mode) menu. */
- private I18nMenu connectMenu;
-
- /** The “connect” (simple mode) menu. */
- private JMenuItem connectMenuItem;
-
- /** The “disconnect” (advanced mode) menu. */
- private I18nMenu disconnectMenu;
-
- /** The “diconnect” (simple mode) menu item. */
- private JMenuItem disconnectMenuItem;
-
/** The language menu. */
private I18nMenu languageMenu;
/** The project overview panel. */
private Box projectOverviewPanel;
+ /** Maps from node to menus. */
+ private final Map<Node, JMenu> nodeMenus = new HashMap<Node, JMenu>();
+
+ /** Maps from nodes to node panels. */
+ private final Map<Node, NodeLabel> nodeLabels = new HashMap<Node, NodeLabel>();
+
/**
* Creates a new main window that redirects all actions to the given swing
* interface.
* <code>false</code> if the simple mode is activated
*/
public void setAdvancedMode(boolean advancedMode) {
- connectMenu.setVisible(advancedMode);
- connectMenuItem.setVisible(!advancedMode);
- disconnectMenu.setVisible(advancedMode);
- disconnectMenuItem.setVisible(!advancedMode);
+ /* doesn’t do anything right now. */
}
/**
//
/**
- * Refreshes the menu items in the “connect” and “disconnect” menus.
+ * Adds a node to the menu.
+ *
+ * @param node
+ * The node to add
*/
- void refreshNodeMenuItems() {
- connectMenu.removeAll();
- for (Action nodeConnectAction: swingInterface.getNodeConnectActions()) {
- connectMenu.add(nodeConnectAction);
- }
- if (connectMenu.getMenuComponentCount() == 0) {
- JMenuItem noNodeAvailableItem = new JMenuItem(I18n.get("mainWindow.menu.connectNoNodeAvailable.name"));
- noNodeAvailableItem.setEnabled(false);
- connectMenu.add(noNodeAvailableItem);
- }
- disconnectMenu.removeAll();
- for (Action nodeDisconnectAction: swingInterface.getNodeDisconnectActions()) {
- disconnectMenu.add(nodeDisconnectAction);
- }
- if (disconnectMenu.getMenuComponentCount() == 0) {
- JMenuItem noNodeAvailableItem = new JMenuItem(I18n.get("mainWindow.menu.disconnectNoNodeAvailable.name"));
- noNodeAvailableItem.setEnabled(false);
- disconnectMenu.add(noNodeAvailableItem);
- }
+ void addNode(Node node) {
+ JMenu newNodeMenu = new JMenu(node.getName());
+ nodeMenus.put(node, newNodeMenu);
+ newNodeMenu.add(swingInterface.getNodeConnectAction(node));
+ newNodeMenu.add(swingInterface.getNodeDisconnectAction(node));
+ nodeMenu.add(newNodeMenu);
+ NodeLabel nodeLabel = new NodeLabel(swingInterface, node, onlineIcon, offlineIcon, errorIcon);
+ nodeLabels.put(node, nodeLabel);
+ statusBar.addSideComponent(nodeLabel);
+ }
+
+ /**
+ * Removes a node from the menu.
+ *
+ * @param node
+ * The node to remove
+ */
+ void removeNode(Node node) {
+ nodeMenu.remove(nodeMenus.remove(node));
+ statusBar.removeSideComponent(nodeLabels.remove(node));
}
/**
* @param project
*/
void projectInsertStarted(Project project) {
- ProjectPanel projectPanel = findProjectPanel(project);
- if (projectPanel == null) {
+ int projectIndex = getProjectIndex(project);
+ if (projectIndex == -1) {
return;
}
-
+ projectPane.setTitleAt(projectIndex, I18n.get("projectPanel.title.starting", project.getName()));
}
/**
* @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 success
*/
void projectInsertFinished(Project project, boolean success) {
-
+ int projectIndex = getProjectIndex(project);
+ if (projectIndex == -1) {
+ return;
+ }
+ projectPane.setTitleAt(projectIndex, project.getName());
}
//
//
/**
- * Locates the project panel that contains the given project.
+ * 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 <code>-1</code> if the project can not be found
*/
- private ProjectPanel findProjectPanel(Project project) {
+ 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 (ProjectPanel) tabComponent;
+ return tabIndex;
}
}
}
- return null;
+ return -1;
}
/**
* Initializes the window by creating all its components.
*/
private void initWindow() {
+ onlineIcon = IconLoader.loadIcon("/node-online.png");
+ offlineIcon = IconLoader.loadIcon("/node-offline.png");
+ errorIcon = IconLoader.loadIcon("/node-error.png");
+
JMenuBar menuBar = new JMenuBar();
jSiteMenu = new I18nMenu("mainWindow.menu.jSite");
jSiteMenu.addSeparator();
jSiteMenu.add(new FixedJMenuItem(swingInterface.getQuitAction()));
- connectMenu = new I18nMenu("mainWindow.menu.connect");
- disconnectMenu = new I18nMenu("mainWindow.menu.disconnect");
-
nodeMenu = new I18nMenu("mainWindow.menu.node");
menuBar.add(nodeMenu);
nodeMenu.add(new FixedJMenuItem(swingInterface.getManageNodesAction()));
nodeMenu.addSeparator();
- nodeMenu.add(connectMenuItem = new FixedJMenuItem(swingInterface.getNodeConnectAction()));
- nodeMenu.add(connectMenu);
- nodeMenu.add(disconnectMenuItem = new FixedJMenuItem(swingInterface.getNodeDisconnectAction()));
- nodeMenu.add(disconnectMenu);
- refreshNodeMenuItems();
languageMenu = new I18nMenu("mainWindow.menu.language");
menuBar.add(languageMenu);
languageMenu.add(new FixedJMenuItem(languageAction));
}
- JPanel spacerPanel = new JPanel();
- spacerPanel.setOpaque(false);
- menuBar.add(spacerPanel);
+ menuBar.add(Box.createHorizontalGlue());
helpMenu = new I18nMenu("mainWindow.menu.help");
menuBar.add(helpMenu);
JToolBar toolBar = new JToolBar(I18n.get("mainWindow.toolbar.name"));
toolBar.add(swingInterface.getManageNodesAction());
toolBar.addSeparator();
- toolBar.add(swingInterface.getNodeConnectAction());
- toolBar.add(swingInterface.getNodeDisconnectAction());
+ toolBar.add(swingInterface.getQuitAction());
super.getContentPane().add(toolBar, BorderLayout.PAGE_START);
super.getContentPane().add(contentPane, BorderLayout.CENTER);
swingInterface.getImportConfigAction().updateI18n();
swingInterface.getQuitAction().updateI18n();
swingInterface.getManageNodesAction().updateI18n();
- swingInterface.getNodeConnectAction().updateI18n();
- connectMenu.updateI18n();
- swingInterface.getNodeDisconnectAction().updateI18n();
- disconnectMenu.updateI18n();
swingInterface.getAddProjectAction().updateI18n();
swingInterface.getCloneProjectAction().updateI18n();
swingInterface.getDeleteProjectAction().updateI18n();
jSiteMenu.updateI18n();
nodeMenu.updateI18n();
languageMenu.updateI18n();
+ for (Node node: swingInterface.getNodes()) {
+ swingInterface.getNodeConnectAction(node).updateI18n();
+ swingInterface.getNodeDisconnectAction(node).updateI18n();
+ }
for (I18nAction languageAction: swingInterface.getLanguageActions()) {
languageAction.updateI18n();
}
((ProjectPanel) tabComponent).updateI18n();
}
}
- refreshNodeMenuItems();
SwingUtils.repackCentered(this);
}
projects / jSite2.git / blobdiff