Skip to content
Snippets Groups Projects
Commit 30e0c2f1 authored by Brutzman, Don's avatar Brutzman, Don
Browse files

cleanups, javadoc warnings

parent fc493889
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 144 additions and 120 deletions
src/edu/nps/moves/dis7/examples/ClassNameComparator.java
+ 2
− 2
View file @ 30e0c2f1
...@@ -25,8 +25,8 @@ public class ClassNameComparator implements Comparator<Pdu> { ...@@ -25,8 +25,8 @@ public class ClassNameComparator implements Comparator<Pdu> {
* Returns a number less than, equal to, or greater than zero, * Returns a number less than, equal to, or greater than zero,
* depending on whether the object is lexically less than, equal to, * depending on whether the object is lexically less than, equal to,
* or greater than the other object. * or greater than the other object.
* @param object1 * @param object1 first object to compare
* @param object2 * @param object2 second object to compare
*/ */
@Override @Override
public int compare(Pdu object1, Pdu object2) { public int compare(Pdu object1, Pdu object2) {
......
src/edu/nps/moves/dis7/examples/EspduSender.java
+ 1
− 1
View file @ 30e0c2f1
...@@ -38,7 +38,7 @@ public class EspduSender ...@@ -38,7 +38,7 @@ public class EspduSender
* If in multicast mode, a join() will be done on the multicast address. * If in multicast mode, a join() will be done on the multicast address.
* port: port used for both source and destination. * port: port used for both source and destination.
* *
* @param args * @param args command-line arguments
*/ */
public static void main(String args[]) public static void main(String args[])
{ {
......
src/edu/nps/moves/dis7/utilities/DisThreadedNetIF.java
+ 36
− 13
View file @ 30e0c2f1
...@@ -25,6 +25,9 @@ import java.util.logging.Logger; ...@@ -25,6 +25,9 @@ import java.util.logging.Logger;
*/ */
public class DisThreadedNetIF public class DisThreadedNetIF
{ {
private static final String messagePrefix = "[" + DisThreadedNetIF.class.getName() + "] ";
private boolean verbose = true;
/** Pdu listener interface */ /** Pdu listener interface */
public interface PduListener public interface PduListener
{ {
...@@ -111,8 +114,8 @@ public class DisThreadedNetIF ...@@ -111,8 +114,8 @@ public class DisThreadedNetIF
private final LinkedBlockingQueue<Pdu> pdus2send = new LinkedBlockingQueue<>(); private final LinkedBlockingQueue<Pdu> pdus2send = new LinkedBlockingQueue<>();
/** /**
* Add a listener to accept only pdus of a given typ * Add a listener to accept only pdus of a given type
* @param lis instance of PduListener * @param lis listener instance implementing the RawPduListener interface
* @param typ Pdu type * @param typ Pdu type
*/ */
public void addListener(PduListener lis, DISPDUType typ) public void addListener(PduListener lis, DISPDUType typ)
...@@ -131,7 +134,7 @@ public class DisThreadedNetIF ...@@ -131,7 +134,7 @@ public class DisThreadedNetIF
/** /**
* Add a listener to accept all pdu types * Add a listener to accept all pdu types
* @param lis instance implementing the PduListener interface * @param lis listener instance implementing the RawPduListener interface
*/ */
public void addListener(PduListener lis) public void addListener(PduListener lis)
{ {
...@@ -140,7 +143,7 @@ public class DisThreadedNetIF ...@@ -140,7 +143,7 @@ public class DisThreadedNetIF
/** /**
* Remove previously added listener * Remove previously added listener
* @param lis instance implementing the PduListener interface * @param lis listener instance implementing the RawPduListener interface
*/ */
public void removeListener(PduListener lis) public void removeListener(PduListener lis)
{ {
...@@ -155,7 +158,7 @@ public class DisThreadedNetIF ...@@ -155,7 +158,7 @@ public class DisThreadedNetIF
/** /**
* Add a listener to accept pdus of all types in the form of a byte array * Add a listener to accept pdus of all types in the form of a byte array
* @param lis instance implementing the RawPduListener interface * @param lis listener instance implementing the RawPduListener interface
*/ */
public void addRawListener(RawPduListener lis) public void addRawListener(RawPduListener lis)
{ {
...@@ -164,7 +167,7 @@ public class DisThreadedNetIF ...@@ -164,7 +167,7 @@ public class DisThreadedNetIF
/** /**
* Remove previously added raw listener * Remove previously added raw listener
* @param lis * @param lis listener instance implementing the RawPduListener interface
*/ */
public void removeRawListener(RawPduListener lis) public void removeRawListener(RawPduListener lis)
{ {
...@@ -240,15 +243,16 @@ public class DisThreadedNetIF ...@@ -240,15 +243,16 @@ public class DisThreadedNetIF
if (pdu != null) if (pdu != null)
{ {
counter++; // TODO experimental, add to generator as a commented-out diagnostic; consider adding diagnostic mode counter++; // TODO experimental, add to generator as a commented-out diagnostic; consider adding diagnostic mode
System.err.println(counter + ". received " + pdu.getPduType().name()); if (verbose)
System.err.println(messagePrefix + counter + ". received " + pdu.getPduType().toString());
toListeners(pdu); toListeners(pdu);
} }
buffer.clear(); buffer.clear();
} }
} }
catch (IOException ex) { catch (IOException ex) {
System.err.println("Exception in DisThreadedNetIF receive thread: " + ex.getLocalizedMessage()); System.err.println(messagePrefix + "Exception in DisThreadedNetIF receive thread: " + ex.getLocalizedMessage());
System.err.println("Retrying new socket in 1 second"); System.err.println(messagePrefix + "Retrying new socket in 1 second");
} }
finally { finally {
if (socket != null && !socket.isClosed()) { if (socket != null && !socket.isClosed()) {
...@@ -286,8 +290,10 @@ public class DisThreadedNetIF ...@@ -286,8 +290,10 @@ public class DisThreadedNetIF
baos.reset(); baos.reset();
} }
} catch (Exception ex) { }
System.err.println("Exception in DisThreadedNetIF send thread: " + ex.getLocalizedMessage()); catch (Exception ex)
{
System.err.println(messagePrefix + "Exception in DisThreadedNetIF send thread: " + ex.getLocalizedMessage());
} }
} }
try { try {
...@@ -354,8 +360,9 @@ public class DisThreadedNetIF ...@@ -354,8 +360,9 @@ public class DisThreadedNetIF
addresses = nif.getInetAddresses(); addresses = nif.getInetAddresses();
while (addresses.hasMoreElements()) { while (addresses.hasMoreElements()) {
addr = addresses.nextElement(); addr = addresses.nextElement();
if (addr instanceof Inet4Address && !addr.isLoopbackAddress() && !addr.isLinkLocalAddress()) { if (addr instanceof Inet4Address && !addr.isLoopbackAddress() && !addr.isLinkLocalAddress())
System.out.println("Using network interface " + nif.getDisplayName()); {
System.out.println(messagePrefix + "Using network interface " + nif.getDisplayName());
return nif; return nif;
} }
} }
...@@ -366,4 +373,20 @@ public class DisThreadedNetIF ...@@ -366,4 +373,20 @@ public class DisThreadedNetIF
} }
return null; return null;
} }
/**
* @return the verbose
*/
public boolean isVerbose()
{
return verbose;
}
/**
* @param verbose the verbose to set
*/
public void setVerbose(boolean verbose)
{
this.verbose = verbose;
}
} }
src/edu/nps/moves/dis7/utilities/PduFactory.java
+ 80
− 80
View file @ 30e0c2f1
...@@ -218,7 +218,7 @@ public class PduFactory ...@@ -218,7 +218,7 @@ public class PduFactory
/** /**
* Create an Entity State PDU<br> * Create an Entity State PDU<br>
* IEEE Std 1278.1-2012, 5.3.2 * IEEE Std 1278.1-2012, 5.3.2
* @return the pdu * @return the new pdu
*/ */
public EntityStatePdu makeEntityStatePdu() public EntityStatePdu makeEntityStatePdu()
{ {
...@@ -241,7 +241,7 @@ public class PduFactory ...@@ -241,7 +241,7 @@ public class PduFactory
/** /**
* Create a Fire PDU<br> * Create a Fire PDU<br>
* IEEE Std 1278.1-2012, 5.4.3 * IEEE Std 1278.1-2012, 5.4.3
* @return the pdu * @return the new pdu
*/ */
public FirePdu makeFirePdu() public FirePdu makeFirePdu()
{ {
...@@ -260,7 +260,7 @@ public class PduFactory ...@@ -260,7 +260,7 @@ public class PduFactory
/** /**
* Create a Detonation PDU<br> * Create a Detonation PDU<br>
* IEEE Std 1278.1-2012, 5.4.4 * IEEE Std 1278.1-2012, 5.4.4
* @return the pdu * @return the new pdu
*/ */
public DetonationPdu makeDetonationPdu() public DetonationPdu makeDetonationPdu()
{ {
...@@ -276,7 +276,7 @@ public class PduFactory ...@@ -276,7 +276,7 @@ public class PduFactory
/** /**
* Create a Collision PDU<br> * Create a Collision PDU<br>
* IEEE Std 1278.1-2012, 5.3.3 * IEEE Std 1278.1-2012, 5.3.3
* @return the pdu * @return the new pdu
*/ */
public CollisionPdu makeCollisionPdu() public CollisionPdu makeCollisionPdu()
{ {
...@@ -295,7 +295,7 @@ public class PduFactory ...@@ -295,7 +295,7 @@ public class PduFactory
/** /**
* Create a Service Request PDU<br> * Create a Service Request PDU<br>
* IEEE Std 1278.1-2012, 5.5.5 * IEEE Std 1278.1-2012, 5.5.5
* @return the pdu * @return the new pdu
*/ */
public ServiceRequestPdu makeServiceRequestPdu() public ServiceRequestPdu makeServiceRequestPdu()
{ {
...@@ -312,7 +312,7 @@ public class PduFactory ...@@ -312,7 +312,7 @@ public class PduFactory
/** /**
* Create a Resupply Offer PDU<br> * Create a Resupply Offer PDU<br>
* IEEE Std 1278.1-2012, 5.5.6 * IEEE Std 1278.1-2012, 5.5.6
* @return the pdu * @return the new pdu
*/ */
public ResupplyOfferPdu makeResupplyOfferPdu() public ResupplyOfferPdu makeResupplyOfferPdu()
{ {
...@@ -326,7 +326,7 @@ public class PduFactory ...@@ -326,7 +326,7 @@ public class PduFactory
/** /**
* Create a Resupply Received PDU<br> * Create a Resupply Received PDU<br>
* IEEE Std 1278.1-2012, 5.5.7 * IEEE Std 1278.1-2012, 5.5.7
* @return the pdu * @return the new pdu
*/ */
public ResupplyReceivedPdu makeResupplyReceivedPdu() public ResupplyReceivedPdu makeResupplyReceivedPdu()
{ {
...@@ -340,7 +340,7 @@ public class PduFactory ...@@ -340,7 +340,7 @@ public class PduFactory
/** /**
* Create a Resupply Cancel PDU<br> * Create a Resupply Cancel PDU<br>
* IEEE Std 1278.1-2012, 5.5.8 * IEEE Std 1278.1-2012, 5.5.8
* @return the pdu * @return the new pdu
*/ */
public ResupplyCancelPdu makeResupplyCancelPdu() public ResupplyCancelPdu makeResupplyCancelPdu()
{ {
...@@ -354,7 +354,7 @@ public class PduFactory ...@@ -354,7 +354,7 @@ public class PduFactory
/** /**
* Create a Repair Complete PDU<br> * Create a Repair Complete PDU<br>
* IEEE Std 1278.1-2012, 5.5.10 * IEEE Std 1278.1-2012, 5.5.10
* @return the pdu * @return the new pdu
*/ */
public RepairCompletePdu makeRepairCompletePdu() public RepairCompletePdu makeRepairCompletePdu()
{ {
...@@ -371,7 +371,7 @@ public class PduFactory ...@@ -371,7 +371,7 @@ public class PduFactory
/** /**
* Create a Repair Response PDU<br> * Create a Repair Response PDU<br>
* IEEE Std 1278.1-2012, 5.5.11 * IEEE Std 1278.1-2012, 5.5.11
* @return the pdu * @return the new pdu
*/ */
public RepairResponsePdu makeRepairResponsePdu() public RepairResponsePdu makeRepairResponsePdu()
{ {
...@@ -388,7 +388,7 @@ public class PduFactory ...@@ -388,7 +388,7 @@ public class PduFactory
/** /**
* Create a Create Entity PDU<br> * Create a Create Entity PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.2 * IEEE Std 1278.1-2012, 5.6.5.2
* @return the pdu * @return the new pdu
*/ */
public CreateEntityPdu makeCreateEntityPdu() public CreateEntityPdu makeCreateEntityPdu()
{ {
...@@ -400,7 +400,7 @@ public class PduFactory ...@@ -400,7 +400,7 @@ public class PduFactory
/** /**
* Create a Remove Entity PDU<br> * Create a Remove Entity PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.3 * IEEE Std 1278.1-2012, 5.6.5.3
* @return the pdu * @return the new pdu
*/ */
public RemoveEntityPdu makeRemoveEntityPdu() public RemoveEntityPdu makeRemoveEntityPdu()
{ {
...@@ -414,7 +414,7 @@ public class PduFactory ...@@ -414,7 +414,7 @@ public class PduFactory
/** /**
* Create a Start Resume PDU<br> * Create a Start Resume PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.4 * IEEE Std 1278.1-2012, 5.6.5.4
* @return the pdu * @return the new pdu
*/ */
public StartResumePdu makeStartResumePdu() public StartResumePdu makeStartResumePdu()
{ {
...@@ -426,7 +426,7 @@ public class PduFactory ...@@ -426,7 +426,7 @@ public class PduFactory
/** /**
* Create a Stop Freeze PDU<br> * Create a Stop Freeze PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.5 * IEEE Std 1278.1-2012, 5.6.5.5
* @return the pdu * @return the new pdu
*/ */
public StopFreezePdu makeStopFreezePdu() public StopFreezePdu makeStopFreezePdu()
{ {
...@@ -442,7 +442,7 @@ public class PduFactory ...@@ -442,7 +442,7 @@ public class PduFactory
/** /**
* Create an Acknowledge PDU<br> * Create an Acknowledge PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.6 * IEEE Std 1278.1-2012, 5.6.5.6
* @return the pdu * @return the new pdu
*/ */
public AcknowledgePdu makeAcknowledgePdu() public AcknowledgePdu makeAcknowledgePdu()
{ {
...@@ -459,7 +459,7 @@ public class PduFactory ...@@ -459,7 +459,7 @@ public class PduFactory
/** /**
* Create an Action Request PDU<br> * Create an Action Request PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.7 * IEEE Std 1278.1-2012, 5.6.5.7
* @return the pdu * @return the new pdu
*/ */
public ActionRequestPdu makeActionRequestPdu() public ActionRequestPdu makeActionRequestPdu()
{ {
...@@ -473,7 +473,7 @@ public class PduFactory ...@@ -473,7 +473,7 @@ public class PduFactory
/** /**
* Create an Action Response PDU<br> * Create an Action Response PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.8 * IEEE Std 1278.1-2012, 5.6.5.8
* @return the pdu * @return the new pdu
*/ */
public ActionResponsePdu makeActionResponsePdu() public ActionResponsePdu makeActionResponsePdu()
{ {
...@@ -487,7 +487,7 @@ public class PduFactory ...@@ -487,7 +487,7 @@ public class PduFactory
/** /**
* Create a Data Query PDU<br> * Create a Data Query PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.9 * IEEE Std 1278.1-2012, 5.6.5.9
* @return the pdu * @return the new pdu
*/ */
public DataQueryPdu makeDataQueryPdu() public DataQueryPdu makeDataQueryPdu()
{ {
...@@ -499,7 +499,7 @@ public class PduFactory ...@@ -499,7 +499,7 @@ public class PduFactory
/** /**
* Create a Set DataPDU<br> * Create a Set DataPDU<br>
* IEEE Std 1278.1-2012, 5.6.5.10 * IEEE Std 1278.1-2012, 5.6.5.10
* @return the pdu * @return the new pdu
*/ */
public SetDataPdu makeSetDataPdu() public SetDataPdu makeSetDataPdu()
{ {
...@@ -511,7 +511,7 @@ public class PduFactory ...@@ -511,7 +511,7 @@ public class PduFactory
/** /**
* Create a Data PDU<br> * Create a Data PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.11 * IEEE Std 1278.1-2012, 5.6.5.11
* @return the pdu * @return the new pdu
*/ */
public DataPdu makeDataPdu() public DataPdu makeDataPdu()
{ {
...@@ -523,7 +523,7 @@ public class PduFactory ...@@ -523,7 +523,7 @@ public class PduFactory
/** /**
* Create an Event Report PDU<br> * Create an Event Report PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.12 * IEEE Std 1278.1-2012, 5.6.5.12
* @return the pdu * @return the new pdu
*/ */
public EventReportPdu makeEventReportPdu() public EventReportPdu makeEventReportPdu()
{ {
...@@ -537,7 +537,7 @@ public class PduFactory ...@@ -537,7 +537,7 @@ public class PduFactory
/** /**
* Create a Comment PDU<br> * Create a Comment PDU<br>
* IEEE Std 1278.1-2012, 5.6.5.13 * IEEE Std 1278.1-2012, 5.6.5.13
* @return the pdu * @return the new pdu
*/ */
public CommentPdu makeCommentPdu() public CommentPdu makeCommentPdu()
{ {
...@@ -548,8 +548,8 @@ public class PduFactory ...@@ -548,8 +548,8 @@ public class PduFactory
/** /**
* Create a Comment PDU containing the given String(s), variable record type = "OTHER" * Create a Comment PDU containing the given String(s), variable record type = "OTHER"
* @param comments * @param comments of interest
* @return the pdu * @return the new pdu
*/ */
public CommentPdu makeCommentPdu(String ... comments) public CommentPdu makeCommentPdu(String ... comments)
{ {
...@@ -559,8 +559,8 @@ public class PduFactory ...@@ -559,8 +559,8 @@ public class PduFactory
/** /**
* Create a Comment PDU containing the given String(s) and variable record type * Create a Comment PDU containing the given String(s) and variable record type
* @param typ VariableRecordType * @param typ VariableRecordType
* @param comments * @param comments of interest
* @return the pdu * @return the new pdu
*/ */
public CommentPdu makeCommentPdu(VariableRecordType typ, String... comments) public CommentPdu makeCommentPdu(VariableRecordType typ, String... comments)
{ {
...@@ -579,7 +579,7 @@ public class PduFactory ...@@ -579,7 +579,7 @@ public class PduFactory
/** /**
* Create a Electromagnetic Emission (EE) PDU<br> * Create a Electromagnetic Emission (EE) PDU<br>
* IEEE Std 1278.1-2012, 5.7.3 * IEEE Std 1278.1-2012, 5.7.3
* @return the pdu * @return the new pdu
*/ */
public ElectromagneticEmissionPdu makeElectronicEmissionsPdu() public ElectromagneticEmissionPdu makeElectronicEmissionsPdu()
{ {
...@@ -595,7 +595,7 @@ public class PduFactory ...@@ -595,7 +595,7 @@ public class PduFactory
/** /**
* Create a Designator PDU<br> * Create a Designator PDU<br>
* IEEE Std 1278.1-2012, 5.7.4 * IEEE Std 1278.1-2012, 5.7.4
* @return the pdu * @return the new pdu
*/ */
public DesignatorPdu makeDesignatorPdu() public DesignatorPdu makeDesignatorPdu()
{ {
...@@ -616,7 +616,7 @@ public class PduFactory ...@@ -616,7 +616,7 @@ public class PduFactory
/** /**
* Create a Transmitter PDU<br> * Create a Transmitter PDU<br>
* IEEE Std 1278.1-2012, 5.8.3 * IEEE Std 1278.1-2012, 5.8.3
* @return the pdu * @return the new pdu
*/ */
public TransmitterPdu makeTransmitterPdu() public TransmitterPdu makeTransmitterPdu()
{ {
...@@ -638,7 +638,7 @@ public class PduFactory ...@@ -638,7 +638,7 @@ public class PduFactory
/** /**
* Create a Signal PDU<br> * Create a Signal PDU<br>
* IEEE Std 1278.1-2012, 5.7.4 * IEEE Std 1278.1-2012, 5.7.4
* @return the pdu * @return the new pdu
*/ */
public SignalPdu makeSignalPdu() public SignalPdu makeSignalPdu()
{ {
...@@ -653,7 +653,7 @@ public class PduFactory ...@@ -653,7 +653,7 @@ public class PduFactory
/** /**
* Create a Receiver PDU<br> * Create a Receiver PDU<br>
* IEEE Std 1278.1-2012, 5.8.5 * IEEE Std 1278.1-2012, 5.8.5
* @return the pdu * @return the new pdu
*/ */
public ReceiverPdu makeReceiverPdu() public ReceiverPdu makeReceiverPdu()
{ {
...@@ -669,7 +669,7 @@ public class PduFactory ...@@ -669,7 +669,7 @@ public class PduFactory
/** /**
* Create a an Identification Friend or Foe (IFF) PDU<br> * Create a an Identification Friend or Foe (IFF) PDU<br>
* IEEE Std 1278.1-2012, 5.7.6 * IEEE Std 1278.1-2012, 5.7.6
* @return the pdu * @return the new pdu
*/ */
public IFFPdu makeIffPdu() public IFFPdu makeIffPdu()
{ {
...@@ -688,7 +688,7 @@ public class PduFactory ...@@ -688,7 +688,7 @@ public class PduFactory
/** /**
* Create a Designator PDU<br> * Create a Designator PDU<br>
* IEEE Std 1278.1-2012, 5.7.4 * IEEE Std 1278.1-2012, 5.7.4
* @return the pdu * @return the new pdu
*/ */
public UnderwaterAcousticPdu makeUnderwaterAcousticPdu() public UnderwaterAcousticPdu makeUnderwaterAcousticPdu()
{ {
...@@ -705,7 +705,7 @@ public class PduFactory ...@@ -705,7 +705,7 @@ public class PduFactory
/** /**
* Create a Supplemental Emission/Entity State (SEES) PDU<br> * Create a Supplemental Emission/Entity State (SEES) PDU<br>
* IEEE Std 1278.1-2012, 5.7.7 * IEEE Std 1278.1-2012, 5.7.7
* @return the pdu * @return the new pdu
*/ */
public SEESPdu makeSeesPdu() public SEESPdu makeSeesPdu()
{ {
...@@ -717,7 +717,7 @@ public class PduFactory ...@@ -717,7 +717,7 @@ public class PduFactory
/** /**
* Create an Intercom Signal PDU<br> * Create an Intercom Signal PDU<br>
* IEEE Std 1278.1-2012, 5.8.6 * IEEE Std 1278.1-2012, 5.8.6
* @return the pdu * @return the new pdu
*/ */
public IntercomSignalPdu makeIntercomSignalPdu() public IntercomSignalPdu makeIntercomSignalPdu()
{ {
...@@ -729,7 +729,7 @@ public class PduFactory ...@@ -729,7 +729,7 @@ public class PduFactory
/** /**
* Create an Intercom Control PDU<br> * Create an Intercom Control PDU<br>
* IEEE Std 1278.1-2012, 5.8.7 * IEEE Std 1278.1-2012, 5.8.7
* @return the pdu * @return the new pdu
*/ */
public IntercomControlPdu makeIntercomControlPdu() public IntercomControlPdu makeIntercomControlPdu()
{ {
...@@ -746,7 +746,7 @@ public class PduFactory ...@@ -746,7 +746,7 @@ public class PduFactory
/** /**
* Create a Designator PDU<br> * Create a Designator PDU<br>
* IEEE Std 1278.1-2012, 5.7.4 * IEEE Std 1278.1-2012, 5.7.4
* @return the pdu * @return the new pdu
*/ */
public AggregateStatePdu makeAggregateStatePdu() public AggregateStatePdu makeAggregateStatePdu()
{ {
...@@ -764,7 +764,7 @@ public class PduFactory ...@@ -764,7 +764,7 @@ public class PduFactory
/** /**
* Create an IsGroupOf PDU<br> * Create an IsGroupOf PDU<br>
* IEEE Std 1278.1-2012, 5.9.3 * IEEE Std 1278.1-2012, 5.9.3
* @return the pdu * @return the new pdu
*/ */
public IsGroupOfPdu makeIsGroupOfPdu() public IsGroupOfPdu makeIsGroupOfPdu()
{ {
...@@ -779,7 +779,7 @@ public class PduFactory ...@@ -779,7 +779,7 @@ public class PduFactory
/** /**
* Create a Transfer Ownership PDU<br> * Create a Transfer Ownership PDU<br>
* IEEE Std 1278.1-2012, 5.9.4 * IEEE Std 1278.1-2012, 5.9.4
* @return the pdu * @return the new pdu
*/ */
public TransferOwnershipPdu makeTransferOwnershipPdu() public TransferOwnershipPdu makeTransferOwnershipPdu()
{ {
...@@ -798,7 +798,7 @@ public class PduFactory ...@@ -798,7 +798,7 @@ public class PduFactory
/** /**
* Create an IsPartOf PDU<br> * Create an IsPartOf PDU<br>
* IEEE Std 1278.1-2012, 5.9.5 * IEEE Std 1278.1-2012, 5.9.5
* @return the pdu * @return the new pdu
*/ */
public IsPartOfPdu makeIsPartOfPdu() public IsPartOfPdu makeIsPartOfPdu()
{ {
...@@ -817,7 +817,7 @@ public class PduFactory ...@@ -817,7 +817,7 @@ public class PduFactory
/** /**
* Create a Minefield State PDU<br> * Create a Minefield State PDU<br>
* IEEE Std 1278.1-2012, 5.10.2 * IEEE Std 1278.1-2012, 5.10.2
* @return the pdu * @return the new pdu
*/ */
public MinefieldStatePdu makeMinefieldStatePdu() public MinefieldStatePdu makeMinefieldStatePdu()
{ {
...@@ -837,7 +837,7 @@ public class PduFactory ...@@ -837,7 +837,7 @@ public class PduFactory
/** /**
* Create a Minefield Query PDU<br> * Create a Minefield Query PDU<br>
* IEEE Std 1278.1-2012, 5.10.3 * IEEE Std 1278.1-2012, 5.10.3
* @return the pdu * @return the new pdu
*/ */
public MinefieldQueryPdu makeMinefieldQueryPdu() public MinefieldQueryPdu makeMinefieldQueryPdu()
{ {
...@@ -854,7 +854,7 @@ public class PduFactory ...@@ -854,7 +854,7 @@ public class PduFactory
/** /**
* Create a Minefield Data PDU<br> * Create a Minefield Data PDU<br>
* IEEE Std 1278.1-2012, 5.10.4 * IEEE Std 1278.1-2012, 5.10.4
* @return the pdu * @return the new pdu
*/ */
public MinefieldDataPdu makeMinefieldDataPdu() public MinefieldDataPdu makeMinefieldDataPdu()
{ {
...@@ -874,7 +874,7 @@ public class PduFactory ...@@ -874,7 +874,7 @@ public class PduFactory
/** /**
* Create a Minefield Response Negative Acknowledgment (NACK) PDU<br> * Create a Minefield Response Negative Acknowledgment (NACK) PDU<br>
* IEEE Std 1278.1-2012, 5.10.5 * IEEE Std 1278.1-2012, 5.10.5
* @return the pdu * @return the new pdu
*/ */
public MinefieldResponseNACKPdu makeMinefieldResponseNackPdu() public MinefieldResponseNACKPdu makeMinefieldResponseNackPdu()
{ {
...@@ -886,7 +886,7 @@ public class PduFactory ...@@ -886,7 +886,7 @@ public class PduFactory
/** /**
* Create an Environmental Process PDU<br> * Create an Environmental Process PDU<br>
* IEEE Std 1278.1-2012, 5.11.2.2 * IEEE Std 1278.1-2012, 5.11.2.2
* @return the pdu * @return the new pdu
*/ */
public EnvironmentalProcessPdu makeEnvironmentalProcessPdu() public EnvironmentalProcessPdu makeEnvironmentalProcessPdu()
{ {
...@@ -903,7 +903,7 @@ public class PduFactory ...@@ -903,7 +903,7 @@ public class PduFactory
/** /**
* Create a Gridded Data PDU<br> * Create a Gridded Data PDU<br>
* IEEE Std 1278.1-2012, 5.11.2.3 * IEEE Std 1278.1-2012, 5.11.2.3
* @return the pdu * @return the new pdu
*/ */
public GriddedDataPdu makeGriddedDataPdu() public GriddedDataPdu makeGriddedDataPdu()
{ {
...@@ -922,7 +922,7 @@ public class PduFactory ...@@ -922,7 +922,7 @@ public class PduFactory
/** /**
* Create a Point Object State PDU<br> * Create a Point Object State PDU<br>
* IEEE Std 1278.1-2012, 5.11.3.2 * IEEE Std 1278.1-2012, 5.11.3.2
* @return the pdu * @return the new pdu
*/ */
public PointObjectStatePdu makePointObjectStatePdu() public PointObjectStatePdu makePointObjectStatePdu()
{ {
...@@ -943,7 +943,7 @@ public class PduFactory ...@@ -943,7 +943,7 @@ public class PduFactory
/** /**
* Create a Linear Object State PDU<br> * Create a Linear Object State PDU<br>
* IEEE Std 1278.1-2012, 5.11.3.3 * IEEE Std 1278.1-2012, 5.11.3.3
* @return the pdu * @return the new pdu
*/ */
public LinearObjectStatePdu makeLinearObjectStatePdu() public LinearObjectStatePdu makeLinearObjectStatePdu()
{ {
...@@ -962,7 +962,7 @@ public class PduFactory ...@@ -962,7 +962,7 @@ public class PduFactory
/** /**
* Create an Areal Object State PDU<br> * Create an Areal Object State PDU<br>
* IEEE Std 1278.1-2012, 5.11.3.4 * IEEE Std 1278.1-2012, 5.11.3.4
* @return the pdu * @return the new pdu
*/ */
public ArealObjectStatePdu makeArealObjectStatePdu() public ArealObjectStatePdu makeArealObjectStatePdu()
{ {
...@@ -979,7 +979,7 @@ public class PduFactory ...@@ -979,7 +979,7 @@ public class PduFactory
/** /**
* Create a Time Space Position Information (TSPI) PDU<br> * Create a Time Space Position Information (TSPI) PDU<br>
* IEEE Std 1278.1-2012, 9.4.2 * IEEE Std 1278.1-2012, 9.4.2
* @return the pdu * @return the new pdu
*/ */
public TSPIPdu makeTspiPdu() public TSPIPdu makeTspiPdu()
{ {
...@@ -999,7 +999,7 @@ public class PduFactory ...@@ -999,7 +999,7 @@ public class PduFactory
/** /**
* Create an Appearance PDU<br> * Create an Appearance PDU<br>
* IEEE Std 1278.1-2012, 9.4.3 * IEEE Std 1278.1-2012, 9.4.3
* @return the pdu * @return the new pdu
*/ */
public AppearancePdu makeAppearancePdu() public AppearancePdu makeAppearancePdu()
{ {
...@@ -1019,7 +1019,7 @@ public class PduFactory ...@@ -1019,7 +1019,7 @@ public class PduFactory
/** /**
* Create an Articulated Parts PDU<br> * Create an Articulated Parts PDU<br>
* IEEE Std 1278.1-2012, 9.4.4 * IEEE Std 1278.1-2012, 9.4.4
* @return the pdu * @return the new pdu
*/ */
public ArticulatedPartsPdu makeArticulatedPartsPdu() public ArticulatedPartsPdu makeArticulatedPartsPdu()
{ {
...@@ -1032,7 +1032,7 @@ public class PduFactory ...@@ -1032,7 +1032,7 @@ public class PduFactory
/** /**
* Create a Live Entity (LE) Fire PDU<br> * Create a Live Entity (LE) Fire PDU<br>
* IEEE Std 1278.1-2012, 9.4.5 * IEEE Std 1278.1-2012, 9.4.5
* @return the pdu * @return the new pdu
*/ */
public LEFirePdu makeLEFirePdu() public LEFirePdu makeLEFirePdu()
{ {
...@@ -1053,7 +1053,7 @@ public class PduFactory ...@@ -1053,7 +1053,7 @@ public class PduFactory
/** /**
* Create a Live Entity (LE) Detonation PDU<br> * Create a Live Entity (LE) Detonation PDU<br>
* IEEE Std 1278.1-2012, 9.4.6 * IEEE Std 1278.1-2012, 9.4.6
* @return the pdu * @return the new pdu
*/ */
public LEDetonationPdu makeLEDetonationPdu() public LEDetonationPdu makeLEDetonationPdu()
{ {
...@@ -1076,7 +1076,7 @@ public class PduFactory ...@@ -1076,7 +1076,7 @@ public class PduFactory
/** /**
* Create a Create Entity-R (Reliable) PDU<br> * Create a Create Entity-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.2 * IEEE Std 1278.1-2012, 5.12.4.2
* @return the pdu * @return the new pdu
*/ */
public CreateEntityReliablePdu makeCreateEntityReliablePdu() public CreateEntityReliablePdu makeCreateEntityReliablePdu()
{ {
...@@ -1092,7 +1092,7 @@ public class PduFactory ...@@ -1092,7 +1092,7 @@ public class PduFactory
/** /**
* Create a Remove Entity-R (Reliable) PDU<br> * Create a Remove Entity-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.3 * IEEE Std 1278.1-2012, 5.12.4.3
* @return the pdu * @return the new pdu
*/ */
public RemoveEntityReliablePdu makeRemoveEntityReliablePdu() public RemoveEntityReliablePdu makeRemoveEntityReliablePdu()
{ {
...@@ -1106,7 +1106,7 @@ public class PduFactory ...@@ -1106,7 +1106,7 @@ public class PduFactory
/** /**
* Create a Start/Resume-R (Reliable) PDU<br> * Create a Start/Resume-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.4 * IEEE Std 1278.1-2012, 5.12.4.4
* @return the pdu * @return the new pdu
*/ */
public StartResumeReliablePdu makeStartResumeReliablePdu() public StartResumeReliablePdu makeStartResumeReliablePdu()
{ {
...@@ -1122,7 +1122,7 @@ public class PduFactory ...@@ -1122,7 +1122,7 @@ public class PduFactory
/** /**
* Create a Stop/Freeze-R (Reliable) PDU<br> * Create a Stop/Freeze-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.5 * IEEE Std 1278.1-2012, 5.12.4.5
* @return the pdu * @return the new pdu
*/ */
public StopFreezeReliablePdu makeStopFreezeReliablePdu() public StopFreezeReliablePdu makeStopFreezeReliablePdu()
{ {
...@@ -1139,7 +1139,7 @@ public class PduFactory ...@@ -1139,7 +1139,7 @@ public class PduFactory
/** /**
* Create an Acknowledge-R (Reliable) PDU<br> * Create an Acknowledge-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.6 * IEEE Std 1278.1-2012, 5.12.4.6
* @return the pdu * @return the new pdu
*/ */
public AcknowledgeReliablePdu makeAcknowledgeReliablePdu() public AcknowledgeReliablePdu makeAcknowledgeReliablePdu()
{ {
...@@ -1156,7 +1156,7 @@ public class PduFactory ...@@ -1156,7 +1156,7 @@ public class PduFactory
/** /**
* Create an Action Request-R (Reliable) PDU<br> * Create an Action Request-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.7 * IEEE Std 1278.1-2012, 5.12.4.7
* @return the pdu * @return the new pdu
*/ */
public ActionRequestReliablePdu makeActionRequestReliablePdu() public ActionRequestReliablePdu makeActionRequestReliablePdu()
{ {
...@@ -1171,7 +1171,7 @@ public class PduFactory ...@@ -1171,7 +1171,7 @@ public class PduFactory
/** /**
* Create an Action Response-R (Reliable) PDU<br> * Create an Action Response-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.8 * IEEE Std 1278.1-2012, 5.12.4.8
* @return the pdu * @return the new pdu
*/ */
public ActionResponseReliablePdu makeActionResponseReliablePdu() public ActionResponseReliablePdu makeActionResponseReliablePdu()
{ {
...@@ -1185,7 +1185,7 @@ public class PduFactory ...@@ -1185,7 +1185,7 @@ public class PduFactory
/** /**
* Create a Data Query-R (Reliable) PDU<br> * Create a Data Query-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.9 * IEEE Std 1278.1-2012, 5.12.4.9
* @return the pdu * @return the new pdu
*/ */
public DataQueryReliablePdu makeDataQueryReliablePdu() public DataQueryReliablePdu makeDataQueryReliablePdu()
{ {
...@@ -1201,7 +1201,7 @@ public class PduFactory ...@@ -1201,7 +1201,7 @@ public class PduFactory
/** /**
* Create a Set Data-R (Reliable) PDU<br> * Create a Set Data-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.10 * IEEE Std 1278.1-2012, 5.12.4.10
* @return the pdu * @return the new pdu
*/ */
public SetDataReliablePdu makeSetDataReliablePdu() public SetDataReliablePdu makeSetDataReliablePdu()
{ {
...@@ -1217,7 +1217,7 @@ public class PduFactory ...@@ -1217,7 +1217,7 @@ public class PduFactory
/** /**
* Create a Data-R (Reliable) PDU<br> * Create a Data-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.11 * IEEE Std 1278.1-2012, 5.12.4.11
* @return the pdu * @return the new pdu
*/ */
public DataReliablePdu makeDataReliablePdu() public DataReliablePdu makeDataReliablePdu()
{ {
...@@ -1233,7 +1233,7 @@ public class PduFactory ...@@ -1233,7 +1233,7 @@ public class PduFactory
/** /**
* Create an Event Report-R (Reliable) PDU<br> * Create an Event Report-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.12 * IEEE Std 1278.1-2012, 5.12.4.12
* @return the pdu * @return the new pdu
*/ */
public EventReportReliablePdu makeEventReportReliablePdu() public EventReportReliablePdu makeEventReportReliablePdu()
{ {
...@@ -1247,7 +1247,7 @@ public class PduFactory ...@@ -1247,7 +1247,7 @@ public class PduFactory
/** /**
* Create a Comment-R (Reliable) PDU<br> * Create a Comment-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.13 * IEEE Std 1278.1-2012, 5.12.4.13
* @return the pdu * @return the new pdu
*/ */
public CommentReliablePdu makeCommentReliablePdu() public CommentReliablePdu makeCommentReliablePdu()
{ {
...@@ -1258,8 +1258,8 @@ public class PduFactory ...@@ -1258,8 +1258,8 @@ public class PduFactory
/** /**
* Create a Comment-R PDU containing the given String(s), variable record type = "OTHER" * Create a Comment-R PDU containing the given String(s), variable record type = "OTHER"
* @param comments * @param comments of interest
* @return the pdu * @return the new pdu
*/ */
public CommentReliablePdu makeCommentReliablePdu(String ... comments) public CommentReliablePdu makeCommentReliablePdu(String ... comments)
{ {
...@@ -1269,8 +1269,8 @@ public class PduFactory ...@@ -1269,8 +1269,8 @@ public class PduFactory
/** /**
* Create a CommentR PDU containing the given String(s) and variable record type * Create a CommentR PDU containing the given String(s) and variable record type
* @param typ VariableRecordType * @param typ VariableRecordType
* @param comments * @param comments of interest
* @return the pdu * @return the new pdu
*/ */
public CommentReliablePdu makeCommentReliablePdu(VariableRecordType typ, String... comments) public CommentReliablePdu makeCommentReliablePdu(VariableRecordType typ, String... comments)
{ {
...@@ -1289,7 +1289,7 @@ public class PduFactory ...@@ -1289,7 +1289,7 @@ public class PduFactory
/** /**
* Create a Record-R (Reliable) PDU<br> * Create a Record-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.16 * IEEE Std 1278.1-2012, 5.12.4.16
* @return the pdu * @return the new pdu
*/ */
public RecordReliablePdu makeRecordReliablePdu() public RecordReliablePdu makeRecordReliablePdu()
{ {
...@@ -1304,7 +1304,7 @@ public class PduFactory ...@@ -1304,7 +1304,7 @@ public class PduFactory
/** /**
* Create a Set Record-R (Reliable) PDU<br> * Create a Set Record-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.15 * IEEE Std 1278.1-2012, 5.12.4.15
* @return the pdu * @return the new pdu
*/ */
public SetRecordReliablePdu makeSetRecordReliablePdu() public SetRecordReliablePdu makeSetRecordReliablePdu()
{ {
...@@ -1318,7 +1318,7 @@ public class PduFactory ...@@ -1318,7 +1318,7 @@ public class PduFactory
/** /**
* Create a Record Query-R (Reliable) PDU<br> * Create a Record Query-R (Reliable) PDU<br>
* IEEE Std 1278.1-2012, 5.12.4.14 * IEEE Std 1278.1-2012, 5.12.4.14
* @return the pdu * @return the new pdu
*/ */
public RecordQueryReliablePdu makeRecordQueryReliablePdu() public RecordQueryReliablePdu makeRecordQueryReliablePdu()
{ {
...@@ -1333,7 +1333,7 @@ public class PduFactory ...@@ -1333,7 +1333,7 @@ public class PduFactory
/** /**
* Create a Collision-Elastic PDU<br> * Create a Collision-Elastic PDU<br>
* IEEE Std 1278.1-2012, 5.3.4 * IEEE Std 1278.1-2012, 5.3.4
* @return the pdu * @return the new pdu
*/ */
public CollisionElasticPdu makeCollisionElasticPdu() public CollisionElasticPdu makeCollisionElasticPdu()
{ {
...@@ -1344,7 +1344,7 @@ public class PduFactory ...@@ -1344,7 +1344,7 @@ public class PduFactory
/** /**
* Create a Entity State Update PDU<br> * Create a Entity State Update PDU<br>
* IEEE Std 1278.1-2012, 5.3.5 * IEEE Std 1278.1-2012, 5.3.5
* @return the pdu * @return the new pdu
*/ */
public EntityStateUpdatePdu makeEntityStateUpdatePdu() public EntityStateUpdatePdu makeEntityStateUpdatePdu()
{ {
...@@ -1361,7 +1361,7 @@ public class PduFactory ...@@ -1361,7 +1361,7 @@ public class PduFactory
/** /**
* Create a Directed Energy (DE) Fire PDU<br> * Create a Directed Energy (DE) Fire PDU<br>
* IEEE Std 1278.1-2012, 5.4.5 * IEEE Std 1278.1-2012, 5.4.5
* @return the pdu * @return the new pdu
*/ */
public DirectedEnergyFirePdu makeDirectedEnergyFirePdu() public DirectedEnergyFirePdu makeDirectedEnergyFirePdu()
{ {
...@@ -1380,7 +1380,7 @@ public class PduFactory ...@@ -1380,7 +1380,7 @@ public class PduFactory
/** /**
* Create a Collision-Elastic PDU<br> * Create a Collision-Elastic PDU<br>
* IEEE Std 1278.1-2012, 5.3.3 * IEEE Std 1278.1-2012, 5.3.3
* @return the pdu * @return the new pdu
*/ */
public EntityDamageStatusPdu makeEntityDamageStatusPdu() public EntityDamageStatusPdu makeEntityDamageStatusPdu()
{ {
...@@ -1391,7 +1391,7 @@ public class PduFactory ...@@ -1391,7 +1391,7 @@ public class PduFactory
/** /**
* Create an Information Operations (IO) Action PDU<br> * Create an Information Operations (IO) Action PDU<br>
* IEEE Std 1278.1-2012, 5.13.3 * IEEE Std 1278.1-2012, 5.13.3
* @return the pdu * @return the new pdu
*/ */
public InformationOperationsActionPdu makeInformationOperationsActionPdu() public InformationOperationsActionPdu makeInformationOperationsActionPdu()
{ {
...@@ -1411,7 +1411,7 @@ public class PduFactory ...@@ -1411,7 +1411,7 @@ public class PduFactory
/** /**
* Create an Information Operations (IO) Report PDU<br> * Create an Information Operations (IO) Report PDU<br>
* IEEE Std 1278.1-2012, 5.13.4 * IEEE Std 1278.1-2012, 5.13.4
* @return the pdu * @return the new pdu
*/ */
public InformationOperationsReportPdu makeInformationOperationsReportPdu() public InformationOperationsReportPdu makeInformationOperationsReportPdu()
{ {
...@@ -1430,7 +1430,7 @@ public class PduFactory ...@@ -1430,7 +1430,7 @@ public class PduFactory
/** /**
* Create an Attribute PDU<br> * Create an Attribute PDU<br>
* IEEE Std 1278.1-2012, 5.3.6 * IEEE Std 1278.1-2012, 5.3.6
* @return the pdu * @return the new pdu
*/ */
public AttributePdu makeAttributePdu() public AttributePdu makeAttributePdu()
{ {
......
src/edu/nps/moves/dis7/utilities/stream/X3dCoordinates.java
+ 6
− 6
View file @ 30e0c2f1
...@@ -22,12 +22,12 @@ public class X3dCoordinates { ...@@ -22,12 +22,12 @@ public class X3dCoordinates {
/** /**
* *
* @param x * @param x coordinate
* @param y * @param y coordinate
* @param z * @param z coordinate
* @param phi * @param phi orientation
* @param psi * @param psi orientation
* @param theta * @param theta orientation
*/ */
public X3dCoordinates(double x, double y, double z, double phi, double psi, double theta) { public X3dCoordinates(double x, double y, double z, double phi, double psi, double theta) {
this.x= x; this.x= x;
......
test/edu/nps/moves/dis7/CommentPdusTest.java
+ 19
− 18
View file @ 30e0c2f1
...@@ -13,9 +13,9 @@ import static org.junit.jupiter.api.Assertions.*; ...@@ -13,9 +13,9 @@ import static org.junit.jupiter.api.Assertions.*;
@DisplayName("Comment Pdus Test") @DisplayName("Comment Pdus Test")
public class CommentPdusTest public class CommentPdusTest
{ {
DisThreadedNetIF netif; DisThreadedNetIF disThreadedNetworkInterface;
Pdu receivedPdu; Pdu receivedPdu;
DisThreadedNetIF.PduListener lis; DisThreadedNetIF.PduListener pduListener;
@BeforeAll @BeforeAll
public static void setUpClass() public static void setUpClass()
...@@ -31,22 +31,22 @@ public class CommentPdusTest ...@@ -31,22 +31,22 @@ public class CommentPdusTest
@BeforeEach @BeforeEach
public void setUp() public void setUp()
{ {
netif = new DisThreadedNetIF(); disThreadedNetworkInterface = new DisThreadedNetIF();
lis = new DisThreadedNetIF.PduListener() { pduListener = new DisThreadedNetIF.PduListener() {
@Override @Override
public void incomingPdu(Pdu pdu) { public void incomingPdu(Pdu newPdu) {
setUpReceiver(pdu); setUpReceiver(newPdu);
} }
}; };
netif.addListener(lis); disThreadedNetworkInterface.addListener(pduListener);
} }
@AfterEach @AfterEach
public void tearDown() public void tearDown()
{ {
netif.removeListener(lis); disThreadedNetworkInterface.removeListener(pduListener);
netif.kill(); disThreadedNetworkInterface.kill();
netif = null; disThreadedNetworkInterface = null;
} }
@Test @Test
...@@ -76,7 +76,7 @@ public class CommentPdusTest ...@@ -76,7 +76,7 @@ public class CommentPdusTest
private void sendPdu(Pdu pdu) private void sendPdu(Pdu pdu)
{ {
try { try {
netif.send(pdu); disThreadedNetworkInterface.send(pdu);
Thread.sleep(100l); Thread.sleep(100l);
} }
catch (InterruptedException ex) { catch (InterruptedException ex) {
...@@ -90,16 +90,17 @@ public class CommentPdusTest ...@@ -90,16 +90,17 @@ public class CommentPdusTest
return pdu1.equals(pdu2); return pdu1.equals(pdu2);
} }
private void setUpReceiver(Pdu pdu) private void setUpReceiver(Pdu newPdu)
{ {
receivedPdu = pdu; receivedPdu = newPdu;
} }
public static void main(String[] args) public static void main(String[] args)
{ {
CommentPdusTest cpt = new CommentPdusTest(); CommentPdusTest commentPdusTest = new CommentPdusTest();
cpt.setUp();
cpt.testRoundTrip(); commentPdusTest.setUp();
cpt.tearDown(); commentPdusTest.testRoundTrip();
commentPdusTest.tearDown();
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment