diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index df6ee01..ee3f314 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - java.src + vslab1.src labor1vs 1.0-SNAPSHOT diff --git a/src/main/java/java/src/FileReaderWriter/FileReaderWriter.java b/src/main/java/vslab1/src/FileReaderWriter/FileReaderWriter.java similarity index 91% rename from src/main/java/java/src/FileReaderWriter/FileReaderWriter.java rename to src/main/java/vslab1/src/FileReaderWriter/FileReaderWriter.java index 156012b..f7ca8d0 100644 --- a/src/main/java/java/src/FileReaderWriter/FileReaderWriter.java +++ b/src/main/java/vslab1/src/FileReaderWriter/FileReaderWriter.java @@ -1,7 +1,7 @@ -package java.src.FileReaderWriter; +package vslab1.src.FileReaderWriter; -import java.src.Peers.EOnlineState; -import java.src.Peers.Peer; +import vslab1.src.Peers.EOnlineState; +import vslab1.src.Peers.Peer; public class FileReaderWriter { diff --git a/src/main/java/java/src/Input/InputThread.java b/src/main/java/vslab1/src/Input/InputThread.java similarity index 87% rename from src/main/java/java/src/Input/InputThread.java rename to src/main/java/vslab1/src/Input/InputThread.java index 86fac46..f8cb995 100644 --- a/src/main/java/java/src/Input/InputThread.java +++ b/src/main/java/vslab1/src/Input/InputThread.java @@ -2,19 +2,20 @@ * @author Aaron Moser */ -package java.src.Input; +package vslab1.src.Input; -import java.src.Terminatable; -import java.src.Peers.Peer; -import java.src.Peers.PeerOrganizer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.PublishFileNameNotification; +import vslab1.src.Terminatable; +import vslab1.src.Peers.Peer; +import vslab1.src.Peers.PeerOrganizer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.PublishFileNameNotification; import java.util.Scanner; public class InputThread extends Thread implements Terminatable { private Terminatable receiverThread; private Terminatable senderThread; + private Terminatable requestExecuterThread; private SendingQueue sendingQueue; @@ -25,9 +26,10 @@ public class InputThread extends Thread implements Terminatable { private boolean receivedValidIP = false; private boolean receivedValidAndFreePort = false; - public InputThread(Terminatable senderThread, Terminatable receiverThread, SendingQueue sendingQueue) { + public InputThread(Terminatable senderThread, Terminatable receiverThread, Terminatable requestExecuterThread, SendingQueue sendingQueue) { this.senderThread = senderThread; this.receiverThread = receiverThread; + this.requestExecuterThread = requestExecuterThread; this.sendingQueue = sendingQueue; } @@ -80,6 +82,9 @@ public class InputThread extends Thread implements Terminatable { if (receiverThread != null) { receiverThread.terminate(); } + if (requestExecuterThread != null) { + requestExecuterThread.terminate(); + } this.terminate(); }break; case "ShowNodes": { @@ -123,5 +128,6 @@ public class InputThread extends Thread implements Terminatable { public void terminate() { inputThreadRunning = false; + this.interrupt(); } } diff --git a/src/main/java/java/src/Input/NetworkController.java b/src/main/java/vslab1/src/Input/NetworkController.java similarity index 98% rename from src/main/java/java/src/Input/NetworkController.java rename to src/main/java/vslab1/src/Input/NetworkController.java index 256cc63..cf948e5 100644 --- a/src/main/java/java/src/Input/NetworkController.java +++ b/src/main/java/vslab1/src/Input/NetworkController.java @@ -1,4 +1,4 @@ -package java.src.Input; +package vslab1.src.Input; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/src/main/java/java/src/Main.java b/src/main/java/vslab1/src/Main.java similarity index 68% rename from src/main/java/java/src/Main.java rename to src/main/java/vslab1/src/Main.java index a9039d2..516d836 100644 --- a/src/main/java/java/src/Main.java +++ b/src/main/java/vslab1/src/Main.java @@ -2,15 +2,16 @@ * @author Aaron Moser */ -package java.src; +package vslab1.src; import java.net.DatagramSocket; import java.net.SocketException; -import java.src.Input.InputThread; -import java.src.Receiving.ReceiverThread; -import java.src.Receiving.ReceivingQueue; -import java.src.Sending.SenderThread; -import java.src.Sending.SendingQueue; +import vslab1.src.Input.InputThread; +import vslab1.src.Receiving.ReceiverThread; +import vslab1.src.Receiving.ReceivingQueue; +import vslab1.src.Request.RequestExecuterThread; +import vslab1.src.Sending.SenderThread; +import vslab1.src.Sending.SendingQueue; public class Main { public static void main(String[] args) { @@ -20,14 +21,17 @@ public class Main { SendingQueue sendingQueue = new SendingQueue(); ReceivingQueue receivingQueue = new ReceivingQueue(); + RequestExecuterThread requestExecuterThread = new RequestExecuterThread(sendingQueue, receivingQueue); + requestExecuterThread.start(); ReceiverThread receiverThread = new ReceiverThread(datagramSocket, receivingQueue); receiverThread.start(); SenderThread senderThread = new SenderThread(datagramSocket, sendingQueue); senderThread.start(); - InputThread inputThread = new InputThread(senderThread, receiverThread, sendingQueue); + InputThread inputThread = new InputThread(senderThread, receiverThread, requestExecuterThread, sendingQueue); inputThread.start(); try { + requestExecuterThread.join(); receiverThread.join(); senderThread.join(); inputThread.join(); diff --git a/src/main/java/java/src/Peers/EOnlineState.java b/src/main/java/vslab1/src/Peers/EOnlineState.java similarity index 67% rename from src/main/java/java/src/Peers/EOnlineState.java rename to src/main/java/vslab1/src/Peers/EOnlineState.java index abf8b0f..bb2ee85 100644 --- a/src/main/java/java/src/Peers/EOnlineState.java +++ b/src/main/java/vslab1/src/Peers/EOnlineState.java @@ -1,4 +1,4 @@ -package java.src.Peers; +package vslab1.src.Peers; public enum EOnlineState { Online, diff --git a/src/main/java/java/src/Peers/Peer.java b/src/main/java/vslab1/src/Peers/Peer.java similarity index 91% rename from src/main/java/java/src/Peers/Peer.java rename to src/main/java/vslab1/src/Peers/Peer.java index ca8fa9b..86bd394 100644 --- a/src/main/java/java/src/Peers/Peer.java +++ b/src/main/java/vslab1/src/Peers/Peer.java @@ -2,7 +2,7 @@ * @author Aaron Moser */ -package java.src.Peers; +package vslab1.src.Peers; import java.util.List; diff --git a/src/main/java/java/src/Peers/PeerOrganizer.java b/src/main/java/vslab1/src/Peers/PeerOrganizer.java similarity index 97% rename from src/main/java/java/src/Peers/PeerOrganizer.java rename to src/main/java/vslab1/src/Peers/PeerOrganizer.java index 32a1975..0d8c7c2 100644 --- a/src/main/java/java/src/Peers/PeerOrganizer.java +++ b/src/main/java/vslab1/src/Peers/PeerOrganizer.java @@ -1,4 +1,4 @@ -package java.src.Peers; +package vslab1.src.Peers; import java.io.FileReader; import java.util.LinkedList; diff --git a/src/main/java/java/src/Receiving/ReceivedData.java b/src/main/java/vslab1/src/Receiving/ReceivedData.java similarity index 71% rename from src/main/java/java/src/Receiving/ReceivedData.java rename to src/main/java/vslab1/src/Receiving/ReceivedData.java index 0cbbcb2..0a34d26 100644 --- a/src/main/java/java/src/Receiving/ReceivedData.java +++ b/src/main/java/vslab1/src/Receiving/ReceivedData.java @@ -2,6 +2,6 @@ * @author Aaron Moser */ -package java.src.Receiving; +package vslab1.src.Receiving; public record ReceivedData(String data) {} diff --git a/src/main/java/java/src/Receiving/ReceiverThread.java b/src/main/java/vslab1/src/Receiving/ReceiverThread.java similarity index 95% rename from src/main/java/java/src/Receiving/ReceiverThread.java rename to src/main/java/vslab1/src/Receiving/ReceiverThread.java index 7fff8d8..0926e06 100644 --- a/src/main/java/java/src/Receiving/ReceiverThread.java +++ b/src/main/java/vslab1/src/Receiving/ReceiverThread.java @@ -2,12 +2,12 @@ * @author Aaron Moser */ -package java.src.Receiving; +package vslab1.src.Receiving; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; -import java.src.Terminatable; +import vslab1.src.Terminatable; /** * An instance of a ReceiverThread is handling incoming traffic by putting data into an internal @@ -48,6 +48,7 @@ public class ReceiverThread extends Thread implements Terminatable { */ public void terminate() { receiverThreadRunning = false; + this.interrupt(); } /** diff --git a/src/main/java/java/src/Receiving/ReceivingQueue.java b/src/main/java/vslab1/src/Receiving/ReceivingQueue.java similarity index 83% rename from src/main/java/java/src/Receiving/ReceivingQueue.java rename to src/main/java/vslab1/src/Receiving/ReceivingQueue.java index 3499272..0048f22 100644 --- a/src/main/java/java/src/Receiving/ReceivingQueue.java +++ b/src/main/java/vslab1/src/Receiving/ReceivingQueue.java @@ -2,7 +2,7 @@ * @author Aaron Moser */ -package java.src.Receiving; +package vslab1.src.Receiving; import java.util.concurrent.LinkedBlockingQueue; diff --git a/src/main/java/java/src/Request/Data/OnlineStateNotificationRequest.java b/src/main/java/vslab1/src/Request/Data/OnlineStateNotificationRequest.java similarity index 69% rename from src/main/java/java/src/Request/Data/OnlineStateNotificationRequest.java rename to src/main/java/vslab1/src/Request/Data/OnlineStateNotificationRequest.java index 3bc6018..7133c42 100644 --- a/src/main/java/java/src/Request/Data/OnlineStateNotificationRequest.java +++ b/src/main/java/vslab1/src/Request/Data/OnlineStateNotificationRequest.java @@ -1,10 +1,10 @@ -package java.src.Request.Data; +package vslab1.src.Request.Data; -import java.src.FileReaderWriter.FileReaderWriter; -import java.src.Peers.EOnlineState; -import java.src.Peers.Peer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.EDataType; +import vslab1.src.FileReaderWriter.FileReaderWriter; +import vslab1.src.Peers.EOnlineState; +import vslab1.src.Peers.Peer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.EDataType; public record OnlineStateNotificationRequest(Peer sender, Peer receiver) implements Requestable { diff --git a/src/main/java/java/src/Request/Data/OnlineStateRequestRequest.java b/src/main/java/vslab1/src/Request/Data/OnlineStateRequestRequest.java similarity index 74% rename from src/main/java/java/src/Request/Data/OnlineStateRequestRequest.java rename to src/main/java/vslab1/src/Request/Data/OnlineStateRequestRequest.java index 708fb3f..c1573f2 100644 --- a/src/main/java/java/src/Request/Data/OnlineStateRequestRequest.java +++ b/src/main/java/vslab1/src/Request/Data/OnlineStateRequestRequest.java @@ -1,9 +1,9 @@ -package java.src.Request.Data; +package vslab1.src.Request.Data; -import java.src.Peers.Peer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.EDataType; -import java.src.Sending.Data.OnlineStateNotification; +import vslab1.src.Peers.Peer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.EDataType; +import vslab1.src.Sending.Data.OnlineStateNotification; public record OnlineStateRequestRequest(Peer sender, Peer receiver) implements Requestable { diff --git a/src/main/java/java/src/Request/Data/PublishFileNameNotificationRequest.java b/src/main/java/vslab1/src/Request/Data/PublishFileNameNotificationRequest.java similarity index 92% rename from src/main/java/java/src/Request/Data/PublishFileNameNotificationRequest.java rename to src/main/java/vslab1/src/Request/Data/PublishFileNameNotificationRequest.java index f9ad6e3..43514e0 100644 --- a/src/main/java/java/src/Request/Data/PublishFileNameNotificationRequest.java +++ b/src/main/java/vslab1/src/Request/Data/PublishFileNameNotificationRequest.java @@ -1,10 +1,10 @@ -package java.src.Request.Data; +package vslab1.src.Request.Data; import java.io.FileReader; import java.io.FileWriter; -import java.src.Peers.Peer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.EDataType; +import vslab1.src.Peers.Peer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.EDataType; import org.json.JSONArray; import org.json.JSONObject; diff --git a/src/main/java/java/src/Request/Data/PullFileListRequestRequest.java b/src/main/java/vslab1/src/Request/Data/PullFileListRequestRequest.java similarity index 71% rename from src/main/java/java/src/Request/Data/PullFileListRequestRequest.java rename to src/main/java/vslab1/src/Request/Data/PullFileListRequestRequest.java index d3ac842..9fe99b1 100644 --- a/src/main/java/java/src/Request/Data/PullFileListRequestRequest.java +++ b/src/main/java/vslab1/src/Request/Data/PullFileListRequestRequest.java @@ -1,9 +1,9 @@ -package java.src.Request.Data; +package vslab1.src.Request.Data; -import java.src.Peers.Peer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.EDataType; -import java.src.Sending.Data.PullFileListRequest; +import vslab1.src.Peers.Peer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.EDataType; +import vslab1.src.Sending.Data.PullFileListRequest; public record PullFileListRequestRequest(Peer sender, Peer receiver) implements Requestable { diff --git a/src/main/java/java/src/Request/Data/PullFileRequestRequest.java b/src/main/java/vslab1/src/Request/Data/PullFileRequestRequest.java similarity index 87% rename from src/main/java/java/src/Request/Data/PullFileRequestRequest.java rename to src/main/java/vslab1/src/Request/Data/PullFileRequestRequest.java index 7ce87b4..4c27afe 100644 --- a/src/main/java/java/src/Request/Data/PullFileRequestRequest.java +++ b/src/main/java/vslab1/src/Request/Data/PullFileRequestRequest.java @@ -1,10 +1,10 @@ -package java.src.Request.Data; +package vslab1.src.Request.Data; import java.io.BufferedReader; import java.io.FileReader; -import java.src.Peers.Peer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.EDataType; +import vslab1.src.Peers.Peer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.EDataType; public record PullFileRequestRequest(Peer sender, Peer receiver, String fileName) implements Requestable { diff --git a/src/main/java/java/src/Request/Data/Requestable.java b/src/main/java/vslab1/src/Request/Data/Requestable.java similarity index 55% rename from src/main/java/java/src/Request/Data/Requestable.java rename to src/main/java/vslab1/src/Request/Data/Requestable.java index 19d8559..6dcdf9a 100644 --- a/src/main/java/java/src/Request/Data/Requestable.java +++ b/src/main/java/vslab1/src/Request/Data/Requestable.java @@ -1,8 +1,8 @@ -package java.src.Request.Data; +package vslab1.src.Request.Data; -import java.src.Peers.Peer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.EDataType; +import vslab1.src.Peers.Peer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.EDataType; public interface Requestable { public EDataType getType(); diff --git a/src/main/java/java/src/Request/Data/SendFileReplyRequest.java b/src/main/java/vslab1/src/Request/Data/SendFileReplyRequest.java similarity index 79% rename from src/main/java/java/src/Request/Data/SendFileReplyRequest.java rename to src/main/java/vslab1/src/Request/Data/SendFileReplyRequest.java index e4df05f..b56b178 100644 --- a/src/main/java/java/src/Request/Data/SendFileReplyRequest.java +++ b/src/main/java/vslab1/src/Request/Data/SendFileReplyRequest.java @@ -1,8 +1,8 @@ -package java.src.Request.Data; +package vslab1.src.Request.Data; -import java.src.Peers.Peer; -import java.src.Sending.SendingQueue; -import java.src.Sending.Data.EDataType; +import vslab1.src.Peers.Peer; +import vslab1.src.Sending.SendingQueue; +import vslab1.src.Sending.Data.EDataType; public record SendFileReplyRequest(Peer sender, Peer receiver, String fileName, String fileContent) implements Requestable { diff --git a/src/main/java/java/src/Request/RequestExecuterThread.java b/src/main/java/vslab1/src/Request/RequestExecuterThread.java similarity index 81% rename from src/main/java/java/src/Request/RequestExecuterThread.java rename to src/main/java/vslab1/src/Request/RequestExecuterThread.java index e547a6a..8148e4d 100644 --- a/src/main/java/java/src/Request/RequestExecuterThread.java +++ b/src/main/java/vslab1/src/Request/RequestExecuterThread.java @@ -2,23 +2,23 @@ * @author Aaron Moser */ -package java.src.Request; +package vslab1.src.Request; -import java.src.Terminatable; -import java.src.FileReaderWriter.FileReaderWriter; -import java.src.FileReaderWriter.FileReaderWriter.EUpdated; -import java.src.Peers.EOnlineState; -import java.src.Peers.Peer; -import java.src.Receiving.ReceivedData; -import java.src.Receiving.ReceivingQueue; -import java.src.Request.Data.OnlineStateNotificationRequest; -import java.src.Request.Data.OnlineStateRequestRequest; -import java.src.Request.Data.PublishFileNameNotificationRequest; -import java.src.Request.Data.PullFileListRequestRequest; -import java.src.Request.Data.PullFileRequestRequest; -import java.src.Request.Data.Requestable; -import java.src.Request.Data.SendFileReplyRequest; -import java.src.Sending.SendingQueue; +import vslab1.src.Terminatable; +import vslab1.src.FileReaderWriter.FileReaderWriter; +import vslab1.src.FileReaderWriter.FileReaderWriter.EUpdated; +import vslab1.src.Peers.EOnlineState; +import vslab1.src.Peers.Peer; +import vslab1.src.Receiving.ReceivedData; +import vslab1.src.Receiving.ReceivingQueue; +import vslab1.src.Request.Data.OnlineStateNotificationRequest; +import vslab1.src.Request.Data.OnlineStateRequestRequest; +import vslab1.src.Request.Data.PublishFileNameNotificationRequest; +import vslab1.src.Request.Data.PullFileListRequestRequest; +import vslab1.src.Request.Data.PullFileRequestRequest; +import vslab1.src.Request.Data.Requestable; +import vslab1.src.Request.Data.SendFileReplyRequest; +import vslab1.src.Sending.SendingQueue; import org.json.JSONObject; @@ -56,6 +56,7 @@ public class RequestExecuterThread extends Thread implements Terminatable { public void terminate() { requestExecuterThreadRunning = false; + this.interrupt(); } private static Requestable toRequestable(JSONObject receivedData) { diff --git a/src/main/java/java/src/Sending/Data/EDataType.java b/src/main/java/vslab1/src/Sending/Data/EDataType.java similarity index 85% rename from src/main/java/java/src/Sending/Data/EDataType.java rename to src/main/java/vslab1/src/Sending/Data/EDataType.java index 30c7623..cfa6056 100644 --- a/src/main/java/java/src/Sending/Data/EDataType.java +++ b/src/main/java/vslab1/src/Sending/Data/EDataType.java @@ -1,4 +1,4 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; public enum EDataType { OnlineStateRequest, diff --git a/src/main/java/java/src/Sending/Data/OnlineStateNotification.java b/src/main/java/vslab1/src/Sending/Data/OnlineStateNotification.java similarity index 90% rename from src/main/java/java/src/Sending/Data/OnlineStateNotification.java rename to src/main/java/vslab1/src/Sending/Data/OnlineStateNotification.java index da4d4d4..8fb93cd 100644 --- a/src/main/java/java/src/Sending/Data/OnlineStateNotification.java +++ b/src/main/java/vslab1/src/Sending/Data/OnlineStateNotification.java @@ -1,6 +1,6 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; public record OnlineStateNotification(Peer sender, Peer receiver) implements Sendable { diff --git a/src/main/java/java/src/Sending/Data/OnlineStateRequest.java b/src/main/java/vslab1/src/Sending/Data/OnlineStateRequest.java similarity index 90% rename from src/main/java/java/src/Sending/Data/OnlineStateRequest.java rename to src/main/java/vslab1/src/Sending/Data/OnlineStateRequest.java index adc91eb..669ce43 100644 --- a/src/main/java/java/src/Sending/Data/OnlineStateRequest.java +++ b/src/main/java/vslab1/src/Sending/Data/OnlineStateRequest.java @@ -1,6 +1,6 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; public record OnlineStateRequest(Peer sender, Peer receiver) implements Sendable { diff --git a/src/main/java/java/src/Sending/Data/OnlineStateResponse.java b/src/main/java/vslab1/src/Sending/Data/OnlineStateResponse.java similarity index 90% rename from src/main/java/java/src/Sending/Data/OnlineStateResponse.java rename to src/main/java/vslab1/src/Sending/Data/OnlineStateResponse.java index 177c0e2..a35e6c7 100644 --- a/src/main/java/java/src/Sending/Data/OnlineStateResponse.java +++ b/src/main/java/vslab1/src/Sending/Data/OnlineStateResponse.java @@ -1,6 +1,6 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; public record OnlineStateResponse(Peer sender, Peer receiver) implements Sendable { diff --git a/src/main/java/java/src/Sending/Data/PublishFileNameNotification.java b/src/main/java/vslab1/src/Sending/Data/PublishFileNameNotification.java similarity index 91% rename from src/main/java/java/src/Sending/Data/PublishFileNameNotification.java rename to src/main/java/vslab1/src/Sending/Data/PublishFileNameNotification.java index a6e7a80..be53f94 100644 --- a/src/main/java/java/src/Sending/Data/PublishFileNameNotification.java +++ b/src/main/java/vslab1/src/Sending/Data/PublishFileNameNotification.java @@ -1,6 +1,6 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; public record PublishFileNameNotification(Peer sender, Peer receiver, String fileName) implements Sendable { diff --git a/src/main/java/java/src/Sending/Data/PullFileListRequest.java b/src/main/java/vslab1/src/Sending/Data/PullFileListRequest.java similarity index 91% rename from src/main/java/java/src/Sending/Data/PullFileListRequest.java rename to src/main/java/vslab1/src/Sending/Data/PullFileListRequest.java index 993cf73..30edd9a 100644 --- a/src/main/java/java/src/Sending/Data/PullFileListRequest.java +++ b/src/main/java/vslab1/src/Sending/Data/PullFileListRequest.java @@ -1,6 +1,6 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; /** * Is never getting sent because szenario is, that all peers come online and stay online forever. diff --git a/src/main/java/java/src/Sending/Data/PullFileRequest.java b/src/main/java/vslab1/src/Sending/Data/PullFileRequest.java similarity index 90% rename from src/main/java/java/src/Sending/Data/PullFileRequest.java rename to src/main/java/vslab1/src/Sending/Data/PullFileRequest.java index 335ae15..1f84af0 100644 --- a/src/main/java/java/src/Sending/Data/PullFileRequest.java +++ b/src/main/java/vslab1/src/Sending/Data/PullFileRequest.java @@ -1,6 +1,6 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; public record PullFileRequest(Peer sender, Peer receiver, String fileName) implements Sendable { diff --git a/src/main/java/java/src/Sending/Data/SendFileReply.java b/src/main/java/vslab1/src/Sending/Data/SendFileReply.java similarity index 91% rename from src/main/java/java/src/Sending/Data/SendFileReply.java rename to src/main/java/vslab1/src/Sending/Data/SendFileReply.java index b92becd..c523a83 100644 --- a/src/main/java/java/src/Sending/Data/SendFileReply.java +++ b/src/main/java/vslab1/src/Sending/Data/SendFileReply.java @@ -1,6 +1,6 @@ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; public record SendFileReply(Peer sender, Peer receiver, String fileContent, String fileName) implements Sendable { diff --git a/src/main/java/java/src/Sending/Data/Sendable.java b/src/main/java/vslab1/src/Sending/Data/Sendable.java similarity index 84% rename from src/main/java/java/src/Sending/Data/Sendable.java rename to src/main/java/vslab1/src/Sending/Data/Sendable.java index 7291e01..932fa87 100644 --- a/src/main/java/java/src/Sending/Data/Sendable.java +++ b/src/main/java/vslab1/src/Sending/Data/Sendable.java @@ -2,9 +2,9 @@ * @author Aaron Moser */ -package java.src.Sending.Data; +package vslab1.src.Sending.Data; -import java.src.Peers.Peer; +import vslab1.src.Peers.Peer; /** * An instance of this class represents data to send to another peer, by also providing information diff --git a/src/main/java/java/src/Sending/SenderThread.java b/src/main/java/vslab1/src/Sending/SenderThread.java similarity index 93% rename from src/main/java/java/src/Sending/SenderThread.java rename to src/main/java/vslab1/src/Sending/SenderThread.java index ca5c3bb..f794544 100644 --- a/src/main/java/java/src/Sending/SenderThread.java +++ b/src/main/java/vslab1/src/Sending/SenderThread.java @@ -2,15 +2,15 @@ * @author Aaron Moser */ -package java.src.Sending; +package vslab1.src.Sending; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; import java.net.UnknownHostException; -import java.src.Terminatable; -import java.src.Sending.Data.Sendable; +import vslab1.src.Terminatable; +import vslab1.src.Sending.Data.Sendable; public class SenderThread extends Thread implements Terminatable { @@ -54,6 +54,7 @@ public class SenderThread extends Thread implements Terminatable { public void terminate() { senderThreadRunning = false; + this.interrupt(); } } diff --git a/src/main/java/java/src/Sending/SendingQueue.java b/src/main/java/vslab1/src/Sending/SendingQueue.java similarity index 68% rename from src/main/java/java/src/Sending/SendingQueue.java rename to src/main/java/vslab1/src/Sending/SendingQueue.java index 22c7be6..3ebd0cd 100644 --- a/src/main/java/java/src/Sending/SendingQueue.java +++ b/src/main/java/vslab1/src/Sending/SendingQueue.java @@ -2,9 +2,9 @@ * @author Aaron Moser */ -package java.src.Sending; +package vslab1.src.Sending; -import java.src.Sending.Data.Sendable; +import vslab1.src.Sending.Data.Sendable; import java.util.concurrent.LinkedBlockingQueue; public class SendingQueue extends LinkedBlockingQueue {} diff --git a/src/main/java/java/src/Sending/TimeoutHandler.java b/src/main/java/vslab1/src/Sending/TimeoutHandler.java similarity index 57% rename from src/main/java/java/src/Sending/TimeoutHandler.java rename to src/main/java/vslab1/src/Sending/TimeoutHandler.java index 8fb7021..19ecf26 100644 --- a/src/main/java/java/src/Sending/TimeoutHandler.java +++ b/src/main/java/vslab1/src/Sending/TimeoutHandler.java @@ -1,4 +1,4 @@ -package java.src.Sending; +package vslab1.src.Sending; public class TimeoutHandler { diff --git a/src/main/java/java/src/Terminatable.java b/src/main/java/vslab1/src/Terminatable.java similarity index 82% rename from src/main/java/java/src/Terminatable.java rename to src/main/java/vslab1/src/Terminatable.java index 06b89e5..874fa00 100644 --- a/src/main/java/java/src/Terminatable.java +++ b/src/main/java/vslab1/src/Terminatable.java @@ -2,7 +2,7 @@ * @author Aaron Moser */ -package java.src; +package vslab1.src; public interface Terminatable { public void terminate();