From cb479767593be781b3295ca67979d6be375153e3 Mon Sep 17 00:00:00 2001
From: Sam Anthony <sam@samanthony.xyz>
Date: Mon, 2 Dec 2024 19:03:09 -0500
Subject: combine replica2.City and replica3.City

---
 src/main/java/derms/replica3/City.java      | 40 -----------------------------
 src/main/java/derms/replica3/MTLServer.java |  1 +
 src/main/java/derms/replica3/QUEServer.java |  2 ++
 src/main/java/derms/replica3/Replica3.java  |  5 +---
 src/main/java/derms/replica3/SHEServer.java |  2 ++
 5 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 src/main/java/derms/replica3/City.java

(limited to 'src/main/java/derms/replica3')

diff --git a/src/main/java/derms/replica3/City.java b/src/main/java/derms/replica3/City.java
deleted file mode 100644
index 89fd8ce..0000000
--- a/src/main/java/derms/replica3/City.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package derms.replica3;
-
-import java.io.Serializable;
-
-public class City implements Serializable {
-	static final int codeLen = 3;
-
-	private String code;
-
-	City(String code) throws IllegalArgumentException {
-		if (code.length() != codeLen)
-			throw new IllegalArgumentException("Invalid city: "+code+"; must be "+codeLen+" letters");
-		this.code = code;
-	}
-
-	public City() {
-		this("XXX");
-	}
-	public String getCode(){
-		return code;
-	}
-	@Override
-	public String toString() {
-		return code;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == null || this.getClass() != obj.getClass()) {
-			return false;
-		}
-		City other = (City) obj;
-		return this.code.equals(other.code);
-	}
-
-	@Override
-	public int hashCode() {
-		return code.hashCode();
-	}
-}
diff --git a/src/main/java/derms/replica3/MTLServer.java b/src/main/java/derms/replica3/MTLServer.java
index 9e7ea5c..c2e7e1a 100644
--- a/src/main/java/derms/replica3/MTLServer.java
+++ b/src/main/java/derms/replica3/MTLServer.java
@@ -11,6 +11,7 @@ import java.net.DatagramSocket;
 import java.net.SocketException;
 import java.nio.charset.StandardCharsets;
 
+import derms.City;
 import derms.replica3.Constants;
 import derms.replica3.Constants;
 
diff --git a/src/main/java/derms/replica3/QUEServer.java b/src/main/java/derms/replica3/QUEServer.java
index c03d329..b74e4ee 100644
--- a/src/main/java/derms/replica3/QUEServer.java
+++ b/src/main/java/derms/replica3/QUEServer.java
@@ -2,6 +2,8 @@ package derms.replica3;
 
 //import logger.Logger;
 
+import derms.City;
+
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
diff --git a/src/main/java/derms/replica3/Replica3.java b/src/main/java/derms/replica3/Replica3.java
index bf2597a..8863c9e 100644
--- a/src/main/java/derms/replica3/Replica3.java
+++ b/src/main/java/derms/replica3/Replica3.java
@@ -1,9 +1,6 @@
 package derms.replica3;
 
-import derms.Replica;
-import derms.ReplicaManager;
-import derms.Request;
-import derms.Response;
+import derms.*;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
diff --git a/src/main/java/derms/replica3/SHEServer.java b/src/main/java/derms/replica3/SHEServer.java
index 9d29a70..64f4da4 100644
--- a/src/main/java/derms/replica3/SHEServer.java
+++ b/src/main/java/derms/replica3/SHEServer.java
@@ -1,5 +1,7 @@
 package derms.replica3;
 
+import derms.City;
+
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
-- 
cgit v1.2.3