From a733a21ec87c92c498ab8a2476083a0761fd67f4 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Thu, 19 Aug 2021 09:18:53 -0700
Subject: [PATCH] move into package, improve javadoc removed duplicate classes
---
.../{ => Allen}/AllenTcpExample3Client.java | 2 +-
.../{ => Allen}/AllenTcpExample3Server.java | 2 +-
.../homework2/FrankClient.java | 99 -------------------
.../homework2/FrankServer.java | 90 -----------------
.../homework2/FrankTcpExample3Client.java | 96 ------------------
.../homework2/FrankTcpExample3Server.java | 90 -----------------
.../homework2/HittnerDTcpExample3Client.java | 2 +-
7 files changed, 3 insertions(+), 378 deletions(-)
rename assignments/src/MV3500Cohort2021JulySeptember/homework2/{ => Allen}/AllenTcpExample3Client.java (98%)
rename assignments/src/MV3500Cohort2021JulySeptember/homework2/{ => Allen}/AllenTcpExample3Server.java (98%)
delete mode 100644 assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankClient.java
delete mode 100644 assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankServer.java
delete mode 100644 assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Client.java
delete mode 100644 assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Server.java
diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework2/AllenTcpExample3Client.java b/assignments/src/MV3500Cohort2021JulySeptember/homework2/Allen/AllenTcpExample3Client.java
similarity index 98%
rename from assignments/src/MV3500Cohort2021JulySeptember/homework2/AllenTcpExample3Client.java
rename to assignments/src/MV3500Cohort2021JulySeptember/homework2/Allen/AllenTcpExample3Client.java
index 2184a1be39..bc3278ae27 100644
--- a/assignments/src/MV3500Cohort2021JulySeptember/homework2/AllenTcpExample3Client.java
+++ b/assignments/src/MV3500Cohort2021JulySeptember/homework2/Allen/AllenTcpExample3Client.java
@@ -1,4 +1,4 @@
-package MV3500Cohort2021JulySeptember.homework2;
+package MV3500Cohort2021JulySeptember.homework2.Allen;
import java.io.*;
import java.net.*;
diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework2/AllenTcpExample3Server.java b/assignments/src/MV3500Cohort2021JulySeptember/homework2/Allen/AllenTcpExample3Server.java
similarity index 98%
rename from assignments/src/MV3500Cohort2021JulySeptember/homework2/AllenTcpExample3Server.java
rename to assignments/src/MV3500Cohort2021JulySeptember/homework2/Allen/AllenTcpExample3Server.java
index 3f4344fe53..ab3fbee545 100644
--- a/assignments/src/MV3500Cohort2021JulySeptember/homework2/AllenTcpExample3Server.java
+++ b/assignments/src/MV3500Cohort2021JulySeptember/homework2/Allen/AllenTcpExample3Server.java
@@ -1,4 +1,4 @@
-package MV3500Cohort2021JulySeptember.homework2;
+package MV3500Cohort2021JulySeptember.homework2.Allen;
import java.io.*;
import java.net.*;
diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankClient.java b/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankClient.java
deleted file mode 100644
index 7a47fc9139..0000000000
--- a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankClient.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package MV3500Cohort2021JulySeptember.homework2;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.Socket;
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-/**
- *
- * @author justi
- */
-public class FrankClient {
-
- /**
- */
- public final static String LOCALHOST = "0:0:0:0:0:0:0:1";
-
- /**
- * Program invocation, execution starts here
- *
- * @param args command-line arguments
- * @throws java.lang.InterruptedException user cancels execution
- */
- public static void main(String[] args) throws InterruptedException {
-
- // Local variables/fields
- Socket socket = null;
- InputStream is;
- Reader isr;
- BufferedReader br;
- String serverMessage;
- int clientLoopCount = 0;
-
- try {
- while (true) {
- clientLoopCount++; // increment at beginning of loop for reliability
- System.out.println( "creating socket...");
-
- // We request an IP to connect to ("localhost") and
- // port number at that IP (2317). This establishes
- // a connection to that IP in the form of a Socket
- // object; the server uses a ServerSocket to wait for
- // connections.
- socket = new Socket(LOCALHOST, 2318); // locohost?
-
- // Now hook everything up (i.e. set up the streams), Java style:
- is = socket.getInputStream();
- isr = new InputStreamReader(is);
- br = new BufferedReader(isr);
-
- // Read a single line written by the server. We'd
- // do things a bit differently if there were many lines to be read
- // from the server instead of one only.
- serverMessage = br.readLine();
- System.out.println("*********************************");
-
- System.out.print( clientLoopCount + ": ");
- System.out.println("Hola!");
- System.out.println("The message the server sent was: '" + serverMessage + "'");
- int count = 0;
- System.out.println("test");
- count++;
-// socket gets closed, either automatically/silently by this code (or possibly by the server)
- if (serverMessage.equals("this is good bye message from Franks server")) { //if client recieved termanation message stop client
- break;
- }
- Thread.sleep(1000); // turned it down to 1 second
-
- } // end while(true) // infinite loops are dangerous, be sure to kill this process!
- } catch (IOException e) {
- System.err.println("Problem with " + FrankClient.class.getName() + " networking:"); // describe what is happening
- System.err.println("Error: " + e);
-
- // Provide more helpful information to user if exception occurs due to running twice at one time
- if (e instanceof java.net.BindException) {
- System.err.println("*** Be sure to stop any other running instances of programs using this port!");
- }
- } finally // occurs after any other activity when shutting down
- {
- try {
- if (socket != null) {
- socket.close();
- }
- } catch (IOException e) {
- }
-
- // program exit: tell somebody about that happening. Likely cause: server drops connection.
- System.out.println();
- System.out.println("Good Bye!!!");
- }
- }
-}
diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankServer.java b/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankServer.java
deleted file mode 100644
index aafe9a4a2e..0000000000
--- a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankServer.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package MV3500Cohort2021JulySeptember.homework2;
-
-import java.io.*;
-import java.net.*;
-
-
-public class FrankServer {
-
- /**
- * Program invocation, execution starts here If already compiled, can run
- * using console in directory ../../build/classes/ by invoking \ java
- * -classpath . TcpExamples.TcpExample3Server
- *
- * @param args command-line arguments
- * @throws java.lang.InterruptedException user cancels execution
- */
- public static void main(String[] args) throws InterruptedException {
- try {
-
- // ServerSocket waits for a connection from a client.
- // Notice that it is outside the loop; ServerSocket
- // needs to be made only once.
- System.out.println(FrankServer.class.getName() + " has started..."); // it helps debugging to put this on console first
-
- ServerSocket serverSocket = new ServerSocket(2318); // changed from 2317 to 2318
- OutputStream os;
- PrintStream ps;
- InetAddress localAddress, remoteAddress;
- int localPort, remotePort;
- int serverLoopCount = 0;
-
- // Server is up and waiting (i.e. "blocked" or paused)
- // Loop, infinitely, waiting for client connections.
- // Stop the program somewhere else.
- while (true) {
-
- // block until connected to a client
- try ( Socket clientConnectionSocket = serverSocket.accept()) {
- serverLoopCount++; // increment at beginning of loop for reliability
-
- // Now hook everything up (i.e. set up the streams), Java style:
- os = clientConnectionSocket.getOutputStream();
- ps = new PrintStream(os);
- if (serverLoopCount <= 10) { // checking if the loop count <= 10
- ps.println("How are you doing?"); // this gets sent back to client!
- } else {
- ps.println("this is good bye message from Franks server"); // termination after 20 messages
- break; // Stop server
- }
- // Print some information locally about the Socket connection.
- // This includes the port and IP numbers on both sides (the socket pair).
- localAddress = clientConnectionSocket.getLocalAddress();
- remoteAddress = clientConnectionSocket.getInetAddress();
- localPort = clientConnectionSocket.getLocalPort();
- remotePort = clientConnectionSocket.getPort();
-
- System.out.print("Server loop " + serverLoopCount + ": ");
-
- // My socket pair connection looks like this, to localhost:
- // Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 54876 ))
- // Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 54881 ))
- // Why is the first IP/port the same, while the second set has different ports?
- System.out.println(FrankServer.class.getName() + " socket pair showing host name, address, port:");
- System.out.println(" (( "
- + localAddress.getHostName() + "=" + localAddress.getHostAddress() + ", " + localPort + " ), ( "
- + remoteAddress.getHostName() + "=" + remoteAddress.getHostAddress() + ", " + remotePort + " ))");
-
- if (localAddress.getHostName().equals(localAddress.getHostAddress())
- || remoteAddress.getHostName().equals(remoteAddress.getHostAddress())) {
- System.out.println(" note HostName matches address if host has no DNS name");
- }
-
- // Not/*i*/ce the use of flush() and try w/ resources. Without
- // the try w/ resources the Socket object may stay open for
- // a while after the client has stopped needing this
- // connection. try w/ resources explicitly ends the connection.
- ps.flush();
- // like it or not, you're outta here!
- }
- }
- } catch (IOException e) {
- System.err.println("Problem with " + FrankServer.class.getName() + " networking: " + e);
-
- // Provide more helpful information to user if exception occurs due to running twice at one time
- if (e instanceof java.net.BindException) {
- System.err.println("*** Be sure to stop any other running instances of programs using this port!");
- }
- }
- }
-}
diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Client.java b/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Client.java
deleted file mode 100644
index 5984241543..0000000000
--- a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Client.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package MV3500Cohort2021JulySeptember.homework2;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.Socket;
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-/**
- *
- * @author justi
- */
-public class FrankTcpExample3Client {
-
- /**
- */
- public final static String LOCALHOST = "0:0:0:0:0:0:0:1";
-
- /**
- * Program invocation, execution starts here
- *
- * @param args command-line arguments
- * @throws java.lang.InterruptedException user cancels execution
- */
- public static void main(String[] args) throws InterruptedException {
-
- // Local variables/fields
- Socket socket = null;
- InputStream is;
- Reader isr;
- BufferedReader br;
- String serverMessage;
- int clientLoopCount = 0;
-
- try {
- while (true) {
- clientLoopCount++; // increment at beginning of loop for reliability
- System.out.println( "creating socket...");
-
- // We request an IP to connect to ("localhost") and
- // port number at that IP (2317). This establishes
- // a connection to that IP in the form of a Socket
- // object; the server uses a ServerSocket to wait for
- // connections.
- socket = new Socket(LOCALHOST, 2318); // locohost?
-
- // Now hook everything up (i.e. set up the streams), Java style:
- is = socket.getInputStream();
- isr = new InputStreamReader(is);
- br = new BufferedReader(isr);
-
- // Read a single line written by the server. We'd
- // do things a bit differently if there were many lines to be read
- // from the server instead of one only.
- serverMessage = br.readLine();
- System.out.println("*********************************");
-
- System.out.print( clientLoopCount + ": ");
- System.out.println("Hola!");
- System.out.println("The message the server sent was: '" + serverMessage + "'");
- // socket gets closed, either automatically/silently by this code (or possibly by the server)
- if (serverMessage.equals("this is good bye message from Franks server")) { //if client recieved termanation message stop client
- break;
- }
- Thread.sleep(1000); // turned it down to 1 second
-
- } // end while(true) // infinite loops are dangerous, be sure to kill this process!
- } catch (IOException e) {
- System.err.println("Problem with " + FrankTcpExample3Client.class.getName() + " networking:"); // describe what is happening
- System.err.println("Error: " + e);
-
- // Provide more helpful information to user if exception occurs due to running twice at one time
- if (e instanceof java.net.BindException) {
- System.err.println("*** Be sure to stop any other running instances of programs using this port!");
- }
- } finally // occurs after any other activity when shutting down
- {
- try {
- if (socket != null) {
- socket.close();
- }
- } catch (IOException e) {
- }
-
- // program exit: tell somebody about that happening. Likely cause: server drops connection.
- System.out.println();
- System.out.println("Good Bye!!!");
- }
- }
-}
diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Server.java b/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Server.java
deleted file mode 100644
index 037239a06f..0000000000
--- a/assignments/src/MV3500Cohort2021JulySeptember/homework2/FrankTcpExample3Server.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package MV3500Cohort2021JulySeptember.homework2;
-
-import java.io.*;
-import java.net.*;
-
-
-public class FrankTcpExample3Server {
-
- /**
- * Program invocation, execution starts here If already compiled, can run
- * using console in directory ../../build/classes/ by invoking \ java
- * -classpath . TcpExamples.TcpExample3Server
- *
- * @param args command-line arguments
- * @throws java.lang.InterruptedException user cancels execution
- */
- public static void main(String[] args) throws InterruptedException {
- try {
-
- // ServerSocket waits for a connection from a client.
- // Notice that it is outside the loop; ServerSocket
- // needs to be made only once.
- System.out.println(FrankTcpExample3Server.class.getName() + " has started..."); // it helps debugging to put this on console first
-
- ServerSocket serverSocket = new ServerSocket(2318); // changed from 2317 to 2318
- OutputStream os;
- PrintStream ps;
- InetAddress localAddress, remoteAddress;
- int localPort, remotePort;
- int serverLoopCount = 0;
-
- // Server is up and waiting (i.e. "blocked" or paused)
- // Loop, infinitely, waiting for client connections.
- // Stop the program somewhere else.
- while (true) {
-
- // block until connected to a client
- try ( Socket clientConnectionSocket = serverSocket.accept()) {
- serverLoopCount++; // increment at beginning of loop for reliability
-
- // Now hook everything up (i.e. set up the streams), Java style:
- os = clientConnectionSocket.getOutputStream();
- ps = new PrintStream(os);
- if (serverLoopCount <= 10) { // checking if the loop count <= 10
- ps.println("How are you doing?"); // this gets sent back to client!
- } else {
- ps.println("this is good bye message from Franks server"); // termination after 20 messages
- break; // Stop server
- }
- // Print some information locally about the Socket connection.
- // This includes the port and IP numbers on both sides (the socket pair).
- localAddress = clientConnectionSocket.getLocalAddress();
- remoteAddress = clientConnectionSocket.getInetAddress();
- localPort = clientConnectionSocket.getLocalPort();
- remotePort = clientConnectionSocket.getPort();
-
- System.out.print("Server loop " + serverLoopCount + ": ");
-
- // My socket pair connection looks like this, to localhost:
- // Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 54876 ))
- // Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 54881 ))
- // Why is the first IP/port the same, while the second set has different ports?
- System.out.println(FrankTcpExample3Server.class.getName() + " socket pair showing host name, address, port:");
- System.out.println(" (( "
- + localAddress.getHostName() + "=" + localAddress.getHostAddress() + ", " + localPort + " ), ( "
- + remoteAddress.getHostName() + "=" + remoteAddress.getHostAddress() + ", " + remotePort + " ))");
-
- if (localAddress.getHostName().equals(localAddress.getHostAddress())
- || remoteAddress.getHostName().equals(remoteAddress.getHostAddress())) {
- System.out.println(" note HostName matches address if host has no DNS name");
- }
-
- // Not/*i*/ce the use of flush() and try w/ resources. Without
- // the try w/ resources the Socket object may stay open for
- // a while after the client has stopped needing this
- // connection. try w/ resources explicitly ends the connection.
- ps.flush();
- // like it or not, you're outta here!
- }
- }
- } catch (IOException e) {
- System.err.println("Problem with " + FrankTcpExample3Server.class.getName() + " networking: " + e);
-
- // Provide more helpful information to user if exception occurs due to running twice at one time
- if (e instanceof java.net.BindException) {
- System.err.println("*** Be sure to stop any other running instances of programs using this port!");
- }
- }
- }
-}
diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework2/HittnerDTcpExample3Client.java b/assignments/src/MV3500Cohort2021JulySeptember/homework2/HittnerDTcpExample3Client.java
index 8362c3a463..f1119e6536 100644
--- a/assignments/src/MV3500Cohort2021JulySeptember/homework2/HittnerDTcpExample3Client.java
+++ b/assignments/src/MV3500Cohort2021JulySeptember/homework2/HittnerDTcpExample3Client.java
@@ -3,7 +3,7 @@ import java.io.*;
import java.net.*;
/**
- *
+ * Hey why not say what this thing does...
* @author Dom Hittner
*/
public class HittnerDTcpExample3Client {
--
GitLab