code clean up using eclipse formatter and cleaner

pull/11/head
Stefan Feuerhahn 7 years ago
parent 3eec5f9589
commit ffe3800619

@ -8,7 +8,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class AccessResult implements Serializable {

@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import java.util.List;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class AlternateAccess implements Serializable {
@ -118,7 +121,7 @@ public class AlternateAccess implements Serializable {
private List<CHOICE> seqOf = null;
public AlternateAccess() {
seqOf = new ArrayList<CHOICE>();
seqOf = new ArrayList<>();
}
public AlternateAccess(byte[] code) {
@ -127,7 +130,7 @@ public class AlternateAccess implements Serializable {
public List<CHOICE> getCHOICE() {
if (seqOf == null) {
seqOf = new ArrayList<CHOICE>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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;
public class AlternateAccessSelection implements Serializable {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.string.*;
import org.openmuc.jasn1.ber.types.string.BerVisibleString;
public class BasicIdentifier extends BerVisibleString {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerNull;
public class ConcludeRequestPDU extends BerNull {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class ConfirmedErrorPDU implements Serializable {

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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 {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
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 {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class ConfirmedServiceRequest implements Serializable {

@ -8,7 +8,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class ConfirmedServiceResponse implements Serializable {

@ -7,13 +7,19 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.string.*;
import java.util.List;
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;
import org.openmuc.jasn1.ber.types.BerOctetString;
import org.openmuc.jasn1.ber.types.string.BerVisibleString;
public class Data implements Serializable {
@ -30,7 +36,7 @@ public class Data implements Serializable {
private List<Data> seqOf = null;
public Array() {
seqOf = new ArrayList<Data>();
seqOf = new ArrayList<>();
}
public Array(byte[] code) {
@ -39,7 +45,7 @@ public class Data implements Serializable {
public List<Data> getData() {
if (seqOf == null) {
seqOf = new ArrayList<Data>();
seqOf = new ArrayList<>();
}
return seqOf;
}
@ -158,7 +164,7 @@ public class Data implements Serializable {
private List<Data> seqOf = null;
public Structure() {
seqOf = new ArrayList<Data>();
seqOf = new ArrayList<>();
}
public Structure(byte[] code) {
@ -167,7 +173,7 @@ public class Data implements Serializable {
public List<Data> getData() {
if (seqOf == null) {
seqOf = new ArrayList<Data>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -5,7 +5,8 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import java.math.BigInteger;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerInteger;
public class DataAccessError extends BerInteger {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class DefineNamedVariableListRequest implements Serializable {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerNull;
public class DefineNamedVariableListResponse extends BerNull {

@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import java.util.List;
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;
public class DeleteNamedVariableListRequest implements Serializable {
@ -28,7 +31,7 @@ public class DeleteNamedVariableListRequest implements Serializable {
private List<ObjectName> seqOf = null;
public ListOfVariableListName() {
seqOf = new ArrayList<ObjectName>();
seqOf = new ArrayList<>();
}
public ListOfVariableListName(byte[] code) {
@ -37,7 +40,7 @@ public class DeleteNamedVariableListRequest implements Serializable {
public List<ObjectName> getObjectName() {
if (seqOf == null) {
seqOf = new ArrayList<ObjectName>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class DeleteNamedVariableListResponse implements Serializable {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class DirectoryEntry implements Serializable {

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
import org.openmuc.jasn1.ber.types.BerGeneralizedTime;
public class FileAttributes implements Serializable {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerNull;
public class FileCloseResponse extends BerNull {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerNull;
public class FileDeleteResponse extends BerNull {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class FileDirectoryRequest implements Serializable {

@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import java.util.List;
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 FileDirectoryResponse implements Serializable {
@ -27,7 +30,7 @@ public class FileDirectoryResponse implements Serializable {
private List<DirectoryEntry> seqOf = null;
public ListOfDirectoryEntry() {
seqOf = new ArrayList<DirectoryEntry>();
seqOf = new ArrayList<>();
}
public ListOfDirectoryEntry(byte[] code) {
@ -36,7 +39,7 @@ public class FileDirectoryResponse implements Serializable {
public List<DirectoryEntry> getDirectoryEntry() {
if (seqOf == null) {
seqOf = new ArrayList<DirectoryEntry>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.string.*;
import java.util.List;
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.BerGraphicString;
public class FileName implements Serializable {
@ -23,7 +26,7 @@ public class FileName implements Serializable {
private List<BerGraphicString> seqOf = null;
public FileName() {
seqOf = new ArrayList<BerGraphicString>();
seqOf = new ArrayList<>();
}
public FileName(byte[] code) {
@ -32,7 +35,7 @@ public class FileName implements Serializable {
public List<BerGraphicString> getBerGraphicString() {
if (seqOf == null) {
seqOf = new ArrayList<BerGraphicString>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class FileOpenRequest implements Serializable {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class FileOpenResponse implements Serializable {

@ -8,8 +8,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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.BerOctetString;
public class FileReadResponse implements Serializable {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerOctetString;
public class FloatingPoint extends BerOctetString {

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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 {

@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import java.util.List;
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 {
@ -27,7 +30,7 @@ public class GetNameListResponse implements Serializable {
private List<Identifier> seqOf = null;
public ListOfIdentifier() {
seqOf = new ArrayList<Identifier>();
seqOf = new ArrayList<>();
}
public ListOfIdentifier(byte[] code) {
@ -36,7 +39,7 @@ public class GetNameListResponse implements Serializable {
public List<Identifier> getIdentifier() {
if (seqOf == null) {
seqOf = new ArrayList<Identifier>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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 {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class GetVariableAccessAttributesRequest implements Serializable {

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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 {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.string.*;
import org.openmuc.jasn1.ber.types.string.BerVisibleString;
public class Identifier extends BerVisibleString {

@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import java.util.List;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class InformationReport implements Serializable {
@ -26,7 +29,7 @@ public class InformationReport implements Serializable {
private List<AccessResult> seqOf = null;
public ListOfAccessResult() {
seqOf = new ArrayList<AccessResult>();
seqOf = new ArrayList<>();
}
public ListOfAccessResult(byte[] code) {
@ -35,7 +38,7 @@ public class InformationReport implements Serializable {
public List<AccessResult> getAccessResult() {
if (seqOf == null) {
seqOf = new ArrayList<AccessResult>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class InitiateRequestPDU implements Serializable {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class InitiateResponsePDU implements Serializable {

@ -5,7 +5,8 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import java.math.BigInteger;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerInteger;
public class Integer16 extends BerInteger {

@ -5,7 +5,8 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import java.math.BigInteger;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerInteger;
public class Integer32 extends BerInteger {

@ -5,7 +5,8 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import java.math.BigInteger;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerInteger;
public class Integer8 extends BerInteger {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.string.*;
import org.openmuc.jasn1.ber.types.string.BerVisibleString;
public class MMSString extends BerVisibleString {

@ -8,7 +8,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class MMSpdu implements Serializable {

@ -8,8 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
import org.openmuc.jasn1.ber.types.BerInteger;
public class ObjectClass implements Serializable {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
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 {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerBitString;
public class ParameterSupportOptions extends BerBitString {

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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 {

@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import java.util.List;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class ReadResponse implements Serializable {
@ -26,7 +29,7 @@ public class ReadResponse implements Serializable {
private List<AccessResult> seqOf = null;
public ListOfAccessResult() {
seqOf = new ArrayList<AccessResult>();
seqOf = new ArrayList<>();
}
public ListOfAccessResult(byte[] code) {
@ -35,7 +38,7 @@ public class ReadResponse implements Serializable {
public List<AccessResult> getAccessResult() {
if (seqOf == null) {
seqOf = new ArrayList<AccessResult>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,8 +8,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
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 {

@ -8,9 +8,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.string.*;
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;
public class ServiceError implements Serializable {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerBitString;
public class ServiceSupportOptions extends BerBitString {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerOctetString;
public class TimeOfDay extends BerOctetString {

@ -7,12 +7,17 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import java.util.List;
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;
public class TypeDescription implements Serializable {
@ -395,7 +400,7 @@ public class TypeDescription implements Serializable {
private List<SEQUENCE> seqOf = null;
public Components() {
seqOf = new ArrayList<SEQUENCE>();
seqOf = new ArrayList<>();
}
public Components(byte[] code) {
@ -404,7 +409,7 @@ public class TypeDescription implements Serializable {
public List<SEQUENCE> getSEQUENCE() {
if (seqOf == null) {
seqOf = new ArrayList<SEQUENCE>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,7 +8,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class TypeSpecification implements Serializable {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class UnconfirmedPDU implements Serializable {

@ -8,7 +8,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class UnconfirmedService implements Serializable {

@ -5,7 +5,8 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import java.math.BigInteger;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerInteger;
public class Unsigned16 extends BerInteger {

@ -5,7 +5,8 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import java.math.BigInteger;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerInteger;
public class Unsigned32 extends BerInteger {

@ -5,7 +5,8 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import java.math.BigInteger;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerInteger;
public class Unsigned8 extends BerInteger {

@ -4,7 +4,7 @@
package org.openmuc.openiec61850.internal.mms.asn1;
import org.openmuc.jasn1.ber.types.*;
import org.openmuc.jasn1.ber.types.BerOctetString;
public class UtcTime extends BerOctetString {

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class VariableAccessSpecification implements Serializable {

@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import java.util.List;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class VariableDefs implements Serializable {
@ -176,7 +179,7 @@ public class VariableDefs implements Serializable {
private List<SEQUENCE> seqOf = null;
public VariableDefs() {
seqOf = new ArrayList<SEQUENCE>();
seqOf = new ArrayList<>();
}
public VariableDefs(byte[] code) {
@ -185,7 +188,7 @@ public class VariableDefs implements Serializable {
public List<SEQUENCE> getSEQUENCE() {
if (seqOf == null) {
seqOf = new ArrayList<SEQUENCE>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -8,7 +8,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class VariableSpecification implements Serializable {

@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import java.util.List;
import org.openmuc.jasn1.ber.BerLength;
import org.openmuc.jasn1.ber.BerTag;
import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
public class WriteRequest implements Serializable {
@ -26,7 +29,7 @@ public class WriteRequest implements Serializable {
private List<Data> seqOf = null;
public ListOfData() {
seqOf = new ArrayList<Data>();
seqOf = new ArrayList<>();
}
public ListOfData(byte[] code) {
@ -35,7 +38,7 @@ public class WriteRequest implements Serializable {
public List<Data> getData() {
if (seqOf == null) {
seqOf = new ArrayList<Data>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.io.Serializable;
import org.openmuc.jasn1.ber.*;
import org.openmuc.jasn1.ber.types.*;
import java.util.List;
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 {
@ -146,7 +149,7 @@ public class WriteResponse implements Serializable {
private List<CHOICE> seqOf = null;
public WriteResponse() {
seqOf = new ArrayList<CHOICE>();
seqOf = new ArrayList<>();
}
public WriteResponse(byte[] code) {
@ -155,7 +158,7 @@ public class WriteResponse implements Serializable {
public List<CHOICE> getCHOICE() {
if (seqOf == null) {
seqOf = new ArrayList<CHOICE>();
seqOf = new ArrayList<>();
}
return seqOf;
}

@ -20,6 +20,7 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import javax.net.SocketFactory;
/**

@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
@ -946,11 +945,11 @@ public final class ClientAssociation {
Calendar lastModified = null;
try {
if (entry.getFileAttributes().getLastModified() != null)
lastModified = entry.getFileAttributes().getLastModified().asCalendar();
if (entry.getFileAttributes().getLastModified() != null) {
lastModified = entry.getFileAttributes().getLastModified().asCalendar();
}
} catch (ParseException e) {
throw new ServiceError(ServiceError.FAILED_DUE_TO_COMMUNICATIONS_CONSTRAINT,
@ -983,7 +982,7 @@ public final class ClientAssociation {
* after this exception is thrown.
*/
public List<FileInformation> getFileDirectory(String directoryName) throws ServiceError, IOException {
List<FileInformation> files = new LinkedList<FileInformation>();
List<FileInformation> files = new LinkedList<>();
boolean moreFollows = true;
@ -1015,8 +1014,9 @@ public final class ClientAssociation {
moreFollows = decodeGetFileDirectoryResponse(confirmedServiceResponse, files);
if (moreFollows)
if (moreFollows) {
continueAfter = files.get(files.size() - 1).getFilename();
}
}
return files;
@ -1091,14 +1091,16 @@ public final class ClientAssociation {
boolean moreFollows = true;
if (confirmedServiceResponse.getFileRead().getMoreFollows() != null)
if (confirmedServiceResponse.getFileRead().getMoreFollows() != null) {
moreFollows = confirmedServiceResponse.getFileRead().getMoreFollows().value;
}
if (listener != null) {
boolean continueRead = listener.dataReceived(fileData, moreFollows);
if (moreFollows == true)
if (moreFollows == true) {
moreFollows = continueRead;
}
}
return moreFollows;

@ -7,11 +7,11 @@ import java.util.Calendar;
*/
public class FileInformation {
private String filename;
private final String filename;
private long fileSize;
private final long fileSize;
private Calendar lastModified;
private final Calendar lastModified;
public String getFilename() {
return filename;

Loading…
Cancel
Save