From ba8f0c969e6597ece0c6bcd0416623f978f9c1de Mon Sep 17 00:00:00 2001 From: Stefan Feuerhahn Date: Wed, 13 Dec 2017 20:54:06 +0100 Subject: [PATCH] generated asn.1 classes using newest version of jasn1-compiler 1.9.0 --- asn1/mms/compile.sh | 2 +- configuration.gradle | 2 +- .../internal/acse/asn1/AAREApdu.java | 11 +- .../internal/acse/asn1/AARQApdu.java | 11 +- .../internal/acse/asn1/ACSEApdu.java | 9 +- .../internal/acse/asn1/ACSERequirements.java | 6 +- .../acse/asn1/AEInvocationIdentifier.java | 2 +- .../internal/acse/asn1/AEQualifier.java | 9 +- .../internal/acse/asn1/AEQualifierForm2.java | 2 +- .../josistack/internal/acse/asn1/AETitle.java | 9 +- .../internal/acse/asn1/AETitleForm2.java | 2 +- .../acse/asn1/APInvocationIdentifier.java | 2 +- .../josistack/internal/acse/asn1/APTitle.java | 9 +- .../internal/acse/asn1/APTitleForm2.java | 2 +- .../acse/asn1/ApplicationContextName.java | 2 +- .../acse/asn1/ApplicationContextNameList.java | 11 +- .../internal/acse/asn1/AssociateResult.java | 2 +- .../acse/asn1/AssociateSourceDiagnostic.java | 9 +- .../acse/asn1/AssociationInformation.java | 11 +- .../acse/asn1/AuthenticationValue.java | 9 +- .../acse/asn1/ImplementationData.java | 2 +- .../internal/acse/asn1/MechanismName.java | 2 +- .../internal/acse/asn1/Myexternal.java | 15 +- .../internal/acse/asn1/Myexternal2.java | 15 +- .../internal/acse/asn1/OidValues.java | 2 +- .../internal/acse/asn1/RLREApdu.java | 11 +- .../internal/acse/asn1/RLRQApdu.java | 11 +- .../acse/asn1/ReleaseRequestReason.java | 2 +- .../acse/asn1/ReleaseResponseReason.java | 2 +- .../presentation/asn1/AbstractSyntaxName.java | 4 +- .../internal/presentation/asn1/CPAPPDU.java | 109 ++++++++++---- .../internal/presentation/asn1/CPType.java | 122 ++++++++++++---- .../asn1/CalledPresentationSelector.java | 4 +- .../asn1/CallingPresentationSelector.java | 4 +- .../presentation/asn1/ContextList.java | 136 +++++++++++++----- .../presentation/asn1/DefaultContextName.java | 53 +++++-- .../presentation/asn1/FullyEncodedData.java | 42 ++++-- .../presentation/asn1/ModeSelector.java | 41 ++++-- .../internal/presentation/asn1/PDVList.java | 85 ++++++++--- .../PresentationContextDefinitionList.java | 4 +- ...esentationContextDefinitionResultList.java | 4 +- .../asn1/PresentationContextIdentifier.java | 4 +- .../asn1/PresentationRequirements.java | 8 +- .../asn1/PresentationSelector.java | 4 +- .../presentation/asn1/ProtocolVersion.java | 8 +- .../asn1/RespondingPresentationSelector.java | 4 +- .../internal/presentation/asn1/Result.java | 4 +- .../presentation/asn1/ResultList.java | 87 ++++++++--- .../presentation/asn1/SimplyEncodedData.java | 4 +- .../presentation/asn1/TransferSyntaxName.java | 4 +- .../internal/presentation/asn1/UserData.java | 30 ++-- .../asn1/UserSessionRequirements.java | 8 +- .../internal/mms/asn1/AccessResult.java | 9 +- .../internal/mms/asn1/AlternateAccess.java | 15 +- .../mms/asn1/AlternateAccessSelection.java | 43 +++--- .../internal/mms/asn1/BasicIdentifier.java | 2 +- .../internal/mms/asn1/ConcludeRequestPDU.java | 2 +- .../internal/mms/asn1/ConfirmedErrorPDU.java | 11 +- .../mms/asn1/ConfirmedRequestPDU.java | 11 +- .../mms/asn1/ConfirmedResponsePDU.java | 11 +- .../mms/asn1/ConfirmedServiceRequest.java | 9 +- .../mms/asn1/ConfirmedServiceResponse.java | 9 +- .../openiec61850/internal/mms/asn1/Data.java | 21 +-- .../internal/mms/asn1/DataAccessError.java | 2 +- .../asn1/DefineNamedVariableListRequest.java | 11 +- .../asn1/DefineNamedVariableListResponse.java | 2 +- .../asn1/DeleteNamedVariableListRequest.java | 21 +-- .../asn1/DeleteNamedVariableListResponse.java | 11 +- .../internal/mms/asn1/FloatingPoint.java | 2 +- .../internal/mms/asn1/GetNameListRequest.java | 15 +- .../mms/asn1/GetNameListResponse.java | 17 +-- ...GetNamedVariableListAttributesRequest.java | 2 +- ...etNamedVariableListAttributesResponse.java | 11 +- .../GetVariableAccessAttributesRequest.java | 9 +- .../GetVariableAccessAttributesResponse.java | 11 +- .../internal/mms/asn1/Identifier.java | 2 +- .../internal/mms/asn1/InformationReport.java | 17 +-- .../internal/mms/asn1/InitiateErrorPDU.java | 2 +- .../internal/mms/asn1/InitiateRequestPDU.java | 17 +-- .../mms/asn1/InitiateResponsePDU.java | 17 +-- .../internal/mms/asn1/Integer16.java | 2 +- .../internal/mms/asn1/Integer32.java | 2 +- .../internal/mms/asn1/Integer8.java | 2 +- .../internal/mms/asn1/MMSString.java | 2 +- .../internal/mms/asn1/MMSpdu.java | 9 +- .../internal/mms/asn1/ObjectClass.java | 9 +- .../internal/mms/asn1/ObjectName.java | 15 +- .../mms/asn1/ParameterSupportOptions.java | 6 +- .../internal/mms/asn1/ReadRequest.java | 11 +- .../internal/mms/asn1/ReadResponse.java | 17 +-- .../internal/mms/asn1/RejectPDU.java | 15 +- .../internal/mms/asn1/ServiceError.java | 15 +- .../mms/asn1/ServiceSupportOptions.java | 6 +- .../internal/mms/asn1/TimeOfDay.java | 2 +- .../internal/mms/asn1/TypeDescription.java | 39 ++--- .../internal/mms/asn1/TypeSpecification.java | 9 +- .../internal/mms/asn1/UnconfirmedPDU.java | 11 +- .../internal/mms/asn1/UnconfirmedService.java | 9 +- .../internal/mms/asn1/Unsigned16.java | 2 +- .../internal/mms/asn1/Unsigned32.java | 2 +- .../internal/mms/asn1/Unsigned8.java | 2 +- .../internal/mms/asn1/UtcTime.java | 2 +- .../mms/asn1/VariableAccessSpecification.java | 9 +- .../internal/mms/asn1/VariableDefs.java | 17 +-- .../mms/asn1/VariableSpecification.java | 9 +- .../internal/mms/asn1/WriteRequest.java | 17 +-- .../internal/mms/asn1/WriteResponse.java | 15 +- .../openmuc/josistack/AcseAssociation.java | 44 +++--- .../org/openmuc/openiec61850/BdaInt128.java | 2 +- .../openiec61850/ClientAssociation.java | 16 +-- .../org/openmuc/openiec61850/SclParser.java | 8 +- .../openiec61850/ServerAssociation.java | 16 +-- 112 files changed, 1047 insertions(+), 564 deletions(-) diff --git a/asn1/mms/compile.sh b/asn1/mms/compile.sh index 38098a0..55d175e 100755 --- a/asn1/mms/compile.sh +++ b/asn1/mms/compile.sh @@ -1,5 +1,5 @@ #!/bin/sh -rm -r ../../src/main/java-gen/* +rm -r ../../src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/* jasn1-compiler -o "../../src/main/java-gen" -p "org.openmuc.openiec61850.internal.mms" -f mms.asn diff --git a/configuration.gradle b/configuration.gradle index e2edae5..59246f1 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -83,7 +83,7 @@ def projectName = 'OpenIEC61850' dependencies { compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' - compile group: 'org.openmuc', name: 'jasn1-61850mod', version: '1.8.3-SNAPSHOT' + compile group: 'org.openmuc', name: 'jasn1', version: '1.9.0' compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' compile group: 'com.toedter', name: 'jcalendar', version: '1.4' } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AAREApdu.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AAREApdu.java index 0646726..9d35651 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AAREApdu.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AAREApdu.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBitString; import org.openmuc.jasn1.ber.types.BerObjectIdentifier; @@ -155,11 +156,11 @@ public class AAREApdu implements Serializable { return userInformation; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -450,7 +451,7 @@ public class AAREApdu implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AARQApdu.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AARQApdu.java index cb38109..58b89b1 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AARQApdu.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AARQApdu.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBitString; import org.openmuc.jasn1.ber.types.BerObjectIdentifier; @@ -173,11 +174,11 @@ public class AARQApdu implements Serializable { return userInformation; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -510,7 +511,7 @@ public class AARQApdu implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSEApdu.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSEApdu.java index 7de5c64..1330fca 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSEApdu.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSEApdu.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class ACSEApdu implements Serializable { @@ -60,7 +61,7 @@ public class ACSEApdu implements Serializable { return rlre; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -139,7 +140,7 @@ public class ACSEApdu implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSERequirements.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSERequirements.java index 526113c..fa7932d 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSERequirements.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ACSERequirements.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; @@ -21,4 +21,8 @@ public class ACSERequirements extends BerBitString { super(value, numBits); } + public ACSERequirements(boolean[] value) { + super(value); + } + } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEInvocationIdentifier.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEInvocationIdentifier.java index 7c70b74..04ba728 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEInvocationIdentifier.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEInvocationIdentifier.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifier.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifier.java index 2ff889a..49e55b1 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifier.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifier.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; public class AEQualifier implements Serializable { @@ -34,7 +35,7 @@ public class AEQualifier implements Serializable { return aeQualifierForm2; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -80,7 +81,7 @@ public class AEQualifier implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifierForm2.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifierForm2.java index 6f56c3c..4161d65 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifierForm2.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AEQualifierForm2.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitle.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitle.java index 5ecb3b9..8340695 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitle.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitle.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerObjectIdentifier; public class AETitle implements Serializable { @@ -34,7 +35,7 @@ public class AETitle implements Serializable { return aeTitleForm2; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -80,7 +81,7 @@ public class AETitle implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitleForm2.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitleForm2.java index 8780e4c..6afdd25 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitleForm2.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AETitleForm2.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APInvocationIdentifier.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APInvocationIdentifier.java index 178cded..a899deb 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APInvocationIdentifier.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APInvocationIdentifier.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitle.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitle.java index 99ff6b4..509548c 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitle.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitle.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerObjectIdentifier; public class APTitle implements Serializable { @@ -34,7 +35,7 @@ public class APTitle implements Serializable { return apTitleForm2; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -80,7 +81,7 @@ public class APTitle implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitleForm2.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitleForm2.java index 7f68227..98865e9 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitleForm2.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/APTitleForm2.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextName.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextName.java index db865ad..ce00f3c 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextName.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextName.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextNameList.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextNameList.java index 1de1674..608c652 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextNameList.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ApplicationContextNameList.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class ApplicationContextNameList implements Serializable { @@ -38,11 +39,11 @@ public class ApplicationContextNameList implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -99,7 +100,7 @@ public class ApplicationContextNameList implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateResult.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateResult.java index 8857738..0d0e4d2 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateResult.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateResult.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateSourceDiagnostic.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateSourceDiagnostic.java index 22831dd..686c0b2 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateSourceDiagnostic.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociateSourceDiagnostic.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; public class AssociateSourceDiagnostic implements Serializable { @@ -44,7 +45,7 @@ public class AssociateSourceDiagnostic implements Serializable { return acseServiceProvider; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -115,7 +116,7 @@ public class AssociateSourceDiagnostic implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociationInformation.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociationInformation.java index 404feb8..71498e3 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociationInformation.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AssociationInformation.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class AssociationInformation implements Serializable { @@ -38,11 +39,11 @@ public class AssociationInformation implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -99,7 +100,7 @@ public class AssociationInformation implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AuthenticationValue.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AuthenticationValue.java index ab27d76..7c43713 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AuthenticationValue.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/AuthenticationValue.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBitString; import org.openmuc.jasn1.ber.types.string.BerGraphicString; @@ -53,7 +54,7 @@ public class AuthenticationValue implements Serializable { return external; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -130,7 +131,7 @@ public class AuthenticationValue implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ImplementationData.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ImplementationData.java index 3b0360f..6516be6 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ImplementationData.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ImplementationData.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/MechanismName.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/MechanismName.java index f99be1e..97e385a 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/MechanismName.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/MechanismName.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal.java index 9b50c2c..0387ab0 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerAny; import org.openmuc.jasn1.ber.types.BerBitString; import org.openmuc.jasn1.ber.types.BerInteger; @@ -61,7 +62,7 @@ public class Myexternal implements Serializable { return arbitrary; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -143,7 +144,7 @@ public class Myexternal implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -215,11 +216,11 @@ public class Myexternal implements Serializable { return encoding; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -295,7 +296,7 @@ public class Myexternal implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal2.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal2.java index 7e506de..f2a1507 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal2.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/Myexternal2.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerAny; import org.openmuc.jasn1.ber.types.BerBitString; import org.openmuc.jasn1.ber.types.BerInteger; @@ -61,7 +62,7 @@ public class Myexternal2 implements Serializable { return arbitrary; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -143,7 +144,7 @@ public class Myexternal2 implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -215,11 +216,11 @@ public class Myexternal2 implements Serializable { return encoding; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -295,7 +296,7 @@ public class Myexternal2 implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/OidValues.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/OidValues.java index d233ef4..e2a0c77 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/OidValues.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/OidValues.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLREApdu.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLREApdu.java index c168426..4e144df 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLREApdu.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLREApdu.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class RLREApdu implements Serializable { @@ -45,11 +46,11 @@ public class RLREApdu implements Serializable { return userInformation; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -131,7 +132,7 @@ public class RLREApdu implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLRQApdu.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLRQApdu.java index d9c4ce8..40550e9 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLRQApdu.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/RLRQApdu.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class RLRQApdu implements Serializable { @@ -45,11 +46,11 @@ public class RLRQApdu implements Serializable { return userInformation; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -131,7 +132,7 @@ public class RLRQApdu implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseRequestReason.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseRequestReason.java index 9042f7c..e7934e5 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseRequestReason.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseRequestReason.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseResponseReason.java b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseResponseReason.java index 9c15b3f..259bdce 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseResponseReason.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/acse/asn1/ReleaseResponseReason.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.acse.asn1; diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/AbstractSyntaxName.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/AbstractSyntaxName.java index c6fe1a3..3bbf01a 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/AbstractSyntaxName.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/AbstractSyntaxName.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -8,6 +8,8 @@ import org.openmuc.jasn1.ber.types.BerObjectIdentifier; public class AbstractSyntaxName extends BerObjectIdentifier { + private static final long serialVersionUID = 1L; + public AbstractSyntaxName() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPAPPDU.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPAPPDU.java index cf54810..caba198 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPAPPDU.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPAPPDU.java @@ -1,19 +1,25 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; -public class CPAPPDU { +public class CPAPPDU implements Serializable { - public static class NormalModeParameters { + private static final long serialVersionUID = 1L; + + public static class NormalModeParameters implements Serializable { + + private static final long serialVersionUID = 1L; public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16); @@ -81,11 +87,11 @@ public class CPAPPDU { return userData; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -227,23 +233,37 @@ public class CPAPPDU { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); boolean firstSelectedElement = true; if (protocolVersion != null) { + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } sb.append("protocolVersion: ").append(protocolVersion); firstSelectedElement = false; } if (respondingPresentationSelector != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } sb.append("respondingPresentationSelector: ").append(respondingPresentationSelector); firstSelectedElement = false; @@ -251,15 +271,22 @@ public class CPAPPDU { if (presentationContextDefinitionResultList != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } - sb.append("presentationContextDefinitionResultList: ").append(presentationContextDefinitionResultList); + sb.append("presentationContextDefinitionResultList: "); + presentationContextDefinitionResultList.appendAsString(sb, indentLevel + 1); firstSelectedElement = false; } if (presentationRequirements != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } sb.append("presentationRequirements: ").append(presentationRequirements); firstSelectedElement = false; @@ -267,7 +294,10 @@ public class CPAPPDU { if (userSessionRequirements != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } sb.append("userSessionRequirements: ").append(userSessionRequirements); firstSelectedElement = false; @@ -275,14 +305,21 @@ public class CPAPPDU { if (userData != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } - sb.append("userData: ").append(userData); + sb.append("userData: "); + userData.appendAsString(sb, indentLevel + 1); firstSelectedElement = false; } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } @@ -316,11 +353,11 @@ public class CPAPPDU { return normalModeParameters; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -394,23 +431,47 @@ public class CPAPPDU { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); - sb.append("modeSelector: ").append(modeSelector); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (modeSelector != null) { + sb.append("modeSelector: "); + modeSelector.appendAsString(sb, indentLevel + 1); + } + else { + sb.append("modeSelector: "); + } if (normalModeParameters != null) { - sb.append(", "); - sb.append("normalModeParameters: ").append(normalModeParameters); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + sb.append("normalModeParameters: "); + normalModeParameters.appendAsString(sb, indentLevel + 1); } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPType.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPType.java index dd43ee2..c2839c0 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPType.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CPType.java @@ -1,19 +1,25 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; -public class CPType { +public class CPType implements Serializable { - public static class NormalModeParameters { + private static final long serialVersionUID = 1L; + + public static class NormalModeParameters implements Serializable { + + private static final long serialVersionUID = 1L; public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16); @@ -99,11 +105,11 @@ public class CPType { return userData; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -277,23 +283,37 @@ public class CPType { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); boolean firstSelectedElement = true; if (protocolVersion != null) { + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } sb.append("protocolVersion: ").append(protocolVersion); firstSelectedElement = false; } if (callingPresentationSelector != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } sb.append("callingPresentationSelector: ").append(callingPresentationSelector); firstSelectedElement = false; @@ -301,7 +321,10 @@ public class CPType { if (calledPresentationSelector != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } sb.append("calledPresentationSelector: ").append(calledPresentationSelector); firstSelectedElement = false; @@ -309,23 +332,34 @@ public class CPType { if (presentationContextDefinitionList != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } - sb.append("presentationContextDefinitionList: ").append(presentationContextDefinitionList); + sb.append("presentationContextDefinitionList: "); + presentationContextDefinitionList.appendAsString(sb, indentLevel + 1); firstSelectedElement = false; } if (defaultContextName != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); } - sb.append("defaultContextName: ").append(defaultContextName); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + sb.append("defaultContextName: "); + defaultContextName.appendAsString(sb, indentLevel + 1); firstSelectedElement = false; } if (presentationRequirements != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } sb.append("presentationRequirements: ").append(presentationRequirements); firstSelectedElement = false; @@ -333,7 +367,10 @@ public class CPType { if (userSessionRequirements != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); } sb.append("userSessionRequirements: ").append(userSessionRequirements); firstSelectedElement = false; @@ -341,14 +378,21 @@ public class CPType { if (userData != null) { if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); } - sb.append("userData: ").append(userData); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + sb.append("userData: "); + userData.appendAsString(sb, indentLevel + 1); firstSelectedElement = false; } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } @@ -382,11 +426,11 @@ public class CPType { return normalModeParameters; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -460,23 +504,47 @@ public class CPType { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); - sb.append("modeSelector: ").append(modeSelector); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (modeSelector != null) { + sb.append("modeSelector: "); + modeSelector.appendAsString(sb, indentLevel + 1); + } + else { + sb.append("modeSelector: "); + } if (normalModeParameters != null) { - sb.append(", "); - sb.append("normalModeParameters: ").append(normalModeParameters); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + sb.append("normalModeParameters: "); + normalModeParameters.appendAsString(sb, indentLevel + 1); } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CalledPresentationSelector.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CalledPresentationSelector.java index 4f95065..db80034 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CalledPresentationSelector.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CalledPresentationSelector.java @@ -1,11 +1,13 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; public class CalledPresentationSelector extends PresentationSelector { + private static final long serialVersionUID = 1L; + public CalledPresentationSelector() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CallingPresentationSelector.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CallingPresentationSelector.java index 903ab9e..a9a1ba4 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CallingPresentationSelector.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/CallingPresentationSelector.java @@ -1,11 +1,13 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; public class CallingPresentationSelector extends PresentationSelector { + private static final long serialVersionUID = 1L; + public CallingPresentationSelector() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ContextList.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ContextList.java index 3b9e403..7911929 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ContextList.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ContextList.java @@ -1,26 +1,34 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.BerObjectIdentifier; -public class ContextList { +public class ContextList implements Serializable { - public static class SEQUENCE { + private static final long serialVersionUID = 1L; - public static class TransferSyntaxNameList { + public static class SEQUENCE implements Serializable { + + private static final long serialVersionUID = 1L; + + public static class TransferSyntaxNameList implements Serializable { + + private static final long serialVersionUID = 1L; public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16); public byte[] code = null; @@ -41,11 +49,11 @@ public class ContextList { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -78,7 +86,6 @@ public class ContextList { public int decode(InputStream is, boolean withTag) throws IOException { int codeLength = 0; int subCodeLength = 0; - BerTag berTag = new BerTag(); if (withTag) { codeLength += tag.decodeAndCheck(is); } @@ -103,15 +110,24 @@ public class ContextList { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE OF{"); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } if (seqOf == null) { sb.append("null"); } @@ -120,14 +136,20 @@ public class ContextList { if (it.hasNext()) { sb.append(it.next()); while (it.hasNext()) { - sb.append(", ").append(it.next()); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + sb.append(it.next()); } } } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - - return sb.toString(); } } @@ -170,11 +192,11 @@ public class ContextList { return transferSyntaxNameList; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -254,24 +276,60 @@ public class ContextList { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); - sb.append("presentationContextIdentifier: ").append(presentationContextIdentifier); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (presentationContextIdentifier != null) { + sb.append("presentationContextIdentifier: ").append(presentationContextIdentifier); + } + else { + sb.append("presentationContextIdentifier: "); + } - sb.append(", "); - sb.append("abstractSyntaxName: ").append(abstractSyntaxName); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (abstractSyntaxName != null) { + sb.append("abstractSyntaxName: ").append(abstractSyntaxName); + } + else { + sb.append("abstractSyntaxName: "); + } - sb.append(", "); - sb.append("transferSyntaxNameList: ").append(transferSyntaxNameList); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (transferSyntaxNameList != null) { + sb.append("transferSyntaxNameList: "); + transferSyntaxNameList.appendAsString(sb, indentLevel + 1); + } + else { + sb.append("transferSyntaxNameList: "); + } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } @@ -295,11 +353,11 @@ public class ContextList { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -332,7 +390,6 @@ public class ContextList { public int decode(InputStream is, boolean withTag) throws IOException { int codeLength = 0; int subCodeLength = 0; - BerTag berTag = new BerTag(); if (withTag) { codeLength += tag.decodeAndCheck(is); } @@ -357,31 +414,46 @@ public class ContextList { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE OF{"); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } if (seqOf == null) { sb.append("null"); } else { Iterator it = seqOf.iterator(); if (it.hasNext()) { - sb.append(it.next()); + it.next().appendAsString(sb, indentLevel + 1); while (it.hasNext()) { - sb.append(", ").append(it.next()); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + it.next().appendAsString(sb, indentLevel + 1); } } } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/DefaultContextName.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/DefaultContextName.java index a27915b..22a2c51 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/DefaultContextName.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/DefaultContextName.java @@ -1,17 +1,21 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; -public class DefaultContextName { +public class DefaultContextName implements Serializable { + + private static final long serialVersionUID = 1L; public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16); @@ -42,11 +46,11 @@ public class DefaultContextName { return transferSyntaxName; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -121,21 +125,48 @@ public class DefaultContextName { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); - sb.append("abstractSyntaxName: ").append(abstractSyntaxName); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { - sb.append(", "); - sb.append("transferSyntaxName: ").append(transferSyntaxName); + sb.append("{"); + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (abstractSyntaxName != null) { + sb.append("abstractSyntaxName: ").append(abstractSyntaxName); + } + else { + sb.append("abstractSyntaxName: "); + } + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (transferSyntaxName != null) { + sb.append("transferSyntaxName: ").append(transferSyntaxName); + } + else { + sb.append("transferSyntaxName: "); + } + + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/FullyEncodedData.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/FullyEncodedData.java index 41066eb..03f28bc 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/FullyEncodedData.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/FullyEncodedData.java @@ -1,20 +1,24 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; -public class FullyEncodedData { +public class FullyEncodedData implements Serializable { + + private static final long serialVersionUID = 1L; public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16); public byte[] code = null; @@ -35,11 +39,11 @@ public class FullyEncodedData { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -72,7 +76,6 @@ public class FullyEncodedData { public int decode(InputStream is, boolean withTag) throws IOException { int codeLength = 0; int subCodeLength = 0; - BerTag berTag = new BerTag(); if (withTag) { codeLength += tag.decodeAndCheck(is); } @@ -97,31 +100,46 @@ public class FullyEncodedData { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE OF{"); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + sb.append("{\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } if (seqOf == null) { sb.append("null"); } else { Iterator it = seqOf.iterator(); if (it.hasNext()) { - sb.append(it.next()); + it.next().appendAsString(sb, indentLevel + 1); while (it.hasNext()) { - sb.append(", ").append(it.next()); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + it.next().appendAsString(sb, indentLevel + 1); } } } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ModeSelector.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ModeSelector.java index 8c3a2d4..eb3b0c3 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ModeSelector.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ModeSelector.java @@ -1,18 +1,22 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; -public class ModeSelector { +public class ModeSelector implements Serializable { + + private static final long serialVersionUID = 1L; public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 17); @@ -34,11 +38,11 @@ public class ModeSelector { return modeValue; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -101,18 +105,37 @@ public class ModeSelector { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); - sb.append("modeValue: ").append(modeValue); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (modeValue != null) { + sb.append("modeValue: ").append(modeValue); + } + else { + sb.append("modeValue: "); + } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PDVList.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PDVList.java index 3df1402..0374da5 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PDVList.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PDVList.java @@ -1,24 +1,30 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerAny; import org.openmuc.jasn1.ber.types.BerBitString; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.BerObjectIdentifier; import org.openmuc.jasn1.ber.types.BerOctetString; -public class PDVList { +public class PDVList implements Serializable { - public static class PresentationDataValues { + private static final long serialVersionUID = 1L; + + public static class PresentationDataValues implements Serializable { + + private static final long serialVersionUID = 1L; public byte[] code = null; private BerAny singleASN1Type = null; @@ -56,7 +62,7 @@ public class PDVList { return arbitrary; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -138,26 +144,36 @@ public class PDVList { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @Override public String toString() { + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + if (singleASN1Type != null) { - return "CHOICE{singleASN1Type: " + singleASN1Type + "}"; + sb.append("singleASN1Type: ").append(singleASN1Type); + return; } if (octetAligned != null) { - return "CHOICE{octetAligned: " + octetAligned + "}"; + sb.append("octetAligned: ").append(octetAligned); + return; } if (arbitrary != null) { - return "CHOICE{arbitrary: " + arbitrary + "}"; + sb.append("arbitrary: ").append(arbitrary); + return; } - return "unknown"; + sb.append(""); } } @@ -200,11 +216,11 @@ public class PDVList { return presentationDataValues; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -281,30 +297,61 @@ public class PDVList { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); boolean firstSelectedElement = true; if (transferSyntaxName != null) { + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } sb.append("transferSyntaxName: ").append(transferSyntaxName); firstSelectedElement = false; } if (!firstSelectedElement) { - sb.append(", "); + sb.append(",\n"); + } + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (presentationContextIdentifier != null) { + sb.append("presentationContextIdentifier: ").append(presentationContextIdentifier); + } + else { + sb.append("presentationContextIdentifier: "); } - sb.append("presentationContextIdentifier: ").append(presentationContextIdentifier); - sb.append(", "); - sb.append("presentationDataValues: ").append(presentationDataValues); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (presentationDataValues != null) { + sb.append("presentationDataValues: "); + presentationDataValues.appendAsString(sb, indentLevel + 1); + } + else { + sb.append("presentationDataValues: "); + } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionList.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionList.java index b692f3a..d23a190 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionList.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionList.java @@ -1,11 +1,13 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; public class PresentationContextDefinitionList extends ContextList { + private static final long serialVersionUID = 1L; + public PresentationContextDefinitionList() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionResultList.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionResultList.java index 7c6868c..3e61c82 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionResultList.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextDefinitionResultList.java @@ -1,11 +1,13 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; public class PresentationContextDefinitionResultList extends ResultList { + private static final long serialVersionUID = 1L; + public PresentationContextDefinitionResultList() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextIdentifier.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextIdentifier.java index 1163a90..2ab8967 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextIdentifier.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationContextIdentifier.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -10,6 +10,8 @@ import org.openmuc.jasn1.ber.types.BerInteger; public class PresentationContextIdentifier extends BerInteger { + private static final long serialVersionUID = 1L; + public PresentationContextIdentifier() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationRequirements.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationRequirements.java index c503d62..a0f5006 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationRequirements.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationRequirements.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -8,6 +8,8 @@ import org.openmuc.jasn1.ber.types.BerBitString; public class PresentationRequirements extends BerBitString { + private static final long serialVersionUID = 1L; + public PresentationRequirements() { } @@ -19,4 +21,8 @@ public class PresentationRequirements extends BerBitString { super(value, numBits); } + public PresentationRequirements(boolean[] value) { + super(value); + } + } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationSelector.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationSelector.java index e3919de..53e797f 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationSelector.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/PresentationSelector.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -8,6 +8,8 @@ import org.openmuc.jasn1.ber.types.BerOctetString; public class PresentationSelector extends BerOctetString { + private static final long serialVersionUID = 1L; + public PresentationSelector() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ProtocolVersion.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ProtocolVersion.java index 225e66b..31ed117 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ProtocolVersion.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ProtocolVersion.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -8,6 +8,8 @@ import org.openmuc.jasn1.ber.types.BerBitString; public class ProtocolVersion extends BerBitString { + private static final long serialVersionUID = 1L; + public ProtocolVersion() { } @@ -19,4 +21,8 @@ public class ProtocolVersion extends BerBitString { super(value, numBits); } + public ProtocolVersion(boolean[] value) { + super(value); + } + } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/RespondingPresentationSelector.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/RespondingPresentationSelector.java index 57ca615..4e85543 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/RespondingPresentationSelector.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/RespondingPresentationSelector.java @@ -1,11 +1,13 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; public class RespondingPresentationSelector extends PresentationSelector { + private static final long serialVersionUID = 1L; + public RespondingPresentationSelector() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/Result.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/Result.java index 7fa57c0..c4bf8bd 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/Result.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/Result.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -10,6 +10,8 @@ import org.openmuc.jasn1.ber.types.BerInteger; public class Result extends BerInteger { + private static final long serialVersionUID = 1L; + public Result() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ResultList.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ResultList.java index 4ccdbfd..68f23d6 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ResultList.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/ResultList.java @@ -1,23 +1,29 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; -public class ResultList { +public class ResultList implements Serializable { - public static class SEQUENCE { + private static final long serialVersionUID = 1L; + + public static class SEQUENCE implements Serializable { + + private static final long serialVersionUID = 1L; public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16); @@ -57,11 +63,11 @@ public class ResultList { return providerReason; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -157,28 +163,53 @@ public class ResultList { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE{"); - sb.append("result: ").append(result); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{"); + sb.append("\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + if (result != null) { + sb.append("result: ").append(result); + } + else { + sb.append("result: "); + } if (transferSyntaxName != null) { - sb.append(", "); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } sb.append("transferSyntaxName: ").append(transferSyntaxName); } if (providerReason != null) { - sb.append(", "); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } sb.append("providerReason: ").append(providerReason); } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - return sb.toString(); } } @@ -202,11 +233,11 @@ public class ResultList { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -239,7 +270,6 @@ public class ResultList { public int decode(InputStream is, boolean withTag) throws IOException { int codeLength = 0; int subCodeLength = 0; - BerTag berTag = new BerTag(); if (withTag) { codeLength += tag.decodeAndCheck(is); } @@ -264,31 +294,46 @@ public class ResultList { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @Override public String toString() { - StringBuilder sb = new StringBuilder("SEQUENCE OF{"); + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + public void appendAsString(StringBuilder sb, int indentLevel) { + + sb.append("{\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } if (seqOf == null) { sb.append("null"); } else { Iterator it = seqOf.iterator(); if (it.hasNext()) { - sb.append(it.next()); + it.next().appendAsString(sb, indentLevel + 1); while (it.hasNext()) { - sb.append(", ").append(it.next()); + sb.append(",\n"); + for (int i = 0; i < indentLevel + 1; i++) { + sb.append("\t"); + } + it.next().appendAsString(sb, indentLevel + 1); } } } + sb.append("\n"); + for (int i = 0; i < indentLevel; i++) { + sb.append("\t"); + } sb.append("}"); - - return sb.toString(); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/SimplyEncodedData.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/SimplyEncodedData.java index ec431df..a764fd5 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/SimplyEncodedData.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/SimplyEncodedData.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -8,6 +8,8 @@ import org.openmuc.jasn1.ber.types.BerOctetString; public class SimplyEncodedData extends BerOctetString { + private static final long serialVersionUID = 1L; + public SimplyEncodedData() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/TransferSyntaxName.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/TransferSyntaxName.java index f8432c1..8e22a25 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/TransferSyntaxName.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/TransferSyntaxName.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -8,6 +8,8 @@ import org.openmuc.jasn1.ber.types.BerObjectIdentifier; public class TransferSyntaxName extends BerObjectIdentifier { + private static final long serialVersionUID = 1L; + public TransferSyntaxName() { } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserData.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserData.java index 7f04b63..5156f44 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserData.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserData.java @@ -1,16 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; -public class UserData { +public class UserData implements Serializable { + + private static final long serialVersionUID = 1L; public byte[] code = null; private SimplyEncodedData simplyEncodedData = null; @@ -39,7 +43,7 @@ public class UserData { return fullyEncodedData; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -102,22 +106,32 @@ public class UserData { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @Override public String toString() { + StringBuilder sb = new StringBuilder(); + appendAsString(sb, 0); + return sb.toString(); + } + + public void appendAsString(StringBuilder sb, int indentLevel) { + if (simplyEncodedData != null) { - return "CHOICE{simplyEncodedData: " + simplyEncodedData + "}"; + sb.append("simplyEncodedData: ").append(simplyEncodedData); + return; } if (fullyEncodedData != null) { - return "CHOICE{fullyEncodedData: " + fullyEncodedData + "}"; + sb.append("fullyEncodedData: "); + fullyEncodedData.appendAsString(sb, indentLevel + 1); + return; } - return "unknown"; + sb.append(""); } } diff --git a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserSessionRequirements.java b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserSessionRequirements.java index 2cdeeae..0b05e12 100644 --- a/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserSessionRequirements.java +++ b/src/main/java-gen/org/openmuc/josistack/internal/presentation/asn1/UserSessionRequirements.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.7.2-SNAPSHOT (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.josistack.internal.presentation.asn1; @@ -8,6 +8,8 @@ import org.openmuc.jasn1.ber.types.BerBitString; public class UserSessionRequirements extends BerBitString { + private static final long serialVersionUID = 1L; + public UserSessionRequirements() { } @@ -19,4 +21,8 @@ public class UserSessionRequirements extends BerBitString { super(value, numBits); } + public UserSessionRequirements(boolean[] value) { + super(value); + } + } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AccessResult.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AccessResult.java index 6224f78..36d74b6 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AccessResult.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AccessResult.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class AccessResult implements Serializable { @@ -42,7 +43,7 @@ public class AccessResult implements Serializable { return success; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -105,7 +106,7 @@ public class AccessResult implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccess.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccess.java index 4879b16..1e98d83 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccess.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccess.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class AlternateAccess implements Serializable { @@ -41,7 +42,7 @@ public class AlternateAccess implements Serializable { return unnamed; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -90,7 +91,7 @@ public class AlternateAccess implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -134,11 +135,11 @@ public class AlternateAccess implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -195,7 +196,7 @@ public class AlternateAccess implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccessSelection.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccessSelection.java index 3245a23..3f6f19e 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccessSelection.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccessSelection.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerNull; import org.openmuc.jasn1.ber.types.string.BerVisibleString; @@ -52,7 +53,7 @@ public class AlternateAccessSelection implements Serializable { return basic; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -98,7 +99,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -155,11 +156,11 @@ public class AlternateAccessSelection implements Serializable { return numberOfElements; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -234,7 +235,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -324,7 +325,7 @@ public class AlternateAccessSelection implements Serializable { return allElements; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -420,7 +421,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -490,11 +491,11 @@ public class AlternateAccessSelection implements Serializable { return alternateAccess; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -558,7 +559,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -634,7 +635,7 @@ public class AlternateAccessSelection implements Serializable { return basic; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -680,7 +681,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -737,11 +738,11 @@ public class AlternateAccessSelection implements Serializable { return numberOfElements; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -816,7 +817,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -906,7 +907,7 @@ public class AlternateAccessSelection implements Serializable { return allElements; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -1002,7 +1003,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -1069,7 +1070,7 @@ public class AlternateAccessSelection implements Serializable { return selectAccess; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -1132,7 +1133,7 @@ public class AlternateAccessSelection implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/BasicIdentifier.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/BasicIdentifier.java index 58c18b6..e405cb0 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/BasicIdentifier.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/BasicIdentifier.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConcludeRequestPDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConcludeRequestPDU.java index b83e232..f3456a4 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConcludeRequestPDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConcludeRequestPDU.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedErrorPDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedErrorPDU.java index 866049a..87cb0c0 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedErrorPDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedErrorPDU.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class ConfirmedErrorPDU implements Serializable { @@ -54,11 +55,11 @@ public class ConfirmedErrorPDU implements Serializable { return serviceError; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -146,7 +147,7 @@ public class ConfirmedErrorPDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedRequestPDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedRequestPDU.java index 8013580..c0f483d 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedRequestPDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedRequestPDU.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; public class ConfirmedRequestPDU implements Serializable { @@ -46,11 +47,11 @@ public class ConfirmedRequestPDU implements Serializable { return service; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -117,7 +118,7 @@ public class ConfirmedRequestPDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedResponsePDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedResponsePDU.java index 1debf2d..bc1240d 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedResponsePDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedResponsePDU.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; public class ConfirmedResponsePDU implements Serializable { @@ -46,11 +47,11 @@ public class ConfirmedResponsePDU implements Serializable { return service; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -117,7 +118,7 @@ public class ConfirmedResponsePDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceRequest.java index 8c0d7b7..ae6ca3f 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceRequest.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class ConfirmedServiceRequest implements Serializable { @@ -89,7 +90,7 @@ public class ConfirmedServiceRequest implements Serializable { return deleteNamedVariableList; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -230,7 +231,7 @@ public class ConfirmedServiceRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceResponse.java index 539ba01..4d63b21 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceResponse.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class ConfirmedServiceResponse implements Serializable { @@ -88,7 +89,7 @@ public class ConfirmedServiceResponse implements Serializable { return deleteNamedVariableList; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -221,7 +222,7 @@ public class ConfirmedServiceResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Data.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Data.java index 74e301a..dfb7271 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Data.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Data.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBitString; import org.openmuc.jasn1.ber.types.BerBoolean; import org.openmuc.jasn1.ber.types.BerInteger; @@ -49,11 +50,11 @@ public class Data implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -110,7 +111,7 @@ public class Data implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -177,11 +178,11 @@ public class Data implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -238,7 +239,7 @@ public class Data implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -398,7 +399,7 @@ public class Data implements Serializable { return utcTime; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -601,7 +602,7 @@ public class Data implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DataAccessError.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DataAccessError.java index 2c109a4..ebb552b 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DataAccessError.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DataAccessError.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListRequest.java index a314f6b..bf3e0a2 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListRequest.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class DefineNamedVariableListRequest implements Serializable { @@ -45,11 +46,11 @@ public class DefineNamedVariableListRequest implements Serializable { return listOfVariable; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -116,7 +117,7 @@ public class DefineNamedVariableListRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListResponse.java index 898453e..f2fdb08 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListResponse.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java index c301522..d191bab 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.string.BerVisibleString; @@ -44,11 +45,11 @@ public class DeleteNamedVariableListRequest implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -105,7 +106,7 @@ public class DeleteNamedVariableListRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -171,7 +172,7 @@ public class DeleteNamedVariableListRequest implements Serializable { return basic; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -217,7 +218,7 @@ public class DeleteNamedVariableListRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -279,11 +280,11 @@ public class DeleteNamedVariableListRequest implements Serializable { return domainName; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -386,7 +387,7 @@ public class DeleteNamedVariableListRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListResponse.java index 6a95879..6ff4adc 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListResponse.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class DeleteNamedVariableListResponse implements Serializable { @@ -45,11 +46,11 @@ public class DeleteNamedVariableListResponse implements Serializable { return numberDeleted; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -124,7 +125,7 @@ public class DeleteNamedVariableListResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FloatingPoint.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FloatingPoint.java index f147f64..d186ccb 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FloatingPoint.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FloatingPoint.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListRequest.java index fcccc52..7d27d57 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListRequest.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerNull; public class GetNameListRequest implements Serializable { @@ -57,7 +58,7 @@ public class GetNameListRequest implements Serializable { return aaSpecific; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -134,7 +135,7 @@ public class GetNameListRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -206,11 +207,11 @@ public class GetNameListRequest implements Serializable { return continueAfter; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -312,7 +313,7 @@ public class GetNameListRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListResponse.java index efe8df7..a882f6e 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListResponse.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBoolean; public class GetNameListResponse implements Serializable { @@ -43,11 +44,11 @@ public class GetNameListResponse implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -104,7 +105,7 @@ public class GetNameListResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -177,11 +178,11 @@ public class GetNameListResponse implements Serializable { return moreFollows; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -261,7 +262,7 @@ public class GetNameListResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesRequest.java index 43c3912..6869fb0 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesRequest.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesResponse.java index 1043b0d..730f86b 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesResponse.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBoolean; public class GetNamedVariableListAttributesResponse implements Serializable { @@ -46,11 +47,11 @@ public class GetNamedVariableListAttributesResponse implements Serializable { return listOfVariable; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -125,7 +126,7 @@ public class GetNamedVariableListAttributesResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesRequest.java index cd00b9f..4bab170 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesRequest.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class GetVariableAccessAttributesRequest implements Serializable { @@ -34,7 +35,7 @@ public class GetVariableAccessAttributesRequest implements Serializable { return name; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -88,7 +89,7 @@ public class GetVariableAccessAttributesRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesResponse.java index ddd3cad..6142dd3 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesResponse.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBoolean; public class GetVariableAccessAttributesResponse implements Serializable { @@ -46,11 +47,11 @@ public class GetVariableAccessAttributesResponse implements Serializable { return typeDescription; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -130,7 +131,7 @@ public class GetVariableAccessAttributesResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Identifier.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Identifier.java index b26b61a..55632f1 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Identifier.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Identifier.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InformationReport.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InformationReport.java index 17fdd43..71bf957 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InformationReport.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InformationReport.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class InformationReport implements Serializable { @@ -42,11 +43,11 @@ public class InformationReport implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -103,7 +104,7 @@ public class InformationReport implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -176,11 +177,11 @@ public class InformationReport implements Serializable { return listOfAccessResult; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -247,7 +248,7 @@ public class InformationReport implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateErrorPDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateErrorPDU.java index 8ed85de..6b2ddb0 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateErrorPDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateErrorPDU.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateRequestPDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateRequestPDU.java index 73ec638..88a58e9 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateRequestPDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateRequestPDU.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class InitiateRequestPDU implements Serializable { @@ -58,11 +59,11 @@ public class InitiateRequestPDU implements Serializable { return servicesSupportedCalling; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -151,7 +152,7 @@ public class InitiateRequestPDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -264,11 +265,11 @@ public class InitiateRequestPDU implements Serializable { return initRequestDetail; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -383,7 +384,7 @@ public class InitiateRequestPDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateResponsePDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateResponsePDU.java index 9b7922a..78f46da 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateResponsePDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateResponsePDU.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class InitiateResponsePDU implements Serializable { @@ -58,11 +59,11 @@ public class InitiateResponsePDU implements Serializable { return servicesSupportedCalled; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -151,7 +152,7 @@ public class InitiateResponsePDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -264,11 +265,11 @@ public class InitiateResponsePDU implements Serializable { return initResponseDetail; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -383,7 +384,7 @@ public class InitiateResponsePDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer16.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer16.java index df499f2..01194c8 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer16.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer16.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer32.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer32.java index eb3f553..c117d16 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer32.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer32.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer8.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer8.java index d81c78c..3db3b76 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer8.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer8.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSString.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSString.java index bc1f76b..3e8b835 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSString.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSString.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSpdu.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSpdu.java index 8a98e8f..2d41990 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSpdu.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSpdu.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class MMSpdu implements Serializable { @@ -105,7 +106,7 @@ public class MMSpdu implements Serializable { return concludeRequestPDU; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -266,7 +267,7 @@ public class MMSpdu implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectClass.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectClass.java index 7b388a2..829c127 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectClass.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectClass.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; public class ObjectClass implements Serializable { @@ -34,7 +35,7 @@ public class ObjectClass implements Serializable { return basicObjectClass; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -83,7 +84,7 @@ public class ObjectClass implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectName.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectName.java index 5881a82..5cdb733 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectName.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectName.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.string.BerVisibleString; public class ObjectName implements Serializable { @@ -52,11 +53,11 @@ public class ObjectName implements Serializable { return itemID; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -125,7 +126,7 @@ public class ObjectName implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -206,7 +207,7 @@ public class ObjectName implements Serializable { return aaSpecific; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -283,7 +284,7 @@ public class ObjectName implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ParameterSupportOptions.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ParameterSupportOptions.java index ebce7ca..2cfdebe 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ParameterSupportOptions.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ParameterSupportOptions.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; @@ -21,4 +21,8 @@ public class ParameterSupportOptions extends BerBitString { super(value, numBits); } + public ParameterSupportOptions(boolean[] value) { + super(value); + } + } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadRequest.java index bb44014..f90d4b1 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadRequest.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBoolean; public class ReadRequest implements Serializable { @@ -46,11 +47,11 @@ public class ReadRequest implements Serializable { return variableAccessSpecification; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -129,7 +130,7 @@ public class ReadRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadResponse.java index 2f040ee..6b4fdfd 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadResponse.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class ReadResponse implements Serializable { @@ -42,11 +43,11 @@ public class ReadResponse implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -103,7 +104,7 @@ public class ReadResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -176,11 +177,11 @@ public class ReadResponse implements Serializable { return listOfAccessResult; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -259,7 +260,7 @@ public class ReadResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/RejectPDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/RejectPDU.java index 7803d6a..97434ca 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/RejectPDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/RejectPDU.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; public class RejectPDU implements Serializable { @@ -129,7 +130,7 @@ public class RejectPDU implements Serializable { return concludeErrorPDU; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -318,7 +319,7 @@ public class RejectPDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -421,11 +422,11 @@ public class RejectPDU implements Serializable { return rejectReason; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -494,7 +495,7 @@ public class RejectPDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceError.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceError.java index be77405..8dfbfa9 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceError.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceError.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.string.BerVisibleString; @@ -148,7 +149,7 @@ public class ServiceError implements Serializable { return others; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -365,7 +366,7 @@ public class ServiceError implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -487,11 +488,11 @@ public class ServiceError implements Serializable { return additionalDescription; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -592,7 +593,7 @@ public class ServiceError implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceSupportOptions.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceSupportOptions.java index bd57a26..b445c08 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceSupportOptions.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceSupportOptions.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; @@ -21,4 +21,8 @@ public class ServiceSupportOptions extends BerBitString { super(value, numBits); } + public ServiceSupportOptions(boolean[] value) { + super(value); + } + } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TimeOfDay.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TimeOfDay.java index 16ea396..e4f3eef 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TimeOfDay.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TimeOfDay.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeDescription.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeDescription.java index e346001..6569a96 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeDescription.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeDescription.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBoolean; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.BerNull; @@ -66,11 +67,11 @@ public class TypeDescription implements Serializable { return elementType; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -163,7 +164,7 @@ public class TypeDescription implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -263,11 +264,11 @@ public class TypeDescription implements Serializable { return componentType; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -346,7 +347,7 @@ public class TypeDescription implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -413,11 +414,11 @@ public class TypeDescription implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -474,7 +475,7 @@ public class TypeDescription implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -547,11 +548,11 @@ public class TypeDescription implements Serializable { return components; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -625,7 +626,7 @@ public class TypeDescription implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -706,11 +707,11 @@ public class TypeDescription implements Serializable { return exponentWidth; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -779,7 +780,7 @@ public class TypeDescription implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -941,7 +942,7 @@ public class TypeDescription implements Serializable { return utcTime; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -1144,7 +1145,7 @@ public class TypeDescription implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeSpecification.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeSpecification.java index 1da9af7..a1ca156 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeSpecification.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeSpecification.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class TypeSpecification implements Serializable { @@ -33,7 +34,7 @@ public class TypeSpecification implements Serializable { return typeDescription; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -82,7 +83,7 @@ public class TypeSpecification implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedPDU.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedPDU.java index 76d3b1f..e473399 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedPDU.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedPDU.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class UnconfirmedPDU implements Serializable { @@ -36,11 +37,11 @@ public class UnconfirmedPDU implements Serializable { return service; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -96,7 +97,7 @@ public class UnconfirmedPDU implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedService.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedService.java index ae5b30d..d2215ce 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedService.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedService.java @@ -1,15 +1,16 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class UnconfirmedService implements Serializable { @@ -33,7 +34,7 @@ public class UnconfirmedService implements Serializable { return informationReport; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -82,7 +83,7 @@ public class UnconfirmedService implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned16.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned16.java index d0198e2..490a2b2 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned16.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned16.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned32.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned32.java index 8387066..5b2aa24 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned32.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned32.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned8.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned8.java index dacc0ea..9a4b9cc 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned8.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned8.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UtcTime.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UtcTime.java index 0683866..0c5be45 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UtcTime.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UtcTime.java @@ -1,5 +1,5 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableAccessSpecification.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableAccessSpecification.java index 480610a..1e792d4 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableAccessSpecification.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableAccessSpecification.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class VariableAccessSpecification implements Serializable { @@ -43,7 +44,7 @@ public class VariableAccessSpecification implements Serializable { return variableListName; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -111,7 +112,7 @@ public class VariableAccessSpecification implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableDefs.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableDefs.java index 4843c74..eadf9d9 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableDefs.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableDefs.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class VariableDefs implements Serializable { @@ -52,11 +53,11 @@ public class VariableDefs implements Serializable { return alternateAccess; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -128,7 +129,7 @@ public class VariableDefs implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -192,11 +193,11 @@ public class VariableDefs implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -253,7 +254,7 @@ public class VariableDefs implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableSpecification.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableSpecification.java index d94e8a1..5049fc8 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableSpecification.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableSpecification.java @@ -1,16 +1,17 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class VariableSpecification implements Serializable { @@ -34,7 +35,7 @@ public class VariableSpecification implements Serializable { return name; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -88,7 +89,7 @@ public class VariableSpecification implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteRequest.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteRequest.java index 5fecb32..2dd0545 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteRequest.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteRequest.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; public class WriteRequest implements Serializable { @@ -42,11 +43,11 @@ public class WriteRequest implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -103,7 +104,7 @@ public class WriteRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } @@ -176,11 +177,11 @@ public class WriteRequest implements Serializable { return listOfData; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -247,7 +248,7 @@ public class WriteRequest implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteResponse.java b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteResponse.java index d1e56aa..35ad50b 100644 --- a/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteResponse.java +++ b/src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteResponse.java @@ -1,19 +1,20 @@ /** - * This class file was automatically generated by jASN1 v1.8.0 (http://www.openmuc.org) + * This class file was automatically generated by jASN1 v1.9.0 (http://www.openmuc.org) */ package org.openmuc.openiec61850.internal.mms.asn1; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; import org.openmuc.jasn1.ber.BerLength; import org.openmuc.jasn1.ber.BerTag; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerNull; public class WriteResponse implements Serializable { @@ -51,7 +52,7 @@ public class WriteResponse implements Serializable { return success; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -114,7 +115,7 @@ public class WriteResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os); code = os.getArray(); } @@ -162,11 +163,11 @@ public class WriteResponse implements Serializable { return seqOf; } - public int encode(BerByteArrayOutputStream os) throws IOException { + public int encode(OutputStream os) throws IOException { return encode(os, true); } - public int encode(BerByteArrayOutputStream os, boolean withTag) throws IOException { + public int encode(OutputStream os, boolean withTag) throws IOException { if (code != null) { for (int i = code.length - 1; i >= 0; i--) { @@ -223,7 +224,7 @@ public class WriteResponse implements Serializable { } public void encodeAndSave(int encodingSizeGuess) throws IOException { - BerByteArrayOutputStream os = new BerByteArrayOutputStream(encodingSizeGuess); + ReverseByteArrayOutputStream os = new ReverseByteArrayOutputStream(encodingSizeGuess); encode(os, false); code = os.getArray(); } diff --git a/src/main/java/org/openmuc/josistack/AcseAssociation.java b/src/main/java/org/openmuc/josistack/AcseAssociation.java index 2602c53..e0d1685 100644 --- a/src/main/java/org/openmuc/josistack/AcseAssociation.java +++ b/src/main/java/org/openmuc/josistack/AcseAssociation.java @@ -29,7 +29,7 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeoutException; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerAny; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.BerObjectIdentifier; @@ -147,10 +147,10 @@ public final class AcseAssociation { ACSEApdu acse = new ACSEApdu(); acse.setAare(aare); - BerByteArrayOutputStream berOStream = new BerByteArrayOutputStream(100, true); - acse.encode(berOStream); + ReverseByteArrayOutputStream reverseOStream = new ReverseByteArrayOutputStream(100, true); + acse.encode(reverseOStream); - UserData userData = getPresentationUserDataField(berOStream.getArray()); + UserData userData = getPresentationUserDataField(reverseOStream.getArray()); CPAPPDU.NormalModeParameters normalModeParameters = new CPAPPDU.NormalModeParameters(); normalModeParameters.setRespondingPresentationSelector(pSelLocalBerOctetString); normalModeParameters.setPresentationContextDefinitionResultList(presentationResultList); @@ -160,16 +160,16 @@ public final class AcseAssociation { cpaPPdu.setModeSelector(normalModeSelector); cpaPPdu.setNormalModeParameters(normalModeParameters); - berOStream.reset(); - cpaPPdu.encode(berOStream, true); + reverseOStream.reset(); + cpaPPdu.encode(reverseOStream, true); List ssduList = new LinkedList<>(); List ssduOffsets = new LinkedList<>(); List ssduLengths = new LinkedList<>(); - ssduList.add(berOStream.buffer); - ssduOffsets.add(berOStream.index + 1); - ssduLengths.add(berOStream.buffer.length - (berOStream.index + 1)); + ssduList.add(reverseOStream.buffer); + ssduOffsets.add(reverseOStream.index + 1); + ssduLengths.add(reverseOStream.buffer.length - (reverseOStream.index + 1)); writeSessionAccept(ssduList, ssduOffsets, ssduLengths); @@ -325,10 +325,10 @@ public final class AcseAssociation { ACSEApdu acse = new ACSEApdu(); acse.setAarq(aarq); - BerByteArrayOutputStream berOStream = new BerByteArrayOutputStream(200, true); - acse.encode(berOStream); + ReverseByteArrayOutputStream reverseOStream = new ReverseByteArrayOutputStream(200, true); + acse.encode(reverseOStream); - UserData userData = getPresentationUserDataField(berOStream.getArray()); + UserData userData = getPresentationUserDataField(reverseOStream.getArray()); CPType.NormalModeParameters normalModeParameter = new CPType.NormalModeParameters(); normalModeParameter @@ -341,16 +341,16 @@ public final class AcseAssociation { cpType.setModeSelector(normalModeSelector); cpType.setNormalModeParameters(normalModeParameter); - berOStream.reset(); - cpType.encode(berOStream, true); + reverseOStream.reset(); + cpType.encode(reverseOStream, true); List ssduList = new LinkedList<>(); List ssduOffsets = new LinkedList<>(); List ssduLengths = new LinkedList<>(); - ssduList.add(berOStream.buffer); - ssduOffsets.add(berOStream.index + 1); - ssduLengths.add(berOStream.buffer.length - (berOStream.index + 1)); + ssduList.add(reverseOStream.buffer); + ssduOffsets.add(reverseOStream.index + 1); + ssduLengths.add(reverseOStream.buffer.length - (reverseOStream.index + 1)); ByteBuffer res = null; res = startSConnection(ssduList, ssduOffsets, ssduLengths, address, port, localAddr, localPort, tSAP, @@ -632,12 +632,12 @@ public final class AcseAssociation { UserData user_data = new UserData(); user_data.setFullyEncodedData(fully_encoded_data); - BerByteArrayOutputStream berOStream = new BerByteArrayOutputStream(200, true); - user_data.encode(berOStream); + ReverseByteArrayOutputStream reverseOStream = new ReverseByteArrayOutputStream(200, true); + user_data.encode(reverseOStream); - ssduList.add(berOStream.buffer); - ssduOffsets.add(berOStream.index + 1); - ssduLengths.add(berOStream.buffer.length - (berOStream.index + 1)); + ssduList.add(reverseOStream.buffer); + ssduOffsets.add(reverseOStream.index + 1); + ssduLengths.add(reverseOStream.buffer.length - (reverseOStream.index + 1)); } private void encodeSessionLayer(List ssduList, List ssduOffsets, List ssduLengths) diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt128.java b/src/main/java/org/openmuc/openiec61850/BdaInt128.java index b3454a2..e86bc31 100644 --- a/src/main/java/org/openmuc/openiec61850/BdaInt128.java +++ b/src/main/java/org/openmuc/openiec61850/BdaInt128.java @@ -89,4 +89,4 @@ public final class BdaInt128 extends BasicDataAttribute { return getReference().toString() + ": " + value; } -} \ No newline at end of file +} diff --git a/src/main/java/org/openmuc/openiec61850/ClientAssociation.java b/src/main/java/org/openmuc/openiec61850/ClientAssociation.java index 8183f73..426291e 100644 --- a/src/main/java/org/openmuc/openiec61850/ClientAssociation.java +++ b/src/main/java/org/openmuc/openiec61850/ClientAssociation.java @@ -31,7 +31,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBoolean; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.BerNull; @@ -99,7 +99,7 @@ public final class ClientAssociation { private final BlockingQueue incomingResponses = new LinkedBlockingQueue<>(); - private final BerByteArrayOutputStream berOStream = new BerByteArrayOutputStream(500, true); + private final ReverseByteArrayOutputStream reverseOStream = new ReverseByteArrayOutputStream(500, true); ServerModel serverModel; @@ -508,10 +508,10 @@ public final class ClientAssociation { MMSpdu requestPdu = new MMSpdu(); requestPdu.setConfirmedRequestPDU(confirmedRequestPdu); - berOStream.reset(); + reverseOStream.reset(); try { - requestPdu.encode(berOStream); + requestPdu.encode(reverseOStream); } catch (Exception e) { IOException e2 = new IOException("Error encoding MmsPdu.", e); clientReceiver.close(e2); @@ -520,7 +520,7 @@ public final class ClientAssociation { clientReceiver.setResponseExpected(currentInvokeId); try { - acseAssociation.send(berOStream.getByteBuffer()); + acseAssociation.send(reverseOStream.getByteBuffer()); } catch (IOException e) { IOException e2 = new IOException("Error sending packet.", e); clientReceiver.close(e2); @@ -572,12 +572,12 @@ public final class ClientAssociation { MMSpdu initiateRequestMMSpdu = constructInitRequestPdu(proposedMaxPduSize, proposedMaxServOutstandingCalling, proposedMaxServOutstandingCalled, proposedDataStructureNestingLevel, servicesSupportedCalling); - BerByteArrayOutputStream berOStream = new BerByteArrayOutputStream(500, true); - initiateRequestMMSpdu.encode(berOStream); + ReverseByteArrayOutputStream reverseOStream = new ReverseByteArrayOutputStream(500, true); + initiateRequestMMSpdu.encode(reverseOStream); try { acseAssociation = acseSap.associate(address, port, localAddr, localPort, authenticationParameter, - berOStream.getByteBuffer()); + reverseOStream.getByteBuffer()); ByteBuffer initResponse = acseAssociation.getAssociateResponseAPdu(); diff --git a/src/main/java/org/openmuc/openiec61850/SclParser.java b/src/main/java/org/openmuc/openiec61850/SclParser.java index aa7ac34..cf9d034 100644 --- a/src/main/java/org/openmuc/openiec61850/SclParser.java +++ b/src/main/java/org/openmuc/openiec61850/SclParser.java @@ -679,13 +679,15 @@ final class SclParser { false)); } - children.add(new BdaOctetString(new ObjectReference(reportObjRef.toString() + ".Owner"), fc, "", 64, false, false)); + children.add(new BdaOctetString(new ObjectReference(reportObjRef.toString() + ".Owner"), fc, "", 64, + false, false)); rcb = new Brcb(reportObjRef, children); } else { - children.add(new BdaOctetString(new ObjectReference(reportObjRef.toString() + ".Owner"), fc, "", 64, false, false)); + children.add(new BdaOctetString(new ObjectReference(reportObjRef.toString() + ".Owner"), fc, "", 64, + false, false)); rcb = new Urcb(reportObjRef, children); @@ -994,7 +996,7 @@ final class SclParser { Integer.parseInt(dattr.getbType().substring(5)), dchg, dupd); if (val != null) { // TODO - //throw new SclParseException("parsing configured value for octet string is not supported yet."); + // throw new SclParseException("parsing configured value for octet string is not supported yet."); } return bda; } diff --git a/src/main/java/org/openmuc/openiec61850/ServerAssociation.java b/src/main/java/org/openmuc/openiec61850/ServerAssociation.java index 9030930..bbbe934 100644 --- a/src/main/java/org/openmuc/openiec61850/ServerAssociation.java +++ b/src/main/java/org/openmuc/openiec61850/ServerAssociation.java @@ -32,7 +32,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeoutException; -import org.openmuc.jasn1.ber.BerByteArrayOutputStream; +import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream; import org.openmuc.jasn1.ber.types.BerBoolean; import org.openmuc.jasn1.ber.types.BerInteger; import org.openmuc.jasn1.ber.types.BerNull; @@ -101,7 +101,7 @@ final class ServerAssociation { private final ServerSap serverSap; final ServerModel serverModel; - private final BerByteArrayOutputStream berOStream = new BerByteArrayOutputStream(500, true); + private final ReverseByteArrayOutputStream reverseOStream = new ReverseByteArrayOutputStream(500, true); private boolean insertRef; private String continueAfter; @@ -144,9 +144,9 @@ final class ServerAssociation { MMSpdu initiateResponseMmsPdu = constructAssociationResponsePdu(mmsPdu.getInitiateRequestPDU()); - initiateResponseMmsPdu.encode(berOStream); + initiateResponseMmsPdu.encode(reverseOStream); - acseAssociation.accept(berOStream.getByteBuffer()); + acseAssociation.accept(reverseOStream.getByteBuffer()); } @@ -376,16 +376,16 @@ final class ServerAssociation { boolean sendAnMmsPdu(MMSpdu mmsResponsePdu) { - synchronized (berOStream) { - berOStream.reset(); + synchronized (reverseOStream) { + reverseOStream.reset(); try { - mmsResponsePdu.encode(berOStream); + mmsResponsePdu.encode(reverseOStream); } catch (IOException e1) { logger.error("IOException while encoding MMS PDU. Closing association.", e1); return false; } try { - acseAssociation.send(berOStream.getByteBuffer()); + acseAssociation.send(reverseOStream.getByteBuffer()); } catch (IOException e) { logger.warn("IOException while sending MMS PDU. Closing association.", e); return false;