clean imports

13 files changed, 21 insertions, 52 deletions

diff --git a/src/main/java/derms/replica/replica1/AnnounceListener.java b/src/main/java/derms/replica/replica1/AnnounceListener.java
index bd58884..9b5980d 100644
--- a/src/main/java/derms/replica/replica1/AnnounceListener.java
+++ b/src/main/java/derms/replica/replica1/AnnounceListener.java
@@ -3,11 +3,7 @@ package derms.replica.replica1;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.MulticastSocket;
-import java.net.NetworkInterface;
+import java.net.*;
 import java.util.logging.Logger;
 
 public class AnnounceListener implements Runnable {
diff --git a/src/main/java/derms/replica/replica1/Announcer.java b/src/main/java/derms/replica/replica1/Announcer.java
index e9dedc4..93bbe24 100644
--- a/src/main/java/derms/replica/replica1/Announcer.java
+++ b/src/main/java/derms/replica/replica1/Announcer.java
@@ -1,11 +1,7 @@
 package derms.replica.replica1;
 
 import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.NetworkInterface;
-import java.net.SocketAddress;
+import java.net.*;
 import java.util.logging.Logger;
 
 public class Announcer implements Runnable {
diff --git a/src/main/java/derms/replica/replica1/CoordinatorServer.java b/src/main/java/derms/replica/replica1/CoordinatorServer.java
index 0ff58de..bdcf242 100644
--- a/src/main/java/derms/replica/replica1/CoordinatorServer.java
+++ b/src/main/java/derms/replica/replica1/CoordinatorServer.java
@@ -5,8 +5,8 @@ import java.net.InetAddress;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
diff --git a/src/main/java/derms/replica/replica1/FindResource.java b/src/main/java/derms/replica/replica1/FindResource.java
index 7104c4c..c9a0552 100644
--- a/src/main/java/derms/replica/replica1/FindResource.java
+++ b/src/main/java/derms/replica/replica1/FindResource.java
@@ -2,15 +2,11 @@ package derms.replica.replica1;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
+import java.net.*;
 import java.util.Collection;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
 public class FindResource {
diff --git a/src/main/java/derms/replica/replica1/Hosts.java b/src/main/java/derms/replica/replica1/Hosts.java
index fed377e..e27413d 100644
--- a/src/main/java/derms/replica/replica1/Hosts.java
+++ b/src/main/java/derms/replica/replica1/Hosts.java
@@ -3,7 +3,6 @@ package derms.replica.replica1;
 import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.NoSuchElementException;
 
 public class Hosts {
     private static Map<City, String> hosts = null;
diff --git a/src/main/java/derms/replica/replica1/ObjectPacket.java b/src/main/java/derms/replica/replica1/ObjectPacket.java
index 28010c0..9d7de45 100644
--- a/src/main/java/derms/replica/replica1/ObjectPacket.java
+++ b/src/main/java/derms/replica/replica1/ObjectPacket.java
@@ -1,11 +1,6 @@
 package derms.replica.replica1;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
+import java.io.*;
 import java.net.DatagramPacket;
 import java.net.SocketAddress;
 
diff --git a/src/main/java/derms/replica/replica1/RequestResource.java b/src/main/java/derms/replica/replica1/RequestResource.java
index f7fa4ab..f7c4cbd 100644
--- a/src/main/java/derms/replica/replica1/RequestResource.java
+++ b/src/main/java/derms/replica/replica1/RequestResource.java
@@ -2,15 +2,11 @@ package derms.replica.replica1;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.concurrent.Executors;
+import java.net.*;
+import java.util.NoSuchElementException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Logger;
-import java.util.NoSuchElementException;
 
 public class RequestResource {
 	public static final int port = 5557;
diff --git a/src/main/java/derms/replica/replica1/Resources.java b/src/main/java/derms/replica/replica1/Resources.java
index 0eb8bf2..a6a8b3a 100644
--- a/src/main/java/derms/replica/replica1/Resources.java
+++ b/src/main/java/derms/replica/replica1/Resources.java
@@ -1,10 +1,10 @@
 package derms.replica.replica1;
 
 import java.util.ArrayList;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class Resources {
 	private Map<ResourceName, Map<ResourceID, Resource>> resources;
diff --git a/src/main/java/derms/replica/replica1/ResponderServer.java b/src/main/java/derms/replica/replica1/ResponderServer.java
index e8000b2..2a6b480 100644
--- a/src/main/java/derms/replica/replica1/ResponderServer.java
+++ b/src/main/java/derms/replica/replica1/ResponderServer.java
@@ -4,12 +4,12 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.time.Duration;
 import java.util.Collection;
+import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
-import java.util.NoSuchElementException;
 
 public class ResponderServer {
 	public static final Duration timeout = Duration.ofSeconds(5);
diff --git a/src/main/java/derms/replica/replica1/ReturnResource.java b/src/main/java/derms/replica/replica1/ReturnResource.java
index a157631..e28815f 100644
--- a/src/main/java/derms/replica/replica1/ReturnResource.java
+++ b/src/main/java/derms/replica/replica1/ReturnResource.java
@@ -2,15 +2,11 @@ package derms.replica.replica1;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.concurrent.Executors;
+import java.net.*;
+import java.util.NoSuchElementException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Logger;
-import java.util.NoSuchElementException;
 
 public class ReturnResource {
 	public static final int port = 5559;
diff --git a/src/main/java/derms/replica/replica1/Servers.java b/src/main/java/derms/replica/replica1/Servers.java
index dc084d7..ed1255a 100644
--- a/src/main/java/derms/replica/replica1/Servers.java
+++ b/src/main/java/derms/replica/replica1/Servers.java
@@ -2,8 +2,8 @@ package derms.replica.replica1;
 
 import java.net.InetAddress;
 import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class Servers {
 	private Map<City, InetAddress> servers = new ConcurrentHashMap<City, InetAddress>();
diff --git a/src/main/java/derms/replica/replica1/StationServer.java b/src/main/java/derms/replica/replica1/StationServer.java
index cdb9cc1..6bfc7c2 100644
--- a/src/main/java/derms/replica/replica1/StationServer.java
+++ b/src/main/java/derms/replica/replica1/StationServer.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
 public class StationServer implements Runnable {
diff --git a/src/main/java/derms/replica/replica1/SwapResource.java b/src/main/java/derms/replica/replica1/SwapResource.java
index 34d5b66..5c6502c 100644
--- a/src/main/java/derms/replica/replica1/SwapResource.java
+++ b/src/main/java/derms/replica/replica1/SwapResource.java
@@ -2,16 +2,11 @@ package derms.replica.replica1;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.UnknownHostException;
-import java.util.concurrent.Executors;
+import java.net.*;
+import java.util.NoSuchElementException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Logger;
-import java.util.NoSuchElementException;
 
 public class SwapResource {
 	public static final int port = 5560;