remove Id keyword

[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 6a6e035..d09c352 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/MainWindow.java
+++ b/src/net/pterodactylus/jsite/gui/MainWindow.java
@@ -63,7 +63,6 @@ import net.pterodactylus.util.swing.SwingUtils;
  * Defines the main window of the application.
  * 
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class MainWindow extends JFrame implements WindowListener, I18nable, PropertyChangeListener {
 
@@ -88,13 +87,13 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
 
        /** 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));
 
@@ -231,10 +230,14 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                nodeMenus.put(node, newNodeMenu);
                newNodeMenu.add(swingInterface.getNodeConnectAction(node));
                newNodeMenu.add(swingInterface.getNodeDisconnectAction(node));
+               newNodeMenu.addSeparator();
+               newNodeMenu.add(swingInterface.getNodeEditAction(node));
+               newNodeMenu.add(swingInterface.getNodeDeleteAction(node));
                nodeMenu.add(newNodeMenu);
                NodeLabel nodeLabel = new NodeLabel(swingInterface, node, onlineIcon, offlineIcon, errorIcon);
                nodeLabels.put(node, nodeLabel);
                statusBar.addSideComponent(nodeLabel);
+               node.addPropertyChangeListener(this);
        }
 
        /**
@@ -246,6 +249,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
        void removeNode(Node node) {
                nodeMenu.remove(nodeMenus.remove(node));
                statusBar.removeSideComponent(nodeLabels.remove(node));
+               node.removePropertyChangeListener(this);
        }
 
        /**
@@ -347,7 +351,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                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");
@@ -362,7 +366,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                nodeMenu = new I18nMenu("mainWindow.menu.node");
                menuBar.add(nodeMenu);
 
-               nodeMenu.add(new FixedJMenuItem(swingInterface.getManageNodesAction()));
+               nodeMenu.add(new FixedJMenuItem(swingInterface.getAddNodeAction()));
                nodeMenu.addSeparator();
 
                languageMenu = new I18nMenu("mainWindow.menu.language");
@@ -382,7 +386,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                setJMenuBar(menuBar);
 
                JToolBar toolBar = new JToolBar(I18n.get("mainWindow.toolbar.name"));
-               toolBar.add(swingInterface.getManageNodesAction());
+               toolBar.add(swingInterface.getAddNodeAction());
                toolBar.addSeparator();
                toolBar.add(swingInterface.getQuitAction());
                super.getContentPane().add(toolBar, BorderLayout.PAGE_START);
@@ -409,14 +413,10 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
         */
        private void initComponents() {
                super.getContentPane().add(statusBar, BorderLayout.PAGE_END);
-
-               /* TODO - remove upper panel */
-               JPanel upperPanel = new JPanel(new BorderLayout(12, 12));
-               getContentPane().add(upperPanel, BorderLayout.CENTER);
                contentPane.setBorder(new EmptyBorder(12, 12, 12, 12));
 
                projectPane = new JTabbedPane(SwingConstants.TOP, JTabbedPane.SCROLL_TAB_LAYOUT);
-               upperPanel.add(projectPane, BorderLayout.CENTER);
+               contentPane.add(projectPane, BorderLayout.CENTER);
 
                projectOverviewPanel = new Box(BoxLayout.PAGE_AXIS);
                projectOverviewPanel.setName(I18n.get("mainWindow.pane.overview.title"));
@@ -427,9 +427,6 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                addProjectButton.setAlignmentX(0.5f);
                projectOverviewPanel.add(addProjectButton);
                projectOverviewPanel.add(Box.createVerticalGlue());
-
-               // JPanel lowerPanel = new JPanel(new BorderLayout(12, 12));
-               // getContentPane().add(lowerPanel, BorderLayout.CENTER);
        }
 
        //
@@ -443,7 +440,7 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                swingInterface.getConfigureAction().updateI18n();
                swingInterface.getImportConfigAction().updateI18n();
                swingInterface.getQuitAction().updateI18n();
-               swingInterface.getManageNodesAction().updateI18n();
+               swingInterface.getAddNodeAction().updateI18n();
                swingInterface.getAddProjectAction().updateI18n();
                swingInterface.getCloneProjectAction().updateI18n();
                swingInterface.getDeleteProjectAction().updateI18n();
@@ -454,6 +451,8 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                for (Node node: swingInterface.getNodes()) {
                        swingInterface.getNodeConnectAction(node).updateI18n();
                        swingInterface.getNodeDisconnectAction(node).updateI18n();
+                       swingInterface.getNodeEditAction(node).updateI18n();
+                       swingInterface.getNodeDeleteAction(node).updateI18n();
                }
                for (I18nAction languageAction: swingInterface.getLanguageActions()) {
                        languageAction.updateI18n();
@@ -550,6 +549,11 @@ public class MainWindow extends JFrame implements WindowListener, I18nable, Prop
                                        }
                                }
                        }
+               } else if (eventSource instanceof Node) {
+                       if (propertyName.equals(Node.PROPERTY_NAME)) {
+                               Node changedNode = (Node) eventSource;
+                               nodeMenus.get(changedNode).setText(changedNode.getName());
+                       }
                }
        }