summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar 2xsaiko2020-06-04 10:10:53 +0200
committerGravatar 2xsaiko2020-06-04 10:10:53 +0200
commita7163d46a6414c38c3eb4ba1e6783b3c158312db (patch)
tree564f1b78819c68c64ae14b09b85c6a120c3170fb
parentUse StandardValidation.notBlank instead of manually checking field text (diff)
downloadenigma-fork-a7163d46a6414c38c3eb4ba1e6783b3c158312db.tar.gz
enigma-fork-a7163d46a6414c38c3eb4ba1e6783b3c158312db.tar.xz
enigma-fork-a7163d46a6414c38c3eb4ba1e6783b3c158312db.zip
Move ServerAddress to enigma-server
-rw-r--r--enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java (renamed from enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java)2
-rw-r--r--enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java (renamed from enigma/src/test/java/cuchaz/enigma/ServerAddressTest.java)3
-rw-r--r--enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java2
3 files changed, 3 insertions, 4 deletions
diff --git a/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java b/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java
index 021d9a1..45e0750 100644
--- a/enigma/src/main/java/cuchaz/enigma/utils/ServerAddress.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/ServerAddress.java
@@ -1,4 +1,4 @@
1package cuchaz.enigma.utils; 1package cuchaz.enigma.network;
2 2
3import java.util.Objects; 3import java.util.Objects;
4 4
diff --git a/enigma/src/test/java/cuchaz/enigma/ServerAddressTest.java b/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java
index fdeb273..3765f7a 100644
--- a/enigma/src/test/java/cuchaz/enigma/ServerAddressTest.java
+++ b/enigma-server/src/test/java/cuchaz/enigma/network/ServerAddressTest.java
@@ -1,6 +1,5 @@
1package cuchaz.enigma; 1package cuchaz.enigma.network;
2 2
3import cuchaz.enigma.utils.ServerAddress;
4import org.junit.Test; 3import org.junit.Test;
5 4
6import static org.junit.Assert.assertEquals; 5import static org.junit.Assert.assertEquals;
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
index db1ceb1..f23007a 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
@@ -13,8 +13,8 @@ import javax.swing.JTextField;
13import cuchaz.enigma.gui.elements.ValidatableTextField; 13import cuchaz.enigma.gui.elements.ValidatableTextField;
14import cuchaz.enigma.gui.util.ScaleUtil; 14import cuchaz.enigma.gui.util.ScaleUtil;
15import cuchaz.enigma.network.EnigmaServer; 15import cuchaz.enigma.network.EnigmaServer;
16import cuchaz.enigma.network.ServerAddress;
16import cuchaz.enigma.utils.Pair; 17import cuchaz.enigma.utils.Pair;
17import cuchaz.enigma.utils.ServerAddress;
18import cuchaz.enigma.utils.validation.Message; 18import cuchaz.enigma.utils.validation.Message;
19import cuchaz.enigma.utils.validation.StandardValidation; 19import cuchaz.enigma.utils.validation.StandardValidation;
20 20