Skip to content

Commit c7258a9

Browse files
drasildrasil
committed
Added generics to model classes
1 parent 8d9ed21 commit c7258a9

16 files changed

+188
-210
lines changed

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/ASNModule.java‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,42 @@
1-
2-
/** This class defines the class holding for ASN.1 modules and basic Types */
31
package org.bn.compiler.parser.model;
42

53
//~--- JDK imports ------------------------------------------------------------
64

7-
import java.io.*;
8-
9-
import java.util.*;
10-
11-
import javax.xml.bind.*;
5+
import java.util.ArrayList;
6+
import java.util.Iterator;
127

138
//~--- classes ----------------------------------------------------------------
149

1510
/** This class defines the class holding for ASN.1 modules and basic Types */
1611
public class ASNModule {
17-
public AsnTypes asnTypes;
18-
public ArrayList asnValues;
19-
public ArrayList exportSymbolList;
20-
public boolean exported;
21-
public boolean extensible;
22-
public ArrayList importSymbolFromModuleList;
23-
ArrayList importSymbolList;
24-
public boolean imported;
25-
public AsnModuleIdentifier moduleIdentifier; // Name of Module
26-
public boolean tag;
27-
public String tagDefault;
12+
public AsnTypes asnTypes;
13+
public ArrayList<AsnValue> asnValues;
14+
public ArrayList exportSymbolList;
15+
public boolean exported;
16+
public boolean extensible;
17+
public ArrayList<SymbolsFromModule> importSymbolFromModuleList;
18+
ArrayList importSymbolList;
19+
public boolean imported;
20+
public AsnModuleIdentifier moduleIdentifier; // Name of Module
21+
public boolean tag;
22+
public String tagDefault;
2823

2924
//~--- constructors -------------------------------------------------------
3025

3126
// Default Constructor
3227
public ASNModule() {
3328
exportSymbolList = new ArrayList();
3429
importSymbolList = new ArrayList();
35-
importSymbolFromModuleList = new ArrayList();
30+
importSymbolFromModuleList = new ArrayList<SymbolsFromModule>();
3631
asnTypes = new AsnTypes();
37-
asnValues = new ArrayList();
32+
asnValues = new ArrayList<AsnValue>();
3833
tagDefault = "";
3934
}
4035

4136
//~--- methods ------------------------------------------------------------
4237

4338
// To String Method
39+
@Override
4440
public String toString() {
4541
String ts = "";
4642
Iterator ii;

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/ASNModules.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//~--- JDK imports ------------------------------------------------------------
44

55
import java.util.ArrayList;
6-
import java.util.Iterator;
76

87
//~--- classes ----------------------------------------------------------------
98

@@ -12,13 +11,13 @@
1211
/**This class defines the class holding for ASN.1 modules and basic Types
1312
*/
1413
public class ASNModules {
15-
ArrayList module_list;
14+
ArrayList<ASNModule> module_list;
1615

1716
//~--- constructors -------------------------------------------------------
1817

1918
// Default Constructor
2019
ASNModules() {
21-
module_list = new ArrayList();
20+
module_list = new ArrayList<ASNModule>();
2221
}
2322

2423
//~--- methods ------------------------------------------------------------
@@ -28,12 +27,12 @@ public void add(ASNModule module) {
2827
}
2928

3029
// toString Method
30+
@Override
3131
public String toString() {
32-
String ts = "";
33-
Iterator i = module_list.iterator();
34-
35-
while (i.hasNext()) {
36-
ts += i.next();
32+
String ts = "";
33+
34+
for ( ASNModule module: module_list ) {
35+
ts += module;
3736
}
3837

3938
return ts;

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnBitOrOctetStringValue.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,34 @@
33
//~--- JDK imports ------------------------------------------------------------
44

55
import java.util.ArrayList;
6-
import java.util.Iterator;
76

87
//~--- classes ----------------------------------------------------------------
98

109
public class AsnBitOrOctetStringValue {
11-
public String bhStr;
12-
public ArrayList idlist;
13-
public boolean isBString;
14-
public boolean isHString;
10+
public String bhStr;
11+
public ArrayList<String> idlist;
12+
public boolean isBString;
13+
public boolean isHString;
1514

1615
//~--- constructors -------------------------------------------------------
1716

1817
// Default Constructor
1918
public AsnBitOrOctetStringValue() {
20-
idlist = new ArrayList();
19+
idlist = new ArrayList<String>();
2120
}
2221

2322
//~--- methods ------------------------------------------------------------
2423

24+
@Override
2525
public String toString() {
2626
String ts = "";
2727

2828
if (isHString || isBString) {
2929
ts += bhStr;
3030
} else {
3131
if (idlist != null) {
32-
Iterator e = idlist.iterator();
33-
34-
while (e.hasNext()) {
35-
ts += e.next();
32+
for (String s: idlist) {
33+
ts += s;
3634
}
3735
}
3836
}

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnCharacterStringValue.java‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,38 @@
33
//~--- JDK imports ------------------------------------------------------------
44

55
import java.util.ArrayList;
6-
import java.util.Iterator;
76

87
//~--- classes ----------------------------------------------------------------
98

109
public class AsnCharacterStringValue {
11-
String cStr;
12-
public ArrayList charDefsList;
13-
public boolean isCharDefList;
14-
boolean isQuadruple;
15-
public boolean isTuple;
16-
public ArrayList tupleQuad;
10+
String cStr;
11+
public ArrayList<CharDef> charDefsList;
12+
public boolean isCharDefList;
13+
boolean isQuadruple;
14+
public boolean isTuple;
15+
public ArrayList<AsnSignedNumber> tupleQuad;
1716

1817
//~--- constructors -------------------------------------------------------
1918

2019
// Default Constructor
2120
public AsnCharacterStringValue() {
22-
charDefsList = new ArrayList();
23-
tupleQuad = new ArrayList();
21+
charDefsList = new ArrayList<CharDef>();
22+
tupleQuad = new ArrayList<AsnSignedNumber>();
2423
}
2524

2625
//~--- methods ------------------------------------------------------------
2726

27+
@Override
2828
public String toString() {
2929
String ts = "";
3030

3131
if (isTuple || isQuadruple) {
32-
Iterator i = tupleQuad.iterator();
33-
34-
while (i.hasNext()) {
35-
ts += i.next() + "\n";
32+
for ( AsnSignedNumber sn: tupleQuad) {
33+
ts += sn + "\n";
3634
}
3735
} else if (isCharDefList) {
38-
Iterator i = charDefsList.iterator();
39-
40-
while (i.hasNext()) {
41-
ts += i.next();
36+
for ( CharDef chDef: charDefsList ) {
37+
ts += chDef;
4238
}
4339
}
4440

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnElementTypeList.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
//~--- classes ----------------------------------------------------------------
88

99
public class AsnElementTypeList {
10-
public ArrayList elements;
10+
public ArrayList<AsnElementType> elements;
1111

1212
//~--- constructors -------------------------------------------------------
1313

1414
// Default Constructor
1515
public AsnElementTypeList() {
16-
elements = new ArrayList();
16+
elements = new ArrayList<AsnElementType>();
1717
}
1818

1919
//~--- methods ------------------------------------------------------------
2020

21+
@Override
2122
public String toString() {
2223
String ts = "";
23-
2424
return ts;
2525
}
2626
}

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnNamedNumberList.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
//~--- classes ----------------------------------------------------------------
88

99
public class AsnNamedNumberList {
10-
public ArrayList namedNumbers;
10+
public ArrayList<AsnNamedNumber> namedNumbers;
1111

1212
//~--- constructors -------------------------------------------------------
1313

1414
// Default Constructor
1515
public AsnNamedNumberList() {
16-
namedNumbers = new ArrayList();
16+
namedNumbers = new ArrayList<AsnNamedNumber>();
1717
}
1818

1919
//~--- methods ------------------------------------------------------------

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnOidComponentList.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
//~--- JDK imports ------------------------------------------------------------
44

55
import java.util.ArrayList;
6-
import java.util.Iterator;
76

87
//~--- classes ----------------------------------------------------------------
98

109
//
1110
//DefinitionofOID_Component_LIST
1211
//
1312
public class AsnOidComponentList {
14-
public ArrayList components;
15-
public AsnDefinedValue defval;
16-
public boolean isDefinitive;
13+
public ArrayList<AsnOidComponent> components;
14+
public AsnDefinedValue defval;
15+
public boolean isDefinitive;
1716

1817
//~--- constructors -------------------------------------------------------
1918

2019
// Default Constructor
2120
public AsnOidComponentList() {
22-
components = new ArrayList();
21+
components = new ArrayList<AsnOidComponent>();
2322
}
2423

2524
//~--- methods ------------------------------------------------------------
2625

2726
// toString Method
27+
@Override
2828
public String toString() {
2929
String ts = "";
3030

@@ -33,10 +33,8 @@ public String toString() {
3333
}
3434

3535
if (components != null) {
36-
Iterator i = components.iterator();
37-
38-
while (i.hasNext()) {
39-
ts += (i.next());
36+
for ( AsnOidComponent component: components ) {
37+
ts += component;
4038
}
4139
}
4240

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnSequenceOfValue.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,29 @@
33
//~--- JDK imports ------------------------------------------------------------
44

55
import java.util.ArrayList;
6-
import java.util.Iterator;
76

87
//~--- classes ----------------------------------------------------------------
98

109
public class AsnSequenceOfValue {
11-
boolean isValPresent;
12-
public ArrayList value;
10+
boolean isValPresent;
11+
public ArrayList<AsnValue> value;
1312

1413
//~--- constructors -------------------------------------------------------
1514

1615
// Default Constructor
1716
public AsnSequenceOfValue() {
18-
value = new ArrayList();
17+
value = new ArrayList<AsnValue>();
1918
}
2019

2120
//~--- methods ------------------------------------------------------------
2221

2322
// toString Method
23+
@Override
2424
public String toString() {
25-
String ts = "";
26-
Iterator i = value.iterator();
27-
28-
while (i.hasNext()) {
29-
ts += i.next();
25+
String ts = "";
26+
27+
for (AsnValue val: value) {
28+
ts += val;
3029
}
3130

3231
return ts;

‎BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnSequenceValue.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,29 @@
33
//~--- JDK imports ------------------------------------------------------------
44

55
import java.util.ArrayList;
6-
import java.util.Iterator;
76

87
//~--- classes ----------------------------------------------------------------
98

109
public class AsnSequenceValue {
11-
public boolean isValPresent;
12-
public ArrayList namedValueList;
10+
public boolean isValPresent;
11+
public ArrayList<AsnNamedValue> namedValueList;
1312

1413
//~--- constructors -------------------------------------------------------
1514

1615
// Default Constructor
1716
public AsnSequenceValue() {
18-
namedValueList = new ArrayList();
17+
namedValueList = new ArrayList<AsnNamedValue>();
1918
}
2019

2120
//~--- methods ------------------------------------------------------------
2221

2322
// toString Method
23+
@Override
2424
public String toString() {
25-
String ts = "";
26-
Iterator i = namedValueList.iterator();
27-
28-
while (i.hasNext()) {
29-
ts += i.next();
25+
String ts = "";
26+
27+
for (AsnNamedValue nv: namedValueList) {
28+
ts += nv;
3029
}
3130

3231
return ts;

0 commit comments

Comments
 (0)