Skip to content

Commit d0b8dd2

Browse files
EricBerendsenEricBerendsen
committed
remove DefaultMutableTreeNode
1 parent bc2b47c commit d0b8dd2

File tree

9 files changed

+166
-177
lines changed

9 files changed

+166
-177
lines changed

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pid/t2mi/BasebandFramePayload.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
import static nl.digitalekabeltelevisie.data.mpeg.pid.t2mi.T2miPacket.getLenInBytes;
3131

32-
import javax.swing.tree.DefaultMutableTreeNode;
33-
3432
import nl.digitalekabeltelevisie.controller.KVP;
3533
import nl.digitalekabeltelevisie.util.*;
3634

@@ -53,29 +51,29 @@ public BasebandFramePayload(byte[] data) {
5351
}
5452

5553
@Override
56-
public DefaultMutableTreeNode getJTreeNode(int modus) {
57-
DefaultMutableTreeNode payloadNode = new DefaultMutableTreeNode(new KVP("payload"));
58-
payloadNode.add(new DefaultMutableTreeNode(new KVP("frame_idx", getFrameIdx(), null)));
59-
payloadNode.add(new DefaultMutableTreeNode(new KVP("plp_id", getPlpId(), null)));
60-
payloadNode.add(new DefaultMutableTreeNode(new KVP("intl_frame_start", getIntlFrameStart(), null)));
54+
public KVP getJTreeNode(int modus) {
55+
KVP payloadNode = new KVP("payload");
56+
payloadNode.add(new KVP("frame_idx", getFrameIdx()));
57+
payloadNode.add(new KVP("plp_id", getPlpId()));
58+
payloadNode.add(new KVP("intl_frame_start", getIntlFrameStart()));
6159

62-
DefaultMutableTreeNode bbframeNode = new DefaultMutableTreeNode(new KVP("BBFRAME"));
60+
KVP bbframeNode = new KVP("BBFRAME");
6361

64-
DefaultMutableTreeNode matypeNode = new DefaultMutableTreeNode(new KVP("MATYPE", getMATYPE(), null));
65-
matypeNode.add(new DefaultMutableTreeNode(new KVP("StreamType TS/GS", getTSGS(), stream_type_list.get(getTSGS()))));
66-
matypeNode.add(new DefaultMutableTreeNode(new KVP("SingleInputStream SIS/MIS", getSISMIS(), getSISMIS()==1?"single":"multiple")));
67-
matypeNode.add(new DefaultMutableTreeNode(new KVP("ConstantCodingAndModulation CCM/ACM ", getCCMACM(), getCCMACM()==1?"CCM":"ACM")));
68-
matypeNode.add(new DefaultMutableTreeNode(new KVP("InputStreamSyncIndicator ISSYI", getISSYI(), getISSYI()==1?"active":"not-active")));
69-
matypeNode.add(new DefaultMutableTreeNode(new KVP("NullPacketDeletion NPD", getNPD(), getNPD()==1?"active":"not-active")));
70-
matypeNode.add(new DefaultMutableTreeNode(new KVP("RO", getRO(), null)));
71-
matypeNode.add(new DefaultMutableTreeNode(new KVP("MAT2 (ISI/PLP_ID)", getMATYPE2(), null)));
62+
KVP matypeNode = new KVP("MATYPE", getMATYPE());
63+
matypeNode.add(new KVP("StreamType TS/GS", getTSGS(), stream_type_list.get(getTSGS())));
64+
matypeNode.add(new KVP("SingleInputStream SIS/MIS", getSISMIS(), getSISMIS()==1?"single":"multiple"));
65+
matypeNode.add(new KVP("ConstantCodingAndModulation CCM/ACM ", getCCMACM(), getCCMACM()==1?"CCM":"ACM"));
66+
matypeNode.add(new KVP("InputStreamSyncIndicator ISSYI", getISSYI(), getISSYI()==1?"active":"not-active"));
67+
matypeNode.add(new KVP("NullPacketDeletion NPD", getNPD(), getNPD()==1?"active":"not-active"));
68+
matypeNode.add(new KVP("RO", getRO()));
69+
matypeNode.add(new KVP("MAT2 (ISI/PLP_ID)", getMATYPE2()));
7270
bbframeNode.add(matypeNode);
7371

74-
bbframeNode.add(new DefaultMutableTreeNode(new KVP("UPL", getUPL(), "User Packet Length "+getLenInBytes(getUPL()))));
75-
bbframeNode.add(new DefaultMutableTreeNode(new KVP("DFL", getDFL(), "Data Field Length "+getLenInBytes(getDFL()))));
76-
bbframeNode.add(new DefaultMutableTreeNode(new KVP("SYNC", getSYNC(), "copy of the User Packet Sync-byte")));
77-
bbframeNode.add(new DefaultMutableTreeNode(new KVP("SYNCD", getSYNCD(), "distance in bits from the beginning of the DATA FIELD and the first UP from this frame"+T2miPacket.getLenInBytes(getSYNCD()))));
78-
bbframeNode.add(new DefaultMutableTreeNode(new KVP("CRC-8 MODE", getCRC8(), null)));
72+
bbframeNode.add(new KVP("UPL", getUPL(), "User Packet Length "+getLenInBytes(getUPL())));
73+
bbframeNode.add(new KVP("DFL", getDFL(), "Data Field Length "+getLenInBytes(getDFL())));
74+
bbframeNode.add(new KVP("SYNC", getSYNC(), "copy of the User Packet Sync-byte"));
75+
bbframeNode.add(new KVP("SYNCD", getSYNCD(), "distance in bits from the beginning of the DATA FIELD and the first UP from this frame"+T2miPacket.getLenInBytes(getSYNCD())));
76+
bbframeNode.add(new KVP("CRC-8 MODE", getCRC8()));
7977

8078
payloadNode.add(bbframeNode);
8179

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pid/t2mi/Configurable1PostSignalling.java‎

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import java.util.ArrayList;
3131
import java.util.List;
3232

33-
import javax.swing.tree.DefaultMutableTreeNode;
34-
3533
import nl.digitalekabeltelevisie.controller.KVP;
3634
import nl.digitalekabeltelevisie.controller.TreeNode;
3735
import nl.digitalekabeltelevisie.util.BitSource;
@@ -50,10 +48,10 @@ public Frequency(BitSource bs) {
5048
}
5149

5250
@Override
53-
public DefaultMutableTreeNode getJTreeNode(int modus) {
54-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("rf_idx:"+rf_idx+", frequency:"+frequency ));
55-
t.add(new DefaultMutableTreeNode(new KVP("rf_idx",rf_idx,null)));
56-
t.add(new DefaultMutableTreeNode(new KVP("frequency",frequency,null)));
51+
public KVP getJTreeNode(int modus) {
52+
KVP t = new KVP("rf_idx:" + rf_idx + ", frequency:" + frequency);
53+
t.add(new KVP("rf_idx", rf_idx));
54+
t.add(new KVP("frequency", frequency));
5755
return t;
5856
}
5957

@@ -117,29 +115,29 @@ public PLP(BitSource bs) {
117115
}
118116

119117
@Override
120-
public DefaultMutableTreeNode getJTreeNode(int modus) {
121-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("PLP"));
122-
t.add(new DefaultMutableTreeNode(new KVP("plp_id", plp_id, null)));
123-
t.add(new DefaultMutableTreeNode(new KVP("plp_type", plp_type, null)));
124-
t.add(new DefaultMutableTreeNode(new KVP("plp_payload_type", plp_payload_type, null)));
125-
t.add(new DefaultMutableTreeNode(new KVP("ff_flag", ff_flag, null)));
126-
t.add(new DefaultMutableTreeNode(new KVP("first_rf_idx", first_rf_idx, null)));
127-
t.add(new DefaultMutableTreeNode(new KVP("first_frame_idx", first_frame_idx, null)));
128-
t.add(new DefaultMutableTreeNode(new KVP("plp_group_id", plp_group_id, null)));
129-
t.add(new DefaultMutableTreeNode(new KVP("plp_cod", plp_cod, null)));
130-
t.add(new DefaultMutableTreeNode(new KVP("plp_mod", plp_mod, null)));
131-
t.add(new DefaultMutableTreeNode(new KVP("plp_rotation", plp_rotation, null)));
132-
t.add(new DefaultMutableTreeNode(new KVP("plp_fec_type", plp_fec_type, null)));
133-
t.add(new DefaultMutableTreeNode(new KVP("plp_num_blocks_max", plp_num_blocks_max, null)));
134-
t.add(new DefaultMutableTreeNode(new KVP("frame_interval", frame_interval, null)));
135-
t.add(new DefaultMutableTreeNode(new KVP("time_il_length", time_il_length, null)));
136-
t.add(new DefaultMutableTreeNode(new KVP("time_il_type", time_il_type, null)));
137-
t.add(new DefaultMutableTreeNode(new KVP("in_band_a_flag", in_band_a_flag, null)));
138-
t.add(new DefaultMutableTreeNode(new KVP("in_band_b_flag", in_band_b_flag, null)));
139-
t.add(new DefaultMutableTreeNode(new KVP("reserved_1", reserved_1, null)));
140-
t.add(new DefaultMutableTreeNode(new KVP("plp_mode", plp_mode, null)));
141-
t.add(new DefaultMutableTreeNode(new KVP("static_flag", static_flag, null)));
142-
t.add(new DefaultMutableTreeNode(new KVP("static_padding_flag", static_padding_flag, null)));
118+
public KVP getJTreeNode(int modus) {
119+
KVP t = new KVP("PLP");
120+
t.add(new KVP("plp_id", plp_id));
121+
t.add(new KVP("plp_type", plp_type));
122+
t.add(new KVP("plp_payload_type", plp_payload_type));
123+
t.add(new KVP("ff_flag", ff_flag));
124+
t.add(new KVP("first_rf_idx", first_rf_idx));
125+
t.add(new KVP("first_frame_idx", first_frame_idx));
126+
t.add(new KVP("plp_group_id", plp_group_id));
127+
t.add(new KVP("plp_cod", plp_cod));
128+
t.add(new KVP("plp_mod", plp_mod));
129+
t.add(new KVP("plp_rotation", plp_rotation));
130+
t.add(new KVP("plp_fec_type", plp_fec_type));
131+
t.add(new KVP("plp_num_blocks_max", plp_num_blocks_max));
132+
t.add(new KVP("frame_interval", frame_interval));
133+
t.add(new KVP("time_il_length", time_il_length));
134+
t.add(new KVP("time_il_type", time_il_type));
135+
t.add(new KVP("in_band_a_flag", in_band_a_flag));
136+
t.add(new KVP("in_band_b_flag", in_band_b_flag));
137+
t.add(new KVP("reserved_1", reserved_1));
138+
t.add(new KVP("plp_mode", plp_mode));
139+
t.add(new KVP("static_flag", static_flag));
140+
t.add(new KVP("static_padding_flag", static_padding_flag));
143141
return t;
144142
}
145143

@@ -241,10 +239,10 @@ public AUX(BitSource bs) {
241239
}
242240

243241
@Override
244-
public DefaultMutableTreeNode getJTreeNode(int modus) {
245-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("AUX"));
246-
t.add(new DefaultMutableTreeNode(new KVP("aux_stream_type", aux_stream_type, null)));
247-
t.add(new DefaultMutableTreeNode(new KVP("aux_private_conf", aux_private_conf, null)));
242+
public KVP getJTreeNode(int modus) {
243+
KVP t = new KVP("AUX");
244+
t.add(new KVP("aux_stream_type", aux_stream_type));
245+
t.add(new KVP("aux_private_conf", aux_private_conf));
248246
return t;
249247
}
250248

@@ -306,27 +304,27 @@ public Configurable1PostSignalling(BitSource bs, L1PreSignallingData l1PreSignal
306304
}
307305

308306
@Override
309-
public DefaultMutableTreeNode getJTreeNode(int modus) {
310-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("Configurable L1-post signalling"));
307+
public KVP getJTreeNode(int modus) {
308+
KVP t = new KVP("Configurable L1-post signalling");
311309

312-
t.add(new DefaultMutableTreeNode(new KVP("sub_slices_per_frame",sub_slices_per_frame,null)));
313-
t.add(new DefaultMutableTreeNode(new KVP("num_plp",num_plp,null)));
314-
t.add(new DefaultMutableTreeNode(new KVP("num_aux",num_aux,null)));
315-
t.add(new DefaultMutableTreeNode(new KVP("aux_config_rfu",aux_config_rfu,null)));
310+
t.add(new KVP("sub_slices_per_frame",sub_slices_per_frame));
311+
t.add(new KVP("num_plp",num_plp));
312+
t.add(new KVP("num_aux",num_aux));
313+
t.add(new KVP("aux_config_rfu",aux_config_rfu));
316314

317315

318316
Utils.addListJTree(t,frequencyList,modus,"Frequencies");
319317

320318
if((l1PreSignallingData.getS2() & 0b1) ==1) {
321-
t.add(new DefaultMutableTreeNode(new KVP("fef_type",fef_type,null)));
322-
t.add(new DefaultMutableTreeNode(new KVP("fef_length",fef_length,null)));
323-
t.add(new DefaultMutableTreeNode(new KVP("fef_interval",fef_interval,null)));
319+
t.add(new KVP("fef_type",fef_type));
320+
t.add(new KVP("fef_length",fef_length));
321+
t.add(new KVP("fef_interval",fef_interval));
324322
}
325323

326324
Utils.addListJTree(t,plpList,modus,"PLPs");
327325

328-
t.add(new DefaultMutableTreeNode(new KVP("fef_length_msb",fef_length_msb,null)));
329-
t.add(new DefaultMutableTreeNode(new KVP("reserved_2",reserved_2,null)));
326+
t.add(new KVP("fef_length_msb",fef_length_msb));
327+
t.add(new KVP("reserved_2",reserved_2));
330328

331329
Utils.addListJTree(t,auxList,modus,"AUXs");
332330

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pid/t2mi/DVBT2TimestampPayload.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
import static nl.digitalekabeltelevisie.util.Utils.*;
3131

32-
import javax.swing.tree.DefaultMutableTreeNode;
33-
3432
import nl.digitalekabeltelevisie.controller.KVP;
3533
import nl.digitalekabeltelevisie.util.*;
3634

@@ -50,12 +48,12 @@ public DVBT2TimestampPayload(byte[] data) {
5048
}
5149

5250
@Override
53-
public DefaultMutableTreeNode getJTreeNode(int modus) {
54-
DefaultMutableTreeNode payloadNode = new DefaultMutableTreeNode(new KVP("payload"));
55-
payloadNode.add(new DefaultMutableTreeNode(new KVP("bw",getBW(),getBWString(getBW()))));
56-
payloadNode.add(new DefaultMutableTreeNode(new KVP("seconds_since_2000",getSecondsSince2000(),null)));
57-
payloadNode.add(new DefaultMutableTreeNode(new KVP("subseconds",getSubSeconds(),null)));
58-
payloadNode.add(new DefaultMutableTreeNode(new KVP("utco",getUtco(),null)));
51+
public KVP getJTreeNode(int modus) {
52+
KVP payloadNode = new KVP("payload");
53+
payloadNode.add(new KVP("bw",getBW(),getBWString(getBW())));
54+
payloadNode.add(new KVP("seconds_since_2000",getSecondsSince2000()));
55+
payloadNode.add(new KVP("subseconds",getSubSeconds()));
56+
payloadNode.add(new KVP("utco",getUtco()));
5957
return payloadNode;
6058
}
6159

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pid/t2mi/DynamicL1PostSignalling.java‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import java.util.ArrayList;
3131
import java.util.List;
3232

33-
import javax.swing.tree.DefaultMutableTreeNode;
34-
3533
import nl.digitalekabeltelevisie.controller.KVP;
3634
import nl.digitalekabeltelevisie.controller.TreeNode;
3735
import nl.digitalekabeltelevisie.util.BitSource;
@@ -54,12 +52,12 @@ public PLP(BitSource bs) {
5452
}
5553

5654
@Override
57-
public DefaultMutableTreeNode getJTreeNode(int modus) {
58-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("PLP"));
59-
t.add(new DefaultMutableTreeNode(new KVP("plp_id", plp_id, null)));
60-
t.add(new DefaultMutableTreeNode(new KVP("plp_start", plp_start, null)));
61-
t.add(new DefaultMutableTreeNode(new KVP("plp_num_blocks", plp_num_blocks, null)));
62-
t.add(new DefaultMutableTreeNode(new KVP("reserved_2", reserved_2, null)));
55+
public KVP getJTreeNode(int modus) {
56+
KVP t = new KVP("PLP");
57+
t.add(new KVP("plp_id", plp_id));
58+
t.add(new KVP("plp_start", plp_start));
59+
t.add(new KVP("plp_num_blocks", plp_num_blocks));
60+
t.add(new KVP("reserved_2", reserved_2));
6361
return t;
6462
}
6563

@@ -74,12 +72,11 @@ public AuxPrivateDyn(BitSource bs) {
7472
}
7573

7674
@Override
77-
public DefaultMutableTreeNode getJTreeNode(int modus) {
78-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("aux_private_dyn",aux_private_dyn,null));
75+
public KVP getJTreeNode(int modus) {
76+
KVP t = new KVP("aux_private_dyn", aux_private_dyn);
7977
return t;
8078
}
81-
82-
79+
8380
}
8481
private int frame_idx;
8582
private int sub_slice_interval;
@@ -109,18 +106,18 @@ public DynamicL1PostSignalling(BitSource bs, Configurable1PostSignalling configu
109106
}
110107

111108
@Override
112-
public DefaultMutableTreeNode getJTreeNode(int modus) {
113-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("Dynamic L1-post signalling"));
109+
public KVP getJTreeNode(int modus) {
110+
KVP t = new KVP("Dynamic L1-post signalling");
114111

115-
t.add(new DefaultMutableTreeNode(new KVP("frame_idx",frame_idx,null)));
116-
t.add(new DefaultMutableTreeNode(new KVP("sub_slice_interval",sub_slice_interval,null)));
117-
t.add(new DefaultMutableTreeNode(new KVP("type_2_start",type_2_start,null)));
118-
t.add(new DefaultMutableTreeNode(new KVP("l1_change_counter",l1_change_counter,null)));
119-
t.add(new DefaultMutableTreeNode(new KVP("start_rf_idx",start_rf_idx,null)));
120-
t.add(new DefaultMutableTreeNode(new KVP("reserved_1",reserved_1,null)));
112+
t.add(new KVP("frame_idx",frame_idx));
113+
t.add(new KVP("sub_slice_interval",sub_slice_interval));
114+
t.add(new KVP("type_2_start",type_2_start));
115+
t.add(new KVP("l1_change_counter",l1_change_counter));
116+
t.add(new KVP("start_rf_idx",start_rf_idx));
117+
t.add(new KVP("reserved_1",reserved_1));
121118

122119
Utils.addListJTree(t,plpList,modus,"PLPs");
123-
t.add(new DefaultMutableTreeNode(new KVP("reserved_3",reserved_3,null)));
120+
t.add(new KVP("reserved_3",reserved_3));
124121
Utils.addListJTree(t,aux_private_dynList,modus,"AUX_PRIVATE_DYNs");
125122
return t;
126123
}

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pid/t2mi/IndividualAddressingPayload.java‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,17 @@
2727

2828
package nl.digitalekabeltelevisie.data.mpeg.pid.t2mi;
2929

30-
import static nl.digitalekabeltelevisie.util.Utils.*;
30+
import static nl.digitalekabeltelevisie.util.Utils.MASK_8BITS;
31+
import static nl.digitalekabeltelevisie.util.Utils.getInt;
3132

32-
import java.util.*;
33+
import java.util.ArrayList;
34+
import java.util.List;
3335

34-
import javax.swing.tree.DefaultMutableTreeNode;
35-
36-
import nl.digitalekabeltelevisie.controller.*;
37-
import nl.digitalekabeltelevisie.util.*;
36+
import nl.digitalekabeltelevisie.controller.KVP;
37+
import nl.digitalekabeltelevisie.controller.TreeNode;
38+
import nl.digitalekabeltelevisie.util.BitSource;
39+
import nl.digitalekabeltelevisie.util.LookUpList;
40+
import nl.digitalekabeltelevisie.util.Utils;
3841

3942
public class IndividualAddressingPayload extends Payload{
4043

@@ -56,14 +59,13 @@ public Function(BitSource bs) {
5659
}
5760

5861
@Override
59-
public DefaultMutableTreeNode getJTreeNode(int modus) {
60-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("Function"));
61-
t.add(new DefaultMutableTreeNode(
62-
new KVP("function_tag", function_tag, function_type_list.get(function_tag))));
63-
t.add(new DefaultMutableTreeNode(new KVP("function_length", function_length,
64-
" defines the total length of the function() in bytes, including the function_tag, function_length and function_body() fields")));
62+
public KVP getJTreeNode(int modus) {
63+
KVP t = new KVP("Function");
64+
t.add(new KVP("function_tag", function_tag, function_type_list.get(function_tag)));
65+
t.add(new KVP("function_length", function_length,
66+
" defines the total length of the function() in bytes, including the function_tag, function_length and function_body() fields"));
6567
if (body != null) {
66-
t.add(new DefaultMutableTreeNode(new KVP("body", body, null)));
68+
t.add(new KVP("body", body));
6769
}
6870
return t;
6971
}
@@ -110,10 +112,10 @@ public IndividualAddressingData(BitSource bs) {
110112
}
111113

112114
@Override
113-
public DefaultMutableTreeNode getJTreeNode(int modus) {
114-
DefaultMutableTreeNode t = new DefaultMutableTreeNode(new KVP("IndividualAddressingData"));
115-
t.add(new DefaultMutableTreeNode(new KVP("tx_identifier", tx_identifier, null)));
116-
t.add(new DefaultMutableTreeNode(new KVP("function_loop_length", function_loop_length, null)));
115+
public KVP getJTreeNode(int modus) {
116+
KVP t = new KVP("IndividualAddressingData");
117+
t.add(new KVP("tx_identifier", tx_identifier));
118+
t.add(new KVP("function_loop_length", function_loop_length));
117119
Utils.addListJTree(t, functionList, modus, "Functions");
118120
return t;
119121
}
@@ -157,11 +159,11 @@ public IndividualAddressingPayload(byte[] data) {
157159
}
158160

159161
@Override
160-
public DefaultMutableTreeNode getJTreeNode(int modus) {
161-
DefaultMutableTreeNode payloadNode = new DefaultMutableTreeNode(new KVP("payload"));
162+
public KVP getJTreeNode(int modus) {
163+
KVP payloadNode = new KVP("payload");
162164

163-
payloadNode.add(new DefaultMutableTreeNode(
164-
new KVP("individual_addressing_length", individual_addressing_length, null)));
165+
payloadNode.add(
166+
new KVP("individual_addressing_length", individual_addressing_length));
165167

166168
Utils.addListJTree(payloadNode, individualAddressingDataList, modus, "Individual addressing");
167169
return payloadNode;

0 commit comments

Comments
 (0)