X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FEditNodeDialog.java;h=2e49055450c5797ce6cf4fabf2e04eb3a195fbd0;hb=ebd531bc775036dd66a7e20abebbcb480af35491;hp=73602fc4ba343a9c0876f05b5e71ffd853922109;hpb=b71f4f4aeb7440b88dd82a252cd296506427c440;p=jSite2.git
diff --git a/src/net/pterodactylus/jsite/gui/EditNodeDialog.java b/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
index 73602fc..2e49055 100644
--- a/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
+++ b/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
@@ -25,26 +25,26 @@ import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import javax.swing.BorderFactory;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JDialog;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.border.EtchedBorder;
+import net.pterodactylus.jsite.core.Verifier;
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.I18nLabel;
import net.pterodactylus.jsite.main.Version;
import net.pterodactylus.util.swing.SwingUtils;
/**
* Dialog that lets the user edit the properties of a node.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
* @version $Id$
*/
@@ -59,9 +59,6 @@ public class EditNodeDialog extends JDialog implements I18nable {
/** The FNP port number of the node. */
private int port;
- /** Whether the node is on the same machine. */
- private boolean sameMachine;
-
/** Action of the okay button. */
private I18nAction okayAction;
@@ -86,15 +83,12 @@ public class EditNodeDialog extends JDialog implements I18nable {
/** The port textfield. */
private JTextField portTextField;
- /** The same machine checkbox. */
- private JCheckBox sameMachineCheckBox;
-
/** Whether the dialog was cancelled. */
private boolean cancelled;
/**
* Creates a new node edit dialog with the given parent.
- *
+ *
* @param parentDialog
* The parent dialog of this dialog
*/
@@ -113,7 +107,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
/**
* Returns the user-given name of the node.
- *
+ *
* @return The user-given name of the node
*/
public String getNodeName() {
@@ -122,7 +116,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
/**
* Sets the user-given name of the node.
- *
+ *
* @param name
* The name of the node
*/
@@ -133,7 +127,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
/**
* Returns the hostname of the node.
- *
+ *
* @return The hostname of the node
*/
public String getNodeHostname() {
@@ -142,7 +136,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
/**
* Sets the hostname of the node.
- *
+ *
* @param hostname
* The hostname of the node
*/
@@ -153,7 +147,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
/**
* Returns the FCP port number of the node.
- *
+ *
* @return The FCP port number of the node
*/
public int getNodePort() {
@@ -162,7 +156,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
/**
* Sets the FCP port number of the node.
- *
+ *
* @param port
* The FCP port number of the node
*/
@@ -172,30 +166,8 @@ public class EditNodeDialog extends JDialog implements I18nable {
}
/**
- * Returns whether the node is on the same machine as jSite.
- *
- * @return true
if the node is on the same machine as jSite,
- * false
otherwise
- */
- public boolean isNodeOnSameMachine() {
- return sameMachine;
- }
-
- /**
- * Sets whether the node is on the same machine as jSite.
- *
- * @param sameMachine
- * true
if the node is on the same machine as
- * jSite, false
otherwise
- */
- public void setNodeOnSameMachine(boolean sameMachine) {
- this.sameMachine = sameMachine;
- sameMachineCheckBox.setSelected(sameMachine);
- }
-
- /**
* Returns whether the dialog was cancelled.
- *
+ *
* @return true
if the dialog was cancelled,
* false
if the user clicked âokayâ
*/
@@ -255,23 +227,17 @@ public class EditNodeDialog extends JDialog implements I18nable {
nameTextField = new JTextField();
contentPanel.add(nameLabel = new I18nLabel("editNodeDialog.label.name", nameTextField), new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
- contentPanel.add(nameTextField, new GridBagConstraints(1, 0, 1, 1, 1, 0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(0, 12, 0, 0), 0, 0));
+ contentPanel.add(nameTextField, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(0, 12, 0, 0), 0, 0));
hostnameTextField = new JTextField();
contentPanel.add(hostnameLabel = new I18nLabel("editNodeDialog.label.hostname", hostnameTextField), new GridBagConstraints(0, 1, 1, 1, 0, 0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(12, 0, 0, 0), 0, 0));
- contentPanel.add(hostnameTextField, new GridBagConstraints(1, 1, 1, 1, 1, 0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(12, 12, 0, 0), 0, 0));
+ contentPanel.add(hostnameTextField, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(12, 12, 0, 0), 0, 0));
portTextField = new JTextField();
contentPanel.add(portLabel = new I18nLabel("editNodeDialog.label.port", portTextField), new GridBagConstraints(0, 2, 1, 1, 0, 0, GridBagConstraints.LINE_END, GridBagConstraints.NONE, new Insets(12, 0, 0, 0), 0, 0));
- contentPanel.add(portTextField, new GridBagConstraints(1, 2, 1, 1, 1, 0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(12, 12, 0, 0), 0, 0));
+ contentPanel.add(portTextField, new GridBagConstraints(1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(12, 12, 0, 0), 0, 0));
- sameMachineCheckBox = new JCheckBox(new I18nAction("editNodeDialog.checkbox.sameMachine") {
-
- public void actionPerformed(ActionEvent e) {
- /* don't do anything. */
- }
- });
- contentPanel.add(sameMachineCheckBox, new GridBagConstraints(0, 3, 2, 1, 1, 1, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(12, 0, 0, 0), 0, 0));
+ contentPanel.add(new JPanel(), new GridBagConstraints(0, 3, 2, 1, 1.0, 1.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
}
//
@@ -279,65 +245,18 @@ public class EditNodeDialog extends JDialog implements I18nable {
//
/**
- * Checks the name textfield for valid input.
- *
- * @return true
if the name textfield seem okay,
- * false
if there is an error
- */
- private boolean verifyName() {
- return (nameTextField.getText().trim().length() != 0);
- }
-
- /**
- * Verifies the hostname textfield by resolving the given name.
- *
- * @return true
if the hostname is not empty and can be
- * resolved, false
otherwise
- */
- private boolean verifyHostname() {
- if (hostnameTextField.getText().trim().length() == 0) {
- return false;
- }
- try {
- InetAddress.getByName(hostnameTextField.getText().trim());
- return true;
- } catch (UnknownHostException uhe1) {
- return false;
- }
- }
-
- /**
- * Verifies that the port number is numeric and in the range from
- * 0
to 65535
.
- *
- * @return true
if the port number is okay,
- * false
otherwise
- */
- private boolean verifyPort() {
- try {
- int portNumber = Integer.valueOf(portTextField.getText().trim());
- if ((portNumber > 0) && (portNumber < 65536)) {
- return true;
- }
- } catch (NumberFormatException nfe1) {
- /* ignore. */
- }
- return false;
- }
-
- /**
* Confirms the node settings and closes the dialog.
*/
private void confirm() {
- if (!verifyName()) {
+ if (!Verifier.verifyNodeName(nameTextField.getText())) {
JOptionPane.showMessageDialog(this, I18n.get("editNodeDialog.error.name.message"), I18n.get("editNodeDialog.error.name.title"), JOptionPane.ERROR_MESSAGE);
return;
}
- if (!verifyHostname()) {
+ if (!Verifier.verifyHostname(hostnameTextField.getText())) {
JOptionPane.showMessageDialog(this, I18n.get("editNodeDialog.error.hostname.message"), I18n.get("editNodeDialog.error.hostname.title"), JOptionPane.ERROR_MESSAGE);
return;
}
- if (!verifyPort()) {
+ if (!Verifier.verifyPort(portTextField.getText())) {
JOptionPane.showMessageDialog(this, I18n.get("editNodeDialog.error.port.message"), I18n.get("editNodeDialog.error.port.title"), JOptionPane.ERROR_MESSAGE);
return;
}
@@ -349,7 +268,6 @@ public class EditNodeDialog extends JDialog implements I18nable {
/* should not occur, the value was checked! */
assert false: "port number is invalid though it was checked!";
}
- sameMachine = sameMachineCheckBox.isSelected();
cancelled = false;
setVisible(false);
}