remove Id keyword

[jSite2.git] / src / net / pterodactylus / jsite / gui / EditNodeDialog.java

diff --git a/src/net/pterodactylus/jsite/gui/EditNodeDialog.java b/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
index 260466e..5eecc98 100644 (file)
--- a/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
+++ b/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
@@ -25,17 +25,17 @@ 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.JDialog;
+import javax.swing.JFrame;
 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;
@@ -45,9 +45,8 @@ 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$
  */
 public class EditNodeDialog extends JDialog implements I18nable {
 
@@ -89,15 +88,16 @@ public class EditNodeDialog extends JDialog implements I18nable {
 
        /**
         * Creates a new node edit dialog with the given parent.
-        *
-        * @param parentDialog
-        *            The parent dialog of this dialog
+        * 
+        * @param parentFrame
+        *            The parent frame of this dialog
         */
-       public EditNodeDialog(JDialog parentDialog) {
-               super(parentDialog, I18n.get("editNodeDialog.title") + " – jSite " + Version.getVersion(), true);
+       public EditNodeDialog(JFrame parentFrame) {
+               super(parentFrame, I18n.get("editNodeDialog.title") + " – jSite " + Version.getVersion(), true);
                initActions();
                initComponents();
                pack();
+               setSize(getWidth() * 2, getHeight());
                I18n.registerI18nable(this);
                SwingUtils.center(this);
        }
@@ -108,7 +108,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() {
@@ -117,7 +117,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
 
        /**
         * Sets the user-given name of the node.
-        *
+        * 
         * @param name
         *            The name of the node
         */
@@ -128,7 +128,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
 
        /**
         * Returns the hostname of the node.
-        *
+        * 
         * @return The hostname of the node
         */
        public String getNodeHostname() {
@@ -137,7 +137,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
 
        /**
         * Sets the hostname of the node.
-        *
+        * 
         * @param hostname
         *            The hostname of the node
         */
@@ -148,7 +148,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() {
@@ -157,7 +157,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
         */
@@ -168,7 +168,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
 
        /**
         * Returns whether the dialog was cancelled.
-        *
+        * 
         * @return <code>true</code> if the dialog was cancelled,
         *         <code>false</code> if the user clicked “okay”
         */
@@ -246,65 +246,18 @@ public class EditNodeDialog extends JDialog implements I18nable {
        //
 
        /**
-        * Checks the name textfield for valid input.
-        *
-        * @return <code>true</code> if the name textfield seem okay,
-        *         <code>false</code> if there is an error
-        */
-       private boolean verifyName() {
-               return (nameTextField.getText().trim().length() != 0);
-       }
-
-       /**
-        * Verifies the hostname textfield by resolving the given name.
-        *
-        * @return <code>true</code> if the hostname is not empty and can be
-        *         resolved, <code>false</code> 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
-        * <code>0</code> to <code>65535</code>.
-        *
-        * @return <code>true</code> if the port number is okay,
-        *         <code>false</code> 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;
                }