X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FSwingInterface.java;h=3f2b8b414df9414af6172cfebe111797c8247b5b;hb=f01867ca12edbb3fd6a34ebc3572cdde9a1f280c;hp=f868f85cd9911d57026025e7b031eac422a596b9;hpb=7ccb1fcb746198ee1417bb2f92c846132bf6bc96;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/SwingInterface.java b/src/net/pterodactylus/jsite/gui/SwingInterface.java
index f868f85..3f2b8b4 100644
--- a/src/net/pterodactylus/jsite/gui/SwingInterface.java
+++ b/src/net/pterodactylus/jsite/gui/SwingInterface.java
@@ -20,12 +20,16 @@
 package net.pterodactylus.jsite.gui;
 
 import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -37,17 +41,17 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 
 import net.pterodactylus.jsite.core.Core;
 import net.pterodactylus.jsite.core.CoreListener;
+import net.pterodactylus.jsite.core.JSiteException;
 import net.pterodactylus.jsite.core.Node;
 import net.pterodactylus.jsite.core.Project;
-import net.pterodactylus.jsite.core.Request;
 import net.pterodactylus.jsite.i18n.I18n;
 import net.pterodactylus.jsite.i18n.gui.I18nAction;
 import net.pterodactylus.util.image.IconLoader;
@@ -57,11 +61,10 @@ import net.pterodactylus.util.logging.LoggingListener;
 
 /**
  * The Swing user interface.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
-public class SwingInterface implements CoreListener, LoggingListener {
+public class SwingInterface implements CoreListener, LoggingListener, PropertyChangeListener {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SwingInterface.class.getName());
@@ -90,35 +93,20 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	/** The “quit” action. */
 	private I18nAction quitAction;
 
-	/** The “manage nodes” action. */
-	private I18nAction manageNodesAction;
-
-	/** The “connect to node” (simple mode) action. */
-	private I18nAction nodeConnectAction;
-
-	/** The “disconnect from node” (simple mode) action. */
-	private I18nAction nodeDisconnectAction;
+	/** The “add node” action. */
+	private I18nAction addNodeAction;
 
 	/** All node menu items. */
-	private List<Action> nodeConnectActions = Collections.synchronizedList(new ArrayList<Action>());
-
-	/** Mapping from nodes to node connect actions. */
-	private Map<Node, Action> nodeNodeConnectActions = Collections.synchronizedMap(new HashMap<Node, Action>());
-
-	/** Mapping from node connect actions to nodes. */
-	private Map<Action, Node> nodeConnectActionNodes = Collections.synchronizedMap(new HashMap<Action, Node>());
+	private Map<Node, I18nAction> nodeConnectActions = Collections.synchronizedMap(new HashMap<Node, I18nAction>());
 
 	/** All node disconnect actions. */
-	private List<Action> nodeDisconnectActions = Collections.synchronizedList(new ArrayList<Action>());
-
-	/** Mapping from nodes to node disconnect actions. */
-	private Map<Node, Action> nodeNodeDisconnectActions = Collections.synchronizedMap(new HashMap<Node, Action>());
+	private Map<Node, I18nAction> nodeDisconnectActions = Collections.synchronizedMap(new HashMap<Node, I18nAction>());
 
-	/** Mapping from node disconnect actions to nodes. */
-	private Map<Action, Node> nodeDisconnectActionNodes = Collections.synchronizedMap(new HashMap<Action, Node>());
+	/** All node edit actions. */
+	private Map<Node, I18nAction> nodeEditActions = Collections.synchronizedMap(new HashMap<Node, I18nAction>());
 
-	/** The node manager dialog. */
-	private ManageNodesDialog manageNodesDialog;
+	/** All node removal actions. */
+	private Map<Node, I18nAction> nodeDeleteActions = Collections.synchronizedMap(new HashMap<Node, I18nAction>());
 
 	/** All lanugage menu items. */
 	private List<I18nAction> languageActions = new ArrayList<I18nAction>();
@@ -129,11 +117,14 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	/** The “add project” action. */
 	private I18nAction addProjectAction;
 
-	/** The “clone project” action. */
-	private I18nAction cloneProjectAction;
+	/** The “insert project” actions. */
+	private Map<Project, I18nAction> insertProjectActions = new HashMap<Project, I18nAction>();
 
-	/** The “delete project” action. */
-	private I18nAction deleteProjectAction;
+	/** The “clone project” actions. */
+	private Map<Project, I18nAction> cloneProjectActions = new HashMap<Project, I18nAction>();
+
+	/** The “delete project” actions. */
+	private Map<Project, I18nAction> deleteProjectActions = new HashMap<Project, I18nAction>();
 
 	/** The “about” dialog. */
 	private AboutDialog aboutDialog;
@@ -141,8 +132,14 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	/** The configuration dialog. */
 	private ConfigurationDialog configurationDialog;
 
+	/** The node editor dialog. */
+	private AddNodeDialog addNodeDialog;
+
 	/** The list of all defined nodes. */
-	private List<Node> nodeList;
+	private List<Node> nodeList = Collections.synchronizedList(new ArrayList<Node>());
+
+	/** The list of all projects. */
+	private List<Project> projectList = Collections.synchronizedList(new ArrayList<Project>());
 
 	//
 	// CONFIGURATION
@@ -163,9 +160,21 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	/** The class name of the look and feel. */
 	private String lookAndFeel;
 
+	/** X coordinate of the main window. */
+	private int mainWindowX = -1;
+
+	/** Y coordinate of the main window. */
+	private int mainWindowY = -1;
+
+	/** Width of the main window. */
+	private int mainWindowWidth = -1;
+
+	/** Height of the main window. */
+	private int mainWindowHeight = -1;
+
 	/**
 	 * Creates a new swing interface.
-	 * 
+	 *
 	 * @param core
 	 *            The core to operate on
 	 * @param configDirectory
@@ -202,6 +211,10 @@ public class SwingInterface implements CoreListener, LoggingListener {
 		initDialogs();
 		mainWindow = new MainWindow(this);
 		mainWindow.setAdvancedMode(advancedMode);
+		if ((mainWindowX != -1) && (mainWindowY != -1) && (mainWindowWidth != -1) && (mainWindowHeight != -1)) {
+			mainWindow.setLocation(mainWindowX, mainWindowY);
+			mainWindow.setSize(mainWindowWidth, mainWindowHeight);
+		}
 		logWindow = new LogWindow();
 	}
 
@@ -211,7 +224,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns the core that is controlled by the Swing interface.
-	 * 
+	 *
 	 * @return The core
 	 */
 	Core getCore() {
@@ -220,7 +233,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns the main window of the Swing interface.
-	 * 
+	 *
 	 * @return The main window
 	 */
 	MainWindow getMainWindow() {
@@ -229,7 +242,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns whether the advanced mode is activated.
-	 * 
+	 *
 	 * @return <code>true</code> if the advanced mode is activated,
 	 *         <code>false</code> if the simple mode is activated
 	 */
@@ -239,7 +252,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns the “configure” action.
-	 * 
+	 *
 	 * @return The “configure” action
 	 */
 	I18nAction getConfigureAction() {
@@ -248,7 +261,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns the “import config” action.
-	 * 
+	 *
 	 * @return The “import config” action
 	 */
 	I18nAction getImportConfigAction() {
@@ -257,7 +270,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns the “quit” action.
-	 * 
+	 *
 	 * @return The “quit” action
 	 */
 	I18nAction getQuitAction() {
@@ -265,53 +278,61 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	}
 
 	/**
-	 * Returns the “manage nodes” action.
-	 * 
-	 * @return The “manage nodes” action
+	 * Returns the “add node” action.
+	 *
+	 * @return The “add node” action
 	 */
-	I18nAction getManageNodesAction() {
-		return manageNodesAction;
+	I18nAction getAddNodeAction() {
+		return addNodeAction;
 	}
 
 	/**
-	 * Returns the “connect to node” action.
-	 * 
+	 * Returns the “connect to node” action for the given node.
+	 *
+	 * @param node
+	 *            The node go get the “connect” action for
 	 * @return The “connect to node” action
 	 */
-	I18nAction getNodeConnectAction() {
-		return nodeConnectAction;
+	I18nAction getNodeConnectAction(Node node) {
+		return nodeConnectActions.get(node);
 	}
 
 	/**
-	 * Returns all “connect node” actions.
-	 * 
-	 * @return All “connect node” actions
+	 * Returns the “disconnect from node” action for the given node.
+	 *
+	 * @param node
+	 *            The node go get the “disconnect” action for
+	 * @return The “disconnect from node” action
 	 */
-	List<Action> getNodeConnectActions() {
-		return nodeConnectActions;
+	I18nAction getNodeDisconnectAction(Node node) {
+		return nodeDisconnectActions.get(node);
 	}
 
 	/**
-	 * Returns the “disconnect from node” action.
-	 * 
-	 * @return The “disconnect from node” action
+	 * Returns the “edit node” action for the given node.
+	 *
+	 * @param node
+	 *            The node to edit
+	 * @return The “edit node” action
 	 */
-	I18nAction getNodeDisconnectAction() {
-		return nodeDisconnectAction;
+	I18nAction getNodeEditAction(Node node) {
+		return nodeEditActions.get(node);
 	}
 
 	/**
-	 * Returns all “disconnect node” actions.
-	 * 
-	 * @return All “disconnect node” action
+	 * Returns the “delete node” action for the given node.
+	 *
+	 * @param node
+	 *            The node to delete
+	 * @return The “delete node” action
 	 */
-	List<Action> getNodeDisconnectActions() {
-		return nodeDisconnectActions;
+	I18nAction getNodeDeleteAction(Node node) {
+		return nodeDeleteActions.get(node);
 	}
 
 	/**
 	 * Returns all language actions.
-	 * 
+	 *
 	 * @return All language actions
 	 */
 	List<I18nAction> getLanguageActions() {
@@ -320,7 +341,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns the “about” action.
-	 * 
+	 *
 	 * @return The “about” action
 	 */
 	I18nAction getHelpAboutAction() {
@@ -329,7 +350,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Returns the “add project” action.
-	 * 
+	 *
 	 * @return The “add project” action
 	 */
 	I18nAction getAddProjectAction() {
@@ -337,21 +358,63 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	}
 
 	/**
-	 * Returns the “clone project” action.
-	 * 
+	 * Returns the “insert project” action for the given project.
+	 *
+	 * @param project
+	 *            The project to get the “insert project” action for
+	 * @return The “insert project” action
+	 */
+	I18nAction getInsertProjectAction(Project project) {
+		return insertProjectActions.get(project);
+	}
+
+	/**
+	 * Returns the “clone project” action for the given project.
+	 *
+	 * @param project
+	 *            The project to get the “clone project” action for
 	 * @return The “clone project” action
 	 */
-	I18nAction getCloneProjectAction() {
-		return cloneProjectAction;
+	I18nAction getCloneProjectAction(Project project) {
+		return cloneProjectActions.get(project);
 	}
 
 	/**
-	 * Returns the “delete project” action.
-	 * 
+	 * Returns the “delete project” action for the given project.
+	 *
+	 * @param project
+	 *            The project to get the “delete project” action for
 	 * @return The “delete project” action
 	 */
-	I18nAction getDeleteProjectAction() {
-		return deleteProjectAction;
+	I18nAction getDeleteProjectAction(Project project) {
+		return deleteProjectActions.get(project);
+	}
+
+	/**
+	 * Returns all currently configured nodes.
+	 *
+	 * @return All configured nodes
+	 */
+	List<Node> getNodes() {
+		return nodeList;
+	}
+
+	/**
+	 * Returns a list of all projects.
+	 *
+	 * @return All projects
+	 */
+	List<Project> getProjects() {
+		return projectList;
+	}
+
+	/**
+	 * Returns the thread pool used for off-thread processes.
+	 *
+	 * @return The thread pool
+	 */
+	Executor getThreadPool() {
+		return threadPool;
 	}
 
 	//
@@ -406,6 +469,18 @@ public class SwingInterface implements CoreListener, LoggingListener {
 		if (configProperties.containsKey("language")) {
 			I18n.setLocale(new Locale(configProperties.getProperty("language")));
 		}
+		if (configProperties.containsKey("mainWindowX")) {
+			mainWindowX = Integer.valueOf(configProperties.getProperty("mainWindowX"));
+		}
+		if (configProperties.containsKey("mainWindowY")) {
+			mainWindowY = Integer.valueOf(configProperties.getProperty("mainWindowY"));
+		}
+		if (configProperties.containsKey("mainWindowWidth")) {
+			mainWindowWidth = Integer.valueOf(configProperties.getProperty("mainWindowWidth"));
+		}
+		if (configProperties.containsKey("mainWindowHeight")) {
+			mainWindowHeight = Integer.valueOf(configProperties.getProperty("mainWindowHeight"));
+		}
 	}
 
 	/**
@@ -437,6 +512,10 @@ public class SwingInterface implements CoreListener, LoggingListener {
 			configProperties.setProperty("lookAndFeel", lookAndFeel);
 		}
 		configProperties.setProperty("language", I18n.getLocale().getLanguage());
+		configProperties.setProperty("mainWindowX", String.valueOf(mainWindowX));
+		configProperties.setProperty("mainWindowY", String.valueOf(mainWindowY));
+		configProperties.setProperty("mainWindowWidth", String.valueOf(mainWindowWidth));
+		configProperties.setProperty("mainWindowHeight", String.valueOf(mainWindowHeight));
 		FileOutputStream configOutputStream = null;
 		try {
 			configOutputStream = new FileOutputStream(configFile);
@@ -482,46 +561,10 @@ public class SwingInterface implements CoreListener, LoggingListener {
 				quit();
 			}
 		};
-		manageNodesAction = new I18nAction("mainWindow.menu.node.item.manageNodes") {
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@SuppressWarnings("synthetic-access")
-			public void actionPerformed(ActionEvent actionEvent) {
-				manageNodes();
-			}
-		};
-		nodeConnectAction = new I18nAction("mainWindow.menu.node.item.connect", false) {
-
-			@SuppressWarnings("synthetic-access")
-			public void actionPerformed(ActionEvent actionEvent) {
-				List<Node> nodes = core.getNodes();
-				if (nodes.isEmpty()) {
-					return;
-				}
-				nodeConnect(nodes.get(0));
-			}
-
-		};
-		nodeDisconnectAction = new I18nAction("mainWindow.menu.node.item.disconnect", false) {
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@SuppressWarnings("synthetic-access")
-			public void actionPerformed(ActionEvent e) {
-				List<Node> nodes = core.getNodes();
-				if (nodes.isEmpty()) {
-					return;
-				}
-				nodeDisconnect(nodes.get(0));
-			}
-		};
-		rebuildNodeActions(core.getNodes());
 		List<Locale> availableLanguages = I18n.findAvailableLanguages();
-		for (final Locale locale: availableLanguages) {
-			I18nAction languageAction = new I18nAction("general.language." + locale.getLanguage()) {
+		for (final Locale locale : availableLanguages) {
+			String language = locale.getLanguage();
+			I18nAction languageAction = new I18nAction("general.language." + language, IconLoader.loadIcon("/flag-" + language + ".png")) {
 
 				@SuppressWarnings("synthetic-access")
 				public void actionPerformed(ActionEvent e) {
@@ -529,49 +572,39 @@ public class SwingInterface implements CoreListener, LoggingListener {
 				}
 
 			};
-			if (I18n.getLocale().getLanguage().equals(locale.getLanguage())) {
+			if (I18n.getLocale().getLanguage().equals(language)) {
 				languageAction.setEnabled(false);
 			}
 			languageActions.add(languageAction);
 		}
-		helpAboutAction = new I18nAction("mainWindow.menu.help.item.about") {
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@SuppressWarnings("synthetic-access")
-			public void actionPerformed(ActionEvent actionEvent) {
-				helpAbout();
-			}
-		};
-		addProjectAction = new I18nAction("mainWindow.button.addProject") {
+		addNodeAction = new I18nAction("mainWindow.menu.node.item.addNode", IconLoader.loadIcon("/node-new.png")) {
 
 			/**
 			 * {@inheritDoc}
 			 */
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
-				addProject();
+				addNode();
 			}
 		};
-		cloneProjectAction = new I18nAction("mainWindow.button.cloneProject") {
+		helpAboutAction = new I18nAction("mainWindow.menu.help.item.about") {
 
 			/**
 			 * {@inheritDoc}
 			 */
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
-				cloneProject();
+				helpAbout();
 			}
 		};
-		deleteProjectAction = new I18nAction("mainWindow.button.deleteProject") {
+		addProjectAction = new I18nAction("mainWindow.button.addProject") {
 
 			/**
 			 * {@inheritDoc}
 			 */
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
-				deleteProject();
+				addProject();
 			}
 		};
 	}
@@ -580,9 +613,9 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	 * Initializes all child dialogs.
 	 */
 	private void initDialogs() {
-		manageNodesDialog = new ManageNodesDialog(this);
 		aboutDialog = new AboutDialog(this);
 		configurationDialog = new ConfigurationDialog(this);
+		addNodeDialog = new AddNodeDialog(mainWindow);
 	}
 
 	//
@@ -624,91 +657,71 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	 * Quits jSite.
 	 */
 	private void quit() {
+		/* TODO - ask */
+		core.stop();
+		mainWindowX = mainWindow.getX();
+		mainWindowY = mainWindow.getY();
+		mainWindowWidth = mainWindow.getWidth();
+		mainWindowHeight = mainWindow.getHeight();
 		saveConfig();
 		System.exit(0);
 	}
 
 	/**
-	 * Rebuilds all node connect and disconnect actions.
-	 * 
-	 * @param nodes
-	 *            The list of nodes
+	 * Adds a node.
 	 */
-	private void rebuildNodeActions(List<Node> nodes) {
-		nodeConnectActions.clear();
-		nodeNodeConnectActions.clear();
-		nodeConnectActionNodes.clear();
-		nodeDisconnectActions.clear();
-		nodeNodeDisconnectActions.clear();
-		nodeDisconnectActionNodes.clear();
-		for (Node node: nodes) {
-			Action nodeConnectAction = new AbstractAction(node.getName()) {
+	private void addNode() {
+		addNodeDialog.setNodeName(I18n.get(nodeList.isEmpty() ? "general.defaultNode.name" : "general.newNode.name"));
+		addNodeDialog.setNodeHostname("localhost");
+		addNodeDialog.setNodePort(9481);
+		addNodeDialog.setVisible(true);
+		if (!addNodeDialog.wasCancelled()) {
+			Node newNode = new Node();
+			newNode.setName(addNodeDialog.getNodeName());
+			newNode.setHostname(addNodeDialog.getNodeHostname());
+			newNode.setPort(addNodeDialog.getNodePort());
+			try {
+				core.addNode(newNode);
+			} catch (UnknownHostException e) {
+				JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.error.hostnameUnresolvable.message"), I18n.get("mainWindow.error.hostnameUnresolvable.title"), JOptionPane.ERROR_MESSAGE);
+			}
+		}
+	}
 
-				/**
-				 * {@inheritDoc}
-				 */
-				@SuppressWarnings("synthetic-access")
-				public void actionPerformed(ActionEvent e) {
-					Node node = nodeConnectActionNodes.get(this);
-					nodeConnect(node);
-				}
-			};
-			nodeConnectActions.add(nodeConnectAction);
-			nodeConnectActionNodes.put(nodeConnectAction, node);
-			nodeNodeConnectActions.put(node, nodeConnectAction);
-			Action nodeDisconnectAction = new AbstractAction(node.getName()) {
-
-				/**
-				 * {@inheritDoc}
-				 */
-				@SuppressWarnings("synthetic-access")
-				public void actionPerformed(ActionEvent e) {
-					Node node = nodeDisconnectActionNodes.get(this);
-					nodeDisconnect(node);
-				}
-			};
-// nodeDisconnectActions.add(nodeDisconnectAction);
-			nodeDisconnectActionNodes.put(nodeDisconnectAction, node);
-			nodeNodeDisconnectActions.put(node, nodeDisconnectAction);
+	/**
+	 * Edits the given node.
+	 *
+	 * @param node
+	 *            The node to edit
+	 */
+	private void editNode(Node node) {
+		addNodeDialog.setNodeName(node.getName());
+		addNodeDialog.setNodeHostname(node.getHostname());
+		addNodeDialog.setNodePort(node.getPort());
+		addNodeDialog.setVisible(true);
+		if (!addNodeDialog.wasCancelled()) {
+			node.setName(addNodeDialog.getNodeName());
+			node.setHostname(addNodeDialog.getNodeHostname());
+			node.setPort(addNodeDialog.getNodePort());
 		}
 	}
 
 	/**
-	 * Pops up the “manage nodes” dialog.
+	 * Deletes the given node.
+	 *
+	 * @param node
+	 *            The node to delete
 	 */
-	private void manageNodes() {
-		if (advancedMode) {
-			manageNodesDialog.setNodeList(nodeList);
-			manageNodesDialog.setVisible(true);
-			nodeList = manageNodesDialog.getNodeList();
-			rebuildNodeActions(nodeList);
-			mainWindow.refreshNodeMenuItems();
-		} else {
-			if (nodeList.isEmpty()) {
-				Node newNode = new Node();
-				newNode.setName(I18n.get("general.defaultNode.name"));
-				newNode.setHostname("localhost");
-				newNode.setPort(9481);
-				nodeList.add(newNode);
-			}
-			Node firstNode = nodeList.get(0);
-			EditNodeDialog editNodeDialog = manageNodesDialog.getEditNodeDialog();
-			editNodeDialog.setNodeName(firstNode.getName());
-			editNodeDialog.setNodeHostname(firstNode.getHostname());
-			editNodeDialog.setNodePort(firstNode.getPort());
-			editNodeDialog.setVisible(true);
-			if (!editNodeDialog.wasCancelled()) {
-				firstNode.setName(editNodeDialog.getNodeName());
-				firstNode.setHostname(editNodeDialog.getNodeHostname());
-				firstNode.setPort(editNodeDialog.getNodePort());
-				/* TODO - give to core. */
-			}
+	private void deleteNode(Node node) {
+		int option = JOptionPane.showConfirmDialog(mainWindow, I18n.get("mainWindow.question.deleteNode.message", node.getName()), I18n.get("mainWindow.question.deleteNode.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+		if (option == JOptionPane.OK_OPTION) {
+			core.removeNode(node);
 		}
 	}
 
 	/**
 	 * Connects to the node.
-	 * 
+	 *
 	 * @param node
 	 *            The node to connect to
 	 */
@@ -728,7 +741,7 @@ public class SwingInterface implements CoreListener, LoggingListener {
 
 	/**
 	 * Disconnects from the node.
-	 * 
+	 *
 	 * @param node
 	 *            The node to disconnect from
 	 */
@@ -740,14 +753,14 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	/**
 	 * Changes the language of the interface. This method also disables the
 	 * action for the newly set language and enables all others.
-	 * 
+	 *
 	 * @param newLocale
 	 *            The new language
 	 * @param languageAction
 	 *            The action that triggered the change
 	 */
 	private void changeLanguage(Locale newLocale, I18nAction languageAction) {
-		for (I18nAction i18nAction: languageActions) {
+		for (I18nAction i18nAction : languageActions) {
 			i18nAction.setEnabled(i18nAction != languageAction);
 		}
 		I18n.setLocale(newLocale);
@@ -764,23 +777,62 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	 * Adds a project.
 	 */
 	private void addProject() {
-		Project project = new Project();
-		project.setName("New Project");
-		project.setDescription("");
+		try {
+			core.createProject();
+		} catch (JSiteException jse1) {
+			JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.error.notConnected.message"), I18n.get("mainWindow.error.notConnected.title"), JOptionPane.ERROR_MESSAGE);
+		} catch (IOException e) {
+			/* TODO - add i18n */
+			JOptionPane.showMessageDialog(mainWindow, I18n.get(""), I18n.get(""), JOptionPane.ERROR_MESSAGE);
+		}
+	}
+
+	/**
+	 * Inserts the given project.
+	 *
+	 * @param project
+	 *            The project to insert
+	 */
+	private void insertProject(Project project) {
+		Node targetNode = project.getNode();
+		if (targetNode == null) {
+			JComboBox nodeComboBox = new JComboBox();
+			for (Node node : nodeList) {
+				((DefaultComboBoxModel) nodeComboBox.getModel()).addElement(node.getName() + " (" + node.getHostname() + ":" + node.getPort() + ")");
+			}
+			int selectedOption = JOptionPane.showConfirmDialog(mainWindow, new Object[] { I18n.get("nodeSelectionDialog.selectNode.text"), nodeComboBox }, I18n.get("nodeSelectionDialog.noNodeSelected.text"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+			if (selectedOption == JOptionPane.CANCEL_OPTION) {
+				return;
+			}
+			int selectedNodeIndex = nodeComboBox.getSelectedIndex();
+			logger.log(Level.FINE, "selected node index: " + selectedNodeIndex);
+			targetNode = nodeList.get(selectedNodeIndex);
+		}
+		logger.log(Level.INFO, "Inserting project “" + project.getName() + "” to node “" + targetNode.getName() + "”...");
 	}
 
 	/**
 	 * Clones a project.
+	 *
+	 * @param project
+	 *            The project to clone
 	 */
-	private void cloneProject() {
-		/* TODO */
+	private void cloneProject(Project project) {
+		core.cloneProject(project);
 	}
 
 	/**
 	 * Deletes a project.
+	 *
+	 * @param project
+	 *            The project to delete
 	 */
-	private void deleteProject() {
-		/* TODO */
+	private void deleteProject(Project project) {
+		int choice = JOptionPane.showConfirmDialog(mainWindow, I18n.get("mainWindow.question.deleteProject.message", project.getName()), I18n.get("mainWindow.question.deleteProject.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+		if (choice == JOptionPane.NO_OPTION) {
+			return;
+		}
+		core.removeProject(project);
 	}
 
 	//
@@ -792,6 +844,9 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	 */
 	public void loadingProjectsDone(String directory) {
 		mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.projectLoadingDone"));
+		for (Project project : core.getProjects()) {
+			projectAdded(project, false);
+		}
 	}
 
 	/**
@@ -818,6 +873,70 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	public void projectAdded(Project project) {
+		project.setName(I18n.get("general.newProject.name"));
+		project.setDescription(I18n.get("general.newProject.description", new Date()));
+		projectAdded(project, true);
+	}
+
+	/**
+	 * @param project
+	 * @param switchToProject
+	 */
+	private void projectAdded(final Project project, boolean switchToProject) {
+		insertProjectActions.put(project, new I18nAction("mainWindow.button.insertProject") {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent actionEvent) {
+				insertProject(project);
+			}
+		});
+		cloneProjectActions.put(project, new I18nAction("mainWindow.button.cloneProject") {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent actionEvent) {
+				cloneProject(project);
+			}
+		});
+		deleteProjectActions.put(project, new I18nAction("mainWindow.button.deleteProject") {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent actionEvent) {
+				deleteProject(project);
+			}
+		});
+		projectList.add(project);
+		mainWindow.addProject(project, switchToProject);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void projectCloned(Project clonedProject, Project projectClone) {
+		projectAdded(projectClone, true);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void projectRemoved(Project project) {
+		mainWindow.removeProject(project);
+		cloneProjectActions.remove(project);
+		deleteProjectActions.remove(project);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
 	public void loadingNodesDone(String directory) {
 		mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.loadingNodesDone"));
 	}
@@ -847,8 +966,6 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	 * {@inheritDoc}
 	 */
 	public void coreLoaded() {
-		this.nodeList = core.getNodes();
-		manageNodesDialog.setNodeList(nodeList);
 		mainWindow.setVisible(true);
 		mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.coreLoaded"));
 	}
@@ -863,41 +980,143 @@ public class SwingInterface implements CoreListener, LoggingListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	public void nodeAdded(final Node node) {
+		logger.log(Level.INFO, "node added: " + node);
+		nodeList.add(node);
+		node.addPropertyChangeListener(this);
+		logger.log(Level.FINE, "nodeList.size(): " + nodeList.size());
+		nodeConnectActions.put(node, new I18nAction("mainWindow.menu.node.item.connect") {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent e) {
+				nodeConnect(node);
+			}
+		});
+		nodeDisconnectActions.put(node, new I18nAction("mainWindow.menu.node.item.disconnect") {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent e) {
+				nodeDisconnect(node);
+			}
+		});
+		nodeDisconnectActions.get(node).setEnabled(false);
+		nodeEditActions.put(node, new I18nAction("mainWindow.menu.node.item.edit") {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent actionEvent) {
+				editNode(node);
+			}
+		});
+		nodeDeleteActions.put(node, new I18nAction("mainWindow.menu.node.item.remove") {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent actionEvent) {
+				deleteNode(node);
+			}
+		});
+		mainWindow.addNode(node);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void nodeRemoved(Node node) {
+		logger.log(Level.INFO, "node removed: " + node);
+		nodeList.remove(node);
+		node.removePropertyChangeListener(this);
+		nodeConnectActions.remove(node);
+		nodeDisconnectActions.remove(node);
+		nodeEditActions.remove(node);
+		nodeDeleteActions.remove(node);
+		mainWindow.removeNode(node);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
 	public void nodeConnecting(Node node) {
-		Action nodeConnectAction = nodeNodeConnectActions.get(node);
-		nodeConnectActions.remove(nodeConnectAction);
+		nodeConnectActions.get(node).setEnabled(false);
+		nodeEditActions.get(node).setEnabled(false);
+		nodeDeleteActions.get(node).setEnabled(false);
 		mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.connectingToNode", node.getName(), node.getHostname(), node.getPort()));
-		mainWindow.refreshNodeMenuItems();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public void nodeConnected(Node node) {
-		Action nodeDisconnectAction = nodeNodeDisconnectActions.get(node);
-		nodeDisconnectActions.add(nodeDisconnectAction);
-		mainWindow.refreshNodeMenuItems();
+		nodeDisconnectActions.get(node).setEnabled(true);
+		mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.connectedToNode", node.getName(), node.getHostname(), node.getPort()));
+		mainWindow.setOnline(node);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public void nodeDisconnected(Node node, Throwable throwable) {
-		Action nodeConnectAction = nodeNodeConnectActions.get(node);
-		nodeConnectActions.add(nodeConnectAction);
-		Action nodeDisconnectAction = nodeNodeDisconnectActions.get(node);
-		nodeDisconnectActions.remove(nodeDisconnectAction);
-		mainWindow.refreshNodeMenuItems();
+	public void nodeConnectionFailed(Node node, Throwable cause) {
+		nodeConnectActions.get(node).setEnabled(true);
+		nodeEditActions.get(node).setEnabled(true);
+		nodeDeleteActions.get(node).setEnabled(true);
+		mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.connectionToNodeFailed", node.getName(), node.getHostname(), node.getPort(), (cause != null) ? cause.getMessage() : "no reason given"));
+		mainWindow.setError(node);
+		JOptionPane.showMessageDialog(mainWindow, I18n.get("mainWindow.error.nodeConnectionFailed.message", node.getName(), node.getHostname(), node.getPort(), (cause != null) ? cause.getMessage() : "no reason given"), I18n.get("mainWindow.error.nodeConnectionFailed.title"), JOptionPane.ERROR_MESSAGE);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public void requestAdded(Node node, Request request) {
-		logger.log(Level.INFO, "request added to node: " + request + ", " + node);
-		/* TODO - implement */
+	public void nodeDisconnected(Node node, Throwable throwable) {
+		nodeDisconnectActions.get(node).setEnabled(false);
+		nodeConnectActions.get(node).setEnabled(true);
+		nodeEditActions.get(node).setEnabled(true);
+		nodeDeleteActions.get(node).setEnabled(true);
+		mainWindow.setStatusBarText(I18n.get("mainWindow.statusBar.disconnectedFromNode", node.getName(), node.getHostname(), node.getPort()));
+		mainWindow.setOffline(node);
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.CoreListener#projectInsertStarted(net.pterodactylus.jsite.core.Project)
+	 */
+	public void projectInsertStarted(Project project) {
+		mainWindow.projectInsertStarted(project);
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.CoreListener#projectInsertProgressed(net.pterodactylus.jsite.core.Project,
+	 *      int, int, int, int, int, boolean)
+	 */
+	public void projectInsertProgressed(Project project, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
+		mainWindow.projectInsertProgressed(project, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.CoreListener#projectInsertGeneratedURI(net.pterodactylus.jsite.core.Project,
+	 *      java.lang.String)
+	 */
+	public void projectInsertGeneratedURI(Project project, String uri) {
+		mainWindow.projectInsertGeneratedURI(project);
 	}
-	
+
+	/**
+	 * @see net.pterodactylus.jsite.core.CoreListener#projectInsertFinished(net.pterodactylus.jsite.core.Project,
+	 *      boolean)
+	 */
+	public void projectInsertFinished(Project project, boolean success) {
+		mainWindow.projectInsertFinished(project, success);
+	}
+
 	//
 	// INTERFACE LoggingListener
 	//
@@ -909,4 +1128,15 @@ public class SwingInterface implements CoreListener, LoggingListener {
 		logWindow.logged(logRecord);
 	}
 
+	//
+	// INTERFACE PropertyChangeListener
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
+		/* do not react to anything (yet). */
+	}
+
 }