X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FManageNodesDialog.java;h=ea2b6c5cee9edcbb65e62908bb1644dd960ed4e0;hb=439bd54002fcdfa9f88d7f21236d4d8b3fadd6b0;hp=447618ce3cac053c86fc9bb62bf78cd236cc9777;hpb=b71f4f4aeb7440b88dd82a252cd296506427c440;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/gui/ManageNodesDialog.java b/src/net/pterodactylus/jsite/gui/ManageNodesDialog.java
index 447618c..ea2b6c5 100644
--- a/src/net/pterodactylus/jsite/gui/ManageNodesDialog.java
+++ b/src/net/pterodactylus/jsite/gui/ManageNodesDialog.java
@@ -43,12 +43,13 @@ import net.pterodactylus.jsite.core.Core;
 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.main.Version;
 import net.pterodactylus.util.swing.SwingUtils;
 
 /**
  * Dialog that lets the user manage her nodes.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  * @version $Id$
  */
@@ -86,7 +87,7 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 
 	/**
 	 * Creates a new node manager dialog.
-	 * 
+	 *
 	 * @param swingInterface
 	 *            The Swing interface
 	 */
@@ -106,8 +107,17 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 	//
 
 	/**
+	 * Expose the edit node dialog for the simple mode.
+	 *
+	 * @return The edit node dialog
+	 */
+	EditNodeDialog getEditNodeDialog() {
+		return editNodeDialog;
+	}
+
+	/**
 	 * Returns the list of nodes.
-	 * 
+	 *
 	 * @return The list of nodes
 	 */
 	public List<Node> getNodeList() {
@@ -116,12 +126,12 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 
 	/**
 	 * Sets the list of nodes.
-	 * 
+	 *
 	 * @param nodeList
 	 *            The list of nodes
 	 */
 	public void setNodeList(List<Node> nodeList) {
-		originalNodeList = nodeList;
+		originalNodeList = new ArrayList<Node>(nodeList);
 		nodeListModel.clear();
 		for (Node node: nodeList) {
 			nodeListModel.addNode(node);
@@ -237,10 +247,9 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 	 * Adds a new node via {@link #editNodeDialog}.
 	 */
 	private void addNode() {
-		editNodeDialog.setNodeName("New Node");
+		editNodeDialog.setNodeName(I18n.get("general.newNode.name"));
 		editNodeDialog.setNodeHostname("localhost");
 		editNodeDialog.setNodePort(9481);
-		editNodeDialog.setNodeOnSameMachine(true);
 		editNodeDialog.setVisible(true);
 		if (!editNodeDialog.wasCancelled()) {
 			Node newNode = new Node();
@@ -259,13 +268,11 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 		editNodeDialog.setNodeName(selectedNode.getName());
 		editNodeDialog.setNodeHostname(selectedNode.getHostname());
 		editNodeDialog.setNodePort(selectedNode.getPort());
-		editNodeDialog.setNodeOnSameMachine(selectedNode.isSameMachine());
 		editNodeDialog.setVisible(true);
 		if (!editNodeDialog.wasCancelled()) {
 			selectedNode.setName(editNodeDialog.getNodeName());
 			selectedNode.setHostname(editNodeDialog.getNodeHostname());
 			selectedNode.setPort(editNodeDialog.getNodePort());
-			selectedNode.setSameMachine(editNodeDialog.isNodeOnSameMachine());
 			nodeList.repaint();
 		}
 	}
@@ -292,7 +299,7 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 
 	/**
 	 * Checks whether the list of nodes is not empty.
-	 * 
+	 *
 	 * @return <code>true</code> if there is at least one node defined,
 	 *         <code>false</code> otherwise
 	 */
@@ -358,7 +365,7 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 
 	/**
 	 * List model for the {@link ManageNodesDialog#nodeList}. TODO
-	 * 
+	 *
 	 * @author David ‘Bombe’ Roden &lt;bombe@freenetproject.org&gt;
 	 * @version $Id$
 	 */
@@ -372,11 +379,12 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 		 * Creates a new node list model.
 		 */
 		public NodeListModel() {
+			/* do nothing. */
 		}
 
 		/**
 		 * Adds the given node to the list model.
-		 * 
+		 *
 		 * @see Collection#add(Object)
 		 * @param node
 		 *            The node to add
@@ -388,7 +396,7 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 
 		/**
 		 * Removes the given node from the list model.
-		 * 
+		 *
 		 * @see Collection#remove(Object)
 		 * @param node
 		 *            The node to remove
@@ -401,7 +409,7 @@ public class ManageNodesDialog extends JDialog implements ListSelectionListener,
 
 		/**
 		 * Removes all nodes from the list model.
-		 * 
+		 *
 		 * @see Collection#clear()
 		 */
 		public void clear() {