From 40168d5b48cea5c804c0b090a6e729940c4e76a4 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Wed, 28 Feb 2018 11:27:20 -0800
Subject: [PATCH] fix warnings, rename class to match filename
---
.../homework3/OpenDisPduSender.java | 26 ++++++++++++-------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/projects/Assignments/homework3/OpenDisPduSender.java b/projects/Assignments/homework3/OpenDisPduSender.java
index 77e4d8ce51..c1fd9db1fe 100644
--- a/projects/Assignments/homework3/OpenDisPduSender.java
+++ b/projects/Assignments/homework3/OpenDisPduSender.java
@@ -1,4 +1,4 @@
-package edu.nps.moves.examples;
+// package edu.nps.moves.examples; // copy example from OpenDIS distribution, modify to serve as template
import java.io.*;
import java.net.*;
@@ -15,28 +15,30 @@ import edu.nps.moves.disenum.*;
* @author DMcG
* @version $Id:$
*/
-public class PduSender {
+public class OpenDisPduSender {
- public static final int PORT = 62040;
+ public static final int PORT = 3000;
public static final String MULTICAST_ADDRESS = "239.1.2.3";
private int port;
InetAddress multicastAddress;
- public PduSender(int port, String multicast) {
+ public OpenDisPduSender(int port, String multicast)
+ {
try {
this.port = port;
multicastAddress = InetAddress.getByName(multicast);
if (!multicastAddress.isMulticastAddress()) {
System.out.println("Not a multicast address: " + multicast);
}
- } catch (Exception e) {
- System.out.println("Unable to open socket");
+ }
+ catch (UnknownHostException e) {
+ System.out.println("Unable to open socket: " + e);
}
}
public void run() {
try {
- List<Pdu> generatedPdus = new ArrayList<Pdu>();
+ List<Pdu> generatedPdus = new ArrayList<>();
// Loop through all the enumerated PDU types, create a PDU for each type,
// and add that PDU to a list.
@@ -148,17 +150,21 @@ public class PduSender {
//PduContainer container = new PduContainer();
//container.setPdus(generatedPdus);
//container.marshallToXml("examplePdus.xml");
- } catch (Exception e) {
+ }
+ catch (IOException e) {
System.out.println(e);
}
}
public static void main(String args[]) {
if (args.length == 2) {
- PduSender sender = new PduSender(Integer.parseInt(args[0]), args[1]);
+ OpenDisPduSender sender = new OpenDisPduSender(Integer.parseInt(args[0]), args[1]);
sender.run();
} else {
- System.out.println("Usage: PduSender <port> <multicast group>");
+ System.out.println("Usage: OpenDisPduSender <port> <multicast group>");
+ System.out.println("Default: OpenDisPduSender " + PORT + " " + MULTICAST_ADDRESS);
+ OpenDisPduSender sender = new OpenDisPduSender(PORT, MULTICAST_ADDRESS);
+ sender.run();
}
}
}
--
GitLab