X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FEditNodeDialog.java;h=0fc21ce7243e0da5e3bc9b8565acd5a11cb49c9a;hb=e99f6d1dafdf8733125537e8ab36d0fedc325630;hp=3f0694de9a73593972f4ce3ebde01268968b3245;hpb=cf6712386e8d0dbd16bd13e4f11430ebefe04b35;p=jSite2.git
diff --git a/src/net/pterodactylus/jsite/gui/EditNodeDialog.java b/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
index 3f0694d..0fc21ce 100644
--- a/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
+++ b/src/net/pterodactylus/jsite/gui/EditNodeDialog.java
@@ -25,18 +25,16 @@ 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;
@@ -61,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;
@@ -88,12 +83,6 @@ public class EditNodeDialog extends JDialog implements I18nable {
/** The port textfield. */
private JTextField portTextField;
- /** The same machine checkbox. */
- private JCheckBox sameMachineCheckBox;
-
- /** The same machine action. */
- private I18nAction sameMachineAction;
-
/** Whether the dialog was cancelled. */
private boolean cancelled;
@@ -108,6 +97,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
initActions();
initComponents();
pack();
+ setSize(getWidth() * 2, getHeight());
I18n.registerI18nable(this);
SwingUtils.center(this);
}
@@ -177,28 +167,6 @@ 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,
@@ -236,12 +204,6 @@ public class EditNodeDialog extends JDialog implements I18nable {
cancel();
}
};
- sameMachineAction = new I18nAction("editNodeDialog.checkbox.sameMachine") {
-
- public void actionPerformed(ActionEvent e) {
- /* don't do anything. */
- }
- };
}
/**
@@ -276,10 +238,7 @@ public class EditNodeDialog extends JDialog implements I18nable {
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, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(12, 12, 0, 0), 0, 0));
- sameMachineCheckBox = new JCheckBox(sameMachineAction);
- contentPanel.add(sameMachineCheckBox, new GridBagConstraints(0, 3, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(12, 0, 0, 0), 0, 0));
-
- contentPanel.add(new JPanel(), new GridBagConstraints(0, 4, 2, 1, 1.0, 1.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(0, 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));
}
//
@@ -287,65 +246,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;
}
@@ -357,7 +269,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);
}
@@ -383,7 +294,6 @@ public class EditNodeDialog extends JDialog implements I18nable {
nameLabel.updateI18n();
hostnameLabel.updateI18n();
portLabel.updateI18n();
- sameMachineAction.updateI18n();
setTitle(I18n.get("editNodeDialog.title") + " â jSite " + Version.getVersion());
SwingUtils.repackCentered(this);
}