From f85206a9b7f3f69911908dfb826118c751cc7b91 Mon Sep 17 00:00:00 2001
From: "Norbraten, Terry" <tdnorbra@nps.edu>
Date: Thu, 4 Jun 2020 19:48:59 -0700
Subject: [PATCH] refactored to reduce redundant casts, add some javadoc. Look
at commit logs for the source generated git proj
---
src-generated/edu/nps/moves/dis7/APA.java | 18 ++--
.../edu/nps/moves/dis7/AcknowledgePdu.java | 16 ++--
.../edu/nps/moves/dis7/AcknowledgeRPdu.java | 16 ++--
.../moves/dis7/AcknowledgeReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/AcousticEmitter.java | 16 ++--
.../edu/nps/moves/dis7/ActionRequestPdu.java | 26 +++---
.../edu/nps/moves/dis7/ActionRequestRPdu.java | 28 +++---
.../moves/dis7/ActionRequestReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/ActionResponsePdu.java | 24 ++---
.../nps/moves/dis7/ActionResponseRPdu.java | 24 ++---
.../moves/dis7/ActionResponseReliablePdu.java | 2 +-
.../nps/moves/dis7/AggregateIdentifier.java | 16 ++--
.../edu/nps/moves/dis7/AggregateMarking.java | 14 +--
.../edu/nps/moves/dis7/AggregateStatePdu.java | 34 +++----
.../edu/nps/moves/dis7/AggregateType.java | 18 ++--
src-generated/edu/nps/moves/dis7/Align.java | 6 +-
.../edu/nps/moves/dis7/AngleDeception.java | 44 ++++-----
.../nps/moves/dis7/AngularVelocityVector.java | 20 +++--
.../edu/nps/moves/dis7/AntennaLocation.java | 14 +--
.../edu/nps/moves/dis7/Appearance.java | 22 ++---
.../edu/nps/moves/dis7/AppearancePdu.java | 16 ++--
.../nps/moves/dis7/ArealObjectStatePdu.java | 24 ++---
.../edu/nps/moves/dis7/ArticulatedPartVP.java | 24 ++---
.../nps/moves/dis7/ArticulatedPartsPdu.java | 18 ++--
.../edu/nps/moves/dis7/Association.java | 16 ++--
.../edu/nps/moves/dis7/AttachedPartVP.java | 16 ++--
.../edu/nps/moves/dis7/Attribute.java | 18 ++--
.../edu/nps/moves/dis7/AttributePdu.java | 24 ++---
.../nps/moves/dis7/AttributeRecordSet.java | 18 ++--
.../nps/moves/dis7/BeamAntennaPattern.java | 30 ++++---
.../edu/nps/moves/dis7/BeamData.java | 24 ++---
.../edu/nps/moves/dis7/BeamStatus.java | 14 +--
.../edu/nps/moves/dis7/BlankingSector.java | 38 ++++----
.../edu/nps/moves/dis7/Category.java | 11 ++-
.../edu/nps/moves/dis7/ChangeOptions.java | 16 ++--
.../edu/nps/moves/dis7/ClockTime.java | 18 ++--
.../nps/moves/dis7/CollisionElasticPdu.java | 32 +++----
.../edu/nps/moves/dis7/CollisionPdu.java | 18 ++--
.../edu/nps/moves/dis7/CommentPdu.java | 20 +++--
.../edu/nps/moves/dis7/CommentRPdu.java | 20 +++--
.../nps/moves/dis7/CommentReliablePdu.java | 2 +-
.../nps/moves/dis7/CommunicationsNodeID.java | 16 ++--
.../edu/nps/moves/dis7/CreateEntityPdu.java | 16 ++--
.../edu/nps/moves/dis7/CreateEntityRPdu.java | 20 +++--
.../moves/dis7/CreateEntityReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/DataFilterRecord.java | 16 ++--
src-generated/edu/nps/moves/dis7/DataPdu.java | 26 +++---
.../dis7/DataQueryDatumSpecification.java | 22 ++---
.../edu/nps/moves/dis7/DataQueryPdu.java | 26 +++---
.../edu/nps/moves/dis7/DataQueryRPdu.java | 30 ++++---
.../nps/moves/dis7/DataQueryReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/DataRPdu.java | 28 +++---
.../edu/nps/moves/dis7/DataReliablePdu.java | 2 +-
.../nps/moves/dis7/DatumSpecification.java | 22 ++---
.../moves/dis7/DeadReckoningParameters.java | 14 +--
.../edu/nps/moves/dis7/DesignatorPdu.java | 22 ++---
.../edu/nps/moves/dis7/DetonationPdu.java | 20 +++--
.../dis7/DirectedEnergyAreaAimpoint.java | 28 +++---
.../nps/moves/dis7/DirectedEnergyDamage.java | 26 +++---
.../nps/moves/dis7/DirectedEnergyFirePdu.java | 36 ++++----
.../dis7/DirectedEnergyPrecisionAimpoint.java | 32 +++----
.../DirectedEnergyTargetEnergyDeposition.java | 18 ++--
.../edu/nps/moves/dis7/DisBitSet.java | 2 +-
src-generated/edu/nps/moves/dis7/DisTime.java | 6 +-
.../dis7/DistributedEmissionsFamilyPdu.java | 14 +--
src-generated/edu/nps/moves/dis7/Domain.java | 72 ++++++++++++---
.../dis7/EEFundamentalParameterData.java | 24 ++---
.../dis7/ElectromagneticEmissionPdu.java | 20 +++--
.../edu/nps/moves/dis7/ElectronicEmitter.java | 20 +++--
.../edu/nps/moves/dis7/EmitterBeam.java | 24 ++---
.../edu/nps/moves/dis7/EmitterSystem.java | 16 ++--
.../edu/nps/moves/dis7/EngineFuel.java | 18 ++--
.../edu/nps/moves/dis7/EngineFuelReload.java | 24 ++---
.../nps/moves/dis7/EntityAssociationVP.java | 16 ++--
.../nps/moves/dis7/EntityCapabilities.java | 2 +-
.../nps/moves/dis7/EntityDamageStatusPdu.java | 22 ++---
.../edu/nps/moves/dis7/EntityID.java | 20 +++--
.../edu/nps/moves/dis7/EntityIdentifier.java | 16 ++--
.../dis7/EntityInformationFamilyPdu.java | 14 +--
.../moves/dis7/EntityManagementFamilyPdu.java | 14 +--
.../edu/nps/moves/dis7/EntityMarking.java | 14 +--
.../edu/nps/moves/dis7/EntityStatePdu.java | 20 +++--
.../nps/moves/dis7/EntityStateUpdatePdu.java | 22 ++---
.../edu/nps/moves/dis7/EntityType.java | 22 ++---
.../edu/nps/moves/dis7/EntityTypeRaw.java | 26 +++---
.../edu/nps/moves/dis7/EntityTypeVP.java | 18 ++--
.../nps/moves/dis7/EnumNotFoundException.java | 2 +-
.../edu/nps/moves/dis7/Environment.java | 20 +++--
.../moves/dis7/EnvironmentalProcessPdu.java | 20 +++--
.../edu/nps/moves/dis7/EulerAngles.java | 20 +++--
.../edu/nps/moves/dis7/EventIdentifier.java | 16 ++--
.../moves/dis7/EventIdentifierLiveEntity.java | 20 +++--
.../edu/nps/moves/dis7/EventReportPdu.java | 24 ++---
.../edu/nps/moves/dis7/EventReportRPdu.java | 24 ++---
.../moves/dis7/EventReportReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/Expendable.java | 20 +++--
.../nps/moves/dis7/ExpendableDescriptor.java | 16 ++--
.../edu/nps/moves/dis7/ExpendableReload.java | 24 ++---
.../nps/moves/dis7/ExplosionDescriptor.java | 18 ++--
.../nps/moves/dis7/FalseTargetsAttribute.java | 42 ++++-----
.../nps/moves/dis7/FastEntityStatePdu.java | 90 ++++++++++---------
src-generated/edu/nps/moves/dis7/FirePdu.java | 20 +++--
.../edu/nps/moves/dis7/FixedDatum.java | 16 ++--
.../dis7/FundamentalOperationalData.java | 34 +++----
.../nps/moves/dis7/GridAxisDescriptor.java | 22 ++---
.../moves/dis7/GridAxisDescriptorFixed.java | 18 ++--
.../dis7/GridAxisDescriptorVariable.java | 22 ++---
.../edu/nps/moves/dis7/GridData.java | 14 +--
.../edu/nps/moves/dis7/GridDataType0.java | 16 ++--
.../edu/nps/moves/dis7/GridDataType1.java | 20 +++--
.../edu/nps/moves/dis7/GridDataType2.java | 18 ++--
.../edu/nps/moves/dis7/GriddedDataPdu.java | 34 +++----
src-generated/edu/nps/moves/dis7/GroupID.java | 16 ++--
src-generated/edu/nps/moves/dis7/IFFData.java | 16 ++--
.../dis7/IFFFundamentalParameterData.java | 24 ++---
.../edu/nps/moves/dis7/IFFLayer2Pdu.java | 22 ++---
src-generated/edu/nps/moves/dis7/IFFPdu.java | 20 +++--
.../edu/nps/moves/dis7/IOCommsNodeRecord.java | 18 ++--
.../edu/nps/moves/dis7/IOEffectRecord.java | 22 ++---
.../edu/nps/moves/dis7/IORecord.java | 14 +--
.../dis7/IdentificationFriendOrFoePdu.java | 2 +-
.../nps/moves/dis7/IffDataSpecification.java | 18 ++--
.../dis7/InformationOperationsActionPdu.java | 24 ++---
.../dis7/InformationOperationsFamilyPdu.java | 14 +--
.../dis7/InformationOperationsReportPdu.java | 24 ++---
.../IntercomCommunicationsParameters.java | 18 ++--
.../nps/moves/dis7/IntercomControlPdu.java | 30 ++++---
.../nps/moves/dis7/IntercomIdentifier.java | 22 ++---
.../nps/moves/dis7/IntercomReferenceID.java | 20 +++--
.../edu/nps/moves/dis7/IntercomSignalPdu.java | 73 ++++++++++-----
.../edu/nps/moves/dis7/IsGroupOfPdu.java | 24 ++---
.../edu/nps/moves/dis7/IsPartOfPdu.java | 14 +--
.../edu/nps/moves/dis7/JammingTechnique.java | 22 ++---
.../edu/nps/moves/dis7/LEDetonationPdu.java | 20 +++--
.../edu/nps/moves/dis7/LEFirePdu.java | 20 +++--
.../nps/moves/dis7/LEVector3FixedByte.java | 20 +++--
.../moves/dis7/LaunchedMunitionRecord.java | 20 +++--
.../edu/nps/moves/dis7/LayerHeader.java | 20 +++--
.../nps/moves/dis7/LinearObjectStatePdu.java | 20 +++--
.../moves/dis7/LinearSegmentParameter.java | 28 +++---
.../dis7/LiveDeadReckoningParameters.java | 14 +--
.../moves/dis7/LiveEntityDetonationPdu.java | 2 +-
.../nps/moves/dis7/LiveEntityFamilyPdu.java | 14 +--
.../edu/nps/moves/dis7/LiveEntityFirePdu.java | 2 +-
.../nps/moves/dis7/LiveEntityIdentifier.java | 16 ++--
.../moves/dis7/LiveEntityLinearVelocity.java | 20 +++--
.../nps/moves/dis7/LiveEntityOrientation.java | 20 +++--
.../moves/dis7/LiveEntityOrientation16.java | 20 +++--
.../dis7/LiveEntityOrientationError.java | 20 +++--
.../edu/nps/moves/dis7/LiveEntityPdu.java | 16 ++--
.../moves/dis7/LiveEntityPositionError.java | 18 ++--
.../LiveEntityRelativeWorldCoordinates.java | 22 ++---
.../nps/moves/dis7/LiveSimulationAddress.java | 18 ++--
.../nps/moves/dis7/LogisticsFamilyPdu.java | 14 +--
.../edu/nps/moves/dis7/Marshaller.java | 31 +++++--
.../nps/moves/dis7/MineEmplacementTime.java | 18 ++--
.../nps/moves/dis7/MineEntityIdentifier.java | 16 ++--
.../edu/nps/moves/dis7/MinefieldDataPdu.java | 40 +++++----
.../nps/moves/dis7/MinefieldFamilyPdu.java | 14 +--
.../nps/moves/dis7/MinefieldIdentifier.java | 16 ++--
.../edu/nps/moves/dis7/MinefieldQueryPdu.java | 26 +++---
.../moves/dis7/MinefieldResponseNACKPdu.java | 18 ++--
.../nps/moves/dis7/MinefieldSensorType.java | 16 ++--
.../edu/nps/moves/dis7/MinefieldStatePdu.java | 24 ++---
.../nps/moves/dis7/ModulationParameters.java | 14 +--
.../edu/nps/moves/dis7/ModulationType.java | 18 ++--
.../edu/nps/moves/dis7/Munition.java | 20 +++--
.../nps/moves/dis7/MunitionDescriptor.java | 18 ++--
.../edu/nps/moves/dis7/MunitionReload.java | 24 ++---
.../dis7/NamedLocationIdentification.java | 16 ++--
.../edu/nps/moves/dis7/ObjectIdentifier.java | 16 ++--
.../edu/nps/moves/dis7/ObjectType.java | 18 ++--
.../nps/moves/dis7/OwnershipStatusRecord.java | 16 ++--
src-generated/edu/nps/moves/dis7/Pdu.java | 20 +++--
src-generated/edu/nps/moves/dis7/PduBase.java | 16 ++--
.../edu/nps/moves/dis7/PduStatus.java | 2 +-
.../nps/moves/dis7/PointObjectStatePdu.java | 22 ++---
.../nps/moves/dis7/PropulsionSystemData.java | 18 ++--
.../edu/nps/moves/dis7/ProtocolMode.java | 16 ++--
.../edu/nps/moves/dis7/RadioCommsHeader.java | 16 ++--
.../dis7/RadioCommunicationsFamilyPdu.java | 14 +--
.../edu/nps/moves/dis7/RadioIdentifier.java | 22 ++---
.../edu/nps/moves/dis7/RadioType.java | 20 +++--
.../edu/nps/moves/dis7/ReceiverPdu.java | 20 +++--
.../edu/nps/moves/dis7/RecordQueryRPdu.java | 24 ++---
.../moves/dis7/RecordQueryReliablePdu.java | 2 +-
.../moves/dis7/RecordQuerySpecification.java | 18 ++--
.../edu/nps/moves/dis7/RecordRPdu.java | 22 ++---
.../edu/nps/moves/dis7/RecordReliablePdu.java | 2 +-
.../nps/moves/dis7/RecordSpecification.java | 18 ++--
.../dis7/RecordSpecificationElement.java | 22 ++---
.../edu/nps/moves/dis7/Relationship.java | 14 +--
.../edu/nps/moves/dis7/RemoveEntityPdu.java | 16 ++--
.../edu/nps/moves/dis7/RemoveEntityRPdu.java | 20 +++--
.../moves/dis7/RemoveEntityReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/RepairCompletePdu.java | 16 ++--
.../edu/nps/moves/dis7/RepairResponsePdu.java | 18 ++--
.../edu/nps/moves/dis7/RequestID.java | 16 ++--
.../edu/nps/moves/dis7/ResupplyCancelPdu.java | 14 +--
.../edu/nps/moves/dis7/ResupplyOfferPdu.java | 22 ++---
.../nps/moves/dis7/ResupplyReceivedPdu.java | 22 ++---
src-generated/edu/nps/moves/dis7/SEESPdu.java | 28 +++---
.../moves/dis7/SecondaryOperationalData.java | 20 +++--
src-generated/edu/nps/moves/dis7/Sensor.java | 22 ++---
.../edu/nps/moves/dis7/SeparationVP.java | 18 ++--
.../edu/nps/moves/dis7/ServiceRequestPdu.java | 20 +++--
.../edu/nps/moves/dis7/SetDataPdu.java | 26 +++---
.../edu/nps/moves/dis7/SetDataRPdu.java | 28 +++---
.../nps/moves/dis7/SetDataReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/SetRecordRPdu.java | 26 +++---
.../nps/moves/dis7/SetRecordReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/ShaftRPM.java | 20 +++--
.../edu/nps/moves/dis7/SignalPdu.java | 36 +++++---
.../nps/moves/dis7/SilentEntitySystem.java | 18 ++--
.../edu/nps/moves/dis7/SimulationAddress.java | 18 ++--
.../nps/moves/dis7/SimulationIdentifier.java | 16 ++--
.../dis7/SimulationManagementFamilyPdu.java | 14 +--
...ionManagementWithReliabilityFamilyPdu.java | 14 +--
.../moves/dis7/StandardVariableRecord.java | 16 ++--
.../dis7/StandardVariableSpecification.java | 18 ++--
.../edu/nps/moves/dis7/StartResumePdu.java | 16 ++--
.../edu/nps/moves/dis7/StartResumeRPdu.java | 20 +++--
.../moves/dis7/StartResumeReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/StopFreezePdu.java | 18 ++--
.../edu/nps/moves/dis7/StopFreezeRPdu.java | 18 ++--
.../nps/moves/dis7/StopFreezeReliablePdu.java | 2 +-
.../edu/nps/moves/dis7/StorageFuel.java | 18 ++--
.../edu/nps/moves/dis7/StorageFuelReload.java | 24 ++---
.../edu/nps/moves/dis7/SubCategory.java | 11 ++-
.../SupplementalEmissionEntityStatePdu.java | 2 +-
.../edu/nps/moves/dis7/SupplyQuantity.java | 16 ++--
.../dis7/SyntheticEnvironmentFamilyPdu.java | 14 +--
.../edu/nps/moves/dis7/SystemIdentifier.java | 14 +--
src-generated/edu/nps/moves/dis7/TSPIPdu.java | 20 +++--
.../dis7/TimeSpacePositionInformationPdu.java | 2 +-
.../edu/nps/moves/dis7/TotalRecordSets.java | 18 ++--
.../edu/nps/moves/dis7/TrackJamData.java | 18 ++--
.../nps/moves/dis7/TransferOwnershipPdu.java | 16 ++--
.../edu/nps/moves/dis7/TransmitterPdu.java | 38 ++++----
src-generated/edu/nps/moves/dis7/UABeam.java | 20 +++--
.../edu/nps/moves/dis7/UAEmitter.java | 22 ++---
.../moves/dis7/UAFundamentalParameter.java | 22 ++---
.../nps/moves/dis7/UnattachedIdentifier.java | 16 ++--
.../nps/moves/dis7/UnderwaterAcousticPdu.java | 30 ++++---
.../nps/moves/dis7/UnsignedDISInteger.java | 16 ++--
.../edu/nps/moves/dis7/VariableDatum.java | 20 +++--
.../edu/nps/moves/dis7/VariableParameter.java | 14 +--
.../dis7/VariableTransmitterParameters.java | 16 ++--
.../edu/nps/moves/dis7/Vector2Float.java | 18 ++--
.../edu/nps/moves/dis7/Vector3Double.java | 20 +++--
.../edu/nps/moves/dis7/Vector3Float.java | 20 +++--
.../nps/moves/dis7/VectoringNozzleSystem.java | 18 ++--
.../edu/nps/moves/dis7/WarfareFamilyPdu.java | 14 +--
.../APAParameterIndexAPAStatus.java | 4 +-
.../AcknowledgeAcknowledgeFlag.java | 4 +-
.../enumerations/AcknowledgeResponseFlag.java | 4 +-
...sionEnumerationsforSubsurfaceAreaSize.java | 4 +-
.../AddVariantsforAirCategory201Insect.java | 4 +-
.../AddVariantsforLandCategory200Mammal.java | 4 +-
...egoriesFishMolluskCrustaceanandInsect.java | 4 +-
.../AggregateStateAggregateKind.java | 4 +-
.../AggregateStateAggregateState.java | 4 +-
.../enumerations/AggregateStateSpecific.java | 4 +-
.../AggregateStateSubcategory.java | 4 +-
.../enumerations/AircraftAddressSource.java | 4 +-
.../AircraftIdentificationType.java | 4 +-
.../enumerations/AircraftPresentDomain.java | 4 +-
.../dis7/enumerations/AircraftTypeWake.java | 4 +-
...roupSizeRangeEnumerationforallDomains.java | 4 +-
.../dis7/enumerations/AntennaSelection.java | 4 +-
.../dis7/enumerations/AntennaStatus.java | 4 +-
.../AppearanceAntiCollisionDayNight.java | 4 +-
.../AppearanceCamouflageType.java | 4 +-
.../dis7/enumerations/AppearanceCanopy.java | 4 +-
.../AppearanceConcealedMovement.java | 4 +-
.../AppearanceConcealedPosition.java | 4 +-
.../dis7/enumerations/AppearanceDamage.java | 4 +-
.../AppearanceEntityorObjectState.java | 4 +-
.../AppearanceEnvironmentalDensity.java | 4 +-
.../dis7/enumerations/AppearanceHatch.java | 4 +-
.../AppearanceLauncherOperational.java | 4 +-
.../AppearanceLifeFormComplianceStatus.java | 4 +-
.../AppearanceLifeFormPosture.java | 4 +-
.../AppearanceLifeFormWeaponImplement.java | 4 +-
.../AppearanceLifeformHealth.java | 4 +-
...pearanceLinearObjectLaneMarkerVisible.java | 4 +-
...AppearanceLinearObjectTankDitchBreach.java | 4 +-
.../dis7/enumerations/AppearanceNVGMode.java | 4 +-
...ppearanceNavigationPositionBrightness.java | 4 +-
.../AppearanceObjectGeneralDamage.java | 4 +-
.../AppearanceObjectGeneralIEDPresent.java | 4 +-
...AppearanceObjectGeneralPredistributed.java | 4 +-
.../AppearanceObjectSpecificBreachState.java | 4 +-
.../AppearanceObjectSpecificChemicalType.java | 4 +-
.../enumerations/AppearancePaintScheme.java | 4 +-
.../AppearanceSubsurfaceHatch.java | 4 +-
.../AppearanceSupplyDeployed.java | 4 +-
.../AppearanceTrailingEffects.java | 4 +-
.../ArticulatedPartsTypeMetric.java | 4 +-
.../AttachedPartDetachedIndicator.java | 4 +-
.../AustralianCategoryOverlay.java | 4 +-
.../enumerations/BeamStatusBeamState.java | 4 +-
.../enumerations/BuildingPaintScheme.java | 4 +-
.../CCTTSINCGARSClearChannel.java | 4 +-
.../CCTTSINCGARSStartofMessage.java | 4 +-
.../enumerations/CIGIExtensionPacketID.java | 4 +-
.../dis7/enumerations/CapabilityReport.java | 4 +-
...yMaterialtoSupportNonMilitaryPrograms.java | 4 +-
...s11SupplyCategorySuppliesNonDoctrinal.java | 4 +-
...2SupplyCategorySlingLoadsNonDoctrinal.java | 4 +-
.../Class1SupplyCategorySubsistence.java | 4 +-
...IndividualEquipmentToolsAdminSupplies.java | 4 +-
...SupplyCategoryPetroleumOilsLubricants.java | 4 +-
...s4SupplyCategoryConstructionMaterials.java | 4 +-
...ss6SupplyCategoryPersonnelDemandItems.java | 4 +-
.../Class7SupplyCategoryMajorItems.java | 4 +-
.../Class8SupplyCategoryMedicalMaterial.java | 4 +-
...upplyCategoryRepairPartsandComponents.java | 4 +-
.../dis7/enumerations/CollisionType.java | 4 +-
.../nps/moves/dis7/enumerations/Color.java | 4 +-
.../ComponentVisualDamageStatusSmoke.java | 4 +-
...ponentVisualDamageStatusSurfaceDamage.java | 4 +-
.../nps/moves/dis7/enumerations/Country.java | 4 +-
.../dis7/enumerations/CoverShroudStatus.java | 4 +-
.../enumerations/CryptoKeyIDCryptoMode.java | 4 +-
...amageDescriptionComponentDamageStatus.java | 4 +-
...eDescriptionComponentVisualSmokeColor.java | 4 +-
.../DEFireFlagsStateUpdateFlag.java | 4 +-
.../dis7/enumerations/DEFirePulseShape.java | 4 +-
.../DEPrecisionAimpointBeamSpotType.java | 4 +-
.../enumerations/DISAttributeActionCode.java | 4 +-
.../DISLiveEntitySubprotocolNumber.java | 4 +-
...StatusActiveInterrogationIndicatorAII.java | 4 +-
...PDUStatusCoupledExtensionIndicatorCEI.java | 4 +-
...ISPDUStatusDetonationTypeIndicatorDTI.java | 4 +-
.../DISPDUStatusFireTypeIndicatorFTI.java | 4 +-
.../DISPDUStatusIFFSimulationModeISM.java | 4 +-
...PDUStatusIntercomAttachedIndicatorIAI.java | 4 +-
.../DISPDUStatusLVCIndicatorLVC.java | 4 +-
...DISPDUStatusRadioAttachedIndicatorRAI.java | 4 +-
...DUStatusTransferredEntityIndicatorTEI.java | 4 +-
.../moves/dis7/enumerations/DISPDUType.java | 4 +-
.../dis7/enumerations/DISProtocolFamily.java | 4 +-
.../dis7/enumerations/DISProtocolVersion.java | 4 +-
.../dis7/enumerations/DRParametersType.java | 4 +-
.../moves/dis7/enumerations/DataCategory.java | 4 +-
.../enumerations/DeadReckoningAlgorithm.java | 4 +-
...de5SAltitudePositiveNegativeIndicator.java | 4 +-
.../DesignatorDesignatorCode.java | 4 +-
.../enumerations/DesignatorSystemName.java | 4 +-
.../dis7/enumerations/DetonationResult.java | 4 +-
.../EEAttributeStateIndicator.java | 4 +-
.../ElectromagneticEmissionBeamFunction.java | 4 +-
...omagneticEmissionStateUpdateIndicator.java | 4 +-
.../moves/dis7/enumerations/EmitterName.java | 4 +-
.../enumerations/EmitterSystemFunction.java | 4 +-
.../EntityAssociationAssociationStatus.java | 4 +-
.../EntityAssociationAssociationType.java | 4 +-
.../EntityAssociationGroupMemberType.java | 4 +-
...ityAssociationPhysicalAssociationType.java | 4 +-
...tityAssociationPhysicalConnectionType.java | 4 +-
...tyDamageStatusComponentIdentification.java | 4 +-
.../moves/dis7/enumerations/EntityKind.java | 4 +-
.../EntityMarkingCharacterSet.java | 4 +-
.../EntityVPRecordChangeIndicator.java | 4 +-
.../EnvironmentRecordTypeGroups.java | 4 +-
.../EnvironmentalProcessModelType.java | 4 +-
.../EnvironmentalSubcategory.java | 4 +-
.../enumerations/ExpendableAirCategory.java | 4 +-
.../ExpendableSubsurfaceCategory.java | 4 +-
.../ExpendableSurfaceCategory.java | 4 +-
.../ExplosiveMaterialCategories.java | 4 +-
.../enumerations/ExplosiveMaterialGroups.java | 4 +-
.../dis7/enumerations/FlareSmokeColor.java | 4 +-
.../dis7/enumerations/FlareSmokeStatus.java | 4 +-
.../nps/moves/dis7/enumerations/ForceID.java | 4 +-
.../moves/dis7/enumerations/FormatType.java | 4 +-
.../moves/dis7/enumerations/FuelLocation.java | 4 +-
.../enumerations/FuelMeasurementUnits.java | 4 +-
.../GridAxisDescriptorAxisType.java | 4 +-
.../enumerations/GriddedDataConstantGrid.java | 4 +-
.../GriddedDataCoordinateSystem.java | 4 +-
.../GriddedDataDataRepresentation.java | 4 +-
.../enumerations/GriddedDataFieldNumber.java | 4 +-
.../enumerations/GriddedDataSampleType.java | 4 +-
.../enumerations/HighDensityTrackJam.java | 4 +-
...FidelityHAVEQUICKTODTransmitIndicator.java | 4 +-
.../IFFAlternateMode4ChallengeReply.java | 4 +-
.../dis7/enumerations/IFFApplicableModes.java | 4 +-
.../enumerations/IFFDataRecordAvailable.java | 4 +-
.../IFFLayerSpecificInformation.java | 4 +-
.../dis7/enumerations/IFFSimulationMode.java | 4 +-
.../dis7/enumerations/IFFSystemMode.java | 4 +-
.../dis7/enumerations/IFFSystemName.java | 4 +-
.../dis7/enumerations/IFFSystemType.java | 4 +-
.../IFFSystemType1OperationalParameter1.java | 4 +-
.../IFFSystemType1OperationalParameter2.java | 4 +-
.../enumerations/IOActionIOActionPhase.java | 4 +-
.../enumerations/IOActionIOActionType.java | 4 +-
.../IOActionIOSimulationSource.java | 4 +-
.../enumerations/IOActionIOWarfareType.java | 4 +-
.../IOCommsNodeRecordCommsNodeType.java | 4 +-
.../enumerations/IOEffectsRecordIOEffect.java | 4 +-
.../IOEffectsRecordIOLinkType.java | 4 +-
.../IOEffectsRecordIOProcess.java | 4 +-
.../enumerations/IOEffectsRecordIOStatus.java | 4 +-
.../enumerations/IOReportIOReportType.java | 4 +-
.../dis7/enumerations/ISLSAntennaType.java | 4 +-
.../enumerations/IntercomControlCommand.java | 4 +-
.../IntercomControlCommunicationsClass.java | 4 +-
.../IntercomControlCommunicationsType.java | 4 +-
.../IntercomControlControlType.java | 4 +-
...comControlDestinationLineStateCommand.java | 4 +-
.../IntercomControlRecordType.java | 4 +-
.../IntercomControlTransmitLineState.java | 4 +-
.../IsGroupOfGroupedEntityCategory.java | 4 +-
.../enumerations/IsGroupOfRestStatus.java | 4 +-
.../dis7/enumerations/IsPartOfNature.java | 4 +-
.../dis7/enumerations/IsPartOfPosition.java | 4 +-
.../enumerations/IsPartOfStationName.java | 4 +-
.../dis7/enumerations/IslandSubcategory.java | 4 +-
...ulationParametersSynchronizationState.java | 4 +-
...metersTransmittingTerminalPrimaryMode.java | 4 +-
...tersTransmittingTerminalSecondaryMode.java | 4 +-
.../moves/dis7/enumerations/LeafCoverage.java | 4 +-
.../enumerations/Level2SquitterStatus.java | 4 +-
.../enumerations/LifeFormAirCategories.java | 4 +-
.../enumerations/LifeFormCategoriesUS.java | 4 +-
.../LifeFormExtraPersonalData.java | 4 +-
...feFormHumanSpecificAntiMaterielRifles.java | 4 +-
...LifeFormHumanSpecificAntiTankMissiles.java | 4 +-
.../LifeFormHumanSpecificAntiTankRockets.java | 4 +-
.../LifeFormHumanSpecificAssaultRifles.java | 4 +-
.../LifeFormHumanSpecificDroneGuns.java | 4 +-
.../LifeFormHumanSpecificEquipmentClass.java | 4 +-
.../LifeFormHumanSpecificFlameRockets.java | 4 +-
.../LifeFormHumanSpecificFlameThrowers.java | 4 +-
...LifeFormHumanSpecificGrenadeLaunchers.java | 4 +-
...manSpecificGrenadeLaunchingMachineGun.java | 4 +-
.../LifeFormHumanSpecificHandGuns.java | 4 +-
.../LifeFormHumanSpecificHighPowerRifles.java | 4 +-
.../LifeFormHumanSpecificMachineGuns.java | 4 +-
...anSpecificManPortableAirDefenseSystem.java | 4 +-
.../LifeFormHumanSpecificMortars.java | 4 +-
...LifeFormHumanSpecificRecoillessRifles.java | 4 +-
.../LifeFormHumanSpecificShotGuns.java | 4 +-
.../LifeFormHumanSpecificSniper.java | 4 +-
.../LifeFormHumanSpecificSubMachineGun.java | 4 +-
...ifeFormHumanSpecificWeaponNonspecific.java | 4 +-
...ifeFormHumanSubcategoryEquipmentClass.java | 4 +-
.../enumerations/LifeFormLandCategories.java | 4 +-
.../LifeFormSubsurfaceCategories.java | 4 +-
.../LifeFormsSubcategoryCISWeapons.java | 4 +-
.../LifeFormsSubcategoryFrenchWeapons.java | 4 +-
.../LifeFormsSubcategoryGermanWeapons.java | 4 +-
.../LifeFormsSubcategoryIranianWeapons.java | 4 +-
.../LifeFormsSubcategoryUKWeapons.java | 4 +-
.../LifeFormsSubcategoryUSWeapons.java | 4 +-
.../enumerations/LifeSavingEquipment.java | 4 +-
.../Link1111BDataTerminalSetIndicator.java | 4 +-
.../enumerations/Link1111BFidelityLevel.java | 4 +-
.../Link1111BModeofOperation.java | 4 +-
.../enumerations/Link1111BTerminalMode.java | 4 +-
.../nps/moves/dis7/enumerations/Material.java | 4 +-
.../MinefieldAppearanceActiveStatus.java | 4 +-
.../enumerations/MinefieldAppearanceLane.java | 4 +-
.../MinefieldAppearanceMinefieldType.java | 4 +-
.../MinefieldAppearanceState.java | 4 +-
.../enumerations/MinefieldFusingFuseType.java | 4 +-
.../MinefieldPaintSchemeAlgae.java | 4 +-
.../MinefieldPaintSchemePaintScheme.java | 4 +-
.../enumerations/MinefieldSensorTypes.java | 4 +-
.../MinefieldSensorTypesFLIR.java | 4 +-
.../MinefieldSensorTypesLaser.java | 4 +-
.../MinefieldSensorTypesMagnetic.java | 4 +-
.../MinefieldSensorTypesMultispectral.java | 4 +-
.../MinefieldSensorTypesOptical.java | 4 +-
.../MinefieldSensorTypesPhysical.java | 4 +-
.../MinefieldSensorTypesRADAR.java | 4 +-
.../MinefieldSensorTypesSONAR.java | 4 +-
.../MinefieldStateProtocolMode.java | 4 +-
.../dis7/enumerations/Mode5IFFMission.java | 4 +-
.../enumerations/Mode5LevelSelection.java | 4 +-
.../enumerations/Mode5LocationErrors.java | 4 +-
.../Mode5MessageFormatsStatus.java | 4 +-
.../dis7/enumerations/Mode5PlatformType.java | 4 +-
.../moves/dis7/enumerations/Mode5Reply.java | 4 +-
.../Mode5SAltitudeResolution.java | 4 +-
.../dis7/enumerations/Mode5SquitterType.java | 4 +-
.../enumerations/ModeCAltitudeIndicator.java | 4 +-
.../ModeSInterrogatorIdentifierICType.java | 4 +-
.../ModeSInterrogatorStatusTransmitState.java | 4 +-
.../ModeSSquitterRecordSource.java | 4 +-
.../dis7/enumerations/ModeSSquitterType.java | 4 +-
.../dis7/enumerations/MunitionCategory.java | 4 +-
.../enumerations/MunitionDescriptorFuse.java | 4 +-
.../MunitionDescriptorWarhead.java | 4 +-
.../dis7/enumerations/MunitionDomain.java | 4 +-
.../MunitionExpendableStatus.java | 4 +-
.../NETIDRecordFrequencyTable.java | 4 +-
.../dis7/enumerations/NETIDRecordMode.java | 4 +-
.../dis7/enumerations/NavigationSource.java | 4 +-
.../moves/dis7/enumerations/ObjectKind.java | 4 +-
.../dis7/enumerations/OwnershipStatus.java | 4 +-
.../moves/dis7/enumerations/Parachute.java | 4 +-
.../PhysicalAssociationTypeGroups.java | 4 +-
.../enumerations/PlatformAirCategory.java | 4 +-
...ivilianFixedWingAircraftSubcategories.java | 4 +-
...latformAirCivilianGliderSubcategories.java | 4 +-
...ormAirCivilianHelicopterSubcategories.java | 4 +-
...ianLighterthanAirAirshipSubcategories.java | 4 +-
...ianLighterthanAirBalloonSubcategories.java | 4 +-
...ightNonrigidWingAircraftSubcategories.java | 4 +-
...ralightRigidWingAircraftSubcategories.java | 4 +-
.../dis7/enumerations/PlatformDomain.java | 4 +-
.../PlatformLandBusSubcategories.java | 4 +-
.../PlatformLandCarSubcategories.java | 4 +-
.../enumerations/PlatformLandCategory.java | 4 +-
...tructionSpecialtyVehicleSubcategories.java | 4 +-
...LandFarmSpecialtyVehicleSubcategories.java | 4 +-
.../PlatformLandMotorcycleSubcategories.java | 4 +-
...ndMultipleUnitCargoTruckSubcategories.java | 4 +-
...nitUtilityEmergencyTruckSubcategories.java | 4 +-
...PlatformLandNonmotorizedSubcategories.java | 4 +-
...PlatformLandRecreationalSubcategories.java | 4 +-
...LandSingleUnitCargoTruckSubcategories.java | 4 +-
...nitUtilityEmergencyTruckSubcategories.java | 4 +-
.../PlatformLandTrailerSubcategories.java | 4 +-
.../PlatformLandTrainsSubcategories.java | 4 +-
...mLandUtilityEmergencyCarSubcategories.java | 4 +-
.../enumerations/PlatformSpaceCategory.java | 4 +-
.../PlatformSubsurfaceCategory.java | 4 +-
...CivilianSemiSubmersiblesSubcategories.java | 4 +-
...surfaceCivilianSubmarineSubcategories.java | 4 +-
...rfaceCivilianSubmersibleSubcategories.java | 4 +-
.../enumerations/PlatformSurfaceCategory.java | 4 +-
...tformSurfaceDryCargoShipSubcategories.java | 4 +-
...formSurfaceFishingVesselSubcategories.java | 4 +-
...tformSurfaceOtherVesselsSubcategories.java | 4 +-
...rmSurfacePassengerVesselSubcategories.java | 4 +-
...mSurfacePrivateMotorboatSubcategories.java | 4 +-
...rmSurfacePrivateSailboatSubcategories.java | 4 +-
...formSurfaceSupportVesselSubcategories.java | 4 +-
.../PlatformSurfaceTankerSubcategories.java | 4 +-
.../dis7/enumerations/RadioCategory.java | 4 +-
.../dis7/enumerations/RadioSubcategory.java | 4 +-
.../enumerations/ReceiverReceiverState.java | 4 +-
.../enumerations/RecordQueryREventType.java | 4 +-
.../dis7/enumerations/RecordREventType.java | 4 +-
.../enumerations/RepairCompleteRepair.java | 4 +-
.../moves/dis7/enumerations/RepairGroups.java | 4 +-
.../RepairResponseRepairResult.java | 4 +-
.../dis7/enumerations/ReplyAmplification.java | 4 +-
.../RequiredReliabilityService.java | 4 +-
.../nps/moves/dis7/enumerations/Season.java | 4 +-
.../enumerations/SensorEmitterCategory.java | 4 +-
.../dis7/enumerations/SensorOnOffStatus.java | 4 +-
...sorRecordSensorTypeOtherActiveSensors.java | 4 +-
.../SensorRecordSensorTypePassiveSensors.java | 4 +-
.../dis7/enumerations/SensorTypeSource.java | 4 +-
.../SeparationVPPreEntityIndicator.java | 4 +-
.../SeparationVPReasonforSeparation.java | 4 +-
.../ServiceRequestServiceTypeRequested.java | 4 +-
.../enumerations/SignalEncodingClass.java | 4 +-
.../dis7/enumerations/SignalEncodingType.java | 4 +-
.../dis7/enumerations/SignalTDLType.java | 4 +-
...ignalUserProtocolIdentificationNumber.java | 4 +-
...icDimensionEnumerationsforAirAreaSize.java | 4 +-
...cDimensionEnumerationsforLandAreaSize.java | 4 +-
.../dis7/enumerations/SpotChaffStatus.java | 4 +-
.../dis7/enumerations/StopFreezeReason.java | 4 +-
.../SubcategoriesforAirCategory200Bird.java | 4 +-
.../SubcategoriesforAirCategory201Insect.java | 4 +-
.../SubcategoriesforAirCategory202Mammal.java | 4 +-
...SubcategoriesforLandCategory200Mammal.java | 4 +-
...ubcategoriesforLandCategory201Reptile.java | 4 +-
...categoriesforLandCategory202Amphibian.java | 4 +-
...SubcategoriesforLandCategory203Insect.java | 4 +-
...bcategoriesforLandCategory204Arachnid.java | 4 +-
...ubcategoriesforLandCategory205Mollusk.java | 4 +-
...categoriesforLandCategory206Marsupial.java | 4 +-
...ategoriesforSubsurfaceCategory200Fish.java | 4 +-
...egoriesforSubsurfaceCategory201Mammal.java | 4 +-
...goriesforSubsurfaceCategory202Mollusk.java | 4 +-
...iesforSubsurfaceCategory203Crustacean.java | 4 +-
...egoriesforSubsurfaceCategory204Insect.java | 4 +-
.../moves/dis7/enumerations/SupplyDomain.java | 4 +-
.../dis7/enumerations/SupplyFuelType.java | 4 +-
.../dis7/enumerations/SurveillanceStatus.java | 4 +-
.../TCASACASBasicAdvancedIndicator.java | 4 +-
.../dis7/enumerations/TCASACASIndicator.java | 4 +-
.../enumerations/TCASACASSoftwareVersion.java | 4 +-
.../moves/dis7/enumerations/TCASACASType.java | 4 +-
.../moves/dis7/enumerations/TCASIIIType.java | 4 +-
.../moves/dis7/enumerations/TILinkType.java | 4 +-
.../dis7/enumerations/TimeTypeSource.java | 4 +-
.../TransferControlTransferType.java | 4 +-
.../enumerations/TransmissionIndicator.java | 4 +-
...nsmitterAntennaPatternReferenceSystem.java | 4 +-
.../TransmitterAntennaPatternType.java | 4 +-
.../enumerations/TransmitterCryptoSystem.java | 4 +-
.../TransmitterDetailAmplitudeModulation.java | 4 +-
...tterDetailAmplitudeandAngleModulation.java | 4 +-
.../TransmitterDetailAnglemodulation.java | 4 +-
...tterDetailCarrierPhaseShiftModulation.java | 4 +-
...ransmitterDetailCombinationModulation.java | 4 +-
.../TransmitterDetailPulseModulation.java | 4 +-
.../TransmitterDetailSATCOMModulation.java | 4 +-
...ransmitterDetailUnmodulatedModulation.java | 4 +-
.../enumerations/TransmitterInputSource.java | 4 +-
.../TransmitterMajorModulation.java | 4 +-
.../TransmitterModulationTypeSystem.java | 4 +-
.../TransmitterTransmitState.java | 4 +-
.../TransponderInterrogatorIndicator.java | 4 +-
.../dis7/enumerations/TurnRateSource.java | 4 +-
.../UAAcousticEmitterSystemFunction.java | 4 +-
.../enumerations/UAAcousticSystemName.java | 4 +-
.../UAActiveEmissionParameterIndex.java | 4 +-
...ditionalPassiveActivityParameterIndex.java | 4 +-
.../enumerations/UAPassiveParameterIndex.java | 4 +-
...ulsionPlantConfigurationConfiguration.java | 4 +-
.../dis7/enumerations/UAScanPattern.java | 4 +-
.../UAStateChangeUpdateIndicator.java | 4 +-
.../VariableParameterRecordType.java | 4 +-
.../VariantsforAirCategory200Bird.java | 4 +-
...ReptilesAmphibiansInsectsandArachnids.java | 4 +-
...ariantsforSubsurfaceCategory201Mammal.java | 4 +-
627 files changed, 3449 insertions(+), 2877 deletions(-)
diff --git a/src-generated/edu/nps/moves/dis7/APA.java b/src-generated/edu/nps/moves/dis7/APA.java
index 68a1d08c91..1e2bc072e2 100644
--- a/src-generated/edu/nps/moves/dis7/APA.java
+++ b/src-generated/edu/nps/moves/dis7/APA.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -65,15 +65,16 @@ public short getValue()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)parameterIndex);
- dos.writeShort( (short)value);
+ dos.writeShort(parameterIndex);
+ dos.writeShort(value);
}
catch(Exception e)
{
@@ -83,9 +84,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" parameterIndex: ").append(parameterIndex).append("\n");
sb.append(" value: ").append(value).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
index 01d6010091..35c62b2865 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -86,8 +86,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -96,7 +97,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
acknowledgeFlag.marshal(dos);
responseFlag.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -106,9 +107,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -126,7 +128,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -200,7 +202,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
sb.append(" responseFlag: ").append(responseFlag).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
index 6744f85146..201a8f0b43 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -86,8 +86,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -96,7 +97,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
acknowledgeFlag.marshal(dos);
responseFlag.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -106,9 +107,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -126,7 +128,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -200,7 +202,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
sb.append(" responseFlag: ").append(responseFlag).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
index 91062c1300..dcf00d2776 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
index a439f49ca0..2ac202cac2 100644
--- a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,8 +84,9 @@ public byte getAcousticIDNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -93,7 +94,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
acousticSystemName.marshal(dos);
acousticFunction.marshal(dos);
- dos.writeByte( (byte)acousticIDNumber);
+ dos.writeByte(acousticIDNumber);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" acousticSystemName: ").append(acousticSystemName).append("\n");
sb.append(" acousticFunction: ").append(acousticFunction).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
index aea9131f14..8b909b5efa 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -15,7 +15,7 @@ import edu.nps.moves.dis7.enumerations.*;
*/
public class ActionRequestPdu extends SimulationManagementFamilyPdu implements Serializable
{
- /** identifies the request being made by the simulaton manager */
+ /** identifies the request being made by the simulation manager */
protected int requestID;
/** identifies the particular action being requested(see Section 7 of SISO-REF-010). uid 71 */
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
actionID.marshal(dos);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" actionID: ").append(actionID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
index 64b7fab909..49a4457888 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -170,8 +170,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -179,12 +180,12 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
actionID.marshal(dos);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -208,9 +209,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -250,7 +252,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -276,14 +278,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -370,7 +372,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
index 9d6b65999c..a1d0465733 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
index 5c9da6f327..13f3c4a747 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requestStatus.marshal(dos);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requestStatus: ").append(requestStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
index 9e95af039b..4a6046460a 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
responseStatus.marshal(dos);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" responseStatus: ").append(responseStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
index 42ac1c397d..bc892f2835 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
index 5eaca06cb0..9ed0a92c97 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getAggregateID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)aggregateID);
+ dos.writeShort(aggregateID);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" aggregateID: ").append(aggregateID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AggregateMarking.java b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
index bce9e5455d..78743f8630 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateMarking.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,8 +67,9 @@ public byte[] getCharacters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -187,7 +189,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" characterSet: ").append(characterSet).append("\n");
sb.append(" characters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
index cab46213ff..bda5e8cbb5 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -333,8 +333,9 @@ public List<VariableDatum> getVariableDatumList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -351,10 +352,10 @@ public void marshal(DataOutputStream dos) throws Exception
orientation.marshal(dos);
centerOfMass.marshal(dos);
velocity.marshal(dos);
- dos.writeShort( (short)aggregateIDList.size());
- dos.writeShort( (short)entityIDList.size());
- dos.writeShort( (short)silentAggregateSystemList.size());
- dos.writeShort( (short)silentEntitySystemList.size());
+ dos.writeShort(aggregateIDList.size());
+ dos.writeShort(entityIDList.size());
+ dos.writeShort(silentAggregateSystemList.size());
+ dos.writeShort(silentEntitySystemList.size());
for(int idx = 0; idx < aggregateIDList.size(); idx++)
{
@@ -384,7 +385,7 @@ public void marshal(DataOutputStream dos) throws Exception
aEntityType.marshal(dos);
}
- dos.writeInt( (int)variableDatumList.size());
+ dos.writeInt(variableDatumList.size());
for(int idx = 0; idx < variableDatumList.size(); idx++)
{
@@ -401,9 +402,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -475,7 +477,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -508,14 +510,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < aggregateIDList.size(); idx++)
{
- AggregateIdentifier aAggregateIdentifier = (AggregateIdentifier)aggregateIDList.get(idx);
+ AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
aAggregateIdentifier.marshal(buff);
}
for(int idx = 0; idx < entityIDList.size(); idx++)
{
- EntityID aEntityID = (EntityID)entityIDList.get(idx);
+ EntityID aEntityID = entityIDList.get(idx);
aEntityID.marshal(buff);
}
@@ -523,14 +525,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
{
- EntityType aEntityType = (EntityType)silentAggregateSystemList.get(idx);
+ EntityType aEntityType = silentAggregateSystemList.get(idx);
aEntityType.marshal(buff);
}
for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
{
- EntityType aEntityType = (EntityType)silentEntitySystemList.get(idx);
+ EntityType aEntityType = silentEntitySystemList.get(idx);
aEntityType.marshal(buff);
}
@@ -538,7 +540,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableDatumList.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumList.get(idx);
+ VariableDatum aVariableDatum = variableDatumList.get(idx);
aVariableDatum.marshal(buff);
}
@@ -672,7 +674,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" aggregateID: ").append(aggregateID).append("\n");
sb.append(" forceID: ").append(forceID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AggregateType.java b/src-generated/edu/nps/moves/dis7/AggregateType.java
index 3502314e8f..ed7c26dcb6 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateType.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -151,8 +151,9 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -161,10 +162,10 @@ public void marshal(DataOutputStream dos) throws Exception
aggregateKind.marshal(dos);
domain.marshal(dos);
country.marshal(dos);
- dos.writeByte( (byte)category);
+ dos.writeByte(category);
subcategory.marshal(dos);
specificInfo.marshal(dos);
- dos.writeByte( (byte)extra);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -174,9 +175,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -200,7 +202,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -288,7 +290,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" aggregateKind: ").append(aggregateKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Align.java b/src-generated/edu/nps/moves/dis7/Align.java
index 3c32fc99aa..c02ff5463c 100644
--- a/src-generated/edu/nps/moves/dis7/Align.java
+++ b/src-generated/edu/nps/moves/dis7/Align.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -111,7 +111,7 @@ public class Align
dis.read();
}
catch(IOException ex) {
- ex.printStackTrace();
+ ex.printStackTrace(System.err);
throw new RuntimeException("IOException ex: "+ex.getLocalizedMessage());
}
}
@@ -122,7 +122,7 @@ public class Align
dos.writeByte(0);
}
catch(IOException ex) {
- ex.printStackTrace();
+ ex.printStackTrace(System.err);
throw new RuntimeException("IOException ex: "+ex.getLocalizedMessage());
}
diff --git a/src-generated/edu/nps/moves/dis7/AngleDeception.java b/src-generated/edu/nps/moves/dis7/AngleDeception.java
index 5abc46508b..0fba4f739e 100644
--- a/src-generated/edu/nps/moves/dis7/AngleDeception.java
+++ b/src-generated/edu/nps/moves/dis7/AngleDeception.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -290,29 +290,30 @@ public int getPadding3()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
stateIndicator.marshal(dos);
- dos.writeByte( (byte)padding2);
- dos.writeFloat( (float)azimuthOffset);
- dos.writeFloat( (float)azimuthWidth);
- dos.writeFloat( (float)azimuthPullRate);
- dos.writeFloat( (float)azimuthPullAcceleration);
- dos.writeFloat( (float)elevationOffset);
- dos.writeFloat( (float)elevationWidth);
- dos.writeFloat( (float)elevationPullRate);
- dos.writeFloat( (float)elevationPullAcceleration);
- dos.writeInt( (int)padding3);
+ dos.writeByte(padding2);
+ dos.writeFloat(azimuthOffset);
+ dos.writeFloat(azimuthWidth);
+ dos.writeFloat(azimuthPullRate);
+ dos.writeFloat(azimuthPullAcceleration);
+ dos.writeFloat(elevationOffset);
+ dos.writeFloat(elevationWidth);
+ dos.writeFloat(elevationPullRate);
+ dos.writeFloat(elevationPullAcceleration);
+ dos.writeInt(padding3);
}
catch(Exception e)
{
@@ -322,9 +323,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -366,7 +368,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -481,7 +483,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
index 98c6981f72..51b61b7264 100644
--- a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
+++ b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public float getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)x);
- dos.writeFloat( (float)y);
- dos.writeFloat( (float)z);
+ dos.writeFloat(x);
+ dos.writeFloat(y);
+ dos.writeFloat(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AntennaLocation.java b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
index ff5f2cccba..8540a61c2c 100644
--- a/src-generated/edu/nps/moves/dis7/AntennaLocation.java
+++ b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,8 +67,9 @@ public Vector3Float getRelativeAntennaLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Appearance.java b/src-generated/edu/nps/moves/dis7/Appearance.java
index cecf352b09..265a760b93 100644
--- a/src-generated/edu/nps/moves/dis7/Appearance.java
+++ b/src-generated/edu/nps/moves/dis7/Appearance.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -97,17 +97,18 @@ public int getAudio()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)visual);
- dos.writeInt( (int)ir);
- dos.writeInt( (int)em);
- dos.writeInt( (int)audio);
+ dos.writeInt(visual);
+ dos.writeInt(ir);
+ dos.writeInt(em);
+ dos.writeInt(audio);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" visual: ").append(visual).append("\n");
sb.append(" ir: ").append(ir).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AppearancePdu.java b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
index ac64683ede..28b1f15d4b 100644
--- a/src-generated/edu/nps/moves/dis7/AppearancePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -165,8 +165,9 @@ public Appearance getAppearanceFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -174,7 +175,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
liveEntityId.marshal(dos);
- dos.writeShort( (short)appearanceFlags);
+ dos.writeShort(appearanceFlags);
forceId.marshal(dos);
entityType.marshal(dos);
alternateEntityType.marshal(dos);
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -214,7 +216,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -303,7 +305,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
sb.append(" appearanceFlags: ").append(appearanceFlags).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
index 65ffa06c58..3d00c27148 100644
--- a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -230,8 +230,9 @@ public List<Vector3Double> getObjectLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -240,13 +241,13 @@ public void marshal(DataOutputStream dos) throws Exception
{
objectID.marshal(dos);
referencedObjectID.marshal(dos);
- dos.writeShort( (short)updateNumber);
+ dos.writeShort(updateNumber);
forceID.marshal(dos);
modifications.marshal(dos);
objectType.marshal(dos);
- dos.writeInt( (int)specificObjectAppearance);
- dos.writeShort( (short)generalObjectAppearance);
- dos.writeShort( (short)objectLocation.size());
+ dos.writeInt(specificObjectAppearance);
+ dos.writeShort(generalObjectAppearance);
+ dos.writeShort(objectLocation.size());
requesterID.marshal(dos);
receivingID.marshal(dos);
@@ -265,9 +266,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -302,7 +304,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -332,7 +334,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < objectLocation.size(); idx++)
{
- Vector3Double aVector3Double = (Vector3Double)objectLocation.get(idx);
+ Vector3Double aVector3Double = objectLocation.get(idx);
aVector3Double.marshal(buff);
}
@@ -417,7 +419,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" objectID: ").append(objectID).append("\n");
sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
index 6ffc26f0f2..603a7baaa9 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -134,19 +134,20 @@ public int getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeByte( (byte)changeIndicator);
- dos.writeShort( (short)partAttachedTo);
- dos.writeInt( (int)parameterType);
- dos.writeFloat( (float)parameterValue);
- dos.writeInt( (int)padding);
+ dos.writeByte(changeIndicator);
+ dos.writeShort(partAttachedTo);
+ dos.writeInt(parameterType);
+ dos.writeFloat(parameterValue);
+ dos.writeInt(padding);
}
catch(Exception e)
{
@@ -156,9 +157,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -180,7 +182,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
index 00501f9203..0b0c18e13e 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -74,8 +74,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -83,7 +84,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
liveEntityId.marshal(dos);
- dos.writeByte( (byte)variableParameters.size());
+ dos.writeByte(variableParameters.size());
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -124,7 +126,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -145,7 +147,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -212,7 +214,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
sb.append(" variableParameters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Association.java b/src-generated/edu/nps/moves/dis7/Association.java
index e2d451ac4d..f28489394d 100644
--- a/src-generated/edu/nps/moves/dis7/Association.java
+++ b/src-generated/edu/nps/moves/dis7/Association.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -100,15 +100,16 @@ public Vector3Double getAssociatedLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
associationType.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
associatedEntityID.marshal(dos);
associatedLocation.marshal(dos);
}
@@ -120,9 +121,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -138,7 +140,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -217,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" associationType: ").append(associationType).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
index 2e1b08fd0b..cb3813869b 100644
--- a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,8 +118,9 @@ public EntityType getAttachedPartType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -127,7 +128,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
recordType.marshal(dos);
detachedIndicator.marshal(dos);
- dos.writeShort( (short)partAttachedTo);
+ dos.writeShort(partAttachedTo);
parameterType.marshal(dos);
attachedPartType.marshal(dos);
}
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" detachedIndicator: ").append(detachedIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Attribute.java b/src-generated/edu/nps/moves/dis7/Attribute.java
index 2fc05fcc2b..e3644dc708 100644
--- a/src-generated/edu/nps/moves/dis7/Attribute.java
+++ b/src-generated/edu/nps/moves/dis7/Attribute.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -71,15 +71,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordSpecificFields.length);
+ dos.writeInt(recordType);
+ dos.writeShort(recordSpecificFields.length);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -94,9 +95,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -115,7 +117,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -201,7 +203,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordSpecificFields: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AttributePdu.java b/src-generated/edu/nps/moves/dis7/AttributePdu.java
index dbe9e75ee0..9c0a25d206 100644
--- a/src-generated/edu/nps/moves/dis7/AttributePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AttributePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -195,8 +195,9 @@ public List<AttributeRecordSet> getAttributeRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -204,14 +205,14 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
originatingSimulationAddress.marshal(dos);
- dos.writeInt( (int)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeInt(padding1);
+ dos.writeShort(padding2);
attributeRecordPduType.marshal(dos);
attributeRecordProtocolVersion.marshal(dos);
masterAttributeRecordType.marshal(dos);
actionCode.marshal(dos);
- dos.writeByte( (byte)padding3);
- dos.writeShort( (short)attributeRecordSets.size());
+ dos.writeByte(padding3);
+ dos.writeShort(attributeRecordSets.size());
for(int idx = 0; idx < attributeRecordSets.size(); idx++)
{
@@ -228,9 +229,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -266,7 +268,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -294,7 +296,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < attributeRecordSets.size(); idx++)
{
- AttributeRecordSet aAttributeRecordSet = (AttributeRecordSet)attributeRecordSets.get(idx);
+ AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
aAttributeRecordSet.marshal(buff);
}
@@ -375,7 +377,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingSimulationAddress: ").append(originatingSimulationAddress).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
index 2a7ba31319..739df9a313 100644
--- a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
+++ b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -71,15 +71,16 @@ public List<Attribute> getAttributeRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityId.marshal(dos);
- dos.writeShort( (short)attributeRecords.size());
+ dos.writeShort(attributeRecords.size());
for(int idx = 0; idx < attributeRecords.size(); idx++)
{
@@ -96,9 +97,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -138,7 +140,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < attributeRecords.size(); idx++)
{
- Attribute aAttribute = (Attribute)attributeRecords.get(idx);
+ Attribute aAttribute = attributeRecords.get(idx);
aAttribute.marshal(buff);
}
@@ -208,7 +210,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityId: ").append(entityId).append("\n");
sb.append(" attributeRecords: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
index 537e33671b..3690f14a82 100644
--- a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
+++ b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -199,23 +199,24 @@ public int getPadding3()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
beamDirection.marshal(dos);
- dos.writeFloat( (float)azimuthBeamwidth);
- dos.writeFloat( (float)elevationBeamwidth);
+ dos.writeFloat(azimuthBeamwidth);
+ dos.writeFloat(elevationBeamwidth);
referenceSystem.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
- dos.writeFloat( (float)ez);
- dos.writeFloat( (float)ex);
- dos.writeFloat( (float)phase);
- dos.writeInt( (int)padding3);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+ dos.writeFloat(ez);
+ dos.writeFloat(ex);
+ dos.writeFloat(phase);
+ dos.writeInt(padding3);
}
catch(Exception e)
{
@@ -225,9 +226,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -256,7 +258,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -353,7 +355,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamDirection: ").append(beamDirection).append("\n");
sb.append(" azimuthBeamwidth: ").append(azimuthBeamwidth).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BeamData.java b/src-generated/edu/nps/moves/dis7/BeamData.java
index 1d4237a860..7bbc6cc9fa 100644
--- a/src-generated/edu/nps/moves/dis7/BeamData.java
+++ b/src-generated/edu/nps/moves/dis7/BeamData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,18 +118,19 @@ public float getBeamSweepSync()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)beamAzimuthCenter);
- dos.writeFloat( (float)beamAzimuthSweep);
- dos.writeFloat( (float)beamElevationCenter);
- dos.writeFloat( (float)beamElevationSweep);
- dos.writeFloat( (float)beamSweepSync);
+ dos.writeFloat(beamAzimuthCenter);
+ dos.writeFloat(beamAzimuthSweep);
+ dos.writeFloat(beamElevationCenter);
+ dos.writeFloat(beamElevationSweep);
+ dos.writeFloat(beamSweepSync);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamAzimuthCenter: ").append(beamAzimuthCenter).append("\n");
sb.append(" beamAzimuthSweep: ").append(beamAzimuthSweep).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BeamStatus.java b/src-generated/edu/nps/moves/dis7/BeamStatus.java
index c3ee452e85..486b290a1f 100644
--- a/src-generated/edu/nps/moves/dis7/BeamStatus.java
+++ b/src-generated/edu/nps/moves/dis7/BeamStatus.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -50,8 +50,9 @@ public BeamStatusBeamState getBeamState()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamState: ").append(beamState).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BlankingSector.java b/src-generated/edu/nps/moves/dis7/BlankingSector.java
index d82ef80307..fdd1a6c30f 100644
--- a/src-generated/edu/nps/moves/dis7/BlankingSector.java
+++ b/src-generated/edu/nps/moves/dis7/BlankingSector.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -242,26 +242,27 @@ public long getPadding3()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
stateIndicator.marshal(dos);
- dos.writeByte( (byte)padding2);
- dos.writeFloat( (float)leftAzimuth);
- dos.writeFloat( (float)rightAzimuth);
- dos.writeFloat( (float)lowerElevation);
- dos.writeFloat( (float)upperElevation);
- dos.writeFloat( (float)residualPower);
- dos.writeLong( (long)padding3);
+ dos.writeByte(padding2);
+ dos.writeFloat(leftAzimuth);
+ dos.writeFloat(rightAzimuth);
+ dos.writeFloat(lowerElevation);
+ dos.writeFloat(upperElevation);
+ dos.writeFloat(residualPower);
+ dos.writeLong(padding3);
}
catch(Exception e)
{
@@ -271,9 +272,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -309,7 +311,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -415,7 +417,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Category.java b/src-generated/edu/nps/moves/dis7/Category.java
index 977070f937..d211d9d21b 100644
--- a/src-generated/edu/nps/moves/dis7/Category.java
+++ b/src-generated/edu/nps/moves/dis7/Category.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -11,6 +11,15 @@ package edu.nps.moves.dis7;
*/
public interface Category
{
+ /**
+ *
+ * @return the value of this SubCategory
+ */
int getValue();
+
+ /**
+ *
+ * @return the description of this SubCategory
+ */
String getDescription();
}
diff --git a/src-generated/edu/nps/moves/dis7/ChangeOptions.java b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
index 121a055d00..60524fe437 100644
--- a/src-generated/edu/nps/moves/dis7/ChangeOptions.java
+++ b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -49,14 +49,15 @@ public byte getValue()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)value);
+ dos.writeByte(value);
}
catch(Exception e)
{
@@ -66,9 +67,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -80,7 +82,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -150,7 +152,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" value: ").append(value).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ClockTime.java b/src-generated/edu/nps/moves/dis7/ClockTime.java
index 338fcbaa88..380dc66e9a 100644
--- a/src-generated/edu/nps/moves/dis7/ClockTime.java
+++ b/src-generated/edu/nps/moves/dis7/ClockTime.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public int getTimePastHour()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)hour);
- dos.writeInt( (int)timePastHour);
+ dos.writeInt(hour);
+ dos.writeInt(timePastHour);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" hour: ").append(hour).append("\n");
sb.append(" timePastHour: ").append(timePastHour).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
index cf7651244a..f127d06c86 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -290,8 +290,9 @@ public float getCoefficientOfRestitution()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -301,18 +302,18 @@ public void marshal(DataOutputStream dos) throws Exception
issuingEntityID.marshal(dos);
collidingEntityID.marshal(dos);
collisionEventID.marshal(dos);
- dos.writeShort( (short)pad);
+ dos.writeShort(pad);
contactVelocity.marshal(dos);
- dos.writeFloat( (float)mass);
+ dos.writeFloat(mass);
locationOfImpact.marshal(dos);
- dos.writeFloat( (float)collisionIntermediateResultXX);
- dos.writeFloat( (float)collisionIntermediateResultXY);
- dos.writeFloat( (float)collisionIntermediateResultXZ);
- dos.writeFloat( (float)collisionIntermediateResultYY);
- dos.writeFloat( (float)collisionIntermediateResultYZ);
- dos.writeFloat( (float)collisionIntermediateResultZZ);
+ dos.writeFloat(collisionIntermediateResultXX);
+ dos.writeFloat(collisionIntermediateResultXY);
+ dos.writeFloat(collisionIntermediateResultXZ);
+ dos.writeFloat(collisionIntermediateResultYY);
+ dos.writeFloat(collisionIntermediateResultYZ);
+ dos.writeFloat(collisionIntermediateResultZZ);
unitSurfaceNormal.marshal(dos);
- dos.writeFloat( (float)coefficientOfRestitution);
+ dos.writeFloat(coefficientOfRestitution);
}
catch(Exception e)
{
@@ -322,9 +323,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -360,7 +362,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -470,7 +472,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CollisionPdu.java b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
index cab7054dd3..d9602c9b70 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -171,8 +171,9 @@ public Vector3Float getLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -183,9 +184,9 @@ public void marshal(DataOutputStream dos) throws Exception
collidingEntityID.marshal(dos);
eventID.marshal(dos);
collisionType.marshal(dos);
- dos.writeByte( (byte)pad);
+ dos.writeByte(pad);
velocity.marshal(dos);
- dos.writeFloat( (float)mass);
+ dos.writeFloat(mass);
location.marshal(dos);
}
catch(Exception e)
@@ -196,9 +197,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -221,7 +223,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -310,7 +312,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CommentPdu.java b/src-generated/edu/nps/moves/dis7/CommentPdu.java
index 764db87399..64ba26f55e 100644
--- a/src-generated/edu/nps/moves/dis7/CommentPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -64,16 +64,17 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)numberOfFixedDatumRecords);
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(numberOfFixedDatumRecords);
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < variableDatums.size(); idx++)
{
@@ -90,9 +91,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -115,7 +117,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -136,7 +138,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -202,7 +204,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" variableDatums: ").append("\n");
variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/CommentRPdu.java b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
index d087637e7d..8c15cb3dc6 100644
--- a/src-generated/edu/nps/moves/dis7/CommentRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -64,16 +64,17 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)numberOfFixedDatumRecords);
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(numberOfFixedDatumRecords);
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
@@ -90,9 +91,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -115,7 +117,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -136,7 +138,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -202,7 +204,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" variableDatumRecords: ").append("\n");
variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
index e114bad6fe..2436de2815 100644
--- a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
index 89eb47b907..d4b48880d9 100644
--- a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
+++ b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -65,15 +65,16 @@ public short getElementID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityID.marshal(dos);
- dos.writeShort( (short)elementID);
+ dos.writeShort(elementID);
}
catch(Exception e)
{
@@ -83,9 +84,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -98,7 +100,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -171,7 +173,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" elementID: ").append(elementID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
index 9d4de4bb1f..38d6b5d3e1 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -52,15 +52,16 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -70,9 +71,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -86,7 +88,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -154,7 +156,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
index 91a3d0c74a..024387ea6a 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,8 +101,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,9 +111,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -122,9 +123,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -144,7 +146,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -221,7 +223,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
index b7fc6385be..4d7d7464e1 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
index 36a8eea574..ad92d3a147 100644
--- a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
+++ b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -61,14 +61,15 @@ public int getBitFlags()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)bitFlags);
+ dos.writeInt(bitFlags);
}
catch(Exception e)
{
@@ -78,9 +79,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -92,7 +94,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -162,7 +164,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" bitFlags: ").append(bitFlags).append("\n");
sb.append(" GROUND_BURIAL_DEPTH_OFFSET_BIT: ").append(GROUND_BURIAL_DEPTH_OFFSET_BIT).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataPdu.java b/src-generated/edu/nps/moves/dis7/DataPdu.java
index 4d39c94d25..ae6fb84b1c 100644
--- a/src-generated/edu/nps/moves/dis7/DataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)padding1);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(requestID);
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
index f47b5125cb..c6b62e1ba0 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -83,15 +83,16 @@ public List<UnsignedDISInteger> getVariableDatumIDList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fixedDatumIDList.size());
- dos.writeInt( (int)variableDatumIDList.size());
+ dos.writeInt(fixedDatumIDList.size());
+ dos.writeInt(variableDatumIDList.size());
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
@@ -115,9 +116,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -145,7 +147,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -165,14 +167,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
- UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)fixedDatumIDList.get(idx);
+ UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
aUnsignedDISInteger.marshal(buff);
}
for(int idx = 0; idx < variableDatumIDList.size(); idx++)
{
- UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)variableDatumIDList.get(idx);
+ UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
aUnsignedDISInteger.marshal(buff);
}
@@ -252,7 +254,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fixedDatumIDList: ").append("\n");
fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
index 00e17a9f7a..ebf2ddc955 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)timeInterval);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(requestID);
+ dos.writeInt(timeInterval);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" timeInterval: ").append(timeInterval).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
index 4364dc2163..36e74d8072 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -170,8 +170,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -179,12 +180,12 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)timeInterval);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
+ dos.writeInt(timeInterval);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -208,9 +209,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -250,7 +252,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -276,14 +278,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -370,7 +372,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
index e32011a9fe..77cf1d749b 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/DataRPdu.java b/src-generated/edu/nps/moves/dis7/DataRPdu.java
index 2dffba6483..b818ccc6c9 100644
--- a/src-generated/edu/nps/moves/dis7/DataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -153,20 +153,21 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -230,7 +232,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -255,14 +257,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -347,7 +349,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
index 2e308768cd..4d1fb78548 100644
--- a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/DatumSpecification.java b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
index d35b8f2972..7cbee05506 100644
--- a/src-generated/edu/nps/moves/dis7/DatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -83,15 +83,16 @@ public List<VariableDatum> getVariableDatumIDList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fixedDatumIDList.size());
- dos.writeInt( (int)variableDatumIDList.size());
+ dos.writeInt(fixedDatumIDList.size());
+ dos.writeInt(variableDatumIDList.size());
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
@@ -115,9 +116,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -145,7 +147,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -165,14 +167,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumIDList.get(idx);
+ FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumIDList.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumIDList.get(idx);
+ VariableDatum aVariableDatum = variableDatumIDList.get(idx);
aVariableDatum.marshal(buff);
}
@@ -252,7 +254,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fixedDatumIDList: ").append("\n");
fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
index b488bdae78..8fbb894a65 100644
--- a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,8 +101,9 @@ public Vector3Float getEntityAngularVelocity()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -124,9 +125,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -143,7 +145,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -231,7 +233,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
sb.append(" parameters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
index e56764c022..0a3d95c447 100644
--- a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -239,8 +239,9 @@ public Vector3Float getEntityLinearAcceleration()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -251,13 +252,13 @@ public void marshal(DataOutputStream dos) throws Exception
codeName.marshal(dos);
designatedEntityID.marshal(dos);
designatorCode.marshal(dos);
- dos.writeFloat( (float)designatorPower);
- dos.writeFloat( (float)designatorWavelength);
+ dos.writeFloat(designatorPower);
+ dos.writeFloat(designatorWavelength);
designatorSpotWrtDesignated.marshal(dos);
designatorSpotLocation.marshal(dos);
deadReckoningAlgorithm.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
entityLinearAcceleration.marshal(dos);
}
catch(Exception e)
@@ -268,9 +269,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -301,7 +303,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -402,7 +404,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" designatingEntityID: ").append(designatingEntityID).append("\n");
sb.append(" codeName: ").append(codeName).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DetonationPdu.java b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
index 13d711f579..1b258491aa 100644
--- a/src-generated/edu/nps/moves/dis7/DetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -230,8 +230,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -247,8 +248,8 @@ public void marshal(DataOutputStream dos) throws Exception
descriptor.marshal(dos);
locationOfEntityCoordinates.marshal(dos);
detonationResult.marshal(dos);
- dos.writeByte( (byte)variableParameters.size());
- dos.writeShort( (short)pad);
+ dos.writeByte(variableParameters.size());
+ dos.writeShort(pad);
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -265,9 +266,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -300,7 +302,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -330,7 +332,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -415,7 +417,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
index 997c2d222f..a1da16bc7c 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -137,18 +137,19 @@ public List<DirectedEnergyTargetEnergyDeposition> getDirectedEnergyTargetEnergyD
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeShort( (short)beamAntennaParameterList.size());
- dos.writeShort( (short)directedEnergyTargetEnergyDepositionRecordList.size());
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeShort(beamAntennaParameterList.size());
+ dos.writeShort(directedEnergyTargetEnergyDepositionRecordList.size());
for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
{
@@ -173,9 +174,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -211,7 +213,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -234,14 +236,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
{
- BeamAntennaPattern aBeamAntennaPattern = (BeamAntennaPattern)beamAntennaParameterList.get(idx);
+ BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
aBeamAntennaPattern.marshal(buff);
}
for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
{
- DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = (DirectedEnergyTargetEnergyDeposition)directedEnergyTargetEnergyDepositionRecordList.get(idx);
+ DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
aDirectedEnergyTargetEnergyDeposition.marshal(buff);
}
@@ -329,7 +331,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
index a08bb629e9..a31eb87596 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -237,25 +237,26 @@ public short getPadding2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
damageLocation.marshal(dos);
- dos.writeFloat( (float)damageDiameter);
- dos.writeFloat( (float)temperature);
+ dos.writeFloat(damageDiameter);
+ dos.writeFloat(temperature);
componentIdentification.marshal(dos);
componentDamageStatus.marshal(dos);
componentVisualDamageStatus.marshal(dos);
componentVisualSmokeColor.marshal(dos);
fireEventID.marshal(dos);
- dos.writeShort( (short)padding2);
+ dos.writeShort(padding2);
}
catch(Exception e)
{
@@ -265,9 +266,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -298,7 +300,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -401,7 +403,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
index 2d9408f713..a62334ed4a 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -326,8 +326,9 @@ public List<StandardVariableSpecification> getDERecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -338,19 +339,19 @@ public void marshal(DataOutputStream dos) throws Exception
eventID.marshal(dos);
munitionType.marshal(dos);
shotStartTime.marshal(dos);
- dos.writeFloat( (float)commulativeShotTime);
+ dos.writeFloat(commulativeShotTime);
apertureEmitterLocation.marshal(dos);
- dos.writeFloat( (float)apertureDiameter);
- dos.writeFloat( (float)wavelength);
- dos.writeInt( (int)pad1);
- dos.writeFloat( (float)pulseRepititionFrequency);
- dos.writeFloat( (float)pulseWidth);
+ dos.writeFloat(apertureDiameter);
+ dos.writeFloat(wavelength);
+ dos.writeInt(pad1);
+ dos.writeFloat(pulseRepititionFrequency);
+ dos.writeFloat(pulseWidth);
flags.marshal(dos);
pulseShape.marshal(dos);
- dos.writeByte( (byte)pad2);
- dos.writeInt( (int)pad3);
- dos.writeShort( (short)pad4);
- dos.writeShort( (short)dERecords.size());
+ dos.writeByte(pad2);
+ dos.writeInt(pad3);
+ dos.writeShort(pad4);
+ dos.writeShort(dERecords.size());
for(int idx = 0; idx < dERecords.size(); idx++)
{
@@ -367,9 +368,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -416,7 +418,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -452,7 +454,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < dERecords.size(); idx++)
{
- StandardVariableSpecification aStandardVariableSpecification = (StandardVariableSpecification)dERecords.get(idx);
+ StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
aStandardVariableSpecification.marshal(buff);
}
@@ -549,7 +551,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
index db66d45822..7ef0e725bb 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -288,28 +288,29 @@ public int getPadding2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
targetSpotLocation.marshal(dos);
targetSpotEntityLocation.marshal(dos);
targetSpotVelocity.marshal(dos);
targetSpotAcceleration.marshal(dos);
targetEntityID.marshal(dos);
- dos.writeByte( (byte)targetComponentID);
+ dos.writeByte(targetComponentID);
beamSpotType.marshal(dos);
- dos.writeFloat( (float)beamSpotCrossSectionSemiMajorAxis);
- dos.writeFloat( (float)beamSpotCrossSectionSemiMinorAxis);
- dos.writeFloat( (float)beamSpotCrossSectionOrientationAngle);
- dos.writeFloat( (float)peakIrradiance);
- dos.writeInt( (int)padding2);
+ dos.writeFloat(beamSpotCrossSectionSemiMajorAxis);
+ dos.writeFloat(beamSpotCrossSectionSemiMinorAxis);
+ dos.writeFloat(beamSpotCrossSectionOrientationAngle);
+ dos.writeFloat(peakIrradiance);
+ dos.writeInt(padding2);
}
catch(Exception e)
{
@@ -319,9 +320,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -356,7 +358,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -468,7 +470,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
index f5d47a2bd6..3629b76b47 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public float getPeakIrradiance()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
targetEntityID.marshal(dos);
- dos.writeShort( (short)padding);
- dos.writeFloat( (float)peakIrradiance);
+ dos.writeShort(padding);
+ dos.writeFloat(peakIrradiance);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DisBitSet.java b/src-generated/edu/nps/moves/dis7/DisBitSet.java
index 5151a96d6d..a2ea35364b 100644
--- a/src-generated/edu/nps/moves/dis7/DisBitSet.java
+++ b/src-generated/edu/nps/moves/dis7/DisBitSet.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/DisTime.java b/src-generated/edu/nps/moves/dis7/DisTime.java
index af14b78943..906479313d 100644
--- a/src-generated/edu/nps/moves/dis7/DisTime.java
+++ b/src-generated/edu/nps/moves/dis7/DisTime.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -109,14 +109,14 @@ public class DisTime
// 2^31-1 DIS time units in an hour. 3600 sec/hr X 1000 msec/sec divided into the number of
// msec since the start of the hour gives the percentage of DIS time units in the hour, times
// the number of DIS time units per hour, equals the time value
- double val = (((double) diff) / (3600.0 * 1000.0)) * Integer.MAX_VALUE;
+ double val = (diff / (3600.0 * 1000.0)) * Integer.MAX_VALUE;
int ts = (int) val;
return ts;
}
/**
- * Returns the absolute timestamp, assuminng that this host is sync'd to NTP.
+ * Returns the absolute timestamp, assuming that this host is sync'd to NTP.
* Fix to bitshift by mvormelch.
* @return DIS time units, get absolute timestamp
*/
diff --git a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
index 793cada234..62b33a4c98 100644
--- a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/Domain.java b/src-generated/edu/nps/moves/dis7/Domain.java
index abc12492d4..e679edd8bd 100644
--- a/src-generated/edu/nps/moves/dis7/Domain.java
+++ b/src-generated/edu/nps/moves/dis7/Domain.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
package edu.nps.moves.dis7;
@@ -33,17 +33,33 @@ public class Domain
private Method getDescription;
//@formatter:off
+
+ /**
+ *
+ * @param d
+ * @return
+ */
public static Domain inst(PlatformDomain d)
{
return _inst(d);
} // uid 8
- public static Domain inst(MunitionDomain d)
+ /**
+ *
+ * @param d
+ * @return
+ */
+ public static Domain inst(MunitionDomain d)
{
return _inst(d);
} // uid 14
- public static Domain inst(SupplyDomain d)
+ /**
+ *
+ * @param d
+ * @return
+ */
+ public static Domain inst(SupplyDomain d)
{
return _inst(d);
} // uid 600
@@ -76,32 +92,57 @@ public class Domain
}
}
- public int getValue()
+ /**
+ *
+ * @return
+ */
+ public int getValue()
{
- return (Integer) invoke(getValue, (Object[]) null);
+ return (Integer) invoke(getValue, null);
}
- public String getDescription()
+ /**
+ *
+ * @return
+ */
+ public String getDescription()
{
- return (String) invoke(getDescription, (Object[]) null);
+ return (String) invoke(getDescription, null);
}
- public int getMarshalledSize()
+ /**
+ *
+ * @return
+ */
+ public int getMarshalledSize()
{
- return (Integer) invoke(mSize, (Object[]) null);
+ return (Integer) invoke(mSize, null);
}
- public void marshal(DataOutputStream dos)
+ /**
+ *
+ * @param dos
+ */
+ public void marshal(DataOutputStream dos)
{
invoke(marshalDos, new Object[]{dos});
}
- public void marshal(ByteBuffer buff)
+ /**
+ *
+ * @param buff
+ */
+ public void marshal(ByteBuffer buff)
{
invoke(marshalBuff, new Object[]{buff});
}
- public int unmarshal(DataInputStream dis)
+ /**
+ *
+ * @param dis
+ * @return
+ */
+ public int unmarshal(DataInputStream dis)
{
Object o = invoke(unmarshalDis, new Object[]{dis});
enumInst = o;
@@ -109,7 +150,12 @@ public class Domain
return getMarshalledSize();
}
- public int unmarshal(ByteBuffer buff)
+ /**
+ *
+ * @param buff
+ * @return
+ */
+ public int unmarshal(ByteBuffer buff)
{
Object o = invoke(unmarshalBuff, new Object[]{buff});
enumInst = o;
diff --git a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
index b4f4a84476..e858c357d1 100644
--- a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,18 +118,19 @@ public float getPulseWidth()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)frequency);
- dos.writeFloat( (float)frequencyRange);
- dos.writeFloat( (float)effectiveRadiatedPower);
- dos.writeFloat( (float)pulseRepetitionFrequency);
- dos.writeFloat( (float)pulseWidth);
+ dos.writeFloat(frequency);
+ dos.writeFloat(frequencyRange);
+ dos.writeFloat(effectiveRadiatedPower);
+ dos.writeFloat(pulseRepetitionFrequency);
+ dos.writeFloat(pulseWidth);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" frequency: ").append(frequency).append("\n");
sb.append(" frequencyRange: ").append(frequencyRange).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
index 3d27d76880..e204b2af53 100644
--- a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -129,8 +129,9 @@ public List<ElectronicEmitter> getSystems()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -140,8 +141,8 @@ public void marshal(DataOutputStream dos) throws Exception
emittingEntityID.marshal(dos);
eventID.marshal(dos);
stateUpdateIndicator.marshal(dos);
- dos.writeByte( (byte)systems.size());
- dos.writeShort( (short)paddingForEmissionsPdu);
+ dos.writeByte(systems.size());
+ dos.writeShort(paddingForEmissionsPdu);
for(int idx = 0; idx < systems.size(); idx++)
{
@@ -158,9 +159,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -187,7 +189,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -211,7 +213,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < systems.size(); idx++)
{
- ElectronicEmitter aElectronicEmitter = (ElectronicEmitter)systems.get(idx);
+ ElectronicEmitter aElectronicEmitter = systems.get(idx);
aElectronicEmitter.marshal(buff);
}
@@ -284,7 +286,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
index 749c963e3b..813b684b74 100644
--- a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -108,15 +108,16 @@ public List<EmitterBeam> getBeams()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)systemDataLength);
- dos.writeByte( (byte)beams.size());
+ dos.writeByte(systemDataLength);
+ dos.writeByte(beams.size());
emitterSystem.marshal(dos);
location.marshal(dos);
@@ -135,9 +136,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -182,7 +184,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < beams.size(); idx++)
{
- EmitterBeam aEmitterBeam = (EmitterBeam)beams.get(idx);
+ EmitterBeam aEmitterBeam = beams.get(idx);
aEmitterBeam.marshal(buff);
}
@@ -256,7 +258,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
sb.append(" emitterSystem: ").append(emitterSystem).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EmitterBeam.java b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
index d05fc1f577..3c2adde19e 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterBeam.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -201,20 +201,21 @@ public List<TrackJamData> getTrackJamData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)beamDataLength);
- dos.writeByte( (byte)beamNumber);
- dos.writeShort( (short)beamParameterIndex);
+ dos.writeByte(beamDataLength);
+ dos.writeByte(beamNumber);
+ dos.writeShort(beamParameterIndex);
fundamentalParameterData.marshal(dos);
beamData.marshal(dos);
beamFunction.marshal(dos);
- dos.writeByte( (byte)trackJamData.size());
+ dos.writeByte(trackJamData.size());
highDensityTrackJam.marshal(dos);
beamStatus.marshal(dos);
jammingTechnique.marshal(dos);
@@ -234,9 +235,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -269,7 +271,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -297,7 +299,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < trackJamData.size(); idx++)
{
- TrackJamData aTrackJamData = (TrackJamData)trackJamData.get(idx);
+ TrackJamData aTrackJamData = trackJamData.get(idx);
aTrackJamData.marshal(buff);
}
@@ -383,7 +385,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
sb.append(" beamNumber: ").append(beamNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EmitterSystem.java b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
index 829056562d..528c336a15 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterSystem.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,8 +84,9 @@ public byte getEmitterIDNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -93,7 +94,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
emitterName.marshal(dos);
emitterFunction.marshal(dos);
- dos.writeByte( (byte)emitterIDNumber);
+ dos.writeByte(emitterIDNumber);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emitterName: ").append(emitterName).append("\n");
sb.append(" emitterFunction: ").append(emitterFunction).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuel.java b/src-generated/edu/nps/moves/dis7/EngineFuel.java
index b9b72cf9a3..2240ab85ac 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuel.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuel.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,18 +118,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fuelQuantity);
+ dos.writeInt(fuelQuantity);
fuelMeasurementUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
index 88d0c803d0..53c98e2787 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -169,21 +169,22 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)standardQuantity);
- dos.writeInt( (int)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(standardQuantity);
+ dos.writeInt(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
fuelMeasurmentUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -193,9 +194,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -221,7 +223,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -312,7 +314,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
index eabc91d2c0..d49f3031d5 100644
--- a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -186,8 +186,9 @@ public short getGroupNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -201,7 +202,7 @@ public void marshal(DataOutputStream dos) throws Exception
ownStationLocation.marshal(dos);
physicalConnectionType.marshal(dos);
groupMemberType.marshal(dos);
- dos.writeShort( (short)groupNumber);
+ dos.writeShort(groupNumber);
}
catch(Exception e)
{
@@ -211,9 +212,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -240,7 +242,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -334,7 +336,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityCapabilities.java b/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
index 016f9560d9..99754a3659 100644
--- a/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
index 47bbed1676..f10479e3ae 100644
--- a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -109,8 +109,9 @@ public List<DirectedEnergyDamage> getDamageDescriptionRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -118,9 +119,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
damagedEntityID.marshal(dos);
- dos.writeShort( (short)padding1);
- dos.writeShort( (short)padding2);
- dos.writeShort( (short)damageDescriptionRecords.size());
+ dos.writeShort(padding1);
+ dos.writeShort(padding2);
+ dos.writeShort(damageDescriptionRecords.size());
for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
{
@@ -137,9 +138,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -165,7 +167,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -188,7 +190,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
{
- DirectedEnergyDamage aDirectedEnergyDamage = (DirectedEnergyDamage)damageDescriptionRecords.get(idx);
+ DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
aDirectedEnergyDamage.marshal(buff);
}
@@ -259,7 +261,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" damagedEntityID: ").append(damagedEntityID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityID.java b/src-generated/edu/nps/moves/dis7/EntityID.java
index c4f96ac37c..95dace7128 100644
--- a/src-generated/edu/nps/moves/dis7/EntityID.java
+++ b/src-generated/edu/nps/moves/dis7/EntityID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public short getEntityID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteID);
- dos.writeShort( (short)applicationID);
- dos.writeShort( (short)entityID);
+ dos.writeShort(siteID);
+ dos.writeShort(applicationID);
+ dos.writeShort(entityID);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteID: ").append(siteID).append("\n");
sb.append(" applicationID: ").append(applicationID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
index 0a9bb4dc4a..7732bf6aa0 100644
--- a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getEntityNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)entityNumber);
+ dos.writeShort(entityNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" entityNumber: ").append(entityNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
index b77ffc5fad..ad4be25047 100644
--- a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
index d4bfc18316..bca3655637 100644
--- a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/EntityMarking.java b/src-generated/edu/nps/moves/dis7/EntityMarking.java
index 1416b15f7f..f9f724bebc 100644
--- a/src-generated/edu/nps/moves/dis7/EntityMarking.java
+++ b/src-generated/edu/nps/moves/dis7/EntityMarking.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,8 +67,9 @@ public byte[] getCharacters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -187,7 +189,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" characterSet: ").append(characterSet).append("\n");
sb.append(" characters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
index a062c8bbe8..22fa540e49 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -246,8 +246,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -256,13 +257,13 @@ public void marshal(DataOutputStream dos) throws Exception
{
entityID.marshal(dos);
forceId.marshal(dos);
- dos.writeByte( (byte)variableParameters.size());
+ dos.writeByte(variableParameters.size());
entityType.marshal(dos);
alternativeEntityType.marshal(dos);
entityLinearVelocity.marshal(dos);
entityLocation.marshal(dos);
entityOrientation.marshal(dos);
- dos.writeInt( (int)entityAppearance);
+ dos.writeInt(entityAppearance);
deadReckoningParameters.marshal(dos);
marking.marshal(dos);
capabilities.marshal(dos);
@@ -282,9 +283,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -318,7 +320,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -349,7 +351,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -436,7 +438,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" forceId: ").append(forceId).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
index fe02b9ae32..ce97c29850 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -162,8 +162,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -171,12 +172,12 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
entityID.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeByte( (byte)variableParameters.size());
+ dos.writeByte(padding1);
+ dos.writeByte(variableParameters.size());
entityLinearVelocity.marshal(dos);
entityLocation.marshal(dos);
entityOrientation.marshal(dos);
- dos.writeInt( (int)entityAppearance);
+ dos.writeInt(entityAppearance);
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -193,9 +194,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -224,7 +226,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -250,7 +252,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -327,7 +329,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityType.java b/src-generated/edu/nps/moves/dis7/EntityType.java
index a97146eaf9..ec666ad112 100644
--- a/src-generated/edu/nps/moves/dis7/EntityType.java
+++ b/src-generated/edu/nps/moves/dis7/EntityType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -151,8 +151,9 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -161,10 +162,10 @@ public void marshal(DataOutputStream dos) throws Exception
entityKind.marshal(dos);
domain.marshal(dos);
country.marshal(dos);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -174,9 +175,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -199,7 +201,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityKind: ").append(entityKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
index 04ab23d11c..cdf1dae870 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -151,20 +151,21 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityKind.marshal(dos);
- dos.writeByte( (byte)domain);
- dos.writeShort( (short)country);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
+ dos.writeByte(domain);
+ dos.writeShort(country);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -174,9 +175,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -200,7 +202,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -288,7 +290,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityKind: ").append(entityKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
index 311bed55b5..6a8956ef8c 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,8 +118,9 @@ public int getPadding1()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,8 +129,8 @@ public void marshal(DataOutputStream dos) throws Exception
recordType.marshal(dos);
changeIndicator.marshal(dos);
entityType.marshal(dos);
- dos.writeShort( (short)padding);
- dos.writeInt( (int)padding1);
+ dos.writeShort(padding);
+ dos.writeInt(padding1);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java b/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
index dc49e20e0a..39cd6c9249 100644
--- a/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
+++ b/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/Environment.java b/src-generated/edu/nps/moves/dis7/Environment.java
index 5d5ba3ad3f..8004254a37 100644
--- a/src-generated/edu/nps/moves/dis7/Environment.java
+++ b/src-generated/edu/nps/moves/dis7/Environment.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -121,17 +121,18 @@ public byte[] getGeometry()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
environmentType.marshal(dos);
- dos.writeShort( (short)length);
- dos.writeByte( (byte)index);
- dos.writeByte( (byte)padding1);
+ dos.writeShort(length);
+ dos.writeByte(index);
+ dos.writeByte(padding1);
for(int idx = 0; idx < geometry.length; idx++)
dos.writeByte(geometry[idx]);
@@ -146,9 +147,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -171,7 +173,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -264,7 +266,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" environmentType: ").append(environmentType).append("\n");
sb.append(" length: ").append(length).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
index 12d326cfb3..889c1b2cf9 100644
--- a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -145,8 +145,9 @@ public List<Environment> getEnvironmentRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -157,8 +158,8 @@ public void marshal(DataOutputStream dos) throws Exception
environmentType.marshal(dos);
modelType.marshal(dos);
environmentStatus.marshal(dos);
- dos.writeShort( (short)environmentRecords.size());
- dos.writeShort( (short)sequenceNumber);
+ dos.writeShort(environmentRecords.size());
+ dos.writeShort(sequenceNumber);
for(int idx = 0; idx < environmentRecords.size(); idx++)
{
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -205,7 +207,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -230,7 +232,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < environmentRecords.size(); idx++)
{
- Environment aEnvironment = (Environment)environmentRecords.get(idx);
+ Environment aEnvironment = environmentRecords.get(idx);
aEnvironment.marshal(buff);
}
@@ -305,7 +307,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" environementalProcessID: ").append(environementalProcessID).append("\n");
sb.append(" environmentType: ").append(environmentType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EulerAngles.java b/src-generated/edu/nps/moves/dis7/EulerAngles.java
index d8b2e4b0db..a654205065 100644
--- a/src-generated/edu/nps/moves/dis7/EulerAngles.java
+++ b/src-generated/edu/nps/moves/dis7/EulerAngles.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -81,16 +81,17 @@ public float getPhi()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)psi);
- dos.writeFloat( (float)theta);
- dos.writeFloat( (float)phi);
+ dos.writeFloat(psi);
+ dos.writeFloat(theta);
+ dos.writeFloat(phi);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" psi: ").append(psi).append("\n");
sb.append(" theta: ").append(theta).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifier.java b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
index 1aa2c2afc6..7b30e61363 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -66,15 +66,16 @@ public short getEventNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)eventNumber);
+ dos.writeShort(eventNumber);
}
catch(Exception e)
{
@@ -84,9 +85,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" eventNumber: ").append(eventNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
index fda0d93204..bbb5b7205e 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -81,16 +81,17 @@ public short getEventNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)siteNumber);
- dos.writeByte( (byte)applicationNumber);
- dos.writeShort( (short)eventNumber);
+ dos.writeByte(siteNumber);
+ dos.writeByte(applicationNumber);
+ dos.writeShort(eventNumber);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventReportPdu.java b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
index 1a0a2d2108..5644db8fa3 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -119,8 +119,9 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,9 +129,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
eventType.marshal(dos);
- dos.writeInt( (int)padding1);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" eventType: ").append(eventType).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
index 269ba162c3..40309a0e7e 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -119,8 +119,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,9 +129,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
eventType.marshal(dos);
- dos.writeInt( (int)pad1);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(pad1);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" eventType: ").append(eventType).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
index 4066396678..f74dc742d1 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/Expendable.java b/src-generated/edu/nps/moves/dis7/Expendable.java
index 4b88b09f46..6bffcbb006 100644
--- a/src-generated/edu/nps/moves/dis7/Expendable.java
+++ b/src-generated/edu/nps/moves/dis7/Expendable.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -115,18 +115,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
expendable.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)quantity);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
expendableStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -136,9 +137,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -157,7 +159,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -239,7 +241,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" expendable: ").append(expendable).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
index bd22190433..d8796d8c8f 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public long getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
expendableType.marshal(dos);
- dos.writeLong( (long)padding);
+ dos.writeLong(padding);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" expendableType: ").append(expendableType).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableReload.java b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
index 9444b3be50..bfa693468e 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableReload.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -130,19 +130,20 @@ public int getMaximumQuantityReloadTime()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
expendable.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)standardQuantity);
- dos.writeShort( (short)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(station);
+ dos.writeShort(standardQuantity);
+ dos.writeShort(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
}
catch(Exception e)
{
@@ -152,9 +153,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -175,7 +177,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -260,7 +262,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" expendable: ").append(expendable).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
index 1c8dd2a1af..20df76cda5 100644
--- a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,8 +101,9 @@ public float getExplosiveForce()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,8 +111,8 @@ public void marshal(DataOutputStream dos) throws Exception
{
explodingObject.marshal(dos);
explosiveMaterial.marshal(dos);
- dos.writeShort( (short)padding);
- dos.writeFloat( (float)explosiveForce);
+ dos.writeShort(padding);
+ dos.writeFloat(explosiveForce);
}
catch(Exception e)
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -140,7 +142,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -219,7 +221,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" explodingObject: ").append(explodingObject).append("\n");
sb.append(" explosiveMaterial: ").append(explosiveMaterial).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
index 3d97ef7c28..2c22a5792e 100644
--- a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
+++ b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -274,28 +274,29 @@ public float getFirstTargetOffset()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
stateIndicator.marshal(dos);
- dos.writeByte( (byte)padding2);
- dos.writeShort( (short)padding3);
- dos.writeShort( (short)falseTargetCount);
- dos.writeFloat( (float)walkSpeed);
- dos.writeFloat( (float)walkAcceleration);
- dos.writeFloat( (float)maximumWalkDistance);
- dos.writeFloat( (float)keepTime);
- dos.writeFloat( (float)echoSpacing);
- dos.writeFloat( (float)firstTargetOffset);
+ dos.writeByte(padding2);
+ dos.writeShort(padding3);
+ dos.writeShort(falseTargetCount);
+ dos.writeFloat(walkSpeed);
+ dos.writeFloat(walkAcceleration);
+ dos.writeFloat(maximumWalkDistance);
+ dos.writeFloat(keepTime);
+ dos.writeFloat(echoSpacing);
+ dos.writeFloat(firstTargetOffset);
}
catch(Exception e)
{
@@ -305,9 +306,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -347,7 +349,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -459,7 +461,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
index 392afb1ccc..010bcf22ec 100644
--- a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -701,59 +701,60 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)site);
- dos.writeShort( (short)application);
- dos.writeShort( (short)entity);
- dos.writeByte( (byte)forceId);
- dos.writeByte( (byte)variableParameters.size());
- dos.writeByte( (byte)entityKind);
- dos.writeByte( (byte)domain);
- dos.writeShort( (short)country);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subcategory);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
- dos.writeByte( (byte)altEntityKind);
- dos.writeByte( (byte)altDomain);
- dos.writeShort( (short)altCountry);
- dos.writeByte( (byte)altCategory);
- dos.writeByte( (byte)altSubcategory);
- dos.writeByte( (byte)altSpecific);
- dos.writeByte( (byte)altExtra);
- dos.writeFloat( (float)xVelocity);
- dos.writeFloat( (float)yVelocity);
- dos.writeFloat( (float)zVelocity);
- dos.writeDouble( (double)xLocation);
- dos.writeDouble( (double)yLocation);
- dos.writeDouble( (double)zLocation);
- dos.writeFloat( (float)psi);
- dos.writeFloat( (float)theta);
- dos.writeFloat( (float)phi);
- dos.writeInt( (int)entityAppearance);
- dos.writeByte( (byte)deadReckoningAlgorithm);
+ dos.writeShort(site);
+ dos.writeShort(application);
+ dos.writeShort(entity);
+ dos.writeByte(forceId);
+ dos.writeByte(variableParameters.size());
+ dos.writeByte(entityKind);
+ dos.writeByte(domain);
+ dos.writeShort(country);
+ dos.writeByte(category);
+ dos.writeByte(subcategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
+ dos.writeByte(altEntityKind);
+ dos.writeByte(altDomain);
+ dos.writeShort(altCountry);
+ dos.writeByte(altCategory);
+ dos.writeByte(altSubcategory);
+ dos.writeByte(altSpecific);
+ dos.writeByte(altExtra);
+ dos.writeFloat(xVelocity);
+ dos.writeFloat(yVelocity);
+ dos.writeFloat(zVelocity);
+ dos.writeDouble(xLocation);
+ dos.writeDouble(yLocation);
+ dos.writeDouble(zLocation);
+ dos.writeFloat(psi);
+ dos.writeFloat(theta);
+ dos.writeFloat(phi);
+ dos.writeInt(entityAppearance);
+ dos.writeByte(deadReckoningAlgorithm);
for(int idx = 0; idx < otherParameters.length; idx++)
dos.writeByte(otherParameters[idx]);
- dos.writeFloat( (float)xAcceleration);
- dos.writeFloat( (float)yAcceleration);
- dos.writeFloat( (float)zAcceleration);
- dos.writeFloat( (float)xAngularVelocity);
- dos.writeFloat( (float)yAngularVelocity);
- dos.writeFloat( (float)zAngularVelocity);
+ dos.writeFloat(xAcceleration);
+ dos.writeFloat(yAcceleration);
+ dos.writeFloat(zAcceleration);
+ dos.writeFloat(xAngularVelocity);
+ dos.writeFloat(yAngularVelocity);
+ dos.writeFloat(zAngularVelocity);
for(int idx = 0; idx < marking.length; idx++)
dos.writeByte(marking[idx]);
- dos.writeShort( (short)capabilities);
+ dos.writeShort(capabilities);
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -770,9 +771,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -871,7 +873,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -935,7 +937,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -1088,7 +1090,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" site: ").append(site).append("\n");
sb.append(" application: ").append(application).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FirePdu.java b/src-generated/edu/nps/moves/dis7/FirePdu.java
index 0c6b651876..5fc94223d3 100644
--- a/src-generated/edu/nps/moves/dis7/FirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -27,7 +27,7 @@ public class FirePdu extends WarfareFamilyPdu implements Serializable
/** This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34). */
protected EventIdentifier eventID = new EventIdentifier();
- /** This field shall identify the fire mission (see 5.4.3.3). This field shall be representedby a 32-bit unsigned integer. */
+ /** This field shall identify the fire mission (see 5.4.3.3). This field shall be represented by a 32-bit unsigned integer. */
protected int fireMissionIndex;
/** This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97). */
@@ -188,8 +188,9 @@ public float getRange()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -200,11 +201,11 @@ public void marshal(DataOutputStream dos) throws Exception
targetEntityID.marshal(dos);
munitionExpendibleID.marshal(dos);
eventID.marshal(dos);
- dos.writeInt( (int)fireMissionIndex);
+ dos.writeInt(fireMissionIndex);
locationInWorldCoordinates.marshal(dos);
descriptor.marshal(dos);
velocity.marshal(dos);
- dos.writeFloat( (float)range);
+ dos.writeFloat(range);
}
catch(Exception e)
{
@@ -214,9 +215,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -239,7 +241,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -331,7 +333,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FixedDatum.java b/src-generated/edu/nps/moves/dis7/FixedDatum.java
index 727fc56dfe..0bb54012bf 100644
--- a/src-generated/edu/nps/moves/dis7/FixedDatum.java
+++ b/src-generated/edu/nps/moves/dis7/FixedDatum.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public int getFixedDatumValue()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
fixedDatumID.marshal(dos);
- dos.writeInt( (int)fixedDatumValue);
+ dos.writeInt(fixedDatumValue);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fixedDatumID: ").append(fixedDatumID).append("\n");
sb.append(" fixedDatumValue: ").append(fixedDatumValue).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
index 48563805bc..be7bacce99 100644
--- a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -203,23 +203,24 @@ public short getParameter6()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)systemStatus);
- dos.writeByte( (byte)dataField1);
- dos.writeByte( (byte)informationLayers);
- dos.writeByte( (byte)dataField2);
- dos.writeShort( (short)parameter1);
- dos.writeShort( (short)parameter2);
- dos.writeShort( (short)parameter3);
- dos.writeShort( (short)parameter4);
- dos.writeShort( (short)parameter5);
- dos.writeShort( (short)parameter6);
+ dos.writeByte(systemStatus);
+ dos.writeByte(dataField1);
+ dos.writeByte(informationLayers);
+ dos.writeByte(dataField2);
+ dos.writeShort(parameter1);
+ dos.writeShort(parameter2);
+ dos.writeShort(parameter3);
+ dos.writeShort(parameter4);
+ dos.writeShort(parameter5);
+ dos.writeShort(parameter6);
}
catch(Exception e)
{
@@ -229,9 +230,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -261,7 +263,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -358,7 +360,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemStatus: ").append(systemStatus).append("\n");
sb.append(" dataField1: ").append(dataField1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
index 9f5603614d..9e4ca46003 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -117,17 +117,18 @@ public GridAxisDescriptorAxisType getAxisType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeDouble( (double)domainInitialXi);
- dos.writeDouble( (double)domainFinalXi);
- dos.writeShort( (short)domainPointsXi);
- dos.writeByte( (byte)interleafFactor);
+ dos.writeDouble(domainInitialXi);
+ dos.writeDouble(domainFinalXi);
+ dos.writeShort(domainPointsXi);
+ dos.writeByte(interleafFactor);
axisType.marshal(dos);
}
catch(Exception e)
@@ -138,9 +139,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" domainInitialXi: ").append(domainInitialXi).append("\n");
sb.append(" domainFinalXi: ").append(domainFinalXi).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
index b2e1597cdd..28237aeda5 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -68,16 +68,17 @@ public short getInitialIndex()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)numberOfPointsOnXiAxis);
- dos.writeShort( (short)initialIndex);
+ dos.writeShort(numberOfPointsOnXiAxis);
+ dos.writeShort(initialIndex);
}
catch(Exception e)
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -176,7 +178,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
sb.append(" initialIndex: ").append(initialIndex).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
index 1a7b6fe737..85baa2bae1 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -122,18 +122,19 @@ public short[] getXiValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)numberOfPointsOnXiAxis);
- dos.writeShort( (short)initialIndex);
- dos.writeDouble( (double)coordinateScaleXi);
- dos.writeDouble( (double)coordinateOffsetXi);
+ dos.writeShort(numberOfPointsOnXiAxis);
+ dos.writeShort(initialIndex);
+ dos.writeDouble(coordinateScaleXi);
+ dos.writeDouble(coordinateOffsetXi);
for(int idx = 0; idx < xiValues.length; idx++)
dos.writeShort(xiValues[idx]);
@@ -148,9 +149,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -175,7 +177,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
sb.append(" initialIndex: ").append(initialIndex).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridData.java b/src-generated/edu/nps/moves/dis7/GridData.java
index 7a2e5bb3f6..9700cd83fe 100644
--- a/src-generated/edu/nps/moves/dis7/GridData.java
+++ b/src-generated/edu/nps/moves/dis7/GridData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,8 +67,9 @@ public GriddedDataDataRepresentation getDataRepresentation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sampleType: ").append(sampleType).append("\n");
sb.append(" dataRepresentation: ").append(dataRepresentation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType0.java b/src-generated/edu/nps/moves/dis7/GridDataType0.java
index 28c45db01c..761117b826 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType0.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType0.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -56,15 +56,16 @@ public byte[] getDataValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)dataValues.length);
+ dos.writeShort(dataValues.length);
for(int idx = 0; idx < dataValues.length; idx++)
dos.writeByte(dataValues[idx]);
@@ -79,9 +80,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -181,7 +183,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" dataValues: ").append("\n");
sb.append(Arrays.toString(dataValues)).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType1.java b/src-generated/edu/nps/moves/dis7/GridDataType1.java
index bd10f474c6..ff3ea3ed51 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType1.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType1.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -88,17 +88,18 @@ public short[] getDataValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeFloat( (float)fieldScale);
- dos.writeFloat( (float)fieldOffset);
- dos.writeShort( (short)dataValues.length);
+ dos.writeFloat(fieldScale);
+ dos.writeFloat(fieldOffset);
+ dos.writeShort(dataValues.length);
for(int idx = 0; idx < dataValues.length; idx++)
dos.writeShort(dataValues[idx]);
@@ -113,9 +114,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -138,7 +140,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -225,7 +227,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fieldScale: ").append(fieldScale).append("\n");
sb.append(" fieldOffset: ").append(fieldOffset).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType2.java b/src-generated/edu/nps/moves/dis7/GridDataType2.java
index fc99186952..7b875d7208 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType2.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType2.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -69,16 +69,17 @@ public float[] getDataValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)dataValues.length);
- dos.writeShort( (short)padding);
+ dos.writeShort(dataValues.length);
+ dos.writeShort(padding);
for(int idx = 0; idx < dataValues.length; idx++)
dos.writeFloat(dataValues[idx]);
@@ -92,9 +93,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -113,7 +115,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -195,7 +197,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" padding: ").append(padding).append("\n");
sb.append(" dataValues: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
index 4d96e48b7f..0e9a3f4e1e 100644
--- a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -302,8 +302,9 @@ public List<GridData> getGridDataRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -311,19 +312,19 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
environmentalSimulationApplicationID.marshal(dos);
- dos.writeShort( (short)fieldNumber);
- dos.writeShort( (short)pduNumber);
- dos.writeShort( (short)pduTotal);
+ dos.writeShort(fieldNumber);
+ dos.writeShort(pduNumber);
+ dos.writeShort(pduTotal);
coordinateSystem.marshal(dos);
- dos.writeByte( (byte)gridDataRecords.size());
+ dos.writeByte(gridDataRecords.size());
constantGrid.marshal(dos);
environmentType.marshal(dos);
orientation.marshal(dos);
sampleTime.marshal(dos);
- dos.writeInt( (int)totalValues);
- dos.writeByte( (byte)vectorDimension);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeInt(totalValues);
+ dos.writeByte(vectorDimension);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
{
@@ -347,9 +348,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -399,7 +401,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -432,14 +434,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
{
- GridAxisDescriptor aGridAxisDescriptor = (GridAxisDescriptor)gridAxisDescriptors.get(idx);
+ GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
aGridAxisDescriptor.marshal(buff);
}
for(int idx = 0; idx < gridDataRecords.size(); idx++)
{
- GridData aGridData = (GridData)gridDataRecords.get(idx);
+ GridData aGridData = gridDataRecords.get(idx);
aGridData.marshal(buff);
}
@@ -541,7 +543,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" environmentalSimulationApplicationID: ").append(environmentalSimulationApplicationID).append("\n");
sb.append(" fieldNumber: ").append(fieldNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GroupID.java b/src-generated/edu/nps/moves/dis7/GroupID.java
index 92e3a5d416..e40a1a31c7 100644
--- a/src-generated/edu/nps/moves/dis7/GroupID.java
+++ b/src-generated/edu/nps/moves/dis7/GroupID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getGroupNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)groupNumber);
+ dos.writeShort(groupNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" groupNumber: ").append(groupNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFData.java b/src-generated/edu/nps/moves/dis7/IFFData.java
index b4a8a4c00e..2d4afb4070 100644
--- a/src-generated/edu/nps/moves/dis7/IFFData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -86,15 +86,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -109,9 +110,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -130,7 +132,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -217,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
index 632b47d3d0..d5c5bf4590 100644
--- a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -152,18 +152,19 @@ public byte[] getSystemSpecificData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)erp);
- dos.writeFloat( (float)frequency);
- dos.writeFloat( (float)pgrf);
- dos.writeFloat( (float)pulseWidth);
- dos.writeInt( (int)burstLength);
+ dos.writeFloat(erp);
+ dos.writeFloat(frequency);
+ dos.writeFloat(pgrf);
+ dos.writeFloat(pulseWidth);
+ dos.writeInt(burstLength);
applicableModes.marshal(dos);
for(int idx = 0; idx < systemSpecificData.length; idx++)
@@ -178,9 +179,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -205,7 +207,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -302,7 +304,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" erp: ").append(erp).append("\n");
sb.append(" frequency: ").append(frequency).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
index 1c9d6a0293..6360ec5721 100644
--- a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -124,8 +124,9 @@ public List<IFFFundamentalParameterData> getFundamentalIFFParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -134,9 +135,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
layerHeader.marshal(dos);
beamData.marshal(dos);
- dos.writeByte( (byte)secondaryOpParameter1);
- dos.writeByte( (byte)secondaryOpParameter2);
- dos.writeShort( (short)fundamentalIFFParameters.size());
+ dos.writeByte(secondaryOpParameter1);
+ dos.writeByte(secondaryOpParameter2);
+ dos.writeShort(fundamentalIFFParameters.size());
for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
{
@@ -153,9 +154,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -182,7 +184,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -206,7 +208,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
{
- IFFFundamentalParameterData aIFFFundamentalParameterData = (IFFFundamentalParameterData)fundamentalIFFParameters.get(idx);
+ IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
aIFFFundamentalParameterData.marshal(buff);
}
@@ -279,7 +281,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" layerHeader: ").append(layerHeader).append("\n");
sb.append(" beamData: ").append(beamData).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFPdu.java b/src-generated/edu/nps/moves/dis7/IFFPdu.java
index 9c0a47bace..2025f435b8 100644
--- a/src-generated/edu/nps/moves/dis7/IFFPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -20,7 +20,7 @@ public class IFFPdu extends DistributedEmissionsFamilyPdu implements Serializabl
/** Number generated by the issuing simulation to associate realted events. */
protected EventIdentifier eventID = new EventIdentifier();
- /** Location wrt entity. There is some ambugiuity in the standard here, but this is the order it is listed in the table. */
+ /** Location wrt entity. There is some ambiguity in the standard here, but this is the order it is listed in the table. */
protected Vector3Float location = new Vector3Float();
/** System ID information */
@@ -151,8 +151,9 @@ public FundamentalOperationalData getFundamentalParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -163,8 +164,8 @@ public void marshal(DataOutputStream dos) throws Exception
eventID.marshal(dos);
location.marshal(dos);
systemID.marshal(dos);
- dos.writeByte( (byte)systemDesignator);
- dos.writeByte( (byte)systemSpecificData);
+ dos.writeByte(systemDesignator);
+ dos.writeByte(systemSpecificData);
fundamentalParameters.marshal(dos);
}
catch(Exception e)
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -198,7 +200,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -284,7 +286,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emittingEntityId: ").append(emittingEntityId).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
index 754762871d..39aa6e18fe 100644
--- a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -116,8 +116,9 @@ public CommunicationsNodeID getCommsNodeId()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -125,9 +126,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
commsNodeType.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
commsNodeId.marshal(dos);
}
catch(Exception e)
@@ -138,9 +139,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -241,7 +243,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
index 5a5e6a806c..780273000b 100644
--- a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -183,8 +183,9 @@ public short getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -192,14 +193,14 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
ioStatus.marshal(dos);
ioLinkType.marshal(dos);
ioEffect.marshal(dos);
- dos.writeByte( (byte)ioEffectDutyCycle);
- dos.writeShort( (short)ioEffectDuration);
+ dos.writeByte(ioEffectDutyCycle);
+ dos.writeShort(ioEffectDuration);
ioProcess.marshal(dos);
- dos.writeShort( (short)padding);
+ dos.writeShort(padding);
}
catch(Exception e)
{
@@ -209,9 +210,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -241,7 +243,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -333,7 +335,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IORecord.java b/src-generated/edu/nps/moves/dis7/IORecord.java
index 4f3c1090b1..f0251c841c 100644
--- a/src-generated/edu/nps/moves/dis7/IORecord.java
+++ b/src-generated/edu/nps/moves/dis7/IORecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -33,8 +33,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -49,9 +50,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -61,7 +63,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -128,7 +130,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
index 967d24340d..160e0e5192 100644
--- a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
+++ b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
index 759112e2d8..3978de5cae 100644
--- a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -58,14 +58,15 @@ public List<IFFData> getIffDataRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)iffDataRecords.size());
+ dos.writeShort(iffDataRecords.size());
for(int idx = 0; idx < iffDataRecords.size(); idx++)
{
@@ -82,9 +83,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -103,7 +105,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -122,7 +124,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < iffDataRecords.size(); idx++)
{
- IFFData aIFFData = (IFFData)iffDataRecords.get(idx);
+ IFFData aIFFData = iffDataRecords.get(idx);
aIFFData.marshal(buff);
}
@@ -190,7 +192,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" iffDataRecords: ").append("\n");
iffDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
index 9859646655..1dd5645c13 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -224,8 +224,9 @@ public List<IORecord> getIoRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -233,16 +234,16 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
receivingSimID.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
IOWarfareType.marshal(dos);
IOSimulationSource.marshal(dos);
IOActionType.marshal(dos);
IOActionPhase.marshal(dos);
- dos.writeInt( (int)padding1);
+ dos.writeInt(padding1);
ioAttackerID.marshal(dos);
ioPrimaryTargetID.marshal(dos);
- dos.writeShort( (short)padding2);
- dos.writeShort( (short)ioRecords.size());
+ dos.writeShort(padding2);
+ dos.writeShort(ioRecords.size());
for(int idx = 0; idx < ioRecords.size(); idx++)
{
@@ -259,9 +260,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -299,7 +301,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -329,7 +331,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < ioRecords.size(); idx++)
{
- IORecord aIORecord = (IORecord)ioRecords.get(idx);
+ IORecord aIORecord = ioRecords.get(idx);
aIORecord.marshal(buff);
}
@@ -414,7 +416,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingSimID: ").append(receivingSimID).append("\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
index ff7182045e..fc309f8d49 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -51,8 +51,9 @@ public EntityID getOriginatingSimID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -69,9 +70,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -84,7 +86,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -152,7 +154,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingSimID: ").append(originatingSimID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
index 7aa6b22e26..849ecc52b3 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -172,8 +172,9 @@ public List<IORecord> getIoRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -182,12 +183,12 @@ public void marshal(DataOutputStream dos) throws Exception
{
ioSimSource.marshal(dos);
ioReportType.marshal(dos);
- dos.writeByte( (byte)padding1);
+ dos.writeByte(padding1);
ioAttackerID.marshal(dos);
ioPrimaryTargetID.marshal(dos);
- dos.writeShort( (short)padding2);
- dos.writeShort( (short)padding3);
- dos.writeShort( (short)ioRecords.size());
+ dos.writeShort(padding2);
+ dos.writeShort(padding3);
+ dos.writeShort(ioRecords.size());
for(int idx = 0; idx < ioRecords.size(); idx++)
{
@@ -204,9 +205,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -239,7 +241,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < ioRecords.size(); idx++)
{
- IORecord aIORecord = (IORecord)ioRecords.get(idx);
+ IORecord aIORecord = ioRecords.get(idx);
aIORecord.marshal(buff);
}
@@ -345,7 +347,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" ioSimSource: ").append(ioSimSource).append("\n");
sb.append(" ioReportType: ").append(ioReportType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
index 5b49bc4c2e..8395b47317 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -10,7 +10,7 @@ import java.io.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * Intercom communcations parameters. Section 6.2.46
+ * Intercom communications parameters. Section 6.2.46
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
public class IntercomCommunicationsParameters extends Object implements Serializable
@@ -87,15 +87,16 @@ public byte[] getRecordSpecificField()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
for(int idx = 0; idx < recordSpecificField.length; idx++)
dos.writeByte(recordSpecificField[idx]);
@@ -110,9 +111,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -131,7 +133,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -218,7 +220,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
index d41faa72be..acbfc74452 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -245,8 +245,9 @@ public List<IntercomCommunicationsParameters> getIntercomParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -254,17 +255,17 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
controlType.marshal(dos);
- dos.writeByte( (byte)communicationsChannelType);
+ dos.writeByte(communicationsChannelType);
sourceEntityID.marshal(dos);
- dos.writeShort( (short)sourceIntercomNumber);
- dos.writeByte( (byte)sourceLineID);
- dos.writeByte( (byte)transmitPriority);
+ dos.writeShort(sourceIntercomNumber);
+ dos.writeByte(sourceLineID);
+ dos.writeByte(transmitPriority);
transmitLineState.marshal(dos);
command.marshal(dos);
masterIntercomReferenceID.marshal(dos);
- dos.writeShort( (short)masterIntercomNumber);
- dos.writeShort( (short)masterChannelID);
- dos.writeInt( (int)intercomParameters.size());
+ dos.writeShort(masterIntercomNumber);
+ dos.writeShort(masterChannelID);
+ dos.writeInt(intercomParameters.size());
for(int idx = 0; idx < intercomParameters.size(); idx++)
{
@@ -281,9 +282,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -324,7 +326,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -355,7 +357,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < intercomParameters.size(); idx++)
{
- IntercomCommunicationsParameters aIntercomCommunicationsParameters = (IntercomCommunicationsParameters)intercomParameters.get(idx);
+ IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
aIntercomCommunicationsParameters.marshal(buff);
}
@@ -442,7 +444,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" controlType: ").append(controlType).append("\n");
sb.append(" communicationsChannelType: ").append(communicationsChannelType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
index c9f6b997f1..55e3de7ad3 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -97,17 +97,18 @@ public short getIntercomNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteNumber);
- dos.writeShort( (short)applicationNumber);
- dos.writeShort( (short)referenceNumber);
- dos.writeShort( (short)intercomNumber);
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
+ dos.writeShort(intercomNumber);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
index 472395e0ae..21b7c96920 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -80,16 +80,17 @@ public short getReferenceNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteNumber);
- dos.writeShort( (short)applicationNumber);
- dos.writeShort( (short)referenceNumber);
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
}
catch(Exception e)
{
@@ -99,9 +100,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -117,7 +119,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -193,7 +195,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
index 08907300c2..1e7556c118 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
@@ -1,10 +1,9 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
package edu.nps.moves.dis7;
-import java.util.*;
import java.io.*;
import edu.nps.moves.dis7.enumerations.*;
@@ -14,7 +13,11 @@ import edu.nps.moves.dis7.enumerations.*;
*/
public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements Serializable
{
- protected IntercomReferenceID intercomReferenceID = new IntercomReferenceID();
+
+ /**
+ *
+ */
+ protected IntercomReferenceID intercomReferenceID = new IntercomReferenceID();
/**
* ID of communications device
@@ -63,12 +66,12 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Returns the size of this serialized object in bytes
+ * @return
*/
+ @Override
public int getMarshalledSize()
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
+ int marshalSize = super.getMarshalledSize();
marshalSize += intercomReferenceID.getMarshalledSize();
marshalSize += 2; // intercomNumber
marshalSize += 2; // encodingScheme
@@ -84,6 +87,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#intercomReferenceID}
+ * @param pIntercomReferenceID
+ * @return
*/
public IntercomSignalPdu setIntercomReferenceID(IntercomReferenceID pIntercomReferenceID)
{
@@ -93,6 +98,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#intercomReferenceID}
+ * @return
*/
public IntercomReferenceID getIntercomReferenceID()
{
@@ -101,6 +107,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#intercomNumber}
+ * @param pIntercomNumber
+ * @return
*/
public IntercomSignalPdu setIntercomNumber(short pIntercomNumber)
{
@@ -110,6 +118,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#intercomNumber}
+ * @return
*/
public short getIntercomNumber()
{
@@ -118,6 +127,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#encodingScheme}
+ * @param pEncodingScheme
+ * @return
*/
public IntercomSignalPdu setEncodingScheme(short pEncodingScheme)
{
@@ -127,6 +138,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#encodingScheme}
+ * @return
*/
public short getEncodingScheme()
{
@@ -135,6 +147,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#tdlType}
+ * @param pTdlType
+ * @return
*/
public IntercomSignalPdu setTdlType(SignalTDLType pTdlType)
{
@@ -144,6 +158,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#tdlType}
+ * @return
*/
public SignalTDLType getTdlType()
{
@@ -152,6 +167,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#sampleRate}
+ * @param pSampleRate
+ * @return
*/
public IntercomSignalPdu setSampleRate(int pSampleRate)
{
@@ -161,6 +178,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#sampleRate}
+ * @return
*/
public int getSampleRate()
{
@@ -196,6 +214,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#samples}
+ * @param pSamples
+ * @return
*/
public IntercomSignalPdu setSamples(short pSamples)
{
@@ -205,6 +225,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#samples}
+ * @return
*/
public short getSamples()
{
@@ -213,6 +234,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#data}
+ * @param pData
+ * @return
*/
public IntercomSignalPdu setData(byte[] pData)
{
@@ -222,6 +245,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#data}
+ * @return
*/
public byte[] getData()
{
@@ -229,30 +253,33 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
}
/* *************************** */
- /* Marshal / unmarshal methods */
- /* *************************** */
+ /* Marshal / unmarshal methods */
+ /* *************************** */
+
/**
* Serializes an object to a DataOutputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataOutputStream
* @param dos The DataOutputStream
*/
+ @Override
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try {
intercomReferenceID.marshal(dos);
- dos.writeShort((short) intercomNumber);
- dos.writeShort((short) encodingScheme);
+ dos.writeShort(intercomNumber);
+ dos.writeShort(encodingScheme);
tdlType.marshal(dos);
- dos.writeInt((int) sampleRate);
+ dos.writeInt(sampleRate);
if (dataLength != null)
- dos.writeShort((short) dataLength);
+ dos.writeShort(dataLength);
else
- dos.writeShort((short) (dataLength = calculateDataLength()));
+ dos.writeShort((dataLength = calculateDataLength()));
- dos.writeShort((short) samples);
+ dos.writeShort(samples);
for (int idx = 0; idx < data.length; idx++) {
dos.writeByte(data[idx]);
@@ -268,10 +295,12 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Unserializes an object from a DataInputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataInputStream
* @param dis The DataInputStream
* @return marshalled size
*/
+ @Override
public int unmarshal(DataInputStream dis) throws Exception
{
int uPosition = 0;
@@ -313,24 +342,25 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
* @param buff The ByteBuffer at the position to begin writing
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public void marshal(java.nio.ByteBuffer buff) throws Exception
{
super.marshal(buff);
intercomReferenceID.marshal(buff);
- buff.putShort((short) intercomNumber);
- buff.putShort((short) encodingScheme);
+ buff.putShort(intercomNumber);
+ buff.putShort(encodingScheme);
tdlType.marshal(buff);
- buff.putInt((int) sampleRate);
+ buff.putInt(sampleRate);
if (dataLength != null)
- buff.putShort((short) dataLength);
+ buff.putShort(dataLength);
else
- buff.putShort((short) (dataLength = calculateDataLength()));
+ buff.putShort((dataLength = calculateDataLength()));
- buff.putShort((short) samples);
+ buff.putShort(samples);
for (int idx = 0; idx < data.length; idx++) {
- buff.put((byte) data[idx]);
+ buff.put(data[idx]);
}
padTo32 = new byte[Align.to32bits(buff)];
@@ -345,6 +375,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
* @return marshalled size
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
super.unmarshal(buff);
diff --git a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
index f5232856bb..6c377f764f 100644
--- a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -145,8 +145,9 @@ public List<VariableDatum> getGroupedEntityDescriptions()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -155,10 +156,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
groupEntityID.marshal(dos);
groupedEntityCategory.marshal(dos);
- dos.writeByte( (byte)groupedEntityDescriptions.size());
- dos.writeInt( (int)pad);
- dos.writeDouble( (double)latitude);
- dos.writeDouble( (double)longitude);
+ dos.writeByte(groupedEntityDescriptions.size());
+ dos.writeInt(pad);
+ dos.writeDouble(latitude);
+ dos.writeDouble(longitude);
for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
{
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -207,7 +209,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -232,7 +234,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)groupedEntityDescriptions.get(idx);
+ VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
aVariableDatum.marshal(buff);
}
@@ -307,7 +309,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" groupEntityID: ").append(groupEntityID).append("\n");
sb.append(" groupedEntityCategory: ").append(groupedEntityCategory).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
index 433a1646d2..be3a927964 100644
--- a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -137,8 +137,9 @@ public EntityType getPartEntityType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -160,9 +161,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -180,7 +182,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -263,7 +265,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/JammingTechnique.java b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
index 72f501eb8b..fe9ef1c598 100644
--- a/src-generated/edu/nps/moves/dis7/JammingTechnique.java
+++ b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -97,17 +97,18 @@ public byte getSpecific()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)kind);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
- dos.writeByte( (byte)specific);
+ dos.writeByte(kind);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" kind: ").append(kind).append("\n");
sb.append(" category: ").append(category).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
index de0b6b1e3a..f78db40982 100644
--- a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -228,8 +228,9 @@ public byte getDetonationResult()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -237,8 +238,8 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
firingLiveEntityId.marshal(dos);
- dos.writeByte( (byte)detonationFlag1);
- dos.writeByte( (byte)detonationFlag2);
+ dos.writeByte(detonationFlag1);
+ dos.writeByte(detonationFlag2);
targetLiveEntityId.marshal(dos);
munitionLiveEntityId.marshal(dos);
eventId.marshal(dos);
@@ -247,7 +248,7 @@ public void marshal(DataOutputStream dos) throws Exception
munitionOrientation.marshal(dos);
munitionDescriptor.marshal(dos);
entityLocation.marshal(dos);
- dos.writeByte( (byte)detonationResult);
+ dos.writeByte(detonationResult);
}
catch(Exception e)
{
@@ -257,9 +258,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -286,7 +288,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -387,7 +389,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
sb.append(" detonationFlag1: ").append(detonationFlag1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LEFirePdu.java b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
index 010faa294e..83ebe2bd15 100644
--- a/src-generated/edu/nps/moves/dis7/LEFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -17,7 +17,7 @@ public class LEFirePdu extends LiveEntityFamilyPdu implements Serializable
{
protected EntityID firingLiveEntityId = new EntityID();
- /** Bits defined in IEE Std. */
+ /** Bits defined in IEEE Standard */
protected byte flags;
protected EntityID targetLiveEntityId = new EntityID();
@@ -180,8 +180,9 @@ public short getRange()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -189,14 +190,14 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
firingLiveEntityId.marshal(dos);
- dos.writeByte( (byte)flags);
+ dos.writeByte(flags);
targetLiveEntityId.marshal(dos);
munitionLiveEntityId.marshal(dos);
eventId.marshal(dos);
location.marshal(dos);
munitionDescriptor.marshal(dos);
velocity.marshal(dos);
- dos.writeShort( (short)range);
+ dos.writeShort(range);
}
catch(Exception e)
{
@@ -206,9 +207,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -231,7 +233,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -323,7 +325,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
sb.append(" flags: ").append(flags).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
index 924f25dd26..a0b17ab73e 100644
--- a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
+++ b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public byte getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)x);
- dos.writeByte( (byte)y);
- dos.writeByte( (byte)z);
+ dos.writeByte(x);
+ dos.writeByte(y);
+ dos.writeByte(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
index 4e31e99231..56fd58213d 100644
--- a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
+++ b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -145,19 +145,20 @@ public Vector3Double getTargetLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
fireEventID.marshal(dos);
- dos.writeShort( (short)padding);
+ dos.writeShort(padding);
firingEntityID.marshal(dos);
- dos.writeShort( (short)padding2);
+ dos.writeShort(padding2);
targetEntityID.marshal(dos);
- dos.writeShort( (short)padding3);
+ dos.writeShort(padding3);
targetLocation.marshal(dos);
}
catch(Exception e)
@@ -168,9 +169,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -278,7 +280,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fireEventID: ").append(fireEventID).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LayerHeader.java b/src-generated/edu/nps/moves/dis7/LayerHeader.java
index 4639a4bfe5..875dff2dda 100644
--- a/src-generated/edu/nps/moves/dis7/LayerHeader.java
+++ b/src-generated/edu/nps/moves/dis7/LayerHeader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -83,16 +83,17 @@ public short getLength()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)layerNumber);
- dos.writeByte( (byte)layerSpecificInformation);
- dos.writeShort( (short)length);
+ dos.writeByte(layerNumber);
+ dos.writeByte(layerSpecificInformation);
+ dos.writeShort(length);
}
catch(Exception e)
{
@@ -102,9 +103,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" layerNumber: ").append(layerNumber).append("\n");
sb.append(" layerSpecificInformation: ").append(layerSpecificInformation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
index 40666e0201..d3ce4125aa 100644
--- a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -179,8 +179,9 @@ public List<LinearSegmentParameter> getLinearSegmentParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -189,9 +190,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
objectID.marshal(dos);
referencedObjectID.marshal(dos);
- dos.writeShort( (short)updateNumber);
+ dos.writeShort(updateNumber);
forceID.marshal(dos);
- dos.writeByte( (byte)linearSegmentParameters.size());
+ dos.writeByte(linearSegmentParameters.size());
requesterID.marshal(dos);
receivingID.marshal(dos);
objectType.marshal(dos);
@@ -211,9 +212,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -243,7 +245,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -270,7 +272,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
{
- LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)linearSegmentParameters.get(idx);
+ LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
aLinearSegmentParameter.marshal(buff);
}
@@ -349,7 +351,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" objectID: ").append(objectID).append("\n");
sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
index 97c275c14d..936381a091 100644
--- a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
+++ b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -220,24 +220,25 @@ public int getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)segmentNumber);
+ dos.writeByte(segmentNumber);
segmentModification.marshal(dos);
generalSegmentAppearance.marshal(dos);
- dos.writeInt( (int)specificSegmentAppearance);
+ dos.writeInt(specificSegmentAppearance);
segmentLocation.marshal(dos);
segmentOrientation.marshal(dos);
- dos.writeFloat( (float)segmentLength);
- dos.writeFloat( (float)segmentWidth);
- dos.writeFloat( (float)segmentHeight);
- dos.writeFloat( (float)segmentDepth);
- dos.writeInt( (int)padding);
+ dos.writeFloat(segmentLength);
+ dos.writeFloat(segmentWidth);
+ dos.writeFloat(segmentHeight);
+ dos.writeFloat(segmentDepth);
+ dos.writeInt(padding);
}
catch(Exception e)
{
@@ -247,9 +248,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -277,7 +279,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -377,7 +379,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" segmentNumber: ").append(segmentNumber).append("\n");
sb.append(" segmentModification: ").append(segmentModification).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
index 1b7f6b91bb..a9132621e5 100644
--- a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -82,8 +82,9 @@ public LEVector3FixedByte getEntityAngularVelocity()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -101,9 +102,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -117,7 +119,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -193,7 +195,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
index 03d1c61da5..3ad54a609f 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
index 1a27e8e646..675d3e8740 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -34,8 +34,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -51,9 +52,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -65,7 +67,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -130,7 +132,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
index 5a756d56e8..90f8d8b1c0 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
index 1c1907d8c0..e6aac2f40d 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getEntityNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
liveSimulationAddress.marshal(dos);
- dos.writeShort( (short)entityNumber);
+ dos.writeShort(entityNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveSimulationAddress: ").append(liveSimulationAddress).append("\n");
sb.append(" entityNumber: ").append(entityNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
index fc03eefa69..ec5c7ccb73 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -81,16 +81,17 @@ public short getZComponent()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)xComponent);
- dos.writeShort( (short)yComponent);
- dos.writeShort( (short)zComponent);
+ dos.writeShort(xComponent);
+ dos.writeShort(yComponent);
+ dos.writeShort(zComponent);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" xComponent: ").append(xComponent).append("\n");
sb.append(" yComponent: ").append(yComponent).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
index 19fd726196..b928c05663 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -81,16 +81,17 @@ public byte getPhi()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)psi);
- dos.writeByte( (byte)theta);
- dos.writeByte( (byte)phi);
+ dos.writeByte(psi);
+ dos.writeByte(theta);
+ dos.writeByte(phi);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" psi: ").append(psi).append("\n");
sb.append(" theta: ").append(theta).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
index 6459c312a0..3f1b69d8b3 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -81,16 +81,17 @@ public short getPhi()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)psi);
- dos.writeShort( (short)theta);
- dos.writeShort( (short)phi);
+ dos.writeShort(psi);
+ dos.writeShort(theta);
+ dos.writeShort(phi);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" psi: ").append(psi).append("\n");
sb.append(" theta: ").append(theta).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
index 2889ab00a0..6d05b2d994 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -81,16 +81,17 @@ public short getRotationError()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)azimuthError);
- dos.writeShort( (short)elevationError);
- dos.writeShort( (short)rotationError);
+ dos.writeShort(azimuthError);
+ dos.writeShort(elevationError);
+ dos.writeShort(rotationError);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" azimuthError: ").append(azimuthError).append("\n");
sb.append(" elevationError: ").append(elevationError).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
index 0988af653f..e1ca309b4e 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -68,8 +68,9 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -77,7 +78,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
subprotocolNumber.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -176,7 +178,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" subprotocolNumber: ").append(subprotocolNumber).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
index 77e7256222..5184cf3395 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -65,15 +65,16 @@ public short getVerticalError()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)horizontalError);
- dos.writeShort( (short)verticalError);
+ dos.writeShort(horizontalError);
+ dos.writeShort(verticalError);
}
catch(Exception e)
{
@@ -83,9 +84,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" horizontalError: ").append(horizontalError).append("\n");
sb.append(" verticalError: ").append(verticalError).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
index 47bff9ddb8..d1c260598b 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -97,17 +97,18 @@ public short getDeltaZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)referencePoint);
- dos.writeShort( (short)deltaX);
- dos.writeShort( (short)deltaY);
- dos.writeShort( (short)deltaZ);
+ dos.writeShort(referencePoint);
+ dos.writeShort(deltaX);
+ dos.writeShort(deltaY);
+ dos.writeShort(deltaZ);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" referencePoint: ").append(referencePoint).append("\n");
sb.append(" deltaX: ").append(deltaX).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
index 227f635322..87849104c8 100644
--- a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public byte getLiveApplicationNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)liveSiteNumber);
- dos.writeByte( (byte)liveApplicationNumber);
+ dos.writeByte(liveSiteNumber);
+ dos.writeByte(liveApplicationNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveSiteNumber: ").append(liveSiteNumber).append("\n");
sb.append(" liveApplicationNumber: ").append(liveApplicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
index 27a5c2fc1d..a673eb7eca 100644
--- a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/Marshaller.java b/src-generated/edu/nps/moves/dis7/Marshaller.java
index 1bcb48a561..16d9c5c7c7 100644
--- a/src-generated/edu/nps/moves/dis7/Marshaller.java
+++ b/src-generated/edu/nps/moves/dis7/Marshaller.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -14,22 +14,41 @@ import java.nio.ByteBuffer;
*/
public interface Marshaller
{
- public int getMarshalledSize();
+ /**
+ *
+ * @return the size in bytes of a value from a stream
+ */
+ int getMarshalledSize();
- public void marshal(DataOutputStream dos) throws Exception;
- public int unmarshal(DataInputStream dis) throws Exception;
+ /**
+ *
+ * @param dos the output stream to marshal to
+ * @throws Exception
+ */
+ void marshal(DataOutputStream dos) throws Exception;
+
+ /**
+ *
+ * @param dis the input stream to unmarshal from
+ * @return the size of the PDU
+ * @throws Exception
+ */
+ int unmarshal(DataInputStream dis) throws Exception;
/**
* Packs a Pdu into the ByteBuffer.
+ * @throws java.lang.Exception
* @see java.nio.ByteBuffer
* @param buff The ByteBuffer at the position to begin writing
*/
- public void marshal(ByteBuffer buff) throws Exception;
+ void marshal(ByteBuffer buff) throws Exception;
/**
* Unpacks a Pdu from the underlying data.
+ * @return the size of the PDU
+ * @throws java.lang.Exception
* @see java.nio.ByteBuffer
* @param buff The ByteBuffer at the position to begin reading
*/
- public int unmarshal(ByteBuffer buff) throws Exception;
+ int unmarshal(ByteBuffer buff) throws Exception;
}
diff --git a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
index 29d6990169..eb18094d0c 100644
--- a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
+++ b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -64,15 +64,16 @@ public int getTimePastTheHour()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)hour);
- dos.writeInt( (int)timePastTheHour);
+ dos.writeInt(hour);
+ dos.writeInt(timePastTheHour);
}
catch(Exception e)
{
@@ -82,9 +83,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -98,7 +100,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -171,7 +173,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" hour: ").append(hour).append("\n");
sb.append(" timePastTheHour: ").append(timePastTheHour).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
index 4e42a2acde..7d202eac6a 100644
--- a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getMineEntityNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)mineEntityNumber);
+ dos.writeShort(mineEntityNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" mineEntityNumber: ").append(mineEntityNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
index 04b2de3345..d4f757fd1b 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -473,8 +473,9 @@ public byte[] getNumberOfVertices()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -483,13 +484,13 @@ public void marshal(DataOutputStream dos) throws Exception
{
minefieldID.marshal(dos);
requestingEntityID.marshal(dos);
- dos.writeShort( (short)minefieldSequenceNumbeer);
- dos.writeByte( (byte)requestID);
- dos.writeByte( (byte)pduSequenceNumber);
- dos.writeByte( (byte)numberOfPdus);
- dos.writeByte( (byte)numberOfVertices.length);
- dos.writeByte( (byte)sensorTypes.size());
- dos.writeByte( (byte)padding);
+ dos.writeShort(minefieldSequenceNumbeer);
+ dos.writeByte(requestID);
+ dos.writeByte(pduSequenceNumber);
+ dos.writeByte(numberOfPdus);
+ dos.writeByte(numberOfVertices.length);
+ dos.writeByte(sensorTypes.size());
+ dos.writeByte(padding);
dataFilter.marshal(dos);
mineType.marshal(dos);
@@ -582,9 +583,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -689,7 +691,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -719,7 +721,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < sensorTypes.size(); idx++)
{
- MinefieldSensorType aMinefieldSensorType = (MinefieldSensorType)sensorTypes.get(idx);
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
aMinefieldSensorType.marshal(buff);
}
@@ -727,7 +729,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < mineLocation.size(); idx++)
{
- Vector3Float aVector3Float = (Vector3Float)mineLocation.get(idx);
+ Vector3Float aVector3Float = mineLocation.get(idx);
aVector3Float.marshal(buff);
}
@@ -746,7 +748,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < mineOrientation.size(); idx++)
{
- EulerAngles aEulerAngles = (EulerAngles)mineOrientation.get(idx);
+ EulerAngles aEulerAngles = mineOrientation.get(idx);
aEulerAngles.marshal(buff);
}
@@ -761,7 +763,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
{
- MineEmplacementTime aMineEmplacementTime = (MineEmplacementTime)mineEmplacementTime.get(idx);
+ MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
aMineEmplacementTime.marshal(buff);
}
@@ -772,7 +774,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fusing.size(); idx++)
{
- MinefieldDataFusing aMinefieldDataFusing = (MinefieldDataFusing)fusing.get(idx);
+ MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
aMinefieldDataFusing.marshal(buff);
}
@@ -783,7 +785,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < paintScheme.size(); idx++)
{
- MinefieldDataPaintScheme aMinefieldDataPaintScheme = (MinefieldDataPaintScheme)paintScheme.get(idx);
+ MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
aMinefieldDataPaintScheme.marshal(buff);
}
@@ -1007,7 +1009,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
index aded770c71..d2e171db1b 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
index 22a7205bda..3c55bb5794 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getMinefieldNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)minefieldNumber);
+ dos.writeShort(minefieldNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" minefieldNumber: ").append(minefieldNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
index 9c6686f267..9140550b80 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -186,8 +186,9 @@ public List<MinefieldSensorType> getSensorTypes()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -196,10 +197,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
minefieldID.marshal(dos);
requestingEntityID.marshal(dos);
- dos.writeByte( (byte)requestID);
- dos.writeByte( (byte)requestedPerimeterPoints.size());
- dos.writeByte( (byte)padding);
- dos.writeByte( (byte)sensorTypes.size());
+ dos.writeByte(requestID);
+ dos.writeByte(requestedPerimeterPoints.size());
+ dos.writeByte(padding);
+ dos.writeByte(sensorTypes.size());
dataFilter.marshal(dos);
requestedMineType.marshal(dos);
@@ -225,9 +226,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -265,7 +267,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -292,14 +294,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
{
- Vector2Float aVector2Float = (Vector2Float)requestedPerimeterPoints.get(idx);
+ Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
aVector2Float.marshal(buff);
}
for(int idx = 0; idx < sensorTypes.size(); idx++)
{
- MinefieldSensorType aMinefieldSensorType = (MinefieldSensorType)sensorTypes.get(idx);
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
aMinefieldSensorType.marshal(buff);
}
@@ -388,7 +390,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
index 12b18855a3..7507c25132 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -107,8 +107,9 @@ public byte[] getMissingPduSequenceNumbers()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -117,8 +118,8 @@ public void marshal(DataOutputStream dos) throws Exception
{
minefieldID.marshal(dos);
requestingEntityID.marshal(dos);
- dos.writeByte( (byte)requestID);
- dos.writeByte( (byte)missingPduSequenceNumbers.length);
+ dos.writeByte(requestID);
+ dos.writeByte(missingPduSequenceNumbers.length);
for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
dos.writeByte(missingPduSequenceNumbers[idx]);
@@ -132,9 +133,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -155,7 +157,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
index 395931762c..10dce71cbe 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -50,14 +50,15 @@ public short getSensorType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)sensorType);
+ dos.writeShort(sensorType);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sensorType: ").append(sensorType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
index baf36efb27..1764ea52d4 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -221,8 +221,9 @@ public List<EntityType> getMineType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -230,11 +231,11 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
minefieldID.marshal(dos);
- dos.writeShort( (short)minefieldSequence);
+ dos.writeShort(minefieldSequence);
forceID.marshal(dos);
- dos.writeByte( (byte)perimeterPoints.size());
+ dos.writeByte(perimeterPoints.size());
minefieldType.marshal(dos);
- dos.writeShort( (short)mineType.size());
+ dos.writeShort(mineType.size());
minefieldLocation.marshal(dos);
minefieldOrientation.marshal(dos);
appearance.marshal(dos);
@@ -262,9 +263,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -304,7 +306,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -333,14 +335,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < perimeterPoints.size(); idx++)
{
- Vector2Float aVector2Float = (Vector2Float)perimeterPoints.get(idx);
+ Vector2Float aVector2Float = perimeterPoints.get(idx);
aVector2Float.marshal(buff);
}
for(int idx = 0; idx < mineType.size(); idx++)
{
- EntityType aEntityType = (EntityType)mineType.get(idx);
+ EntityType aEntityType = mineType.get(idx);
aEntityType.marshal(buff);
}
@@ -433,7 +435,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" minefieldSequence: ").append(minefieldSequence).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ModulationParameters.java b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
index ea096f623d..0d89118b15 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationParameters.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -52,8 +52,9 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -73,9 +74,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -90,7 +92,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -171,7 +173,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordSpecificFields: ").append("\n");
sb.append(Arrays.toString(recordSpecificFields)).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ModulationType.java b/src-generated/edu/nps/moves/dis7/ModulationType.java
index e367dbcb41..bba818a273 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationType.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,16 +101,17 @@ public TransmitterModulationTypeSystem getRadioSystem()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)spreadSpectrum);
+ dos.writeShort(spreadSpectrum);
majorModulation.marshal(dos);
- dos.writeShort( (short)detail);
+ dos.writeShort(detail);
radioSystem.marshal(dos);
}
catch(Exception e)
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -141,7 +143,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -220,7 +222,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" spreadSpectrum: ").append(spreadSpectrum).append("\n");
sb.append(" majorModulation: ").append(majorModulation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Munition.java b/src-generated/edu/nps/moves/dis7/Munition.java
index 0280d519e9..95e855e0ba 100644
--- a/src-generated/edu/nps/moves/dis7/Munition.java
+++ b/src-generated/edu/nps/moves/dis7/Munition.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,18 +118,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
munitionType.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)quantity);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
munitionStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" munitionType: ").append(munitionType).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
index 58b6a4d375..34cb216bd7 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,8 +118,9 @@ public short getRate()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,8 +129,8 @@ public void marshal(DataOutputStream dos) throws Exception
munitionType.marshal(dos);
warhead.marshal(dos);
fuse.marshal(dos);
- dos.writeShort( (short)quantity);
- dos.writeShort( (short)rate);
+ dos.writeShort(quantity);
+ dos.writeShort(rate);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" munitionType: ").append(munitionType).append("\n");
sb.append(" warhead: ").append(warhead).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MunitionReload.java b/src-generated/edu/nps/moves/dis7/MunitionReload.java
index b48d36521d..408625f36d 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionReload.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -135,19 +135,20 @@ public int getMaximumQuantityReloadTime()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
munitionType.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)standardQuantity);
- dos.writeShort( (short)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(station);
+ dos.writeShort(standardQuantity);
+ dos.writeShort(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -180,7 +182,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" munitionType: ").append(munitionType).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
index 126f0dc40b..3a15cdd9ee 100644
--- a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getStationNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
stationName.marshal(dos);
- dos.writeShort( (short)stationNumber);
+ dos.writeShort(stationNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" stationName: ").append(stationName).append("\n");
sb.append(" stationNumber: ").append(stationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
index 08597de18a..3be8c0a74f 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getObjectNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)objectNumber);
+ dos.writeShort(objectNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" objectNumber: ").append(objectNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ObjectType.java b/src-generated/edu/nps/moves/dis7/ObjectType.java
index 0355d73a23..6a19da3fbb 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectType.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,8 +101,9 @@ public byte getSubCategory()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,8 +111,8 @@ public void marshal(DataOutputStream dos) throws Exception
{
domain.marshal(dos);
objectKind.marshal(dos);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
}
catch(Exception e)
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -141,7 +143,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -220,7 +222,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" domain: ").append(domain).append("\n");
sb.append(" objectKind: ").append(objectKind).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
index bc404aee40..8743663714 100644
--- a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
+++ b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,8 +84,9 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -93,7 +94,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
entityId.marshal(dos);
ownershipStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityId: ").append(entityId).append("\n");
sb.append(" ownershipStatus: ").append(ownershipStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Pdu.java b/src-generated/edu/nps/moves/dis7/Pdu.java
index b5f33f382c..ffe517e637 100644
--- a/src-generated/edu/nps/moves/dis7/Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/Pdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -135,19 +135,20 @@ public short getLength()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
protocolVersion.marshal(dos);
- dos.writeByte( (byte)exerciseID);
+ dos.writeByte(exerciseID);
pduType.marshal(dos);
protocolFamily.marshal(dos);
- dos.writeInt( (int)timestamp);
- dos.writeShort( (short)length);
+ dos.writeInt(timestamp);
+ dos.writeShort(length);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -181,7 +183,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -280,7 +282,7 @@ public byte[] marshal() throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" protocolVersion: ").append(protocolVersion).append("\n");
sb.append(" exerciseID: ").append(exerciseID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/PduBase.java b/src-generated/edu/nps/moves/dis7/PduBase.java
index d77d8844e3..fa313efd1c 100644
--- a/src-generated/edu/nps/moves/dis7/PduBase.java
+++ b/src-generated/edu/nps/moves/dis7/PduBase.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -68,8 +68,9 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -77,7 +78,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
pduStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -104,7 +106,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -175,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" pduStatus: ").append(pduStatus).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/PduStatus.java b/src-generated/edu/nps/moves/dis7/PduStatus.java
index d1f9bde31a..7fdc45ad65 100644
--- a/src-generated/edu/nps/moves/dis7/PduStatus.java
+++ b/src-generated/edu/nps/moves/dis7/PduStatus.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
package edu.nps.moves.dis7;
diff --git a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
index 1fc431d50f..08e0e6def2 100644
--- a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -272,8 +272,9 @@ public int getPad2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -282,18 +283,18 @@ public void marshal(DataOutputStream dos) throws Exception
{
objectID.marshal(dos);
referencedObjectID.marshal(dos);
- dos.writeInt( (int)updateNumber);
+ dos.writeInt(updateNumber);
forceID.marshal(dos);
modifications.marshal(dos);
objectType.marshal(dos);
objectLocation.marshal(dos);
objectOrientation.marshal(dos);
- dos.writeInt( (int)specificObjectAppearance);
+ dos.writeInt(specificObjectAppearance);
generObjectAppearance.marshal(dos);
- dos.writeShort( (short)padding1);
+ dos.writeShort(padding1);
requesterID.marshal(dos);
receivingID.marshal(dos);
- dos.writeInt( (int)pad2);
+ dos.writeInt(pad2);
}
catch(Exception e)
{
@@ -303,9 +304,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -336,7 +338,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -443,7 +445,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" objectID: ").append(objectID).append("\n");
sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
index 8f64b597b0..02adc08647 100644
--- a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
+++ b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public float getEngineRpm()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)powerSetting);
- dos.writeFloat( (float)engineRpm);
+ dos.writeFloat(powerSetting);
+ dos.writeFloat(engineRpm);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" powerSetting: ").append(powerSetting).append("\n");
sb.append(" engineRpm: ").append(engineRpm).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ProtocolMode.java b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
index 395ad0a9e5..7ad2500a10 100644
--- a/src-generated/edu/nps/moves/dis7/ProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -50,14 +50,15 @@ public short getProtocolMode()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)protocolMode);
+ dos.writeShort(protocolMode);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" protocolMode: ").append(protocolMode).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
index f0c1df7a05..8cd2f1b6de 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -66,15 +66,16 @@ public short getRadioNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
radioReferenceID.marshal(dos);
- dos.writeShort( (short)radioNumber);
+ dos.writeShort(radioNumber);
}
catch(Exception e)
{
@@ -84,9 +85,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" radioReferenceID: ").append(radioReferenceID).append("\n");
sb.append(" radioNumber: ").append(radioNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
index 7696836fd7..f617ac6b6a 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
index cc29ada69b..12be44ee7c 100644
--- a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,17 +101,18 @@ public short getRadioNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteNumber);
- dos.writeShort( (short)applicationNumber);
- dos.writeShort( (short)referenceNumber);
- dos.writeShort( (short)radioNumber);
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
+ dos.writeShort(radioNumber);
}
catch(Exception e)
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -141,7 +143,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -220,7 +222,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RadioType.java b/src-generated/edu/nps/moves/dis7/RadioType.java
index 014d69bdc1..4208621d23 100644
--- a/src-generated/edu/nps/moves/dis7/RadioType.java
+++ b/src-generated/edu/nps/moves/dis7/RadioType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -150,20 +150,21 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityKind.marshal(dos);
- dos.writeByte( (byte)domain);
+ dos.writeByte(domain);
country.marshal(dos);
category.marshal(dos);
subcategory.marshal(dos);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -173,9 +174,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -199,7 +201,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityKind: ").append(entityKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
index 3ce7d45e8c..85e3d09753 100644
--- a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -135,8 +135,9 @@ public short getTransmitterRadioId()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -145,10 +146,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
header.marshal(dos);
receiverState.marshal(dos);
- dos.writeShort( (short)padding1);
- dos.writeFloat( (float)receivedPower);
+ dos.writeShort(padding1);
+ dos.writeFloat(receivedPower);
transmitterEntityId.marshal(dos);
- dos.writeShort( (short)transmitterRadioId);
+ dos.writeShort(transmitterRadioId);
}
catch(Exception e)
{
@@ -158,9 +159,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -182,7 +184,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" header: ").append(header).append("\n");
sb.append(" receiverState: ").append(receiverState).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
index 356025ff75..71f8d3855c 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -145,20 +145,21 @@ public List<RecordQuerySpecification> getRecordIDs()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
+ dos.writeByte(pad1);
eventType.marshal(dos);
- dos.writeInt( (int)time);
- dos.writeInt( (int)recordIDs.size());
+ dos.writeInt(time);
+ dos.writeInt(recordIDs.size());
for(int idx = 0; idx < recordIDs.size(); idx++)
{
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -208,7 +210,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -233,7 +235,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordIDs.size(); idx++)
{
- RecordQuerySpecification aRecordQuerySpecification = (RecordQuerySpecification)recordIDs.get(idx);
+ RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
aRecordQuerySpecification.marshal(buff);
}
@@ -308,7 +310,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
index ea5c67319a..e2b412b727 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
index f956a55bed..07d57f6ec6 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -57,14 +57,15 @@ public List<VariableRecordType> getRecordIDs()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordIDs.size());
+ dos.writeInt(recordIDs.size());
for(int idx = 0; idx < recordIDs.size(); idx++)
{
@@ -81,9 +82,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -102,7 +104,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -121,7 +123,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordIDs.size(); idx++)
{
- VariableRecordType aVariableRecordType = (VariableRecordType)recordIDs.get(idx);
+ VariableRecordType aVariableRecordType = recordIDs.get(idx);
aVariableRecordType.marshal(buff);
}
@@ -188,7 +190,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordIDs: ").append("\n");
recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/RecordRPdu.java b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
index fc34ca02f1..8d086a0752 100644
--- a/src-generated/edu/nps/moves/dis7/RecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -127,19 +127,20 @@ public List<RecordSpecification> getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
+ dos.writeByte(pad1);
eventType.marshal(dos);
- dos.writeInt( (int)recordSets.size());
+ dos.writeInt(recordSets.size());
for(int idx = 0; idx < recordSets.size(); idx++)
{
@@ -156,9 +157,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -187,7 +189,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -211,7 +213,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordSets.size(); idx++)
{
- RecordSpecification aRecordSpecification = (RecordSpecification)recordSets.get(idx);
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
aRecordSpecification.marshal(buff);
}
@@ -284,7 +286,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
index dd2bef6729..3381444dbb 100644
--- a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecification.java b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
index a96854fa07..2547cfb3d7 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -58,14 +58,15 @@ public List<RecordSpecificationElement> getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordSets.size());
+ dos.writeInt(recordSets.size());
for(int idx = 0; idx < recordSets.size(); idx++)
{
@@ -82,9 +83,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -103,7 +105,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -122,7 +124,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordSets.size(); idx++)
{
- RecordSpecificationElement aRecordSpecificationElement = (RecordSpecificationElement)recordSets.get(idx);
+ RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
aRecordSpecificationElement.marshal(buff);
}
@@ -190,7 +192,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordSets: ").append("\n");
recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
index d8ce257c74..88bafba782 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -151,18 +151,19 @@ public byte[] getPadTo64()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordID.marshal(dos);
- dos.writeInt( (int)recordSetSerialNumber);
- dos.writeInt( (int)padding);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)recordCount);
+ dos.writeInt(recordSetSerialNumber);
+ dos.writeInt(padding);
+ dos.writeShort(recordLength);
+ dos.writeShort(recordCount);
for(int idx = 0; idx < recordValues.length; idx++)
dos.writeByte(recordValues[idx]);
@@ -180,9 +181,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -208,7 +210,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -314,7 +316,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordID: ").append(recordID).append("\n");
sb.append(" recordSetSerialNumber: ").append(recordSetSerialNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Relationship.java b/src-generated/edu/nps/moves/dis7/Relationship.java
index a2ba6ac1de..10c7c36024 100644
--- a/src-generated/edu/nps/moves/dis7/Relationship.java
+++ b/src-generated/edu/nps/moves/dis7/Relationship.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,8 +67,9 @@ public IsPartOfPosition getPosition()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" nature: ").append(nature).append("\n");
sb.append(" position: ").append(position).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
index e8bbbebfb4..16e80e05f3 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -52,15 +52,16 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -70,9 +71,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -86,7 +88,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -154,7 +156,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
index 5fbbef632d..ffb721ee7c 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,8 +101,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,9 +111,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -122,9 +123,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -144,7 +146,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -221,7 +223,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
index e42c0fb7dd..30a79ffd44 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
index c8258f3419..780f6546b3 100644
--- a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -103,8 +103,9 @@ public short getPadding4()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -114,7 +115,7 @@ public void marshal(DataOutputStream dos) throws Exception
receivingEntityID.marshal(dos);
repairingEntityID.marshal(dos);
repair.marshal(dos);
- dos.writeShort( (short)padding4);
+ dos.writeShort(padding4);
}
catch(Exception e)
{
@@ -124,9 +125,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -144,7 +146,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -221,7 +223,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
index ee78848d8d..f09356a1ef 100644
--- a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -120,8 +120,9 @@ public short getPadding2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -131,8 +132,8 @@ public void marshal(DataOutputStream dos) throws Exception
receivingEntityID.marshal(dos);
repairingEntityID.marshal(dos);
repairResult.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
}
catch(Exception e)
{
@@ -142,9 +143,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -164,7 +166,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -244,7 +246,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RequestID.java b/src-generated/edu/nps/moves/dis7/RequestID.java
index 626a40c86b..ccbe82cb10 100644
--- a/src-generated/edu/nps/moves/dis7/RequestID.java
+++ b/src-generated/edu/nps/moves/dis7/RequestID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -50,14 +50,15 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
index 06da4102d6..6035e828a8 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -69,8 +69,9 @@ public EntityID getSupplyingEntityID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -104,7 +106,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -175,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
index d2fd9ea736..42f00f2365 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -128,8 +128,9 @@ public List<SupplyQuantity> getSupplies()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -138,9 +139,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
receivingEntityID.marshal(dos);
supplyingEntityID.marshal(dos);
- dos.writeByte( (byte)supplies.size());
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(supplies.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < supplies.size(); idx++)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -186,7 +188,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -210,7 +212,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < supplies.size(); idx++)
{
- SupplyQuantity aSupplyQuantity = (SupplyQuantity)supplies.get(idx);
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
aSupplyQuantity.marshal(buff);
}
@@ -283,7 +285,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
index 4df57d4bb3..8dfe14e846 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -128,8 +128,9 @@ public List<SupplyQuantity> getSupplies()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -138,9 +139,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
receivingEntityID.marshal(dos);
supplyingEntityID.marshal(dos);
- dos.writeByte( (byte)supplies.size());
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(supplies.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < supplies.size(); idx++)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -186,7 +188,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -210,7 +212,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < supplies.size(); idx++)
{
- SupplyQuantity aSupplyQuantity = (SupplyQuantity)supplies.get(idx);
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
aSupplyQuantity.marshal(buff);
}
@@ -283,7 +285,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SEESPdu.java b/src-generated/edu/nps/moves/dis7/SEESPdu.java
index 512f42f6b5..1988f95d9c 100644
--- a/src-generated/edu/nps/moves/dis7/SEESPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SEESPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -153,8 +153,9 @@ public List<VectoringNozzleSystem> getVectoringSystemData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -162,11 +163,11 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
orginatingEntityID.marshal(dos);
- dos.writeShort( (short)infraredSignatureRepresentationIndex);
- dos.writeShort( (short)acousticSignatureRepresentationIndex);
- dos.writeShort( (short)radarCrossSectionSignatureRepresentationIndex);
- dos.writeShort( (short)propulsionSystemData.size());
- dos.writeShort( (short)vectoringSystemData.size());
+ dos.writeShort(infraredSignatureRepresentationIndex);
+ dos.writeShort(acousticSignatureRepresentationIndex);
+ dos.writeShort(radarCrossSectionSignatureRepresentationIndex);
+ dos.writeShort(propulsionSystemData.size());
+ dos.writeShort(vectoringSystemData.size());
for(int idx = 0; idx < propulsionSystemData.size(); idx++)
{
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -229,7 +231,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -254,14 +256,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < propulsionSystemData.size(); idx++)
{
- PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)propulsionSystemData.get(idx);
+ PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
aPropulsionSystemData.marshal(buff);
}
for(int idx = 0; idx < vectoringSystemData.size(); idx++)
{
- VectoringNozzleSystem aVectoringNozzleSystem = (VectoringNozzleSystem)vectoringSystemData.get(idx);
+ VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
aVectoringNozzleSystem.marshal(buff);
}
@@ -346,7 +348,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
sb.append(" infraredSignatureRepresentationIndex: ").append(infraredSignatureRepresentationIndex).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
index b45271dbbd..7795185ef7 100644
--- a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public short getNumberOfIFFFundamentalParameterRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)operationalData1);
- dos.writeByte( (byte)operationalData2);
- dos.writeShort( (short)numberOfIFFFundamentalParameterRecords);
+ dos.writeByte(operationalData1);
+ dos.writeByte(operationalData2);
+ dos.writeShort(numberOfIFFFundamentalParameterRecords);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" operationalData1: ").append(operationalData1).append("\n");
sb.append(" operationalData2: ").append(operationalData2).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Sensor.java b/src-generated/edu/nps/moves/dis7/Sensor.java
index c85c5fb613..8c66b42e65 100644
--- a/src-generated/edu/nps/moves/dis7/Sensor.java
+++ b/src-generated/edu/nps/moves/dis7/Sensor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -135,8 +135,9 @@ public short getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -144,10 +145,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
sensorTypeSource.marshal(dos);
sensorOnOffStatus.marshal(dos);
- dos.writeShort( (short)sensorType);
- dos.writeInt( (int)station);
- dos.writeShort( (short)quantity);
- dos.writeShort( (short)padding);
+ dos.writeShort(sensorType);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
+ dos.writeShort(padding);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -181,7 +183,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sensorTypeSource: ").append(sensorTypeSource).append("\n");
sb.append(" sensorOnOffStatus: ").append(sensorOnOffStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SeparationVP.java b/src-generated/edu/nps/moves/dis7/SeparationVP.java
index dde4a8314c..1c810e2be0 100644
--- a/src-generated/edu/nps/moves/dis7/SeparationVP.java
+++ b/src-generated/edu/nps/moves/dis7/SeparationVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -152,8 +152,9 @@ public NamedLocationIdentification getStationLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -162,9 +163,9 @@ public void marshal(DataOutputStream dos) throws Exception
recordType.marshal(dos);
reasonForSeparation.marshal(dos);
preEntityIndicator.marshal(dos);
- dos.writeByte( (byte)padding1);
+ dos.writeByte(padding1);
parentEntityID.marshal(dos);
- dos.writeShort( (short)padding2);
+ dos.writeShort(padding2);
stationLocation.marshal(dos);
}
catch(Exception e)
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -199,7 +201,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" reasonForSeparation: ").append(reasonForSeparation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
index 75e7cc566c..87c37e4cd2 100644
--- a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -126,8 +126,9 @@ public List<SupplyQuantity> getSupplies()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -137,8 +138,8 @@ public void marshal(DataOutputStream dos) throws Exception
requestingEntityID.marshal(dos);
servicingEntityID.marshal(dos);
serviceTypeRequested.marshal(dos);
- dos.writeByte( (byte)supplies.size());
- dos.writeShort( (short)padding1);
+ dos.writeByte(supplies.size());
+ dos.writeShort(padding1);
for(int idx = 0; idx < supplies.size(); idx++)
{
@@ -155,9 +156,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -184,7 +186,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -208,7 +210,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < supplies.size(); idx++)
{
- SupplyQuantity aSupplyQuantity = (SupplyQuantity)supplies.get(idx);
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
aSupplyQuantity.marshal(buff);
}
@@ -281,7 +283,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
sb.append(" servicingEntityID: ").append(servicingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetDataPdu.java b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
index 63b44c9799..923cad6f85 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)padding1);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(requestID);
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
index 59897ac591..62d251b2d8 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -153,8 +153,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -162,11 +163,11 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -230,7 +232,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -255,14 +257,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -347,7 +349,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
index d4266df4b1..c5030fe69c 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
index 23d052368c..fa869f6367 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -142,20 +142,21 @@ public List<RecordSpecification> getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)pad3);
- dos.writeInt( (int)recordSets.size());
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(pad3);
+ dos.writeInt(recordSets.size());
for(int idx = 0; idx < recordSets.size(); idx++)
{
@@ -172,9 +173,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -205,7 +207,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -230,7 +232,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordSets.size(); idx++)
{
- RecordSpecification aRecordSpecification = (RecordSpecification)recordSets.get(idx);
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
aRecordSpecification.marshal(buff);
}
@@ -305,7 +307,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
index 0d17852628..1370d05f56 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/ShaftRPM.java b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
index 40c5d38d75..c652cb7f4d 100644
--- a/src-generated/edu/nps/moves/dis7/ShaftRPM.java
+++ b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -80,16 +80,17 @@ public int getRPMrateOfChange()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)currentRPM);
- dos.writeShort( (short)orderedRPM);
- dos.writeInt( (int)RPMrateOfChange);
+ dos.writeShort(currentRPM);
+ dos.writeShort(orderedRPM);
+ dos.writeInt(RPMrateOfChange);
}
catch(Exception e)
{
@@ -99,9 +100,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -117,7 +119,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -193,7 +195,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" currentRPM: ").append(currentRPM).append("\n");
sb.append(" orderedRPM: ").append(orderedRPM).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SignalPdu.java b/src-generated/edu/nps/moves/dis7/SignalPdu.java
index 5066a65351..b8ec0afd32 100644
--- a/src-generated/edu/nps/moves/dis7/SignalPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SignalPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
package edu.nps.moves.dis7;
@@ -13,7 +13,11 @@ import edu.nps.moves.dis7.enumerations.*;
*/
public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializable
{
- protected RadioCommsHeader header = new RadioCommsHeader();
+
+ /**
+ *
+ */
+ protected RadioCommsHeader header = new RadioCommsHeader();
/**
* encoding scheme used, and enumeration
@@ -58,6 +62,7 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
/**
* Returns the size of this serialized object in bytes
*/
+ @Override
public int getMarshalledSize()
{
int marshalSize = 0;
@@ -206,7 +211,6 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
*
* @return this object
* @param pData data
- * @return this object;
*/
public SignalPdu setData(byte[] pData)
{
@@ -234,21 +238,22 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @see java.io.DataOutputStream
* @param dos The DataOutputStream
*/
+ @Override
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
header.marshal(dos);
- dos.writeShort((short) encodingScheme);
+ dos.writeShort(encodingScheme);
tdlType.marshal(dos);
- dos.writeInt((int) sampleRate);
+ dos.writeInt(sampleRate);
if (dataLength != null)
- dos.writeShort((short) dataLength);
+ dos.writeShort(dataLength);
else
- dos.writeShort((short) (dataLength = calculateDataLength()));
+ dos.writeShort((dataLength = calculateDataLength()));
- dos.writeShort((short) samples);
+ dos.writeShort(samples);
for (int idx = 0; idx < data.length; idx++) {
dos.writeByte(data[idx]);
}
@@ -263,6 +268,7 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @param dis The DataInputStream
* @return marshaled size
*/
+ @Override
public int unmarshal(DataInputStream dis) throws Exception
{
int uPosition = 0;
@@ -301,23 +307,24 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @param buff The ByteBuffer at the position to begin writing
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public void marshal(java.nio.ByteBuffer buff) throws Exception
{
super.marshal(buff);
header.marshal(buff);
- buff.putShort((short) encodingScheme);
+ buff.putShort(encodingScheme);
tdlType.marshal(buff);
- buff.putInt((int) sampleRate);
+ buff.putInt(sampleRate);
if(dataLength != null)
- buff.putShort((short) dataLength);
+ buff.putShort(dataLength);
else
- buff.putShort((short) (dataLength = calculateDataLength()));
+ buff.putShort((dataLength = calculateDataLength()));
- buff.putShort((short) samples);
+ buff.putShort(samples);
for (int idx = 0; idx < data.length; idx++) {
- buff.put((byte) data[idx]);
+ buff.put(data[idx]);
}
padTo32 = new byte[Align.to32bits(buff)];
@@ -332,6 +339,7 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @return marshalled size
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
super.unmarshal(buff);
diff --git a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
index 9f85b660af..b2c1eeefef 100644
--- a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
+++ b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -88,15 +88,16 @@ public int[] getAppearanceRecordList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)numberOfEntities);
- dos.writeShort( (short)appearanceRecordList.length);
+ dos.writeShort(numberOfEntities);
+ dos.writeShort(appearanceRecordList.length);
entityType.marshal(dos);
for(int idx = 0; idx < appearanceRecordList.length; idx++)
@@ -111,9 +112,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -131,7 +133,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -218,7 +220,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfEntities: ").append(numberOfEntities).append("\n");
sb.append(" entityType: ").append(entityType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationAddress.java b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
index be7849ed73..ea094da512 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getApplication()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)site);
- dos.writeShort( (short)application);
+ dos.writeShort(site);
+ dos.writeShort(application);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" site: ").append(site).append("\n");
sb.append(" application: ").append(application).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
index 68867cd6ef..11126ff270 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getReferenceNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)referenceNumber);
+ dos.writeShort(referenceNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
index 8d8760d932..d771726df0 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -69,8 +69,9 @@ public SimulationIdentifier getReceivingID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -104,7 +106,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -175,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingID: ").append(originatingID).append("\n");
sb.append(" receivingID: ").append(receivingID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
index 2ccc548263..a25ab49bf5 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -68,8 +68,9 @@ public SimulationIdentifier getReceivingID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -103,7 +105,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingID: ").append(originatingID).append("\n");
sb.append(" receivingID: ").append(receivingID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
index 4627f09d73..4b6859b969 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -72,15 +72,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordSpecificFields.length);
+ dos.writeShort(recordSpecificFields.length);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -95,9 +96,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -116,7 +118,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -202,7 +204,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordSpecificFields: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
index 999e41cc6b..764305b4cc 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -73,14 +73,15 @@ public List<StandardVariableRecord> getStandardVariables()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)standardVariables.size());
+ dos.writeShort(standardVariables.size());
for(int idx = 0; idx < standardVariables.size(); idx++)
{
@@ -97,9 +98,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -137,7 +139,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < standardVariables.size(); idx++)
{
- StandardVariableRecord aStandardVariableRecord = (StandardVariableRecord)standardVariables.get(idx);
+ StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
aStandardVariableRecord.marshal(buff);
}
@@ -206,7 +208,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfStandardVariableRecords: ").append(numberOfStandardVariableRecords).append("\n");
sb.append(" standardVariables: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StartResumePdu.java b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
index 8f60c1697f..972bbddd44 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -86,8 +86,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -96,7 +97,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
realWorldTime.marshal(dos);
simulationTime.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -106,9 +107,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -124,7 +126,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -198,7 +200,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" simulationTime: ").append(simulationTime).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
index f6985c45df..faea428b87 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -135,8 +135,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -146,9 +147,9 @@ public void marshal(DataOutputStream dos) throws Exception
realWorldTime.marshal(dos);
simulationTime.marshal(dos);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -158,9 +159,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -182,7 +184,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" simulationTime: ").append(simulationTime).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
index 11ea80adf1..383cdd36fb 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
index 21a28b2f6f..ce3fd9353f 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -120,8 +120,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -131,8 +132,8 @@ public void marshal(DataOutputStream dos) throws Exception
realWorldTime.marshal(dos);
reason.marshal(dos);
frozenBehavior.marshal(dos);
- dos.writeShort( (short)padding1);
- dos.writeInt( (int)requestID);
+ dos.writeShort(padding1);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -142,9 +143,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -164,7 +166,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -244,7 +246,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" reason: ").append(reason).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
index a0e56c8eac..63bddfba19 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -137,8 +137,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -149,8 +150,8 @@ public void marshal(DataOutputStream dos) throws Exception
reason.marshal(dos);
frozenBehavior.marshal(dos);
requiredReliablityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -160,9 +161,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -184,7 +186,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -267,7 +269,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" reason: ").append(reason).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
index f0b3f8162b..5b7a5a11db 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuel.java b/src-generated/edu/nps/moves/dis7/StorageFuel.java
index 16376da4df..fb76d2ffd1 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuel.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuel.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -118,18 +118,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fuelQuantity);
+ dos.writeInt(fuelQuantity);
fuelMeasurementUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
index 93e9b6d12d..d32ed18a57 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -169,21 +169,22 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)standardQuantity);
- dos.writeInt( (int)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(standardQuantity);
+ dos.writeInt(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
fuelMeasurementUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -193,9 +194,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -221,7 +223,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -312,7 +314,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SubCategory.java b/src-generated/edu/nps/moves/dis7/SubCategory.java
index 8f27b071be..9253284498 100644
--- a/src-generated/edu/nps/moves/dis7/SubCategory.java
+++ b/src-generated/edu/nps/moves/dis7/SubCategory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -7,6 +7,15 @@ package edu.nps.moves.dis7;
public interface SubCategory
{
+ /**
+ *
+ * @return the value of this SubCategory
+ */
int getValue();
+
+ /**
+ *
+ * @return the description of this SubCategory
+ */
String getDescription();
}
diff --git a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
index 03b27ccbb1..d848c54a0d 100644
--- a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
index e5ec0685a3..5502043509 100644
--- a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
+++ b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public float getQuantity()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
supplyType.marshal(dos);
- dos.writeFloat( (float)quantity);
+ dos.writeFloat(quantity);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" supplyType: ").append(supplyType).append("\n");
sb.append(" quantity: ").append(quantity).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
index e496120a07..01bd4705ef 100644
--- a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
index 5d2518c482..2b4f8cd40a 100644
--- a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -101,8 +101,9 @@ public ChangeOptions getChangeOptions()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -140,7 +142,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -219,7 +221,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemType: ").append(systemType).append("\n");
sb.append(" systemName: ").append(systemName).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TSPIPdu.java b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
index 111b78caa0..8636c902db 100644
--- a/src-generated/edu/nps/moves/dis7/TSPIPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -199,8 +199,9 @@ public byte[] getSystemSpecificData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -208,15 +209,15 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
liveEntityId.marshal(dos);
- dos.writeByte( (byte)TSPIFlag);
+ dos.writeByte(TSPIFlag);
entityLocation.marshal(dos);
entityLinearVelocity.marshal(dos);
entityOrientation.marshal(dos);
positionError.marshal(dos);
orientationError.marshal(dos);
deadReckoningParameters.marshal(dos);
- dos.writeShort( (short)measuredSpeed);
- dos.writeByte( (byte)systemSpecificData.length);
+ dos.writeShort(measuredSpeed);
+ dos.writeByte(systemSpecificData.length);
for(int idx = 0; idx < systemSpecificData.length; idx++)
dos.writeByte(systemSpecificData[idx]);
@@ -230,9 +231,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -260,7 +262,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -366,7 +368,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
sb.append(" TSPIFlag: ").append(TSPIFlag).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
index 8b61bdca4f..533d48f0dc 100644
--- a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
diff --git a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
index b5aa112166..5e6e1caeee 100644
--- a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
+++ b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)totalRecordSets);
- dos.writeShort( (short)padding);
+ dos.writeShort(totalRecordSets);
+ dos.writeShort(padding);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" totalRecordSets: ").append(totalRecordSets).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TrackJamData.java b/src-generated/edu/nps/moves/dis7/TrackJamData.java
index 16b451c9c7..bd9ab2d1ae 100644
--- a/src-generated/edu/nps/moves/dis7/TrackJamData.java
+++ b/src-generated/edu/nps/moves/dis7/TrackJamData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public byte getBeamNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityID.marshal(dos);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
index 3ebdc61e71..7bdbf34e68 100644
--- a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -153,8 +153,9 @@ public RecordSpecification getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -163,7 +164,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
originatingEntityID.marshal(dos);
receivingEntityID.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
transferType.marshal(dos);
transferEntityID.marshal(dos);
@@ -177,9 +178,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -201,7 +203,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingEntityID: ").append(originatingEntityID).append("\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
index 877b3ef6d0..dfd2ad0b43 100644
--- a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -371,8 +371,9 @@ public List<VariableTransmitterParameters> getAntennaPatternList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -380,24 +381,24 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
header.marshal(dos);
- dos.writeShort( (short)radioNumber);
+ dos.writeShort(radioNumber);
radioEntityType.marshal(dos);
transmitState.marshal(dos);
inputSource.marshal(dos);
- dos.writeShort( (short)variableTransmitterParameterCount);
+ dos.writeShort(variableTransmitterParameterCount);
antennaLocation.marshal(dos);
relativeAntennaLocation.marshal(dos);
antennaPatternType.marshal(dos);
- dos.writeShort( (short)antennaPatternList.size());
- dos.writeLong( (long)frequency);
- dos.writeFloat( (float)transmitFrequencyBandwidth);
- dos.writeFloat( (float)power);
+ dos.writeShort(antennaPatternList.size());
+ dos.writeLong(frequency);
+ dos.writeFloat(transmitFrequencyBandwidth);
+ dos.writeFloat(power);
modulationType.marshal(dos);
cryptoSystem.marshal(dos);
- dos.writeShort( (short)cryptoKeyId);
- dos.writeByte( (byte)modulationParametersList.size());
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeShort(cryptoKeyId);
+ dos.writeByte(modulationParametersList.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < modulationParametersList.size(); idx++)
{
@@ -421,9 +422,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -482,7 +484,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -520,14 +522,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < modulationParametersList.size(); idx++)
{
- ModulationParameters aModulationParameters = (ModulationParameters)modulationParametersList.get(idx);
+ ModulationParameters aModulationParameters = modulationParametersList.get(idx);
aModulationParameters.marshal(buff);
}
for(int idx = 0; idx < antennaPatternList.size(); idx++)
{
- VariableTransmitterParameters aVariableTransmitterParameters = (VariableTransmitterParameters)antennaPatternList.get(idx);
+ VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
aVariableTransmitterParameters.marshal(buff);
}
@@ -638,7 +640,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" header: ").append(header).append("\n");
sb.append(" radioNumber: ").append(radioNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UABeam.java b/src-generated/edu/nps/moves/dis7/UABeam.java
index 789814ab8d..7119a368d9 100644
--- a/src-generated/edu/nps/moves/dis7/UABeam.java
+++ b/src-generated/edu/nps/moves/dis7/UABeam.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -96,16 +96,17 @@ public UAFundamentalParameter getFundamentalParameterData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)beamDataLength);
- dos.writeByte( (byte)beamNumber);
- dos.writeShort( (short)padding);
+ dos.writeByte(beamDataLength);
+ dos.writeByte(beamNumber);
+ dos.writeShort(padding);
fundamentalParameterData.marshal(dos);
}
catch(Exception e)
@@ -116,9 +117,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -135,7 +137,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -214,7 +216,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
sb.append(" beamNumber: ").append(beamNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UAEmitter.java b/src-generated/edu/nps/moves/dis7/UAEmitter.java
index a700013e72..145720de96 100644
--- a/src-generated/edu/nps/moves/dis7/UAEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/UAEmitter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -124,16 +124,17 @@ public List<UABeam> getBeams()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)systemDataLength);
- dos.writeByte( (byte)beams.size());
- dos.writeShort( (short)padding);
+ dos.writeByte(systemDataLength);
+ dos.writeByte(beams.size());
+ dos.writeShort(padding);
acousticEmitter.marshal(dos);
location.marshal(dos);
@@ -152,9 +153,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -179,7 +181,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -202,7 +204,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < beams.size(); idx++)
{
- UABeam aUABeam = (UABeam)beams.get(idx);
+ UABeam aUABeam = beams.get(idx);
aUABeam.marshal(buff);
}
@@ -278,7 +280,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
index cdde654e18..57e31d3c1b 100644
--- a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
+++ b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -135,8 +135,9 @@ public float getDepressionElevationBeamWidth()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -144,10 +145,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
activeEmissionParameterIndex.marshal(dos);
scanPattern.marshal(dos);
- dos.writeFloat( (float)beamCenterAzimuthHorizontal);
- dos.writeFloat( (float)azimuthalBeamwidthHorizontal);
- dos.writeFloat( (float)beamCenterDepressionElevation);
- dos.writeFloat( (float)depressionElevationBeamWidth);
+ dos.writeFloat(beamCenterAzimuthHorizontal);
+ dos.writeFloat(azimuthalBeamwidthHorizontal);
+ dos.writeFloat(beamCenterDepressionElevation);
+ dos.writeFloat(depressionElevationBeamWidth);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -181,7 +183,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" activeEmissionParameterIndex: ").append(activeEmissionParameterIndex).append("\n");
sb.append(" scanPattern: ").append(scanPattern).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
index c2ccbc3260..b1c8138579 100644
--- a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public short getReferenceNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)referenceNumber);
+ dos.writeShort(referenceNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
index 5a6354cb75..a9cdd92e8f 100644
--- a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -211,8 +211,9 @@ public List<UAEmitter> getEmitterSystems()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -222,12 +223,12 @@ public void marshal(DataOutputStream dos) throws Exception
emittingEntityID.marshal(dos);
eventID.marshal(dos);
stateChangeIndicator.marshal(dos);
- dos.writeByte( (byte)pad);
+ dos.writeByte(pad);
passiveParameterIndex.marshal(dos);
- dos.writeByte( (byte)propulsionPlantConfiguration);
- dos.writeByte( (byte)shaftRPMs.size());
- dos.writeByte( (byte)apaData.size());
- dos.writeByte( (byte)emitterSystems.size());
+ dos.writeByte(propulsionPlantConfiguration);
+ dos.writeByte(shaftRPMs.size());
+ dos.writeByte(apaData.size());
+ dos.writeByte(emitterSystems.size());
for(int idx = 0; idx < shaftRPMs.size(); idx++)
{
@@ -258,9 +259,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -309,7 +311,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -337,21 +339,21 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < shaftRPMs.size(); idx++)
{
- ShaftRPM aShaftRPM = (ShaftRPM)shaftRPMs.get(idx);
+ ShaftRPM aShaftRPM = shaftRPMs.get(idx);
aShaftRPM.marshal(buff);
}
for(int idx = 0; idx < apaData.size(); idx++)
{
- APA aAPA = (APA)apaData.get(idx);
+ APA aAPA = apaData.get(idx);
aAPA.marshal(buff);
}
for(int idx = 0; idx < emitterSystems.size(); idx++)
{
- UAEmitter aUAEmitter = (UAEmitter)emitterSystems.get(idx);
+ UAEmitter aUAEmitter = emitterSystems.get(idx);
aUAEmitter.marshal(buff);
}
@@ -452,7 +454,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
index b8c96f408d..9bb314cc47 100644
--- a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
+++ b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -50,14 +50,15 @@ public int getVal()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)val);
+ dos.writeInt(val);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" val: ").append(val).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/VariableDatum.java b/src-generated/edu/nps/moves/dis7/VariableDatum.java
index 1864710ded..934ea9cfd6 100644
--- a/src-generated/edu/nps/moves/dis7/VariableDatum.java
+++ b/src-generated/edu/nps/moves/dis7/VariableDatum.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
package edu.nps.moves.dis7;
@@ -33,7 +33,7 @@ public class VariableDatum extends Object implements Serializable
private byte[] padding = new byte[0]; // pad to 64-bit boundary
/**
- * Returns the size of this serialized object in bytes
+ * @return the size of this serialized object in bytes
*/
public int getMarshalledSize()
{
@@ -50,6 +50,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Setter for {@link VariableDatum#variableDatumID}
*
+ * @param pVariableDatumID
* @return this object
*/
public VariableDatum setVariableDatumID(VariableRecordType pVariableDatumID)
@@ -76,6 +77,8 @@ public class VariableDatum extends Object implements Serializable
* {@link VariableDatum#variableDatumValue} is NOT
* set and this pdu is issued (marshaled), the value used when marshaling this field will be
* the size of the byte array times 8.
+ * @param bitLength
+ * @return
*/
public VariableDatum setVariableDatumLengthInBits(int bitLength)
{
@@ -91,6 +94,8 @@ public class VariableDatum extends Object implements Serializable
* {@link VariableDatum#variableDatumValue} is NOT
* set and this pdu is issued (marshaled), the value used when marshaling this field will be
* the size of the byte array times 8.
+ * @param byteLength
+ * @return
*/
public VariableDatum setVariableDatumLengthInBytes(int byteLength)
{
@@ -100,6 +105,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Getter for {@link VariableDatum#variableDatumLength}
+ * @return
*/
public int getVariableDatumLength()
{
@@ -113,6 +119,7 @@ public class VariableDatum extends Object implements Serializable
* The size of the byte array reflects the value of {@link VariableDatum#variableDatumLength} rounded to the next
* highest byte boundary. If {@link VariableDatum#variableDatumLength} is not set when the Pdu is sent, the
* receiver will read a bit length equal to the size of the byte array times 8.
+ * @param pVariableDatumValue
* @return this object
*/
public VariableDatum setVariableDatumValue(byte[] pVariableDatumValue)
@@ -123,6 +130,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Getter for {@link VariableDatum#variableDatumValue}
+ * @return
*/
public byte[] getVariableDatumValue()
{
@@ -136,6 +144,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Serializes an object to a DataOutputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataOutputStream
* @param dos The DataOutputStream
*/
@@ -144,7 +153,7 @@ public class VariableDatum extends Object implements Serializable
try {
variableDatumID.marshal(dos);
if (variableDatumLength != null)
- dos.writeInt((int) variableDatumLength);
+ dos.writeInt(variableDatumLength);
else
dos.writeInt(variableDatumLength = calculateDatumLength());
@@ -154,7 +163,7 @@ public class VariableDatum extends Object implements Serializable
padding = new byte[Align.to64bits(dos)];
}
- catch (Exception e) {
+ catch (IOException e) {
System.err.println(e);
}
}
@@ -162,6 +171,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Unserializes an object from a DataInputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataInputStream
* @param dis The DataInputStream
* @return marshalled size
@@ -208,7 +218,7 @@ public class VariableDatum extends Object implements Serializable
buff.putInt(variableDatumLength = calculateDatumLength());
for (int idx = 0; idx < variableDatumLength; idx++) //for(int idx = 0; idx < variableDatumValue.length; idx++)
{
- buff.put((byte) variableDatumValue[idx]);
+ buff.put(variableDatumValue[idx]);
}
padding = new byte[Align.to64bits(buff)];
}
diff --git a/src-generated/edu/nps/moves/dis7/VariableParameter.java b/src-generated/edu/nps/moves/dis7/VariableParameter.java
index 67635cc214..adfb3737aa 100644
--- a/src-generated/edu/nps/moves/dis7/VariableParameter.java
+++ b/src-generated/edu/nps/moves/dis7/VariableParameter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,8 +67,9 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -187,7 +189,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordSpecificFields: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
index 9120b7da50..967eadf021 100644
--- a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
+++ b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -86,15 +86,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -109,9 +110,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -130,7 +132,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -217,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Vector2Float.java b/src-generated/edu/nps/moves/dis7/Vector2Float.java
index d0a8494d63..9d0ae58fe8 100644
--- a/src-generated/edu/nps/moves/dis7/Vector2Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector2Float.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public float getY()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)x);
- dos.writeFloat( (float)y);
+ dos.writeFloat(x);
+ dos.writeFloat(y);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Double.java b/src-generated/edu/nps/moves/dis7/Vector3Double.java
index f0a7b314c9..4df208322f 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Double.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Double.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public double getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeDouble( (double)x);
- dos.writeDouble( (double)y);
- dos.writeDouble( (double)z);
+ dos.writeDouble(x);
+ dos.writeDouble(y);
+ dos.writeDouble(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Float.java b/src-generated/edu/nps/moves/dis7/Vector3Float.java
index dd9c6975fe..7d18aa1f2e 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Float.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -84,16 +84,17 @@ public float getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)x);
- dos.writeFloat( (float)y);
- dos.writeFloat( (float)z);
+ dos.writeFloat(x);
+ dos.writeFloat(y);
+ dos.writeFloat(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
index ccdf2ba269..a6ceef0b63 100644
--- a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
+++ b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -67,15 +67,16 @@ public float getVerticalDeflectionAngle()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)horizontalDeflectionAngle);
- dos.writeFloat( (float)verticalDeflectionAngle);
+ dos.writeFloat(horizontalDeflectionAngle);
+ dos.writeFloat(verticalDeflectionAngle);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" horizontalDeflectionAngle: ").append(horizontalDeflectionAngle).append("\n");
sb.append(" verticalDeflectionAngle: ").append(verticalDeflectionAngle).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
index 8c70ae6a91..21bbb67a42 100644
--- a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
index 9f1029c0b5..e0b5b07d21 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
@@ -77,7 +77,7 @@ public enum APAParameterIndexAPAStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static APAParameterIndexAPAStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum APAParameterIndexAPAStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
index f22bb303ad..17d8caebfb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
@@ -72,12 +72,12 @@ public enum AcknowledgeAcknowledgeFlag
public static AcknowledgeAcknowledgeFlag unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static AcknowledgeAcknowledgeFlag unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
index 770184e9b3..58f905a370 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
@@ -70,12 +70,12 @@ public enum AcknowledgeResponseFlag
public static AcknowledgeResponseFlag unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static AcknowledgeResponseFlag unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
index df5242d1af..f395a4cd04 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
@@ -83,7 +83,7 @@ public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddSpecificDimensionEnumerationsforSubsurfaceAreaSize unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
index 2609ca3d2f..c03c8e6d7c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
@@ -75,7 +75,7 @@ public enum AddVariantsforAirCategory201Insect
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddVariantsforAirCategory201Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AddVariantsforAirCategory201Insect
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
index 3fdf179106..5962b1d195 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
@@ -81,7 +81,7 @@ public enum AddVariantsforLandCategory200Mammal
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddVariantsforLandCategory200Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AddVariantsforLandCategory200Mammal
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
index c7fe41cbe7..7ff285356c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
@@ -85,7 +85,7 @@ public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
index 732b9e1f16..6fee569af0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
@@ -81,7 +81,7 @@ public enum AggregateStateAggregateKind
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateAggregateKind unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AggregateStateAggregateKind
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
index 95aec001fd..ca60ef2fdf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
@@ -81,7 +81,7 @@ public enum AggregateStateAggregateState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateAggregateState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AggregateStateAggregateState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
index 0a8f49e112..1959eca199 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
@@ -73,7 +73,7 @@ public enum AggregateStateSpecific
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateSpecific unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AggregateStateSpecific
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
index 83f9e794b6..0d4a8fb6cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
@@ -115,7 +115,7 @@ public enum AggregateStateSubcategory implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateSubcategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -128,7 +128,7 @@ public enum AggregateStateSubcategory implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
index f1a5f76a98..6c565790b5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
@@ -73,7 +73,7 @@ public enum AircraftAddressSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftAddressSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AircraftAddressSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
index a6536b9d15..c1f150a3eb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
@@ -75,7 +75,7 @@ public enum AircraftIdentificationType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftIdentificationType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AircraftIdentificationType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
index 3379372a69..0cf328e7da 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
@@ -75,7 +75,7 @@ public enum AircraftPresentDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftPresentDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AircraftPresentDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
index e0cadf4d9b..da52feee3b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
@@ -71,7 +71,7 @@ public enum AircraftTypeWake
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftTypeWake unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum AircraftTypeWake
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
index 9f46f23b3e..1bdf3e4019 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
@@ -99,7 +99,7 @@ public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AnimalLifeformGroupSizeRangeEnumerationforallDomains unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
index a2f58b7799..92ad6125e6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
@@ -77,7 +77,7 @@ public enum AntennaSelection
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AntennaSelection unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AntennaSelection
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
index 0d74542c8b..a1eb19789c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
@@ -75,7 +75,7 @@ public enum AntennaStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AntennaStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AntennaStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
index 833be08344..a7ed07595c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
@@ -73,7 +73,7 @@ public enum AppearanceAntiCollisionDayNight
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceAntiCollisionDayNight unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceAntiCollisionDayNight
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
index 25187334df..012155c857 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
@@ -77,7 +77,7 @@ public enum AppearanceCamouflageType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceCamouflageType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceCamouflageType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
index 00102d0926..0d0d5c9d5a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
@@ -83,7 +83,7 @@ public enum AppearanceCanopy
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceCanopy unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum AppearanceCanopy
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
index d04878ef60..1e07e1d7e9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
@@ -73,7 +73,7 @@ public enum AppearanceConcealedMovement
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceConcealedMovement unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceConcealedMovement
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
index b761a8ce63..3c9bb5ba64 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
@@ -73,7 +73,7 @@ public enum AppearanceConcealedPosition
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceConcealedPosition unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceConcealedPosition
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
index aa380e21eb..f992931251 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
@@ -77,7 +77,7 @@ public enum AppearanceDamage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceDamage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceDamage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
index 90e977dff9..724f5b9240 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
@@ -73,7 +73,7 @@ public enum AppearanceEntityorObjectState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceEntityorObjectState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceEntityorObjectState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
index 828f6287c9..81edf5a6a8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
@@ -79,7 +79,7 @@ public enum AppearanceEnvironmentalDensity
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceEnvironmentalDensity unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum AppearanceEnvironmentalDensity
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
index e135afc7ed..c6e16c16b7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
@@ -81,7 +81,7 @@ public enum AppearanceHatch
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceHatch unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AppearanceHatch
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
index 6eb501cf45..3ca63e7fa8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
@@ -73,7 +73,7 @@ public enum AppearanceLauncherOperational
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLauncherOperational unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceLauncherOperational
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
index 1a42ce9677..b013c3231e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
@@ -101,7 +101,7 @@ public enum AppearanceLifeFormComplianceStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeFormComplianceStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum AppearanceLifeFormComplianceStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
index 9ba12bb0d1..4ea339bc2f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
@@ -101,7 +101,7 @@ public enum AppearanceLifeFormPosture
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeFormPosture unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum AppearanceLifeFormPosture
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
index 714f206c02..1109010c56 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
@@ -77,7 +77,7 @@ public enum AppearanceLifeFormWeaponImplement
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeFormWeaponImplement unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceLifeFormWeaponImplement
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
index 9cc357ff71..4bc2703330 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
@@ -77,7 +77,7 @@ public enum AppearanceLifeformHealth
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeformHealth unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceLifeformHealth
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
index d103095f37..a2d03b42c9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
@@ -75,7 +75,7 @@ public enum AppearanceLinearObjectLaneMarkerVisible
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLinearObjectLaneMarkerVisible unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceLinearObjectLaneMarkerVisible
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
index 709977cb70..cb06ee1bda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
@@ -77,7 +77,7 @@ public enum AppearanceLinearObjectTankDitchBreach
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLinearObjectTankDitchBreach unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceLinearObjectTankDitchBreach
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
index e2928c28e1..6e3401c025 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
@@ -73,7 +73,7 @@ public enum AppearanceNVGMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceNVGMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceNVGMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
index 54831a99d6..aa3e396c76 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
@@ -73,7 +73,7 @@ public enum AppearanceNavigationPositionBrightness
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceNavigationPositionBrightness unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceNavigationPositionBrightness
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
index 202369ff6a..870e78b926 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
@@ -75,7 +75,7 @@ public enum AppearanceObjectGeneralDamage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectGeneralDamage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceObjectGeneralDamage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
index ac59c3686a..1349d68b6c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
@@ -77,7 +77,7 @@ public enum AppearanceObjectGeneralIEDPresent
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectGeneralIEDPresent unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceObjectGeneralIEDPresent
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
index e170022247..f8ef6c3b51 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
@@ -73,7 +73,7 @@ public enum AppearanceObjectGeneralPredistributed
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectGeneralPredistributed unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceObjectGeneralPredistributed
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
index 41f10dd9ac..c7a852b0c6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
@@ -75,7 +75,7 @@ public enum AppearanceObjectSpecificBreachState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectSpecificBreachState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceObjectSpecificBreachState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
index e1ba1b03b1..9e37042a7f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
@@ -77,7 +77,7 @@ public enum AppearanceObjectSpecificChemicalType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectSpecificChemicalType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceObjectSpecificChemicalType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
index 7847b3786c..c6fd8fea0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
@@ -73,7 +73,7 @@ public enum AppearancePaintScheme
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearancePaintScheme unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearancePaintScheme
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
index 27c3c866d0..4d2277f3a9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
@@ -75,7 +75,7 @@ public enum AppearanceSubsurfaceHatch
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceSubsurfaceHatch unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceSubsurfaceHatch
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
index 34ba698763..1274cefb8f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
@@ -77,7 +77,7 @@ public enum AppearanceSupplyDeployed
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceSupplyDeployed unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceSupplyDeployed
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
index 073e7425f5..4d13f8bf56 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
@@ -77,7 +77,7 @@ public enum AppearanceTrailingEffects
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceTrailingEffects unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceTrailingEffects
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
index 7b1e38a399..37573a2672 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
@@ -103,7 +103,7 @@ public enum ArticulatedPartsTypeMetric
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ArticulatedPartsTypeMetric unmarshalEnum(ByteBuffer buff) throws Exception
@@ -116,7 +116,7 @@ public enum ArticulatedPartsTypeMetric
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
index b1af4dc8b9..17cbc4fe8d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
@@ -73,7 +73,7 @@ public enum AttachedPartDetachedIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AttachedPartDetachedIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AttachedPartDetachedIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
index a3dfa3f50d..dd1d3d977a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
@@ -81,7 +81,7 @@ public enum AustralianCategoryOverlay
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AustralianCategoryOverlay unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AustralianCategoryOverlay
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
index d8a64ac577..9353d5a479 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
@@ -73,7 +73,7 @@ public enum BeamStatusBeamState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static BeamStatusBeamState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum BeamStatusBeamState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
index 8a18bffd9a..96b24dbcfa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
@@ -71,7 +71,7 @@ public enum BuildingPaintScheme
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static BuildingPaintScheme unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum BuildingPaintScheme
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
index a9bbd25d0f..ab5e76e4ba 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
@@ -73,7 +73,7 @@ public enum CCTTSINCGARSClearChannel
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CCTTSINCGARSClearChannel unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum CCTTSINCGARSClearChannel
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
index b10996168b..22fc434641 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
@@ -73,7 +73,7 @@ public enum CCTTSINCGARSStartofMessage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CCTTSINCGARSStartofMessage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum CCTTSINCGARSStartofMessage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
index 94bed43960..846384b39b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
@@ -68,12 +68,12 @@ public enum CIGIExtensionPacketID
public static CIGIExtensionPacketID unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static CIGIExtensionPacketID unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
index 9a952d1c45..e4ba79051c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
@@ -87,7 +87,7 @@ public enum CapabilityReport
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CapabilityReport unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum CapabilityReport
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
index 0747e1a1a3..6943bb1733 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
@@ -71,7 +71,7 @@ public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
index 24c06fcb37..c728d9453c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
@@ -79,7 +79,7 @@ public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class11SupplyCategorySuppliesNonDoctrinal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
index 871beace03..b7acdd99f2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
@@ -91,7 +91,7 @@ public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class12SupplyCategorySlingLoadsNonDoctrinal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -104,7 +104,7 @@ public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
index c9a58b60eb..e8913a1fb6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
@@ -81,7 +81,7 @@ public enum Class1SupplyCategorySubsistence implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class1SupplyCategorySubsistence unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum Class1SupplyCategorySubsistence implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
index 7f6331d858..2db6abfd49 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
@@ -85,7 +85,7 @@ public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies im
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies im
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
index 5c2ac08035..1f377900c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
@@ -77,7 +77,7 @@ public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class3SupplyCategoryPetroleumOilsLubricants unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
index 4241a1b221..4032527880 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
@@ -75,7 +75,7 @@ public enum Class4SupplyCategoryConstructionMaterials implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class4SupplyCategoryConstructionMaterials unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Class4SupplyCategoryConstructionMaterials implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
index 03786e3608..8dcc6166a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
@@ -71,7 +71,7 @@ public enum Class6SupplyCategoryPersonnelDemandItems implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class6SupplyCategoryPersonnelDemandItems unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum Class6SupplyCategoryPersonnelDemandItems implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
index 8bba754562..bd62ee2b8f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
@@ -115,7 +115,7 @@ public enum Class7SupplyCategoryMajorItems implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class7SupplyCategoryMajorItems unmarshalEnum(ByteBuffer buff) throws Exception
@@ -128,7 +128,7 @@ public enum Class7SupplyCategoryMajorItems implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
index 8c2a1c8eaa..42a6374efd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
@@ -75,7 +75,7 @@ public enum Class8SupplyCategoryMedicalMaterial implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class8SupplyCategoryMedicalMaterial unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Class8SupplyCategoryMedicalMaterial implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
index 39047ed569..7091586a6e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
@@ -89,7 +89,7 @@ public enum Class9SupplyCategoryRepairPartsandComponents implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class9SupplyCategoryRepairPartsandComponents unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum Class9SupplyCategoryRepairPartsandComponents implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
index e7da3af1b4..b5af0e90d6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
@@ -75,7 +75,7 @@ public enum CollisionType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CollisionType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum CollisionType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Color.java b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
index 407da6142a..9810baaf0a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Color.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
@@ -391,7 +391,7 @@ public enum Color
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Color unmarshalEnum(ByteBuffer buff) throws Exception
@@ -404,7 +404,7 @@ public enum Color
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
index b93ab4db90..2eb5c586c3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
@@ -77,7 +77,7 @@ public enum ComponentVisualDamageStatusSmoke
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ComponentVisualDamageStatusSmoke unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ComponentVisualDamageStatusSmoke
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
index eee1f83633..437bca1cb9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
@@ -77,7 +77,7 @@ public enum ComponentVisualDamageStatusSurfaceDamage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ComponentVisualDamageStatusSurfaceDamage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ComponentVisualDamageStatusSurfaceDamage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Country.java b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
index 61e8a017a5..7af4013356 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Country.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
@@ -620,12 +620,12 @@ public enum Country
public static Country unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static Country unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
index 05b47428b6..3c8ec8e035 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
@@ -77,7 +77,7 @@ public enum CoverShroudStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CoverShroudStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum CoverShroudStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
index 804b60a894..eecc7d95c3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
@@ -73,7 +73,7 @@ public enum CryptoKeyIDCryptoMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CryptoKeyIDCryptoMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum CryptoKeyIDCryptoMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
index 2e99b5fcf1..26383dcba4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
@@ -79,7 +79,7 @@ public enum DEDamageDescriptionComponentDamageStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEDamageDescriptionComponentDamageStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum DEDamageDescriptionComponentDamageStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
index d020bd6dcf..cedb1ee519 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
@@ -77,7 +77,7 @@ public enum DEDamageDescriptionComponentVisualSmokeColor
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEDamageDescriptionComponentVisualSmokeColor unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum DEDamageDescriptionComponentVisualSmokeColor
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
index 224c27c329..be061863da 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
@@ -73,7 +73,7 @@ public enum DEFireFlagsStateUpdateFlag
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEFireFlagsStateUpdateFlag unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DEFireFlagsStateUpdateFlag
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
index 045e18d0cf..397627b4a7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
@@ -77,7 +77,7 @@ public enum DEFirePulseShape
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEFirePulseShape unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum DEFirePulseShape
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
index beabd009be..da9c7b681f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
@@ -75,7 +75,7 @@ public enum DEPrecisionAimpointBeamSpotType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEPrecisionAimpointBeamSpotType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DEPrecisionAimpointBeamSpotType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
index 051ed2b918..fd157a20ca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
@@ -71,7 +71,7 @@ public enum DISAttributeActionCode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISAttributeActionCode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum DISAttributeActionCode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
index 3a9a02fe93..73f4e886a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
@@ -71,7 +71,7 @@ public enum DISLiveEntitySubprotocolNumber
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISLiveEntitySubprotocolNumber unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum DISLiveEntitySubprotocolNumber
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
index ab6462e6a5..6beef58e6c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusActiveInterrogationIndicatorAII
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusActiveInterrogationIndicatorAII unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusActiveInterrogationIndicatorAII
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
index c1bb9ee647..aa4087ef09 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusCoupledExtensionIndicatorCEI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusCoupledExtensionIndicatorCEI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusCoupledExtensionIndicatorCEI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
index 72bba58ebe..42ea3d3e80 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
@@ -75,7 +75,7 @@ public enum DISPDUStatusDetonationTypeIndicatorDTI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusDetonationTypeIndicatorDTI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DISPDUStatusDetonationTypeIndicatorDTI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
index 3e302f4463..1ae4989e9c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusFireTypeIndicatorFTI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusFireTypeIndicatorFTI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusFireTypeIndicatorFTI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
index 3c266e689b..016cdb6f9d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusIFFSimulationModeISM
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusIFFSimulationModeISM unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusIFFSimulationModeISM
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
index c32afa26b2..6e6c121fae 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
@@ -75,7 +75,7 @@ public enum DISPDUStatusIntercomAttachedIndicatorIAI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusIntercomAttachedIndicatorIAI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DISPDUStatusIntercomAttachedIndicatorIAI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
index 302edb3618..e943de5010 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
@@ -77,7 +77,7 @@ public enum DISPDUStatusLVCIndicatorLVC
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusLVCIndicatorLVC unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum DISPDUStatusLVCIndicatorLVC
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
index 0d9c7f5ffe..cc1a6f7b70 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
@@ -75,7 +75,7 @@ public enum DISPDUStatusRadioAttachedIndicatorRAI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusRadioAttachedIndicatorRAI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DISPDUStatusRadioAttachedIndicatorRAI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
index 83cc8e4250..be2eb518c4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusTransferredEntityIndicatorTEI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusTransferredEntityIndicatorTEI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusTransferredEntityIndicatorTEI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
index 20c44ac332..2ec7ac173d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
@@ -215,7 +215,7 @@ public enum DISPDUType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -228,7 +228,7 @@ public enum DISPDUType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
index f6e6fbd629..54e44e205f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
@@ -97,7 +97,7 @@ public enum DISProtocolFamily
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISProtocolFamily unmarshalEnum(ByteBuffer buff) throws Exception
@@ -110,7 +110,7 @@ public enum DISProtocolFamily
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
index ed1b6b3c9b..39b61ce7cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
@@ -85,7 +85,7 @@ public enum DISProtocolVersion
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISProtocolVersion unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum DISProtocolVersion
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
index d7c7e1e48d..a3eaf537df 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
@@ -75,7 +75,7 @@ public enum DRParametersType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DRParametersType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DRParametersType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
index be2e921902..145018a407 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
@@ -75,7 +75,7 @@ public enum DataCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DataCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DataCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
index 761f6379bf..c461d0b51b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
@@ -89,7 +89,7 @@ public enum DeadReckoningAlgorithm
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DeadReckoningAlgorithm unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum DeadReckoningAlgorithm
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
index 3b3f7b23fc..e262dea0ee 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
@@ -73,7 +73,7 @@ public enum DeltaMode5SAltitudePositiveNegativeIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DeltaMode5SAltitudePositiveNegativeIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DeltaMode5SAltitudePositiveNegativeIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
index 313a3986b1..7065bdfd2e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
@@ -66,12 +66,12 @@ public enum DesignatorDesignatorCode
public static DesignatorDesignatorCode unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static DesignatorDesignatorCode unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
index d43e89409f..92bedccd49 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
@@ -238,12 +238,12 @@ public enum DesignatorSystemName
public static DesignatorSystemName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static DesignatorSystemName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
index 6dae2f84e5..198856978a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
@@ -137,7 +137,7 @@ public enum DetonationResult
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DetonationResult unmarshalEnum(ByteBuffer buff) throws Exception
@@ -150,7 +150,7 @@ public enum DetonationResult
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
index 4a55c4e0d3..6a21ed9074 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
@@ -75,7 +75,7 @@ public enum EEAttributeStateIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EEAttributeStateIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum EEAttributeStateIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
index d407ca993d..a48ccf5279 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
@@ -117,7 +117,7 @@ public enum ElectromagneticEmissionBeamFunction
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ElectromagneticEmissionBeamFunction unmarshalEnum(ByteBuffer buff) throws Exception
@@ -130,7 +130,7 @@ public enum ElectromagneticEmissionBeamFunction
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
index 6b1540aa53..db77038ccd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
@@ -73,7 +73,7 @@ public enum ElectromagneticEmissionStateUpdateIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ElectromagneticEmissionStateUpdateIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ElectromagneticEmissionStateUpdateIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
index 98ede1e0c5..bdae5e553e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
@@ -4066,12 +4066,12 @@ public enum EmitterName
public static EmitterName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static EmitterName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
index df77ed8292..2b7c29fe06 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
@@ -231,7 +231,7 @@ public enum EmitterSystemFunction
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EmitterSystemFunction unmarshalEnum(ByteBuffer buff) throws Exception
@@ -244,7 +244,7 @@ public enum EmitterSystemFunction
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
index e2700032b2..ae82c75ce3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
@@ -83,7 +83,7 @@ public enum EntityAssociationAssociationStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationAssociationStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum EntityAssociationAssociationStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
index ee0ae4a345..28621e125a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
@@ -99,7 +99,7 @@ public enum EntityAssociationAssociationType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationAssociationType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum EntityAssociationAssociationType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
index 4d43b8e61f..61d4120404 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
@@ -83,7 +83,7 @@ public enum EntityAssociationGroupMemberType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationGroupMemberType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum EntityAssociationGroupMemberType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
index f7071b7de4..de62fa2958 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
@@ -125,7 +125,7 @@ public enum EntityAssociationPhysicalAssociationType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationPhysicalAssociationType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -138,7 +138,7 @@ public enum EntityAssociationPhysicalAssociationType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
index 66c194c8e5..303a977ebe 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
@@ -95,7 +95,7 @@ public enum EntityAssociationPhysicalConnectionType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationPhysicalConnectionType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum EntityAssociationPhysicalConnectionType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
index 95ac1d8ee4..d3ae9aa27e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
@@ -89,7 +89,7 @@ public enum EntityDamageStatusComponentIdentification
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityDamageStatusComponentIdentification unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum EntityDamageStatusComponentIdentification
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
index c570834305..cdf00cde3a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
@@ -89,7 +89,7 @@ public enum EntityKind
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityKind unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum EntityKind
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
index 654eb08c92..4817de4064 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
@@ -77,7 +77,7 @@ public enum EntityMarkingCharacterSet
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityMarkingCharacterSet unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum EntityMarkingCharacterSet
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
index be48bb685a..509df1c9c5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
@@ -73,7 +73,7 @@ public enum EntityVPRecordChangeIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityVPRecordChangeIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum EntityVPRecordChangeIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
index 3bc792ba61..6ccd94e6de 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
@@ -73,7 +73,7 @@ public enum EnvironmentRecordTypeGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EnvironmentRecordTypeGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum EnvironmentRecordTypeGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
index 8ce57d6775..4d93ab7e81 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
@@ -71,7 +71,7 @@ public enum EnvironmentalProcessModelType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EnvironmentalProcessModelType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum EnvironmentalProcessModelType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
index 8864d8b47c..ec5f771462 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
@@ -81,7 +81,7 @@ public enum EnvironmentalSubcategory implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EnvironmentalSubcategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum EnvironmentalSubcategory implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
index 6a8603f626..84f0a837a7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
@@ -87,7 +87,7 @@ public enum ExpendableAirCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExpendableAirCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum ExpendableAirCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
index 807656e66e..506286e205 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
@@ -83,7 +83,7 @@ public enum ExpendableSubsurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExpendableSubsurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum ExpendableSubsurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
index 1c4b44c345..e4c82685dd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
@@ -79,7 +79,7 @@ public enum ExpendableSurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExpendableSurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum ExpendableSurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
index 503c835461..68be83a1e0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
@@ -152,12 +152,12 @@ public enum ExplosiveMaterialCategories
public static ExplosiveMaterialCategories unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static ExplosiveMaterialCategories unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
index 936d7d26f4..24067c029b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
@@ -83,7 +83,7 @@ public enum ExplosiveMaterialGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExplosiveMaterialGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum ExplosiveMaterialGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
index cc7b1524bf..da205606f7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
@@ -77,7 +77,7 @@ public enum FlareSmokeColor
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FlareSmokeColor unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum FlareSmokeColor
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
index 5dab4f2aec..abb0a23fb4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
@@ -75,7 +75,7 @@ public enum FlareSmokeStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FlareSmokeStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum FlareSmokeStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
index 41b09c3875..5031588540 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
@@ -131,7 +131,7 @@ public enum ForceID
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ForceID unmarshalEnum(ByteBuffer buff) throws Exception
@@ -144,7 +144,7 @@ public enum ForceID
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
index 1a43f05bba..4a91364416 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
@@ -97,7 +97,7 @@ public enum FormatType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FormatType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -110,7 +110,7 @@ public enum FormatType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
index 788347fb79..2ae1da3c38 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
@@ -71,7 +71,7 @@ public enum FuelLocation
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FuelLocation unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum FuelLocation
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
index 968d56bb63..8c66133676 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
@@ -75,7 +75,7 @@ public enum FuelMeasurementUnits
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FuelMeasurementUnits unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum FuelMeasurementUnits
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
index ac9f011754..9c28ce058c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
@@ -73,7 +73,7 @@ public enum GridAxisDescriptorAxisType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static GridAxisDescriptorAxisType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum GridAxisDescriptorAxisType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
index ffcc2f44b2..24f83c810c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
@@ -73,7 +73,7 @@ public enum GriddedDataConstantGrid
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static GriddedDataConstantGrid unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum GriddedDataConstantGrid
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
index 7bc9729b06..506f8f6006 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
@@ -70,12 +70,12 @@ public enum GriddedDataCoordinateSystem
public static GriddedDataCoordinateSystem unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataCoordinateSystem unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
index 2a462c7bc9..643bd49d4d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
@@ -68,12 +68,12 @@ public enum GriddedDataDataRepresentation
public static GriddedDataDataRepresentation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataDataRepresentation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
index c7945d6e23..d029098105 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
@@ -64,12 +64,12 @@ public enum GriddedDataFieldNumber
public static GriddedDataFieldNumber unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataFieldNumber unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
index 1e35fe2d00..fb9a394dfd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
@@ -64,12 +64,12 @@ public enum GriddedDataSampleType
public static GriddedDataSampleType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataSampleType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
index 743c744ca4..0599aac82e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
@@ -73,7 +73,7 @@ public enum HighDensityTrackJam
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static HighDensityTrackJam unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum HighDensityTrackJam
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
index c5f8fd1840..190723a309 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
@@ -73,7 +73,7 @@ public enum HighFidelityHAVEQUICKTODTransmitIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static HighFidelityHAVEQUICKTODTransmitIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum HighFidelityHAVEQUICKTODTransmitIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
index 30f1b8a88c..cb0cfaec82 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
@@ -79,7 +79,7 @@ public enum IFFAlternateMode4ChallengeReply
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFAlternateMode4ChallengeReply unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum IFFAlternateMode4ChallengeReply
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
index 6cf00924dd..550401abd8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
@@ -73,7 +73,7 @@ public enum IFFApplicableModes
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFApplicableModes unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IFFApplicableModes
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
index 24ccbdc2e8..145fd380f9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
@@ -73,7 +73,7 @@ public enum IFFDataRecordAvailable
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFDataRecordAvailable unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IFFDataRecordAvailable
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
index 9b13753b39..e234e75a05 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
@@ -71,7 +71,7 @@ public enum IFFLayerSpecificInformation
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFLayerSpecificInformation unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum IFFLayerSpecificInformation
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
index f769bba4bb..6ae96775a6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
@@ -73,7 +73,7 @@ public enum IFFSimulationMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSimulationMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IFFSimulationMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
index 0463260fcf..f11ae13fde 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
@@ -81,7 +81,7 @@ public enum IFFSystemMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSystemMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum IFFSystemMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
index 430ac6e52b..ec10fe0a94 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
@@ -100,12 +100,12 @@ public enum IFFSystemName
public static IFFSystemName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IFFSystemName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
index 4ee079df14..2a0c15baea 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
@@ -92,12 +92,12 @@ public enum IFFSystemType
public static IFFSystemType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IFFSystemType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
index 6094c6b182..2f4bc93cc6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
@@ -71,7 +71,7 @@ public enum IFFSystemType1OperationalParameter1
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSystemType1OperationalParameter1 unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum IFFSystemType1OperationalParameter1
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
index 1a94ee7cf1..a650ea3430 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
@@ -71,7 +71,7 @@ public enum IFFSystemType1OperationalParameter2
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSystemType1OperationalParameter2 unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum IFFSystemType1OperationalParameter2
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
index 67c758445a..fdcc9e99a2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
@@ -76,12 +76,12 @@ public enum IOActionIOActionPhase
public static IOActionIOActionPhase unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOActionPhase unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
index b5c6bb7bb4..ee654ef4d2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
@@ -68,12 +68,12 @@ public enum IOActionIOActionType
public static IOActionIOActionType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOActionType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
index b53b9bd594..84d1b618c0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
@@ -66,12 +66,12 @@ public enum IOActionIOSimulationSource
public static IOActionIOSimulationSource unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOSimulationSource unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
index 9f06fab9a7..5d3c8595d7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
@@ -76,12 +76,12 @@ public enum IOActionIOWarfareType
public static IOActionIOWarfareType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOWarfareType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
index ad51170340..6b6c918fe5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
@@ -77,7 +77,7 @@ public enum IOCommsNodeRecordCommsNodeType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOCommsNodeRecordCommsNodeType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IOCommsNodeRecordCommsNodeType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
index 60c24f1e0e..9e1d4d4ea8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
@@ -79,7 +79,7 @@ public enum IOEffectsRecordIOEffect
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOEffectsRecordIOEffect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum IOEffectsRecordIOEffect
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
index 0b5b99cb96..f74df1aa7f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
@@ -77,7 +77,7 @@ public enum IOEffectsRecordIOLinkType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOEffectsRecordIOLinkType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IOEffectsRecordIOLinkType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
index 4f3f640ad5..5fb62c88b1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
@@ -64,12 +64,12 @@ public enum IOEffectsRecordIOProcess
public static IOEffectsRecordIOProcess unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOEffectsRecordIOProcess unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
index 9f4ff9c5d5..5b0e88fdb5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
@@ -85,7 +85,7 @@ public enum IOEffectsRecordIOStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOEffectsRecordIOStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum IOEffectsRecordIOStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
index 62d52c5b54..7073c1f6dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
@@ -77,7 +77,7 @@ public enum IOReportIOReportType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOReportIOReportType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IOReportIOReportType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
index 808caef0d4..8c45a5384d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
@@ -73,7 +73,7 @@ public enum ISLSAntennaType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ISLSAntennaType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ISLSAntennaType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
index 4e08238d5e..7ee02dcb3a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
@@ -83,7 +83,7 @@ public enum IntercomControlCommand
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlCommand unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum IntercomControlCommand
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
index 4078bf4874..e8ccff40c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
@@ -73,7 +73,7 @@ public enum IntercomControlCommunicationsClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlCommunicationsClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IntercomControlCommunicationsClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
index ccf366e0dd..f7e4da28a4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
@@ -79,7 +79,7 @@ public enum IntercomControlCommunicationsType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlCommunicationsType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum IntercomControlCommunicationsType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
index bda567b9ac..d5229f7dcf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
@@ -81,7 +81,7 @@ public enum IntercomControlControlType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlControlType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum IntercomControlControlType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
index ceb4a07249..3b0aa853f0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
@@ -77,7 +77,7 @@ public enum IntercomControlDestinationLineStateCommand
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlDestinationLineStateCommand unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IntercomControlDestinationLineStateCommand
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
index eeb77fce67..d271fde1d6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
@@ -68,12 +68,12 @@ public enum IntercomControlRecordType
public static IntercomControlRecordType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IntercomControlRecordType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
index ac05451c47..6ae97c7ffd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
@@ -75,7 +75,7 @@ public enum IntercomControlTransmitLineState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlTransmitLineState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum IntercomControlTransmitLineState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
index 914f24760e..ef7253c8cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
@@ -89,7 +89,7 @@ public enum IsGroupOfGroupedEntityCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IsGroupOfGroupedEntityCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum IsGroupOfGroupedEntityCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
index 3776052193..af9d6a0cdc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
@@ -87,7 +87,7 @@ public enum IsGroupOfRestStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IsGroupOfRestStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum IsGroupOfRestStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
index 63eb5dbe6d..a2fd7ef122 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
@@ -84,12 +84,12 @@ public enum IsPartOfNature
public static IsPartOfNature unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IsPartOfNature unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
index 87bd4c6af7..cd4055ae3c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
@@ -68,12 +68,12 @@ public enum IsPartOfPosition
public static IsPartOfPosition unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IsPartOfPosition unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
index e395f81fe5..9ca8928d9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
@@ -100,12 +100,12 @@ public enum IsPartOfStationName
public static IsPartOfStationName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IsPartOfStationName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
index 099612a29f..0cdbc5fc49 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
@@ -76,12 +76,12 @@ public enum IslandSubcategory implements SubCategory
public static IslandSubcategory unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IslandSubcategory unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
index 2518ffd05f..0c68678d6f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
@@ -77,7 +77,7 @@ public enum JTIDSMIDSModulationParametersSynchronizationState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static JTIDSMIDSModulationParametersSynchronizationState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum JTIDSMIDSModulationParametersSynchronizationState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
index 6342c34d3a..b39cb3f0c8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
@@ -73,7 +73,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
index e290ecde33..cb2b925a7f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
@@ -77,7 +77,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
index d35e1fe2b4..cf5fac872d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
@@ -73,7 +73,7 @@ public enum LeafCoverage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LeafCoverage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum LeafCoverage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
index 98c1cd8465..27e92b5ce4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
@@ -73,7 +73,7 @@ public enum Level2SquitterStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Level2SquitterStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Level2SquitterStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
index b4d82ddaf9..6c5e2e90d2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
@@ -72,7 +72,7 @@ public enum LifeFormAirCategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormAirCategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -85,7 +85,7 @@ public enum LifeFormAirCategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
index c27bb4fff0..6bf07c3e28 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
@@ -111,7 +111,7 @@ public enum LifeFormCategoriesUS
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormCategoriesUS unmarshalEnum(ByteBuffer buff) throws Exception
@@ -124,7 +124,7 @@ public enum LifeFormCategoriesUS
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
index 2597efe1f4..0392d8329f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
@@ -147,7 +147,7 @@ public enum LifeFormExtraPersonalData
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormExtraPersonalData unmarshalEnum(ByteBuffer buff) throws Exception
@@ -160,7 +160,7 @@ public enum LifeFormExtraPersonalData
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
index 990aa73511..b0d171ef27 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
@@ -75,7 +75,7 @@ public enum LifeFormHumanSpecificAntiMaterielRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAntiMaterielRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum LifeFormHumanSpecificAntiMaterielRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
index 04ed40a03a..44c7b9395b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
@@ -217,7 +217,7 @@ public enum LifeFormHumanSpecificAntiTankMissiles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAntiTankMissiles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -230,7 +230,7 @@ public enum LifeFormHumanSpecificAntiTankMissiles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
index dd5698944c..a504e574a0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
@@ -207,7 +207,7 @@ public enum LifeFormHumanSpecificAntiTankRockets
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAntiTankRockets unmarshalEnum(ByteBuffer buff) throws Exception
@@ -220,7 +220,7 @@ public enum LifeFormHumanSpecificAntiTankRockets
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
index b822514cd5..0e8c393eaf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
@@ -189,7 +189,7 @@ public enum LifeFormHumanSpecificAssaultRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAssaultRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -202,7 +202,7 @@ public enum LifeFormHumanSpecificAssaultRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
index 53f33f18c8..4e1bf2190b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
@@ -75,7 +75,7 @@ public enum LifeFormHumanSpecificDroneGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificDroneGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum LifeFormHumanSpecificDroneGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
index a78660ffab..10d931258f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
@@ -79,7 +79,7 @@ public enum LifeFormHumanSpecificEquipmentClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificEquipmentClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeFormHumanSpecificEquipmentClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
index 0561dc7c3c..af01b3cd73 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
@@ -83,7 +83,7 @@ public enum LifeFormHumanSpecificFlameRockets
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificFlameRockets unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum LifeFormHumanSpecificFlameRockets
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
index dad2de2554..195fd3ffc4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
@@ -99,7 +99,7 @@ public enum LifeFormHumanSpecificFlameThrowers
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificFlameThrowers unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum LifeFormHumanSpecificFlameThrowers
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
index b1441217f6..4c2eec2dac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
@@ -151,7 +151,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchers
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificGrenadeLaunchers unmarshalEnum(ByteBuffer buff) throws Exception
@@ -164,7 +164,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchers
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
index db575d6784..00cd5e31f6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
@@ -109,7 +109,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificGrenadeLaunchingMachineGun unmarshalEnum(ByteBuffer buff) throws Exception
@@ -122,7 +122,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
index ff5fb14cb7..16506c150c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
@@ -79,7 +79,7 @@ public enum LifeFormHumanSpecificHandGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificHandGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeFormHumanSpecificHandGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
index 7e3a161990..7cedbee5ee 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
@@ -89,7 +89,7 @@ public enum LifeFormHumanSpecificHighPowerRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificHighPowerRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum LifeFormHumanSpecificHighPowerRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
index 19173f1066..a5042cbdff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
@@ -243,7 +243,7 @@ public enum LifeFormHumanSpecificMachineGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificMachineGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -256,7 +256,7 @@ public enum LifeFormHumanSpecificMachineGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
index d3e7f50c2d..08f88d8c39 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
@@ -113,7 +113,7 @@ public enum LifeFormHumanSpecificManPortableAirDefenseSystem
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificManPortableAirDefenseSystem unmarshalEnum(ByteBuffer buff) throws Exception
@@ -126,7 +126,7 @@ public enum LifeFormHumanSpecificManPortableAirDefenseSystem
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
index 4c62382445..475f0cc896 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
@@ -79,7 +79,7 @@ public enum LifeFormHumanSpecificMortars
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificMortars unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeFormHumanSpecificMortars
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
index caa7cef07a..904ee07450 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
@@ -127,7 +127,7 @@ public enum LifeFormHumanSpecificRecoillessRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificRecoillessRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -140,7 +140,7 @@ public enum LifeFormHumanSpecificRecoillessRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
index a65cda255b..4ea1033f7e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
@@ -347,7 +347,7 @@ public enum LifeFormHumanSpecificShotGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificShotGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -360,7 +360,7 @@ public enum LifeFormHumanSpecificShotGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
index b3a2fa9a9a..2ab75b6bb2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
@@ -123,7 +123,7 @@ public enum LifeFormHumanSpecificSniper
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificSniper unmarshalEnum(ByteBuffer buff) throws Exception
@@ -136,7 +136,7 @@ public enum LifeFormHumanSpecificSniper
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
index 8d21abb0e6..365e1d89f7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
@@ -95,7 +95,7 @@ public enum LifeFormHumanSpecificSubMachineGun
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificSubMachineGun unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum LifeFormHumanSpecificSubMachineGun
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
index 8fcf19eb80..ead806ff8b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
@@ -75,7 +75,7 @@ public enum LifeFormHumanSpecificWeaponNonspecific
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificWeaponNonspecific unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum LifeFormHumanSpecificWeaponNonspecific
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
index b8fbc8b3b7..43fd48fa95 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
@@ -101,7 +101,7 @@ public enum LifeFormHumanSubcategoryEquipmentClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSubcategoryEquipmentClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum LifeFormHumanSubcategoryEquipmentClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
index 0bd2c9041f..ef8448674a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
@@ -114,7 +114,7 @@ public enum LifeFormLandCategories implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormLandCategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -127,7 +127,7 @@ public enum LifeFormLandCategories implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
index 8b29f57afe..5cb291be95 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
@@ -74,7 +74,7 @@ public enum LifeFormSubsurfaceCategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormSubsurfaceCategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -87,7 +87,7 @@ public enum LifeFormSubsurfaceCategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
index 7747c3e949..94c58ef8f2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
@@ -173,7 +173,7 @@ public enum LifeFormsSubcategoryCISWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryCISWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -186,7 +186,7 @@ public enum LifeFormsSubcategoryCISWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
index 31ff96d0d5..b447043498 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
@@ -85,7 +85,7 @@ public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryFrenchWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
index 948abfd5d0..f0f3ca675f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
@@ -87,7 +87,7 @@ public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryGermanWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
index 28162bedf9..87d034705a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
@@ -73,7 +73,7 @@ public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryIranianWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
index 55c9d44afd..2cb9be2acd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
@@ -93,7 +93,7 @@ public enum LifeFormsSubcategoryUKWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryUKWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -106,7 +106,7 @@ public enum LifeFormsSubcategoryUKWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
index 6000ce8fb7..d3a3b49045 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
@@ -313,7 +313,7 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryUSWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -326,7 +326,7 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
index 20b46e8b63..3f91a469f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
@@ -79,7 +79,7 @@ public enum LifeSavingEquipment implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeSavingEquipment unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeSavingEquipment implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
index 4219d3c742..7b4188f6b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
@@ -85,7 +85,7 @@ public enum Link1111BDataTerminalSetIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Link1111BDataTerminalSetIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum Link1111BDataTerminalSetIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
index 234d930507..1a204f0e3e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
@@ -75,7 +75,7 @@ public enum Link1111BFidelityLevel
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Link1111BFidelityLevel unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Link1111BFidelityLevel
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
index 81fc8bc225..6a8e73953f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
@@ -74,12 +74,12 @@ public enum Link1111BModeofOperation
public static Link1111BModeofOperation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static Link1111BModeofOperation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
index c3c36030c1..14e8c895a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
@@ -75,7 +75,7 @@ public enum Link1111BTerminalMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Link1111BTerminalMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Link1111BTerminalMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Material.java b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
index 76b25f8b7b..cf83268008 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Material.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
@@ -77,7 +77,7 @@ public enum Material
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Material unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Material
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
index a960f29ab2..314b41da33 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
@@ -73,7 +73,7 @@ public enum MinefieldAppearanceActiveStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceActiveStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldAppearanceActiveStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
index 05eee45724..c6fbfbcfd6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
@@ -73,7 +73,7 @@ public enum MinefieldAppearanceLane
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceLane unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldAppearanceLane
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
index 3c4fd0bf17..3288b6b88c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
@@ -75,7 +75,7 @@ public enum MinefieldAppearanceMinefieldType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceMinefieldType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum MinefieldAppearanceMinefieldType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
index 238d86d86d..127ff014ed 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
@@ -73,7 +73,7 @@ public enum MinefieldAppearanceState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldAppearanceState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
index 0692d843ef..c326a97a1b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
@@ -83,7 +83,7 @@ public enum MinefieldFusingFuseType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldFusingFuseType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum MinefieldFusingFuseType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
index 26c3486999..7ee7119cc5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
@@ -77,7 +77,7 @@ public enum MinefieldPaintSchemeAlgae
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldPaintSchemeAlgae unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum MinefieldPaintSchemeAlgae
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
index 8213ff5d70..412b7cd007 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
@@ -107,7 +107,7 @@ public enum MinefieldPaintSchemePaintScheme
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldPaintSchemePaintScheme unmarshalEnum(ByteBuffer buff) throws Exception
@@ -120,7 +120,7 @@ public enum MinefieldPaintSchemePaintScheme
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
index 1795f0b11d..a5dd8638a8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
@@ -79,7 +79,7 @@ public enum MinefieldSensorTypes
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldSensorTypes unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum MinefieldSensorTypes
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
index 778f086ccc..fb75cb73f6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
@@ -82,12 +82,12 @@ public enum MinefieldSensorTypesFLIR
public static MinefieldSensorTypesFLIR unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesFLIR unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
index 76b1da2fa5..aa6d0abf68 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
@@ -66,12 +66,12 @@ public enum MinefieldSensorTypesLaser
public static MinefieldSensorTypesLaser unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesLaser unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
index 85eb33f462..9b740b38c6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
@@ -70,12 +70,12 @@ public enum MinefieldSensorTypesMagnetic
public static MinefieldSensorTypesMagnetic unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesMagnetic unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
index f60eae8359..e4a6170349 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
@@ -64,12 +64,12 @@ public enum MinefieldSensorTypesMultispectral
public static MinefieldSensorTypesMultispectral unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesMultispectral unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
index caca72633d..c4afbacd65 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
@@ -86,12 +86,12 @@ public enum MinefieldSensorTypesOptical
public static MinefieldSensorTypesOptical unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesOptical unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
index bc4e0de31f..c85930b8a0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
@@ -68,12 +68,12 @@ public enum MinefieldSensorTypesPhysical
public static MinefieldSensorTypesPhysical unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesPhysical unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
index 92260e8960..6bb4281fac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
@@ -74,12 +74,12 @@ public enum MinefieldSensorTypesRADAR
public static MinefieldSensorTypesRADAR unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesRADAR unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
index ccc99f73bf..3ff2c7dd65 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
@@ -64,12 +64,12 @@ public enum MinefieldSensorTypesSONAR
public static MinefieldSensorTypesSONAR unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesSONAR unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
index e3990794d0..f8615d77a7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
@@ -73,7 +73,7 @@ public enum MinefieldStateProtocolMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldStateProtocolMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldStateProtocolMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
index 18c9001b82..ccafa0d8d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
@@ -83,7 +83,7 @@ public enum Mode5IFFMission
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5IFFMission unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum Mode5IFFMission
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
index 645c928d5e..dd8f5ba2d7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
@@ -73,7 +73,7 @@ public enum Mode5LevelSelection
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5LevelSelection unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5LevelSelection
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
index 25fecbbd5a..3efb7c532c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
@@ -73,7 +73,7 @@ public enum Mode5LocationErrors
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5LocationErrors unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5LocationErrors
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
index 7abec83c3d..94cd4be007 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
@@ -73,7 +73,7 @@ public enum Mode5MessageFormatsStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5MessageFormatsStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5MessageFormatsStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
index 72de434e0f..df72c926c9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
@@ -73,7 +73,7 @@ public enum Mode5PlatformType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5PlatformType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5PlatformType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
index 63a54ae2e1..27bdcf0dc5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
@@ -77,7 +77,7 @@ public enum Mode5Reply
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5Reply unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Mode5Reply
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
index 577eb52c70..ecd7b62f74 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
@@ -73,7 +73,7 @@ public enum Mode5SAltitudeResolution
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5SAltitudeResolution unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5SAltitudeResolution
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
index 4e56a63f8c..2065e1dbc2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
@@ -75,7 +75,7 @@ public enum Mode5SquitterType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5SquitterType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Mode5SquitterType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
index 3f2aa4e6da..b130998564 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
@@ -73,7 +73,7 @@ public enum ModeCAltitudeIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeCAltitudeIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ModeCAltitudeIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
index fe0a01cf66..bb98733dfa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
@@ -73,7 +73,7 @@ public enum ModeSInterrogatorIdentifierICType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSInterrogatorIdentifierICType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ModeSInterrogatorIdentifierICType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
index 6e6dccb721..f3c55040fb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
@@ -81,7 +81,7 @@ public enum ModeSInterrogatorStatusTransmitState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSInterrogatorStatusTransmitState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum ModeSInterrogatorStatusTransmitState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
index d4252aacb9..d1fcfb9fe1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
@@ -73,7 +73,7 @@ public enum ModeSSquitterRecordSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSSquitterRecordSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ModeSSquitterRecordSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
index f9b70362a7..cfd32d4f90 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
@@ -77,7 +77,7 @@ public enum ModeSSquitterType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSSquitterType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ModeSSquitterType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
index 9908e57a41..f37658f61b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
@@ -77,7 +77,7 @@ public enum MunitionCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MunitionCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum MunitionCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
index 8a224e9cbc..bfd68a3ae8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
@@ -276,12 +276,12 @@ public enum MunitionDescriptorFuse
public static MunitionDescriptorFuse unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MunitionDescriptorFuse unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
index 6999aa9058..d5c0193edb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
@@ -254,12 +254,12 @@ public enum MunitionDescriptorWarhead
public static MunitionDescriptorWarhead unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MunitionDescriptorWarhead unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
index 749b134b9f..705cbc2303 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
@@ -95,7 +95,7 @@ public enum MunitionDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MunitionDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum MunitionDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
index 920500120e..be0cace545 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
@@ -75,7 +75,7 @@ public enum MunitionExpendableStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MunitionExpendableStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum MunitionExpendableStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
index 8023fedb86..7f82b15d58 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
@@ -77,7 +77,7 @@ public enum NETIDRecordFrequencyTable
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static NETIDRecordFrequencyTable unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum NETIDRecordFrequencyTable
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
index b96eaec08a..06e2684ed8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
@@ -75,7 +75,7 @@ public enum NETIDRecordMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static NETIDRecordMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum NETIDRecordMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
index c10f9c971c..debeb8243a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
@@ -77,7 +77,7 @@ public enum NavigationSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static NavigationSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum NavigationSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
index 1015f20cdf..7a836ea2a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
@@ -87,7 +87,7 @@ public enum ObjectKind
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ObjectKind unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum ObjectKind
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
index 09515585d5..5016bcc34b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
@@ -83,7 +83,7 @@ public enum OwnershipStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static OwnershipStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum OwnershipStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
index 3c2dfce80c..a1d08f1908 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
@@ -77,7 +77,7 @@ public enum Parachute
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Parachute unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Parachute
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
index 9786922879..f84ec2adfb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
@@ -79,7 +79,7 @@ public enum PhysicalAssociationTypeGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PhysicalAssociationTypeGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PhysicalAssociationTypeGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
index 6c5812d66c..062d7fc1e8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
@@ -122,7 +122,7 @@ public enum PlatformAirCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -135,7 +135,7 @@ public enum PlatformAirCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
index 6d858aaa70..ff40bd8e1f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
@@ -87,7 +87,7 @@ public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCate
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianFixedWingAircraftSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCate
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
index f2003b53ad..9d5f77af0c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
@@ -75,7 +75,7 @@ public enum PlatformAirCivilianGliderSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianGliderSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum PlatformAirCivilianGliderSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
index 62a599ce7b..76d79dd8a7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
@@ -85,7 +85,7 @@ public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianHelicopterSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
index 4b36bd7a92..cceba41745 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
@@ -79,7 +79,7 @@ public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements Sub
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianLighterthanAirAirshipSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements Sub
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
index 9ee020180e..b63375d217 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements Sub
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianLighterthanAirBalloonSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements Sub
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
index 69683e30cb..35b7b5374f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories imple
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories imple
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
index 277c0b1e9c..e994255dec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
@@ -75,7 +75,7 @@ public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implemen
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianUltralightRigidWingAircraftSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implemen
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
index d8757a833f..09e5ae069e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
@@ -81,7 +81,7 @@ public enum PlatformDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
index 2a5f507973..f4ef2262e6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
@@ -109,7 +109,7 @@ public enum PlatformLandBusSubcategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandBusSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -122,7 +122,7 @@ public enum PlatformLandBusSubcategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
index 0dd251de5e..4ce3d0f4b6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
@@ -159,7 +159,7 @@ public enum PlatformLandCarSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandCarSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -172,7 +172,7 @@ public enum PlatformLandCarSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
index 9ef84e1d49..b1ae949ccf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
@@ -167,7 +167,7 @@ public enum PlatformLandCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -180,7 +180,7 @@ public enum PlatformLandCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
index b35770f98c..8ed401c5f8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
@@ -183,7 +183,7 @@ public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements Sub
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandConstructionSpecialtyVehicleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -196,7 +196,7 @@ public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements Sub
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
index f720ce3a81..d84ebf4790 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
@@ -89,7 +89,7 @@ public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandFarmSpecialtyVehicleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
index 2662019c06..8c3971a015 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformLandMotorcycleSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandMotorcycleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformLandMotorcycleSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
index 4f14523252..79666b5b85 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
@@ -77,7 +77,7 @@ public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCatego
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandMultipleUnitCargoTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCatego
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
index ff2e214d34..246c6d6624 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
@@ -75,7 +75,7 @@ public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implement
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implement
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
index 387c5402ea..7b25b67661 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
@@ -121,7 +121,7 @@ public enum PlatformLandNonmotorizedSubcategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandNonmotorizedSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -134,7 +134,7 @@ public enum PlatformLandNonmotorizedSubcategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
index 02e8b9201d..2e3325b62a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
@@ -101,7 +101,7 @@ public enum PlatformLandRecreationalSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandRecreationalSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum PlatformLandRecreationalSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
index 780fad7530..a52003f095 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
@@ -135,7 +135,7 @@ public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandSingleUnitCargoTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -148,7 +148,7 @@ public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
index 97caad8369..07841871dd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
@@ -159,7 +159,7 @@ public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandSingleUnitUtilityEmergencyTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -172,7 +172,7 @@ public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
index 4ae26f207c..c4f089682b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
@@ -125,7 +125,7 @@ public enum PlatformLandTrailerSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandTrailerSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -138,7 +138,7 @@ public enum PlatformLandTrailerSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
index be2bcb4dec..4e7d3cd95b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
@@ -87,7 +87,7 @@ public enum PlatformLandTrainsSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandTrainsSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum PlatformLandTrainsSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
index 9a2f1c5f7c..572aa44ad5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
@@ -83,7 +83,7 @@ public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandUtilityEmergencyCarSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
index bdceea1a33..766046e3b4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
@@ -77,7 +77,7 @@ public enum PlatformSpaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSpaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum PlatformSpaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
index 1c4665020d..a727b6f4f3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
@@ -109,7 +109,7 @@ public enum PlatformSubsurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -122,7 +122,7 @@ public enum PlatformSubsurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
index 6a2583f2e5..6d42dd3c7a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
@@ -73,7 +73,7 @@ public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements S
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements S
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
index 7d588cb273..03f518b98e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
@@ -73,7 +73,7 @@ public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCateg
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCivilianSubmarineSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCateg
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
index 4dc64688d8..2f1081ea97 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
@@ -73,7 +73,7 @@ public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCat
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCivilianSubmersibleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCat
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
index ae68fca12a..ae9ff314d9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
@@ -154,7 +154,7 @@ public enum PlatformSurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -167,7 +167,7 @@ public enum PlatformSurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
index f9cb597564..38c1b20981 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
@@ -85,7 +85,7 @@ public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceDryCargoShipSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
index 59d4492d40..53b51406f4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceFishingVesselSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
index 4d865ef062..2b4fe660b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
@@ -91,7 +91,7 @@ public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceOtherVesselsSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -104,7 +104,7 @@ public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
index 932d210a5f..5aefbe58c1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfacePassengerVesselSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
index a27645ebef..bea7e0c1ba 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
@@ -79,7 +79,7 @@ public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfacePrivateMotorboatSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
index cae5bc24d3..114322483d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
@@ -79,7 +79,7 @@ public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfacePrivateSailboatSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
index c89c05788e..82cd8b3121 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceSupportVesselSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
index ced6b9cbf0..afc48efa51 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
@@ -89,7 +89,7 @@ public enum PlatformSurfaceTankerSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceTankerSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum PlatformSurfaceTankerSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
index c91388ba96..e91a8cd7a4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
@@ -153,7 +153,7 @@ public enum RadioCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RadioCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -166,7 +166,7 @@ public enum RadioCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
index ab4bc4e442..96f401618c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
@@ -184,12 +184,12 @@ public enum RadioSubcategory implements SubCategory
public static RadioSubcategory unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RadioSubcategory unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
index 72cf4a1896..f732a92b8c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
@@ -68,12 +68,12 @@ public enum ReceiverReceiverState
public static ReceiverReceiverState unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static ReceiverReceiverState unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
index 34799b8b0c..0049256b05 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
@@ -66,12 +66,12 @@ public enum RecordQueryREventType
public static RecordQueryREventType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RecordQueryREventType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
index 44d2915a21..cfc7fab724 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
@@ -64,12 +64,12 @@ public enum RecordREventType
public static RecordREventType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RecordREventType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
index 3711ac93cb..d49d247393 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
@@ -230,12 +230,12 @@ public enum RepairCompleteRepair
public static RepairCompleteRepair unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RepairCompleteRepair unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
index 40e93bdbd7..c15b380054 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
@@ -89,7 +89,7 @@ public enum RepairGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RepairGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum RepairGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
index 83b31c175f..35f7c494e7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
@@ -79,7 +79,7 @@ public enum RepairResponseRepairResult
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RepairResponseRepairResult unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum RepairResponseRepairResult
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
index d7a515f3ef..801fab68fd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
@@ -77,7 +77,7 @@ public enum ReplyAmplification
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ReplyAmplification unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ReplyAmplification
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
index e786debb47..daf5d52cda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
@@ -73,7 +73,7 @@ public enum RequiredReliabilityService
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RequiredReliabilityService unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum RequiredReliabilityService
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Season.java b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
index e9e991d745..05972736be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Season.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
@@ -77,7 +77,7 @@ public enum Season
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Season unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Season
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
index 65c221f8d5..c953a7f21a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
@@ -103,7 +103,7 @@ public enum SensorEmitterCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SensorEmitterCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -116,7 +116,7 @@ public enum SensorEmitterCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
index b2ffeaff46..452aded8df 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
@@ -73,7 +73,7 @@ public enum SensorOnOffStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SensorOnOffStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum SensorOnOffStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
index 76cf4b7da0..b301fc9a5c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
@@ -64,12 +64,12 @@ public enum SensorRecordSensorTypeOtherActiveSensors
public static SensorRecordSensorTypeOtherActiveSensors unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SensorRecordSensorTypeOtherActiveSensors unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
index 5c556bf3cf..2ab66aaf79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
@@ -152,12 +152,12 @@ public enum SensorRecordSensorTypePassiveSensors
public static SensorRecordSensorTypePassiveSensors unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SensorRecordSensorTypePassiveSensors unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
index 01a8508aae..66edb68106 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
@@ -81,7 +81,7 @@ public enum SensorTypeSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SensorTypeSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum SensorTypeSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
index c2297fc456..06ac0dedda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
@@ -77,7 +77,7 @@ public enum SeparationVPPreEntityIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SeparationVPPreEntityIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SeparationVPPreEntityIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
index f135efa2b9..984e3f5d9d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
@@ -75,7 +75,7 @@ public enum SeparationVPReasonforSeparation
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SeparationVPReasonforSeparation unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum SeparationVPReasonforSeparation
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
index 8137630632..efeef6b0fd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
@@ -79,7 +79,7 @@ public enum ServiceRequestServiceTypeRequested
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ServiceRequestServiceTypeRequested unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum ServiceRequestServiceTypeRequested
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
index ee85251df2..0ae8f79dd5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
@@ -77,7 +77,7 @@ public enum SignalEncodingClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SignalEncodingClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SignalEncodingClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
index 1b5bff6ef9..66f4dc4136 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
@@ -86,12 +86,12 @@ public enum SignalEncodingType
public static SignalEncodingType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SignalEncodingType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
index b8e49f5486..5b712a46fc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
@@ -252,12 +252,12 @@ public enum SignalTDLType
public static SignalTDLType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SignalTDLType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
index 8d16786c56..7b42ccf7ef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
@@ -130,12 +130,12 @@ public enum SignalUserProtocolIdentificationNumber
public static SignalUserProtocolIdentificationNumber unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SignalUserProtocolIdentificationNumber unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
index d2d511835f..022dc34e07 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
@@ -83,7 +83,7 @@ public enum SpecificDimensionEnumerationsforAirAreaSize
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SpecificDimensionEnumerationsforAirAreaSize unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum SpecificDimensionEnumerationsforAirAreaSize
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
index 9cc598768e..f0aac18eda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
@@ -83,7 +83,7 @@ public enum SpecificDimensionEnumerationsforLandAreaSize
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SpecificDimensionEnumerationsforLandAreaSize unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum SpecificDimensionEnumerationsforLandAreaSize
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
index ef76e9110a..004812857d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
@@ -75,7 +75,7 @@ public enum SpotChaffStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SpotChaffStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum SpotChaffStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
index 4aff54ca5f..8457e30f38 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
@@ -87,7 +87,7 @@ public enum StopFreezeReason
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static StopFreezeReason unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum StopFreezeReason
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
index d2b4f64a79..9acdf02c4a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
@@ -123,7 +123,7 @@ public enum SubcategoriesforAirCategory200Bird implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforAirCategory200Bird unmarshalEnum(ByteBuffer buff) throws Exception
@@ -136,7 +136,7 @@ public enum SubcategoriesforAirCategory200Bird implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
index ea0e264d9a..f23151dbf0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
@@ -87,7 +87,7 @@ public enum SubcategoriesforAirCategory201Insect implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforAirCategory201Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum SubcategoriesforAirCategory201Insect implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
index c33f1860a8..b340f350dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
@@ -75,7 +75,7 @@ public enum SubcategoriesforAirCategory202Mammal implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforAirCategory202Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum SubcategoriesforAirCategory202Mammal implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
index 8d5eda9697..d0248076f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
@@ -129,7 +129,7 @@ public enum SubcategoriesforLandCategory200Mammal implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory200Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -142,7 +142,7 @@ public enum SubcategoriesforLandCategory200Mammal implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
index 961b0db26f..959a2eaeba 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
@@ -115,7 +115,7 @@ public enum SubcategoriesforLandCategory201Reptile implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory201Reptile unmarshalEnum(ByteBuffer buff) throws Exception
@@ -128,7 +128,7 @@ public enum SubcategoriesforLandCategory201Reptile implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
index 2c2b95cf35..0c919fce59 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
@@ -77,7 +77,7 @@ public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory202Amphibian unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
index 7492b6f9b4..2faa3cb7f5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
@@ -83,7 +83,7 @@ public enum SubcategoriesforLandCategory203Insect implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory203Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum SubcategoriesforLandCategory203Insect implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
index 0b3520090f..c1131895dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
@@ -79,7 +79,7 @@ public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory204Arachnid unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
index dc2c311d6d..9676f7fd54 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
@@ -73,7 +73,7 @@ public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory205Mollusk unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
index ad086933cc..f1fd780c10 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
@@ -95,7 +95,7 @@ public enum SubcategoriesforLandCategory206Marsupial
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory206Marsupial unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum SubcategoriesforLandCategory206Marsupial
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
index 0f8c98c651..771df4a0cb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
@@ -123,7 +123,7 @@ public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory200Fish unmarshalEnum(ByteBuffer buff) throws Exception
@@ -136,7 +136,7 @@ public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
index 0ad746b990..04b38fcb9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
@@ -187,7 +187,7 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory201Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -200,7 +200,7 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
index 7d406d14fb..c080a87c2d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
@@ -87,7 +87,7 @@ public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory202Mollusk unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
index 5f9d7c1a12..9bdb672f33 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
@@ -79,7 +79,7 @@ public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCatego
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory203Crustacean unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCatego
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
index 82b38a9871..85d740aff2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
@@ -73,7 +73,7 @@ public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory204Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
index 2652519a13..817b4ba301 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
@@ -95,7 +95,7 @@ public enum SupplyDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SupplyDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum SupplyDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
index efc637f754..03eead2d43 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
@@ -93,7 +93,7 @@ public enum SupplyFuelType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SupplyFuelType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -106,7 +106,7 @@ public enum SupplyFuelType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
index 03b0b718c1..8ce4c313ec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
@@ -77,7 +77,7 @@ public enum SurveillanceStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SurveillanceStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SurveillanceStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
index 0d3c2b3fd0..35e9e3277b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
@@ -73,7 +73,7 @@ public enum TCASACASBasicAdvancedIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASBasicAdvancedIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TCASACASBasicAdvancedIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
index c72c7cf5be..d5fecbd3dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
@@ -73,7 +73,7 @@ public enum TCASACASIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TCASACASIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
index 84c95d5b63..83c80137b3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
@@ -75,7 +75,7 @@ public enum TCASACASSoftwareVersion
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASSoftwareVersion unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TCASACASSoftwareVersion
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
index dc55209c78..90a7fd54c9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
@@ -75,7 +75,7 @@ public enum TCASACASType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TCASACASType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
index add821ba90..42bc973948 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
@@ -73,7 +73,7 @@ public enum TCASIIIType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASIIIType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TCASIIIType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
index 949ac105ad..f33c907395 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
@@ -88,12 +88,12 @@ public enum TILinkType
public static TILinkType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TILinkType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
index 02228952c1..e388e5ca4c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
@@ -75,7 +75,7 @@ public enum TimeTypeSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TimeTypeSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TimeTypeSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
index 7adae86731..311b1bc2f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
@@ -91,7 +91,7 @@ public enum TransferControlTransferType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransferControlTransferType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -104,7 +104,7 @@ public enum TransferControlTransferType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
index 8e4d68e193..ac7aebdc7a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
@@ -77,7 +77,7 @@ public enum TransmissionIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmissionIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum TransmissionIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
index e7ea12b9d5..7aaa98065f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
@@ -73,7 +73,7 @@ public enum TransmitterAntennaPatternReferenceSystem
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmitterAntennaPatternReferenceSystem unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TransmitterAntennaPatternReferenceSystem
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
index 6a053f70c6..e265bef3d6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
@@ -72,12 +72,12 @@ public enum TransmitterAntennaPatternType
public static TransmitterAntennaPatternType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterAntennaPatternType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
index 00e9c204be..c8923ce9ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
@@ -90,12 +90,12 @@ public enum TransmitterCryptoSystem
public static TransmitterCryptoSystem unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterCryptoSystem unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
index 02de21f040..196d6be84d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
@@ -84,12 +84,12 @@ public enum TransmitterDetailAmplitudeModulation
public static TransmitterDetailAmplitudeModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailAmplitudeModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
index 16d8167a0d..3776b0c672 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailAmplitudeandAngleModulation
public static TransmitterDetailAmplitudeandAngleModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailAmplitudeandAngleModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
index 54c90edd46..c3a64e20a1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
@@ -70,12 +70,12 @@ public enum TransmitterDetailAnglemodulation
public static TransmitterDetailAnglemodulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailAnglemodulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
index c1b2bc7810..16e5275d78 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
@@ -64,12 +64,12 @@ public enum TransmitterDetailCarrierPhaseShiftModulation
public static TransmitterDetailCarrierPhaseShiftModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailCarrierPhaseShiftModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
index fc16c786a2..bb84c193d9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailCombinationModulation
public static TransmitterDetailCombinationModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailCombinationModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
index 5f4b074379..6e46dcb8ac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
@@ -70,12 +70,12 @@ public enum TransmitterDetailPulseModulation
public static TransmitterDetailPulseModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailPulseModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
index 9d4c5e73e8..baba458bca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailSATCOMModulation
public static TransmitterDetailSATCOMModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailSATCOMModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
index 824fbe1a20..86a2ce7dcb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailUnmodulatedModulation
public static TransmitterDetailUnmodulatedModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailUnmodulatedModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
index b9d67d5bd3..dbf8511e1b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
@@ -99,7 +99,7 @@ public enum TransmitterInputSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmitterInputSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum TransmitterInputSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
index cd3f22616d..efa97cb10a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
@@ -72,12 +72,12 @@ public enum TransmitterMajorModulation
public static TransmitterMajorModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterMajorModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
index c81ef5ffda..8b5c7197f5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
@@ -90,12 +90,12 @@ public enum TransmitterModulationTypeSystem
public static TransmitterModulationTypeSystem unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterModulationTypeSystem unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
index 45e1d60797..6e44634454 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
@@ -75,7 +75,7 @@ public enum TransmitterTransmitState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmitterTransmitState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TransmitterTransmitState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
index 493dd16920..6f5573cee5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
@@ -73,7 +73,7 @@ public enum TransponderInterrogatorIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransponderInterrogatorIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TransponderInterrogatorIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
index 79303f5c79..c20f96cba5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
@@ -75,7 +75,7 @@ public enum TurnRateSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TurnRateSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TurnRateSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
index 7b37001460..f69ee88176 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
@@ -79,7 +79,7 @@ public enum UAAcousticEmitterSystemFunction
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static UAAcousticEmitterSystemFunction unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum UAAcousticEmitterSystemFunction
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
index b06ae652e6..b3be375778 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
@@ -82,12 +82,12 @@ public enum UAAcousticSystemName
public static UAAcousticSystemName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAAcousticSystemName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
index eafe90f6e0..9205a1f13c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
@@ -64,12 +64,12 @@ public enum UAActiveEmissionParameterIndex
public static UAActiveEmissionParameterIndex unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAActiveEmissionParameterIndex unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
index 599a03654c..56270e3167 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
@@ -64,12 +64,12 @@ public enum UAAdditionalPassiveActivityParameterIndex
public static UAAdditionalPassiveActivityParameterIndex unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAAdditionalPassiveActivityParameterIndex unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
index 633e5752af..2f5160628e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
@@ -64,12 +64,12 @@ public enum UAPassiveParameterIndex
public static UAPassiveParameterIndex unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAPassiveParameterIndex unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
index 881986d7e1..9bc958cbf6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
@@ -83,7 +83,7 @@ public enum UAPropulsionPlantConfigurationConfiguration
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static UAPropulsionPlantConfigurationConfiguration unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum UAPropulsionPlantConfigurationConfiguration
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
index b20e96dfc8..9ae66b4d5d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
@@ -74,12 +74,12 @@ public enum UAScanPattern
public static UAScanPattern unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAScanPattern unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
index db1c0965c1..102e9fb88a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
@@ -73,7 +73,7 @@ public enum UAStateChangeUpdateIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static UAStateChangeUpdateIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum UAStateChangeUpdateIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
index 8c9245d6ee..225a03231e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
@@ -79,7 +79,7 @@ public enum VariableParameterRecordType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariableParameterRecordType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum VariableParameterRecordType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
index 78a5a688bb..9f606e541d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
@@ -77,7 +77,7 @@ public enum VariantsforAirCategory200Bird
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariantsforAirCategory200Bird unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum VariantsforAirCategory200Bird
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
index 84804620e8..45dcd28fda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
@@ -79,7 +79,7 @@ public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
index 6e2b51c91b..1712304c6c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
@@ -73,7 +73,7 @@ public enum VariantsforSubsurfaceCategory201Mammal
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariantsforSubsurfaceCategory201Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum VariantsforSubsurfaceCategory201Mammal
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
--
GitLab