From 3082a3739ed3606874b75bb6ffadf915bbe4ad71 Mon Sep 17 00:00:00 2001 From: Stefan Feuerhahn Date: Fri, 22 Mar 2019 11:04:00 +0100 Subject: [PATCH] reformat code again using google java formatter --- .../internal/acse/asn1/Myexternal.java | 1 + .../internal/acse/asn1/Myexternal2.java | 1 + .../internal/presentation/asn1/CPAPPDU.java | 1 + .../internal/presentation/asn1/CPType.java | 1 + .../presentation/asn1/ContextList.java | 2 + .../internal/presentation/asn1/PDVList.java | 1 + .../presentation/asn1/ResultList.java | 1 + .../internal/mms/asn1/AlternateAccess.java | 1 + .../mms/asn1/AlternateAccessSelection.java | 6 +++ .../openiec61850/internal/mms/asn1/Data.java | 2 + .../asn1/DeleteNamedVariableListRequest.java | 2 + .../mms/asn1/FileDirectoryResponse.java | 1 + .../internal/mms/asn1/GetNameListRequest.java | 1 + .../mms/asn1/GetNameListResponse.java | 1 + .../internal/mms/asn1/InformationReport.java | 1 + .../internal/mms/asn1/InitiateRequestPDU.java | 1 + .../mms/asn1/InitiateResponsePDU.java | 1 + .../internal/mms/asn1/ObjectName.java | 1 + .../internal/mms/asn1/ReadResponse.java | 1 + .../internal/mms/asn1/RejectPDU.java | 1 + .../internal/mms/asn1/ServiceError.java | 1 + .../internal/mms/asn1/TypeDescription.java | 4 ++ .../internal/mms/asn1/VariableDefs.java | 1 + .../internal/mms/asn1/WriteRequest.java | 1 + .../internal/mms/asn1/WriteResponse.java | 1 + .../com/beanit/josistack/AcseAssociation.java | 34 +++++++------- .../com/beanit/josistack/ClientAcseSap.java | 2 +- .../com/beanit/josistack/ServerAcseSap.java | 6 +-- .../beanit/jositransport/ServerThread.java | 2 +- .../com/beanit/openiec61850/AcseListener.java | 4 +- .../java/com/beanit/openiec61850/Array.java | 8 ++-- .../com/beanit/openiec61850/BdaBitString.java | 2 +- .../com/beanit/openiec61850/BdaBoolean.java | 4 +- .../com/beanit/openiec61850/BdaEntryTime.java | 2 +- .../com/beanit/openiec61850/BdaFloat32.java | 2 +- .../com/beanit/openiec61850/BdaFloat64.java | 2 +- .../com/beanit/openiec61850/BdaInt128.java | 2 +- .../com/beanit/openiec61850/BdaInt16.java | 2 +- .../com/beanit/openiec61850/BdaInt16U.java | 2 +- .../com/beanit/openiec61850/BdaInt32.java | 2 +- .../com/beanit/openiec61850/BdaInt32U.java | 2 +- .../com/beanit/openiec61850/BdaInt64.java | 2 +- .../java/com/beanit/openiec61850/BdaInt8.java | 2 +- .../com/beanit/openiec61850/BdaInt8U.java | 2 +- .../beanit/openiec61850/BdaOctetString.java | 4 +- .../com/beanit/openiec61850/BdaTimestamp.java | 6 +-- .../beanit/openiec61850/BdaVisibleString.java | 2 +- .../openiec61850/ClientAssociation.java | 44 +++++++++---------- .../com/beanit/openiec61850/ClientSap.java | 2 +- .../ConstructedDataAttribute.java | 4 +- .../openiec61850/DataDefinitionResParser.java | 8 ++-- .../java/com/beanit/openiec61850/DataSet.java | 4 +- .../com/beanit/openiec61850/FcDataObject.java | 2 +- .../com/beanit/openiec61850/FcModelNode.java | 6 +-- .../com/beanit/openiec61850/ModelNode.java | 12 ++--- .../beanit/openiec61850/ReportEntryData.java | 4 +- .../com/beanit/openiec61850/SclParser.java | 20 ++++----- .../openiec61850/ServerAssociation.java | 40 ++++++++--------- .../com/beanit/openiec61850/ServerModel.java | 8 ++-- .../com/beanit/openiec61850/ServerSap.java | 4 +- .../java/com/beanit/openiec61850/Urcb.java | 18 ++++---- .../openiec61850/app/ConsoleClient.java | 10 ++--- .../openiec61850/app/ConsoleServer.java | 6 +-- .../openiec61850/clientgui/BasicDataBind.java | 4 +- .../openiec61850/clientgui/ClientGui.java | 10 ++--- .../clientgui/DataObjectTreeCellRenderer.java | 4 +- .../clientgui/DataObjectTreeNode.java | 4 +- .../clientgui/DataSetTreeNode.java | 4 +- .../openiec61850/clientgui/DataTreeNode.java | 4 +- .../clientgui/ServerModelParser.java | 14 +++--- .../clientgui/databind/BooleanDataBind.java | 4 +- .../clientgui/databind/CheckDataBind.java | 6 +-- .../databind/DoubleBitPosDataBind.java | 4 +- .../clientgui/databind/EntryTimeDataBind.java | 4 +- .../databind/OctetStringDataBind.java | 4 +- .../clientgui/databind/OptfldsDataBind.java | 6 +-- .../clientgui/databind/QualityDataBind.java | 6 +-- .../databind/ReasonForInclusionDataBind.java | 6 +-- .../databind/TapCommandDataBind.java | 4 +- .../clientgui/databind/TextFieldDataBind.java | 6 +-- .../clientgui/databind/TimeStampDataBind.java | 6 +-- .../databind/TriggerConditionDataBind.java | 6 +-- .../databind/UnicodeStringDataBind.java | 4 +- .../databind/VisibleStringDataBind.java | 4 +- .../openiec61850/internal/scl/DaType.java | 2 +- .../openiec61850/internal/scl/DoType.java | 2 +- .../openiec61850/internal/scl/EnumType.java | 2 +- .../openiec61850/internal/scl/LnType.java | 2 +- .../integrationtests/ClientServerITest.java | 20 ++++----- .../integrationtests/ClientServerITest2.java | 16 +++---- .../integrationtests/ReportingTest.java | 18 ++++---- .../integrationtests/SclTests.java | 2 +- 92 files changed, 269 insertions(+), 233 deletions(-) diff --git a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java index b23e44c..955e30d 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java +++ b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java @@ -22,6 +22,7 @@ public class Myexternal implements Serializable { private BerObjectIdentifier directReference = null; private BerInteger indirectReference = null; private Encoding encoding = null; + public Myexternal() {} public Myexternal(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java index 9c96dd8..ca401c4 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java +++ b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java @@ -22,6 +22,7 @@ public class Myexternal2 implements Serializable { private BerObjectIdentifier directReference = null; private BerInteger indirectReference = null; private Encoding encoding = null; + public Myexternal2() {} public Myexternal2(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java index 949a5e7..5fde886 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java @@ -16,6 +16,7 @@ public class CPAPPDU implements Serializable { public byte[] code = null; private ModeSelector modeSelector = null; private NormalModeParameters normalModeParameters = null; + public CPAPPDU() {} public CPAPPDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java index f56e184..a071944 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java @@ -16,6 +16,7 @@ public class CPType implements Serializable { public byte[] code = null; private ModeSelector modeSelector = null; private NormalModeParameters normalModeParameters = null; + public CPType() {} public CPType(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java index be91bb2..13b28ee 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java @@ -20,6 +20,7 @@ public class ContextList implements Serializable { private static final long serialVersionUID = 1L; public byte[] code = null; private List seqOf = null; + public ContextList() { seqOf = new ArrayList<>(); } @@ -147,6 +148,7 @@ public class ContextList implements Serializable { private PresentationContextIdentifier presentationContextIdentifier = null; private AbstractSyntaxName abstractSyntaxName = null; private TransferSyntaxNameList transferSyntaxNameList = null; + public SEQUENCE() {} public SEQUENCE(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java index 30cf865..a609c76 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java @@ -22,6 +22,7 @@ public class PDVList implements Serializable { private TransferSyntaxName transferSyntaxName = null; private PresentationContextIdentifier presentationContextIdentifier = null; private PresentationDataValues presentationDataValues = null; + public PDVList() {} public PDVList(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java index 8fa3da4..4aab4e2 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java @@ -19,6 +19,7 @@ public class ResultList implements Serializable { private static final long serialVersionUID = 1L; public byte[] code = null; private List seqOf = null; + public ResultList() { seqOf = new ArrayList<>(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java index ed8ff96..c7fdafd 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java @@ -18,6 +18,7 @@ public class AlternateAccess implements Serializable { private static final long serialVersionUID = 1L; public byte[] code = null; private List seqOf = null; + public AlternateAccess() { seqOf = new ArrayList<>(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java index 02de8eb..82dc014 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java @@ -20,6 +20,7 @@ public class AlternateAccessSelection implements Serializable { private SelectAccess selectAccess = null; public AlternateAccessSelection() {} + public AlternateAccessSelection(byte[] code) { this.code = code; } @@ -138,6 +139,7 @@ public class AlternateAccessSelection implements Serializable { public byte[] code = null; private AccessSelection accessSelection = null; private AlternateAccess alternateAccess = null; + public SelectAlternateAccess() {} public SelectAlternateAccess(byte[] code) { @@ -282,7 +284,9 @@ public class AlternateAccessSelection implements Serializable { private Unsigned32 index = null; private IndexRange indexRange = null; private BerNull allElements = null; + public AccessSelection() {} + public AccessSelection(byte[] code) { this.code = code; } @@ -707,7 +711,9 @@ public class AlternateAccessSelection implements Serializable { private Unsigned32 index = null; private IndexRange indexRange = null; private BerNull allElements = null; + public SelectAccess() {} + public SelectAccess(byte[] code) { this.code = code; } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java index 8cd135f..ae457a9 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java @@ -34,7 +34,9 @@ public class Data implements Serializable { private TimeOfDay binaryTime = null; private MMSString mMSString = null; private UtcTime utcTime = null; + public Data() {} + public Data(byte[] code) { this.code = code; } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java index e1d8bb5..e9b9cc9 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java @@ -22,7 +22,9 @@ public class DeleteNamedVariableListRequest implements Serializable { private BerInteger scopeOfDelete = null; private ListOfVariableListName listOfVariableListName = null; private DomainName domainName = null; + public DeleteNamedVariableListRequest() {} + public DeleteNamedVariableListRequest(byte[] code) { this.code = code; } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java index d3e33f1..5101341 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java @@ -20,6 +20,7 @@ public class FileDirectoryResponse implements Serializable { public byte[] code = null; private ListOfDirectoryEntry listOfDirectoryEntry = null; private BerBoolean moreFollows = null; + public FileDirectoryResponse() {} public FileDirectoryResponse(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java index ef8a5d0..0b319db 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java @@ -18,6 +18,7 @@ public class GetNameListRequest implements Serializable { private ObjectClass objectClass = null; private ObjectScope objectScope = null; private Identifier continueAfter = null; + public GetNameListRequest() {} public GetNameListRequest(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java index 4e30fa2..8b20650 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java @@ -20,6 +20,7 @@ public class GetNameListResponse implements Serializable { public byte[] code = null; private ListOfIdentifier listOfIdentifier = null; private BerBoolean moreFollows = null; + public GetNameListResponse() {} public GetNameListResponse(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java index 06b29c2..64d4d70 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java @@ -19,6 +19,7 @@ public class InformationReport implements Serializable { public byte[] code = null; private VariableAccessSpecification variableAccessSpecification = null; private ListOfAccessResult listOfAccessResult = null; + public InformationReport() {} public InformationReport(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java index 6c773a4..205a027 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java @@ -19,6 +19,7 @@ public class InitiateRequestPDU implements Serializable { private Integer16 proposedMaxServOutstandingCalled = null; private Integer8 proposedDataStructureNestingLevel = null; private InitRequestDetail initRequestDetail = null; + public InitiateRequestPDU() {} public InitiateRequestPDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java index c5a8fa7..9f47c08 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java @@ -19,6 +19,7 @@ public class InitiateResponsePDU implements Serializable { private Integer16 negotiatedMaxServOutstandingCalled = null; private Integer8 negotiatedDataStructureNestingLevel = null; private InitResponseDetail initResponseDetail = null; + public InitiateResponsePDU() {} public InitiateResponsePDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java index 4a6c919..db83dac 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java @@ -18,6 +18,7 @@ public class ObjectName implements Serializable { private Identifier vmdSpecific = null; private DomainSpecific domainSpecific = null; private Identifier aaSpecific = null; + public ObjectName() {} public ObjectName(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java index 73cd6cd..c84c776 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java @@ -19,6 +19,7 @@ public class ReadResponse implements Serializable { public byte[] code = null; private VariableAccessSpecification variableAccessSpecification = null; private ListOfAccessResult listOfAccessResult = null; + public ReadResponse() {} public ReadResponse(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java index e77dd84..4880422 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java @@ -17,6 +17,7 @@ public class RejectPDU implements Serializable { public byte[] code = null; private Unsigned32 originalInvokeID = null; private RejectReason rejectReason = null; + public RejectPDU() {} public RejectPDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java index b1ed6ff..da11573 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java @@ -19,6 +19,7 @@ public class ServiceError implements Serializable { private ErrorClass errorClass = null; private BerInteger additionalCode = null; private BerVisibleString additionalDescription = null; + public ServiceError() {} public ServiceError(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java index a39ee6b..9f657c0 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java @@ -32,7 +32,9 @@ public class TypeDescription implements Serializable { private BerBoolean binaryTime = null; private Integer32 mMSString = null; private BerNull utcTime = null; + public TypeDescription() {} + public TypeDescription(byte[] code) { this.code = code; } @@ -615,6 +617,7 @@ public class TypeDescription implements Serializable { public byte[] code = null; private BerBoolean packed = null; private Components components = null; + public Structure() {} public Structure(byte[] code) { @@ -767,6 +770,7 @@ public class TypeDescription implements Serializable { private static final long serialVersionUID = 1L; public byte[] code = null; private List seqOf = null; + public Components() { seqOf = new ArrayList<>(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java index e3ff655..38b52a5 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java @@ -18,6 +18,7 @@ public class VariableDefs implements Serializable { private static final long serialVersionUID = 1L; public byte[] code = null; private List seqOf = null; + public VariableDefs() { seqOf = new ArrayList<>(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java index 4f664ea..2e22c79 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java @@ -19,6 +19,7 @@ public class WriteRequest implements Serializable { public byte[] code = null; private VariableAccessSpecification variableAccessSpecification = null; private ListOfData listOfData = null; + public WriteRequest() {} public WriteRequest(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java index 3c7eb7f..d0071d5 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java @@ -19,6 +19,7 @@ public class WriteResponse implements Serializable { private static final long serialVersionUID = 1L; public byte[] code = null; private List seqOf = null; + public WriteResponse() { seqOf = new ArrayList<>(); } diff --git a/src/main/java/com/beanit/josistack/AcseAssociation.java b/src/main/java/com/beanit/josistack/AcseAssociation.java index 2f28cde..8bb6b68 100644 --- a/src/main/java/com/beanit/josistack/AcseAssociation.java +++ b/src/main/java/com/beanit/josistack/AcseAssociation.java @@ -13,23 +13,6 @@ */ package com.beanit.josistack; -import java.io.ByteArrayInputStream; -import java.io.EOFException; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.net.InetAddress; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.TimeoutException; -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; -import org.openmuc.jasn1.ber.types.string.BerGraphicString; import com.beanit.josistack.internal.acse.asn1.AAREApdu; import com.beanit.josistack.internal.acse.asn1.AARQApdu; import com.beanit.josistack.internal.acse.asn1.ACSEApdu; @@ -58,6 +41,23 @@ import com.beanit.josistack.internal.presentation.asn1.RespondingPresentationSel import com.beanit.josistack.internal.presentation.asn1.UserData; import com.beanit.jositransport.ClientTSap; import com.beanit.jositransport.TConnection; +import java.io.ByteArrayInputStream; +import java.io.EOFException; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigInteger; +import java.net.InetAddress; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.TimeoutException; +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; +import org.openmuc.jasn1.ber.types.string.BerGraphicString; public final class AcseAssociation { diff --git a/src/main/java/com/beanit/josistack/ClientAcseSap.java b/src/main/java/com/beanit/josistack/ClientAcseSap.java index ba83b1f..228cdae 100644 --- a/src/main/java/com/beanit/josistack/ClientAcseSap.java +++ b/src/main/java/com/beanit/josistack/ClientAcseSap.java @@ -13,11 +13,11 @@ */ package com.beanit.josistack; +import com.beanit.jositransport.ClientTSap; import java.io.IOException; import java.net.InetAddress; import java.nio.ByteBuffer; import javax.net.SocketFactory; -import com.beanit.jositransport.ClientTSap; /** * This class implements the Service Access Point (SAP) for the Application Control Service Element diff --git a/src/main/java/com/beanit/josistack/ServerAcseSap.java b/src/main/java/com/beanit/josistack/ServerAcseSap.java index c224526..2ef9bfe 100644 --- a/src/main/java/com/beanit/josistack/ServerAcseSap.java +++ b/src/main/java/com/beanit/josistack/ServerAcseSap.java @@ -13,14 +13,14 @@ */ package com.beanit.josistack; +import com.beanit.jositransport.ServerTSap; +import com.beanit.jositransport.TConnection; +import com.beanit.jositransport.TConnectionListener; import java.io.IOException; import java.net.InetAddress; import java.nio.ByteBuffer; import java.util.concurrent.TimeoutException; import javax.net.ServerSocketFactory; -import com.beanit.jositransport.ServerTSap; -import com.beanit.jositransport.TConnection; -import com.beanit.jositransport.TConnectionListener; /** * This class implements the server Service Access Point (SAP) for the Application Control Service diff --git a/src/main/java/com/beanit/jositransport/ServerThread.java b/src/main/java/com/beanit/jositransport/ServerThread.java index 682729e..29e8a49 100644 --- a/src/main/java/com/beanit/jositransport/ServerThread.java +++ b/src/main/java/com/beanit/jositransport/ServerThread.java @@ -13,12 +13,12 @@ */ package com.beanit.jositransport; +import com.beanit.openiec61850.internal.NamedDefaultThreadFactory; import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import com.beanit.openiec61850.internal.NamedDefaultThreadFactory; /** * This class extends Thread. It is started by ServerTSAP and listens on a socket for connections diff --git a/src/main/java/com/beanit/openiec61850/AcseListener.java b/src/main/java/com/beanit/openiec61850/AcseListener.java index f92e124..57b35c9 100644 --- a/src/main/java/com/beanit/openiec61850/AcseListener.java +++ b/src/main/java/com/beanit/openiec61850/AcseListener.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import java.io.IOException; -import java.nio.ByteBuffer; import com.beanit.josistack.AcseAssociation; import com.beanit.josistack.AcseAssociationListener; +import java.io.IOException; +import java.nio.ByteBuffer; final class AcseListener implements AcseAssociationListener { diff --git a/src/main/java/com/beanit/openiec61850/Array.java b/src/main/java/com/beanit/openiec61850/Array.java index 6fb634f..ef7d8b6 100644 --- a/src/main/java/com/beanit/openiec61850/Array.java +++ b/src/main/java/com/beanit/openiec61850/Array.java @@ -13,15 +13,15 @@ */ package com.beanit.openiec61850; +import com.beanit.openiec61850.internal.mms.asn1.Data; +import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; +import com.beanit.openiec61850.internal.mms.asn1.TypeSpecification; +import com.beanit.openiec61850.internal.mms.asn1.Unsigned32; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import com.beanit.openiec61850.internal.mms.asn1.Data; -import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; -import com.beanit.openiec61850.internal.mms.asn1.TypeSpecification; -import com.beanit.openiec61850.internal.mms.asn1.Unsigned32; /** * An Array can contain up to n instances of one and the same DataObject, ConstructedDataAttribute, diff --git a/src/main/java/com/beanit/openiec61850/BdaBitString.java b/src/main/java/com/beanit/openiec61850/BdaBitString.java index 4731b9a..6393a13 100644 --- a/src/main/java/com/beanit/openiec61850/BdaBitString.java +++ b/src/main/java/com/beanit/openiec61850/BdaBitString.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerBitString; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.Integer32; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; +import org.openmuc.jasn1.ber.types.BerBitString; public abstract class BdaBitString extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaBoolean.java b/src/main/java/com/beanit/openiec61850/BdaBoolean.java index da3fe63..de3f457 100644 --- a/src/main/java/com/beanit/openiec61850/BdaBoolean.java +++ b/src/main/java/com/beanit/openiec61850/BdaBoolean.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerBoolean; -import org.openmuc.jasn1.ber.types.BerNull; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; +import org.openmuc.jasn1.ber.types.BerBoolean; +import org.openmuc.jasn1.ber.types.BerNull; public final class BdaBoolean extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaEntryTime.java b/src/main/java/com/beanit/openiec61850/BdaEntryTime.java index 8dc1462..949933d 100644 --- a/src/main/java/com/beanit/openiec61850/BdaEntryTime.java +++ b/src/main/java/com/beanit/openiec61850/BdaEntryTime.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerBoolean; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TimeOfDay; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; +import org.openmuc.jasn1.ber.types.BerBoolean; /** * BdaEntryTime stores time in terms of days and ms since 1984. diff --git a/src/main/java/com/beanit/openiec61850/BdaFloat32.java b/src/main/java/com/beanit/openiec61850/BdaFloat32.java index 2e718df..b3c8349 100644 --- a/src/main/java/com/beanit/openiec61850/BdaFloat32.java +++ b/src/main/java/com/beanit/openiec61850/BdaFloat32.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850; -import java.nio.ByteBuffer; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.FloatingPoint; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import java.nio.ByteBuffer; public final class BdaFloat32 extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaFloat64.java b/src/main/java/com/beanit/openiec61850/BdaFloat64.java index ad9571d..9be2514 100644 --- a/src/main/java/com/beanit/openiec61850/BdaFloat64.java +++ b/src/main/java/com/beanit/openiec61850/BdaFloat64.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850; -import java.nio.ByteBuffer; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.FloatingPoint; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import java.nio.ByteBuffer; public final class BdaFloat64 extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt128.java b/src/main/java/com/beanit/openiec61850/BdaInt128.java index a9c414a..faddb98 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt128.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt128.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt128 extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt16.java b/src/main/java/com/beanit/openiec61850/BdaInt16.java index d18bff9..a1f2424 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt16.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt16.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt16 extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt16U.java b/src/main/java/com/beanit/openiec61850/BdaInt16U.java index e4be57a..077e7a0 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt16U.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt16U.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt16U extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt32.java b/src/main/java/com/beanit/openiec61850/BdaInt32.java index be2c185..4f67ddb 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt32.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt32.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt32 extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt32U.java b/src/main/java/com/beanit/openiec61850/BdaInt32U.java index 848b077..4e50e05 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt32U.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt32U.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt32U extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt64.java b/src/main/java/com/beanit/openiec61850/BdaInt64.java index 6384c9c..8a421d5 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt64.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt64.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt64 extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt8.java b/src/main/java/com/beanit/openiec61850/BdaInt8.java index 8009a80..ab7e679 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt8.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt8.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt8 extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaInt8U.java b/src/main/java/com/beanit/openiec61850/BdaInt8U.java index 9274d5a..1a30714 100644 --- a/src/main/java/com/beanit/openiec61850/BdaInt8U.java +++ b/src/main/java/com/beanit/openiec61850/BdaInt8U.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.BerInteger; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.Unsigned8; +import org.openmuc.jasn1.ber.types.BerInteger; public final class BdaInt8U extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaOctetString.java b/src/main/java/com/beanit/openiec61850/BdaOctetString.java index 2d3a00c..e9d8703 100644 --- a/src/main/java/com/beanit/openiec61850/BdaOctetString.java +++ b/src/main/java/com/beanit/openiec61850/BdaOctetString.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850; -import java.util.Arrays; -import org.openmuc.jasn1.ber.types.BerOctetString; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.Integer32; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; +import java.util.Arrays; +import org.openmuc.jasn1.ber.types.BerOctetString; public final class BdaOctetString extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaTimestamp.java b/src/main/java/com/beanit/openiec61850/BdaTimestamp.java index c06abfa..cffa98d 100644 --- a/src/main/java/com/beanit/openiec61850/BdaTimestamp.java +++ b/src/main/java/com/beanit/openiec61850/BdaTimestamp.java @@ -13,12 +13,12 @@ */ package com.beanit.openiec61850; -import java.util.Calendar; -import java.util.Date; -import org.openmuc.jasn1.ber.types.BerNull; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.UtcTime; +import java.util.Calendar; +import java.util.Date; +import org.openmuc.jasn1.ber.types.BerNull; public final class BdaTimestamp extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/BdaVisibleString.java b/src/main/java/com/beanit/openiec61850/BdaVisibleString.java index 293cf99..86c705a 100644 --- a/src/main/java/com/beanit/openiec61850/BdaVisibleString.java +++ b/src/main/java/com/beanit/openiec61850/BdaVisibleString.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; -import org.openmuc.jasn1.ber.types.string.BerVisibleString; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.Integer32; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; +import org.openmuc.jasn1.ber.types.string.BerVisibleString; public final class BdaVisibleString extends BasicDataAttribute { diff --git a/src/main/java/com/beanit/openiec61850/ClientAssociation.java b/src/main/java/com/beanit/openiec61850/ClientAssociation.java index 5720ed6..42c976d 100644 --- a/src/main/java/com/beanit/openiec61850/ClientAssociation.java +++ b/src/main/java/com/beanit/openiec61850/ClientAssociation.java @@ -13,28 +13,6 @@ */ package com.beanit.openiec61850; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.InetAddress; -import java.nio.ByteBuffer; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -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; -import org.openmuc.jasn1.ber.types.string.BerGraphicString; -import org.openmuc.jasn1.ber.types.string.BerVisibleString; import com.beanit.josistack.AcseAssociation; import com.beanit.josistack.ByteBufferInputStream; import com.beanit.josistack.ClientAcseSap; @@ -86,6 +64,28 @@ import com.beanit.openiec61850.internal.mms.asn1.VariableDefs; import com.beanit.openiec61850.internal.mms.asn1.WriteRequest; import com.beanit.openiec61850.internal.mms.asn1.WriteRequest.ListOfData; import com.beanit.openiec61850.internal.mms.asn1.WriteResponse; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.InetAddress; +import java.nio.ByteBuffer; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +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; +import org.openmuc.jasn1.ber.types.string.BerGraphicString; +import org.openmuc.jasn1.ber.types.string.BerVisibleString; /** * Represents an association/connection to an IEC 61850 MMS server. An instance of diff --git a/src/main/java/com/beanit/openiec61850/ClientSap.java b/src/main/java/com/beanit/openiec61850/ClientSap.java index 90262ea..9e7eaf4 100644 --- a/src/main/java/com/beanit/openiec61850/ClientSap.java +++ b/src/main/java/com/beanit/openiec61850/ClientSap.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850; +import com.beanit.josistack.ClientAcseSap; import java.io.IOException; import java.net.InetAddress; import javax.net.SocketFactory; -import com.beanit.josistack.ClientAcseSap; /** * The ClientSap class represents the IEC 61850 service access point for client diff --git a/src/main/java/com/beanit/openiec61850/ConstructedDataAttribute.java b/src/main/java/com/beanit/openiec61850/ConstructedDataAttribute.java index c5bec26..5f068e2 100644 --- a/src/main/java/com/beanit/openiec61850/ConstructedDataAttribute.java +++ b/src/main/java/com/beanit/openiec61850/ConstructedDataAttribute.java @@ -13,12 +13,12 @@ */ package com.beanit.openiec61850; +import com.beanit.openiec61850.internal.mms.asn1.Data; +import com.beanit.openiec61850.internal.mms.asn1.Data.Structure; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; -import com.beanit.openiec61850.internal.mms.asn1.Data; -import com.beanit.openiec61850.internal.mms.asn1.Data.Structure; public final class ConstructedDataAttribute extends FcModelNode { diff --git a/src/main/java/com/beanit/openiec61850/DataDefinitionResParser.java b/src/main/java/com/beanit/openiec61850/DataDefinitionResParser.java index 379e15f..9915244 100644 --- a/src/main/java/com/beanit/openiec61850/DataDefinitionResParser.java +++ b/src/main/java/com/beanit/openiec61850/DataDefinitionResParser.java @@ -13,15 +13,15 @@ */ package com.beanit.openiec61850; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; import com.beanit.openiec61850.internal.mms.asn1.ConfirmedServiceResponse; import com.beanit.openiec61850.internal.mms.asn1.GetVariableAccessAttributesResponse; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription.Structure.Components; import com.beanit.openiec61850.internal.mms.asn1.TypeSpecification; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; final class DataDefinitionResParser { diff --git a/src/main/java/com/beanit/openiec61850/DataSet.java b/src/main/java/com/beanit/openiec61850/DataSet.java index 1080677..ea1a934 100644 --- a/src/main/java/com/beanit/openiec61850/DataSet.java +++ b/src/main/java/com/beanit/openiec61850/DataSet.java @@ -13,6 +13,8 @@ */ package com.beanit.openiec61850; +import com.beanit.openiec61850.internal.mms.asn1.Identifier; +import com.beanit.openiec61850.internal.mms.asn1.ObjectName; import java.util.ArrayList; import java.util.EnumMap; import java.util.Iterator; @@ -20,8 +22,6 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.beanit.openiec61850.internal.mms.asn1.Identifier; -import com.beanit.openiec61850.internal.mms.asn1.ObjectName; public final class DataSet implements Iterable { diff --git a/src/main/java/com/beanit/openiec61850/FcDataObject.java b/src/main/java/com/beanit/openiec61850/FcDataObject.java index 1a59080..fcb8fc3 100644 --- a/src/main/java/com/beanit/openiec61850/FcDataObject.java +++ b/src/main/java/com/beanit/openiec61850/FcDataObject.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850; +import com.beanit.openiec61850.internal.mms.asn1.Data; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; -import com.beanit.openiec61850.internal.mms.asn1.Data; /** * This class represents a functionally constraint DataObject. That means it has unique reference diff --git a/src/main/java/com/beanit/openiec61850/FcModelNode.java b/src/main/java/com/beanit/openiec61850/FcModelNode.java index e2c58f0..4f93402 100644 --- a/src/main/java/com/beanit/openiec61850/FcModelNode.java +++ b/src/main/java/com/beanit/openiec61850/FcModelNode.java @@ -13,9 +13,6 @@ */ package com.beanit.openiec61850; -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; import com.beanit.openiec61850.internal.mms.asn1.AlternateAccess; import com.beanit.openiec61850.internal.mms.asn1.AlternateAccessSelection; import com.beanit.openiec61850.internal.mms.asn1.AlternateAccessSelection.SelectAccess; @@ -26,6 +23,9 @@ import com.beanit.openiec61850.internal.mms.asn1.ObjectName; import com.beanit.openiec61850.internal.mms.asn1.Unsigned32; import com.beanit.openiec61850.internal.mms.asn1.VariableDefs; import com.beanit.openiec61850.internal.mms.asn1.VariableSpecification; +import java.util.List; +import java.util.Timer; +import java.util.TimerTask; public abstract class FcModelNode extends ModelNode { diff --git a/src/main/java/com/beanit/openiec61850/ModelNode.java b/src/main/java/com/beanit/openiec61850/ModelNode.java index 091ab69..a03fc05 100644 --- a/src/main/java/com/beanit/openiec61850/ModelNode.java +++ b/src/main/java/com/beanit/openiec61850/ModelNode.java @@ -13,18 +13,18 @@ */ package com.beanit.openiec61850; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.Identifier; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription.Structure; import com.beanit.openiec61850.internal.mms.asn1.TypeDescription.Structure.Components; import com.beanit.openiec61850.internal.mms.asn1.TypeSpecification; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; public abstract class ModelNode implements Iterable { diff --git a/src/main/java/com/beanit/openiec61850/ReportEntryData.java b/src/main/java/com/beanit/openiec61850/ReportEntryData.java index bdb5556..954f0a3 100644 --- a/src/main/java/com/beanit/openiec61850/ReportEntryData.java +++ b/src/main/java/com/beanit/openiec61850/ReportEntryData.java @@ -15,7 +15,7 @@ package com.beanit.openiec61850; public class ReportEntryData { - /** Not specified in IEC61850 but useful for data persistence */ + /** Not specified in IEC61850 but useful for data persistence */ private long id;; /** Reference to to {@link DataSet}-member */ private String dataRef; @@ -67,7 +67,7 @@ public class ReportEntryData { this.report = report; } -public static enum ReasonCode { + public static enum ReasonCode { DCHG, QCHG, DUPD, diff --git a/src/main/java/com/beanit/openiec61850/SclParser.java b/src/main/java/com/beanit/openiec61850/SclParser.java index 68874d8..4630ec5 100644 --- a/src/main/java/com/beanit/openiec61850/SclParser.java +++ b/src/main/java/com/beanit/openiec61850/SclParser.java @@ -13,16 +13,6 @@ */ package com.beanit.openiec61850; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import javax.xml.parsers.DocumentBuilderFactory; import com.beanit.openiec61850.internal.scl.AbstractDataAttribute; import com.beanit.openiec61850.internal.scl.Bda; import com.beanit.openiec61850.internal.scl.Da; @@ -35,6 +25,16 @@ import com.beanit.openiec61850.internal.scl.LnSubDef; import com.beanit.openiec61850.internal.scl.LnType; import com.beanit.openiec61850.internal.scl.Sdo; import com.beanit.openiec61850.internal.scl.TypeDefinitions; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import javax.xml.parsers.DocumentBuilderFactory; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; diff --git a/src/main/java/com/beanit/openiec61850/ServerAssociation.java b/src/main/java/com/beanit/openiec61850/ServerAssociation.java index 69c77d9..1db08e1 100644 --- a/src/main/java/com/beanit/openiec61850/ServerAssociation.java +++ b/src/main/java/com/beanit/openiec61850/ServerAssociation.java @@ -13,26 +13,6 @@ */ package com.beanit.openiec61850; -import java.io.ByteArrayInputStream; -import java.io.EOFException; -import java.io.IOException; -import java.net.SocketTimeoutException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.ListIterator; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeoutException; -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; -import org.openmuc.jasn1.ber.types.string.BerVisibleString; import com.beanit.josistack.AcseAssociation; import com.beanit.josistack.ByteBufferInputStream; import com.beanit.josistack.DecodingException; @@ -79,6 +59,26 @@ import com.beanit.openiec61850.internal.mms.asn1.VariableAccessSpecification; import com.beanit.openiec61850.internal.mms.asn1.VariableDefs; import com.beanit.openiec61850.internal.mms.asn1.WriteRequest; import com.beanit.openiec61850.internal.mms.asn1.WriteResponse; +import java.io.ByteArrayInputStream; +import java.io.EOFException; +import java.io.IOException; +import java.net.SocketTimeoutException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeoutException; +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; +import org.openmuc.jasn1.ber.types.string.BerVisibleString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/beanit/openiec61850/ServerModel.java b/src/main/java/com/beanit/openiec61850/ServerModel.java index 9b45fae..1e196c9 100644 --- a/src/main/java/com/beanit/openiec61850/ServerModel.java +++ b/src/main/java/com/beanit/openiec61850/ServerModel.java @@ -13,6 +13,10 @@ */ package com.beanit.openiec61850; +import com.beanit.openiec61850.internal.mms.asn1.AlternateAccessSelection; +import com.beanit.openiec61850.internal.mms.asn1.ObjectName; +import com.beanit.openiec61850.internal.mms.asn1.ObjectName.DomainSpecific; +import com.beanit.openiec61850.internal.mms.asn1.VariableDefs; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -21,10 +25,6 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.beanit.openiec61850.internal.mms.asn1.AlternateAccessSelection; -import com.beanit.openiec61850.internal.mms.asn1.ObjectName; -import com.beanit.openiec61850.internal.mms.asn1.ObjectName.DomainSpecific; -import com.beanit.openiec61850.internal.mms.asn1.VariableDefs; public final class ServerModel extends ModelNode { diff --git a/src/main/java/com/beanit/openiec61850/ServerSap.java b/src/main/java/com/beanit/openiec61850/ServerSap.java index 9077fce..4d85335 100644 --- a/src/main/java/com/beanit/openiec61850/ServerSap.java +++ b/src/main/java/com/beanit/openiec61850/ServerSap.java @@ -13,6 +13,8 @@ */ package com.beanit.openiec61850; +import com.beanit.josistack.AcseAssociation; +import com.beanit.josistack.ServerAcseSap; import java.io.IOException; import java.net.InetAddress; import java.nio.ByteBuffer; @@ -20,8 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Timer; import javax.net.ServerSocketFactory; -import com.beanit.josistack.AcseAssociation; -import com.beanit.josistack.ServerAcseSap; /** * The ServerSap class represents the IEC 61850 service access point for server diff --git a/src/main/java/com/beanit/openiec61850/Urcb.java b/src/main/java/com/beanit/openiec61850/Urcb.java index 398cb20..4ceb007 100644 --- a/src/main/java/com/beanit/openiec61850/Urcb.java +++ b/src/main/java/com/beanit/openiec61850/Urcb.java @@ -13,15 +13,6 @@ */ package com.beanit.openiec61850; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import org.openmuc.jasn1.ber.types.BerBitString; import com.beanit.openiec61850.internal.mms.asn1.AccessResult; import com.beanit.openiec61850.internal.mms.asn1.Data; import com.beanit.openiec61850.internal.mms.asn1.Identifier; @@ -31,6 +22,15 @@ import com.beanit.openiec61850.internal.mms.asn1.ObjectName; import com.beanit.openiec61850.internal.mms.asn1.UnconfirmedPDU; import com.beanit.openiec61850.internal.mms.asn1.UnconfirmedService; import com.beanit.openiec61850.internal.mms.asn1.VariableAccessSpecification; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import org.openmuc.jasn1.ber.types.BerBitString; public class Urcb extends Rcb { diff --git a/src/main/java/com/beanit/openiec61850/app/ConsoleClient.java b/src/main/java/com/beanit/openiec61850/app/ConsoleClient.java index 6eb7ee2..49171ad 100644 --- a/src/main/java/com/beanit/openiec61850/app/ConsoleClient.java +++ b/src/main/java/com/beanit/openiec61850/app/ConsoleClient.java @@ -13,11 +13,6 @@ */ package com.beanit.openiec61850.app; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.List; import com.beanit.openiec61850.BdaTriggerConditions; import com.beanit.openiec61850.Brcb; import com.beanit.openiec61850.ClientAssociation; @@ -44,6 +39,11 @@ import com.beanit.openiec61850.internal.cli.CliParser; import com.beanit.openiec61850.internal.cli.FatalActionException; import com.beanit.openiec61850.internal.cli.IntCliParameter; import com.beanit.openiec61850.internal.cli.StringCliParameter; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; public class ConsoleClient { diff --git a/src/main/java/com/beanit/openiec61850/app/ConsoleServer.java b/src/main/java/com/beanit/openiec61850/app/ConsoleServer.java index b81ce25..0365af3 100644 --- a/src/main/java/com/beanit/openiec61850/app/ConsoleServer.java +++ b/src/main/java/com/beanit/openiec61850/app/ConsoleServer.java @@ -13,9 +13,6 @@ */ package com.beanit.openiec61850.app; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaBoolean; import com.beanit.openiec61850.BdaFloat32; @@ -45,6 +42,9 @@ import com.beanit.openiec61850.internal.cli.CliParseException; import com.beanit.openiec61850.internal.cli.CliParser; import com.beanit.openiec61850.internal.cli.IntCliParameter; import com.beanit.openiec61850.internal.cli.StringCliParameter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; public class ConsoleServer { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/BasicDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/BasicDataBind.java index 81e7221..619b7c6 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/BasicDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/BasicDataBind.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850.clientgui; -import javax.swing.JComponent; -import javax.swing.JLabel; import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaType; +import javax.swing.JComponent; +import javax.swing.JLabel; public abstract class BasicDataBind { protected final E data; diff --git a/src/main/java/com/beanit/openiec61850/clientgui/ClientGui.java b/src/main/java/com/beanit/openiec61850/clientgui/ClientGui.java index 0e3670b..1c5f4d2 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/ClientGui.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/ClientGui.java @@ -13,6 +13,11 @@ */ package com.beanit.openiec61850.clientgui; +import com.beanit.openiec61850.ClientAssociation; +import com.beanit.openiec61850.ClientSap; +import com.beanit.openiec61850.ServerModel; +import com.beanit.openiec61850.ServiceError; +import com.beanit.openiec61850.clientgui.util.Counter; import java.awt.Component; import java.awt.Dimension; import java.awt.GridBagConstraints; @@ -44,11 +49,6 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; -import com.beanit.openiec61850.ClientAssociation; -import com.beanit.openiec61850.ClientSap; -import com.beanit.openiec61850.ServerModel; -import com.beanit.openiec61850.ServiceError; -import com.beanit.openiec61850.clientgui.util.Counter; public class ClientGui extends JFrame implements ActionListener, TreeSelectionListener { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeCellRenderer.java b/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeCellRenderer.java index e9a01eb..59c97f5 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeCellRenderer.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeCellRenderer.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850.clientgui; +import com.beanit.openiec61850.BasicDataAttribute; +import com.beanit.openiec61850.FcModelNode; import java.awt.Component; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import com.beanit.openiec61850.BasicDataAttribute; -import com.beanit.openiec61850.FcModelNode; public class DataObjectTreeCellRenderer extends DefaultTreeCellRenderer { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeNode.java b/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeNode.java index 771a6a2..5cd0bad 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeNode.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/DataObjectTreeNode.java @@ -13,8 +13,6 @@ */ package com.beanit.openiec61850.clientgui; -import java.io.IOException; -import javax.swing.tree.DefaultMutableTreeNode; import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaBoolean; import com.beanit.openiec61850.BdaCheck; @@ -65,6 +63,8 @@ import com.beanit.openiec61850.clientgui.databind.TimeStampDataBind; import com.beanit.openiec61850.clientgui.databind.TriggerConditionDataBind; import com.beanit.openiec61850.clientgui.databind.UnicodeStringDataBind; import com.beanit.openiec61850.clientgui.databind.VisibleStringDataBind; +import java.io.IOException; +import javax.swing.tree.DefaultMutableTreeNode; public class DataObjectTreeNode extends DefaultMutableTreeNode implements DataTreeNode { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/DataSetTreeNode.java b/src/main/java/com/beanit/openiec61850/clientgui/DataSetTreeNode.java index 3a30db6..477fb68 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/DataSetTreeNode.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/DataSetTreeNode.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850.clientgui; -import java.io.IOException; -import javax.swing.tree.DefaultMutableTreeNode; import com.beanit.openiec61850.ClientAssociation; import com.beanit.openiec61850.DataSet; import com.beanit.openiec61850.ServiceError; +import java.io.IOException; +import javax.swing.tree.DefaultMutableTreeNode; public class DataSetTreeNode extends DefaultMutableTreeNode implements DataTreeNode { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/DataTreeNode.java b/src/main/java/com/beanit/openiec61850/clientgui/DataTreeNode.java index c2c911d..2d569e4 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/DataTreeNode.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/DataTreeNode.java @@ -13,10 +13,10 @@ */ package com.beanit.openiec61850.clientgui; -import java.io.IOException; -import javax.swing.tree.TreeNode; import com.beanit.openiec61850.ClientAssociation; import com.beanit.openiec61850.ServiceError; +import java.io.IOException; +import javax.swing.tree.TreeNode; public interface DataTreeNode { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/ServerModelParser.java b/src/main/java/com/beanit/openiec61850/clientgui/ServerModelParser.java index 88d15e1..94c07aa 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/ServerModelParser.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/ServerModelParser.java @@ -13,13 +13,6 @@ */ package com.beanit.openiec61850.clientgui; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import javax.swing.tree.TreeNode; import com.beanit.openiec61850.DataSet; import com.beanit.openiec61850.Fc; import com.beanit.openiec61850.FcModelNode; @@ -27,6 +20,13 @@ import com.beanit.openiec61850.LogicalDevice; import com.beanit.openiec61850.LogicalNode; import com.beanit.openiec61850.ModelNode; import com.beanit.openiec61850.ServerModel; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import javax.swing.tree.TreeNode; public class ServerModelParser { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/BooleanDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/BooleanDataBind.java index a2abcbf..2945ad5 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/BooleanDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/BooleanDataBind.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850.clientgui.databind; -import javax.swing.JCheckBox; -import javax.swing.JComponent; import com.beanit.openiec61850.BdaBoolean; import com.beanit.openiec61850.BdaType; import com.beanit.openiec61850.clientgui.BasicDataBind; +import javax.swing.JCheckBox; +import javax.swing.JComponent; public class BooleanDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/CheckDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/CheckDataBind.java index 37f0272..d75a206 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/CheckDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/CheckDataBind.java @@ -13,14 +13,14 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaCheck; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.clientgui.BasicDataBind; import java.awt.Component; import javax.swing.BoxLayout; import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JPanel; -import com.beanit.openiec61850.BdaCheck; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.clientgui.BasicDataBind; public class CheckDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/DoubleBitPosDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/DoubleBitPosDataBind.java index 8370224..010fafe 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/DoubleBitPosDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/DoubleBitPosDataBind.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850.clientgui.databind; -import javax.swing.JComboBox; -import javax.swing.JComponent; import com.beanit.openiec61850.BdaDoubleBitPos; import com.beanit.openiec61850.BdaType; import com.beanit.openiec61850.clientgui.BasicDataBind; +import javax.swing.JComboBox; +import javax.swing.JComponent; public class DoubleBitPosDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/EntryTimeDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/EntryTimeDataBind.java index a754a21..81d6d66 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/EntryTimeDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/EntryTimeDataBind.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850.clientgui.databind; -import javax.swing.JComponent; -import javax.swing.JLabel; import com.beanit.openiec61850.BdaEntryTime; import com.beanit.openiec61850.BdaType; import com.beanit.openiec61850.clientgui.BasicDataBind; +import javax.swing.JComponent; +import javax.swing.JLabel; public class EntryTimeDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/OctetStringDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/OctetStringDataBind.java index bda27ef..f32c591 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/OctetStringDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/OctetStringDataBind.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850.clientgui.databind; -import javax.swing.JComponent; -import javax.swing.JLabel; import com.beanit.openiec61850.BdaOctetString; import com.beanit.openiec61850.BdaType; import com.beanit.openiec61850.clientgui.BasicDataBind; +import javax.swing.JComponent; +import javax.swing.JLabel; public class OctetStringDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/OptfldsDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/OptfldsDataBind.java index e696b27..31446c2 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/OptfldsDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/OptfldsDataBind.java @@ -13,14 +13,14 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaOptFlds; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.clientgui.BasicDataBind; import java.awt.Component; import javax.swing.BoxLayout; import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JPanel; -import com.beanit.openiec61850.BdaOptFlds; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.clientgui.BasicDataBind; public class OptfldsDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/QualityDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/QualityDataBind.java index ad9adc9..43ff968 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/QualityDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/QualityDataBind.java @@ -13,15 +13,15 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaQuality; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.clientgui.BasicDataBind; import java.awt.Component; import javax.swing.BoxLayout; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JPanel; -import com.beanit.openiec61850.BdaQuality; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.clientgui.BasicDataBind; public class QualityDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java index 4fa31c3..88ee19d 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java @@ -13,14 +13,14 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaReasonForInclusion; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.clientgui.BasicDataBind; import java.awt.Component; import javax.swing.BoxLayout; import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JPanel; -import com.beanit.openiec61850.BdaReasonForInclusion; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.clientgui.BasicDataBind; public class ReasonForInclusionDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/TapCommandDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/TapCommandDataBind.java index 9a58c96..fc827e4 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/TapCommandDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/TapCommandDataBind.java @@ -13,11 +13,11 @@ */ package com.beanit.openiec61850.clientgui.databind; -import javax.swing.JComboBox; -import javax.swing.JComponent; import com.beanit.openiec61850.BdaTapCommand; import com.beanit.openiec61850.BdaType; import com.beanit.openiec61850.clientgui.BasicDataBind; +import javax.swing.JComboBox; +import javax.swing.JComponent; public class TapCommandDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/TextFieldDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/TextFieldDataBind.java index 9ca124a..88be445 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/TextFieldDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/TextFieldDataBind.java @@ -13,6 +13,9 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BasicDataAttribute; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.clientgui.BasicDataBind; import javax.swing.JComponent; import javax.swing.JTextField; import javax.swing.text.AttributeSet; @@ -20,9 +23,6 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Document; import javax.swing.text.DocumentFilter; import javax.swing.text.PlainDocument; -import com.beanit.openiec61850.BasicDataAttribute; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.clientgui.BasicDataBind; public abstract class TextFieldDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/TimeStampDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/TimeStampDataBind.java index e270126..803948f 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/TimeStampDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/TimeStampDataBind.java @@ -13,6 +13,9 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaTimestamp; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.clientgui.BasicDataBind; import com.toedter.calendar.JDateChooser; import java.awt.Dimension; import java.awt.FlowLayout; @@ -22,9 +25,6 @@ import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JSpinner; import javax.swing.SpinnerDateModel; -import com.beanit.openiec61850.BdaTimestamp; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.clientgui.BasicDataBind; public class TimeStampDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/TriggerConditionDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/TriggerConditionDataBind.java index b8f591a..6d729f4 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/TriggerConditionDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/TriggerConditionDataBind.java @@ -13,14 +13,14 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaTriggerConditions; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.clientgui.BasicDataBind; import java.awt.Component; import javax.swing.BoxLayout; import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JPanel; -import com.beanit.openiec61850.BdaTriggerConditions; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.clientgui.BasicDataBind; public class TriggerConditionDataBind extends BasicDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/UnicodeStringDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/UnicodeStringDataBind.java index f8fc38c..2058c97 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/UnicodeStringDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/UnicodeStringDataBind.java @@ -13,12 +13,12 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.BdaUnicodeString; import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.BdaUnicodeString; public class UnicodeStringDataBind extends TextFieldDataBind { diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/VisibleStringDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/VisibleStringDataBind.java index 02469a5..0f8f583 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/VisibleStringDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/VisibleStringDataBind.java @@ -13,12 +13,12 @@ */ package com.beanit.openiec61850.clientgui.databind; +import com.beanit.openiec61850.BdaType; +import com.beanit.openiec61850.BdaVisibleString; import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; -import com.beanit.openiec61850.BdaType; -import com.beanit.openiec61850.BdaVisibleString; public class VisibleStringDataBind extends TextFieldDataBind { diff --git a/src/main/java/com/beanit/openiec61850/internal/scl/DaType.java b/src/main/java/com/beanit/openiec61850/internal/scl/DaType.java index 440a357..717bdc8 100644 --- a/src/main/java/com/beanit/openiec61850/internal/scl/DaType.java +++ b/src/main/java/com/beanit/openiec61850/internal/scl/DaType.java @@ -13,9 +13,9 @@ */ package com.beanit.openiec61850.internal.scl; +import com.beanit.openiec61850.SclParseException; import java.util.ArrayList; import java.util.List; -import com.beanit.openiec61850.SclParseException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/com/beanit/openiec61850/internal/scl/DoType.java b/src/main/java/com/beanit/openiec61850/internal/scl/DoType.java index dc54485..27288de 100644 --- a/src/main/java/com/beanit/openiec61850/internal/scl/DoType.java +++ b/src/main/java/com/beanit/openiec61850/internal/scl/DoType.java @@ -13,9 +13,9 @@ */ package com.beanit.openiec61850.internal.scl; +import com.beanit.openiec61850.SclParseException; import java.util.ArrayList; import java.util.List; -import com.beanit.openiec61850.SclParseException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/com/beanit/openiec61850/internal/scl/EnumType.java b/src/main/java/com/beanit/openiec61850/internal/scl/EnumType.java index 2297d0d..6c91d1e 100644 --- a/src/main/java/com/beanit/openiec61850/internal/scl/EnumType.java +++ b/src/main/java/com/beanit/openiec61850/internal/scl/EnumType.java @@ -13,9 +13,9 @@ */ package com.beanit.openiec61850.internal.scl; +import com.beanit.openiec61850.SclParseException; import java.util.ArrayList; import java.util.List; -import com.beanit.openiec61850.SclParseException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/com/beanit/openiec61850/internal/scl/LnType.java b/src/main/java/com/beanit/openiec61850/internal/scl/LnType.java index 2995938..3b5555e 100644 --- a/src/main/java/com/beanit/openiec61850/internal/scl/LnType.java +++ b/src/main/java/com/beanit/openiec61850/internal/scl/LnType.java @@ -13,9 +13,9 @@ */ package com.beanit.openiec61850.internal.scl; +import com.beanit.openiec61850.SclParseException; import java.util.ArrayList; import java.util.List; -import com.beanit.openiec61850.SclParseException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java index 0d5a97f..713f59c 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java @@ -13,16 +13,6 @@ */ package com.beanit.openiec61850.integrationtests; -import java.io.IOException; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import javax.naming.ConfigurationException; -import org.junit.Assert; -import org.junit.Test; import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaBoolean; import com.beanit.openiec61850.BdaFloat32; @@ -48,6 +38,16 @@ import com.beanit.openiec61850.ServerModel; import com.beanit.openiec61850.ServerSap; import com.beanit.openiec61850.ServiceError; import com.beanit.openiec61850.Urcb; +import java.io.IOException; +import java.net.InetAddress; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import javax.naming.ConfigurationException; +import org.junit.Assert; +import org.junit.Test; public class ClientServerITest extends Thread implements ServerEventListener, ClientEventListener { diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java index f56a055..b985d68 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java @@ -13,14 +13,6 @@ */ package com.beanit.openiec61850.integrationtests; -import java.io.IOException; -import java.net.InetAddress; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import javax.naming.ConfigurationException; -import org.junit.Assert; -import org.junit.Test; import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaReasonForInclusion; import com.beanit.openiec61850.ClientAssociation; @@ -36,6 +28,14 @@ import com.beanit.openiec61850.ServerEventListener; import com.beanit.openiec61850.ServerModel; import com.beanit.openiec61850.ServerSap; import com.beanit.openiec61850.ServiceError; +import java.io.IOException; +import java.net.InetAddress; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import javax.naming.ConfigurationException; +import org.junit.Assert; +import org.junit.Test; public class ClientServerITest2 extends Thread implements ServerEventListener, ClientEventListener { diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java b/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java index 1158566..aed852f 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java @@ -15,15 +15,6 @@ package com.beanit.openiec61850.integrationtests; import static org.junit.Assert.assertNotNull; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.List; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaFloat32; import com.beanit.openiec61850.ClientAssociation; @@ -40,6 +31,15 @@ import com.beanit.openiec61850.ServerModel; import com.beanit.openiec61850.ServerSap; import com.beanit.openiec61850.ServiceError; import com.beanit.openiec61850.Urcb; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class ReportingTest implements ClientEventListener { diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java b/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java index b19650e..d32ce12 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java @@ -13,9 +13,9 @@ */ package com.beanit.openiec61850.integrationtests; -import org.junit.Test; import com.beanit.openiec61850.SclParseException; import com.beanit.openiec61850.SclParser; +import org.junit.Test; public class SclTests {