Skip to content

Commit b03780a

Browse files
EricBerendsenEricBerendsen
committed
remove DefaultMutableTreeNode
1 parent b1538d5 commit b03780a

File tree

12 files changed

+70
-107
lines changed

12 files changed

+70
-107
lines changed

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/PesPacketData.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
package nl.digitalekabeltelevisie.data.mpeg;
2929

3030
import static nl.digitalekabeltelevisie.gui.utils.GuiUtils.getErrorKVP;
31-
import static nl.digitalekabeltelevisie.util.Utils.*;
32-
33-
import javax.swing.tree.DefaultMutableTreeNode;
31+
import static nl.digitalekabeltelevisie.util.Utils.MASK_8BITS;
32+
import static nl.digitalekabeltelevisie.util.Utils.getInt;
33+
import static nl.digitalekabeltelevisie.util.Utils.printTimebase90kHz;
34+
import static nl.digitalekabeltelevisie.util.Utils.showPtsModus;
3435

3536
import nl.digitalekabeltelevisie.controller.KVP;
3637
import nl.digitalekabeltelevisie.controller.TreeNode;
@@ -233,8 +234,8 @@ public final int getPes_header_data_length() {
233234
* @see nl.digitalekabeltelevisie.controller.TreeNode#getJTreeNode(int)
234235
*/
235236
@Override
236-
public DefaultMutableTreeNode getJTreeNode(final int modus){
237-
return getJTreeNode(modus,new KVP("PES Packet"));
237+
public KVP getJTreeNode(final int modus){
238+
return getJTreeNode(modus,new KVP("PES Packet"));
238239
}
239240

240241
/**

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/ac3/AC3PESDataField.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
package nl.digitalekabeltelevisie.data.mpeg.pes.ac3;
2929

30-
import javax.swing.tree.DefaultMutableTreeNode;
31-
3230
import nl.digitalekabeltelevisie.controller.KVP;
3331
import nl.digitalekabeltelevisie.controller.TreeNode;
3432
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
@@ -51,8 +49,9 @@ public AC3PESDataField(final PesPacketData pesPacket) {
5149

5250

5351

54-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
55-
return super.getJTreeNode(modus,new KVP("AC-3 PES Packet"));
52+
@Override
53+
public KVP getJTreeNode(int modus) {
54+
return getJTreeNode(modus,new KVP("AC-3 PES Packet"));
5655
}
5756

5857
}

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/audio/AudioPESDataField.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,15 @@
2727

2828
package nl.digitalekabeltelevisie.data.mpeg.pes.audio;
2929

30-
import javax.swing.tree.DefaultMutableTreeNode;
31-
3230
import nl.digitalekabeltelevisie.controller.KVP;
33-
import nl.digitalekabeltelevisie.controller.TreeNode;
3431
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
3532

3633
/**
3734
* @author Eric Berendsen
3835
*
3936
*/
4037

41-
public class AudioPESDataField extends PesPacketData implements TreeNode {
38+
public class AudioPESDataField extends PesPacketData {
4239

4340

4441
public AudioPESDataField(final PesPacketData pesPacket) {
@@ -52,11 +49,8 @@ public AudioPESDataField(final PesPacketData pesPacket) {
5249
* @see nl.digitalekabeltelevisie.controller.TreeNode#getJTreeNode(int)
5350
*/
5451
@Override
55-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
56-
57-
final DefaultMutableTreeNode s = super.getJTreeNode(modus,new KVP("Audio PES Packet"));
58-
59-
return s;
52+
public KVP getJTreeNode(int modus) {
53+
return getJTreeNode(modus,new KVP("Audio PES Packet"));
6054
}
6155

6256

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/audio/aac/Audio144963PESDataField.java‎

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

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

32-
import java.util.*;
33-
34-
import javax.swing.tree.DefaultMutableTreeNode;
32+
import java.util.ArrayList;
33+
import java.util.List;
3534

3635
import nl.digitalekabeltelevisie.controller.KVP;
3736
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
@@ -66,12 +65,9 @@ public Audio144963PESDataField(final PesPacketData pesPacket, Audio144963Handler
6665
* @see nl.digitalekabeltelevisie.controller.TreeNode#getJTreeNode(int)
6766
*/
6867
@Override
69-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
70-
71-
final DefaultMutableTreeNode s = super.getJTreeNode(modus,new KVP("Audio 14496-3 PES Packet"));
72-
68+
public KVP getJTreeNode(int modus) {
69+
KVP s = getJTreeNode(modus,new KVP("Audio 14496-3 PES Packet"));
7370
addListJTree(s, audioSyncStreamList, modus, "AudioSyncStreams");
74-
7571
return s;
7672
}
7773

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/audio/ac4/AC4PesDataField.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
import java.util.ArrayList;
3333
import java.util.List;
3434

35-
import javax.swing.tree.DefaultMutableTreeNode;
36-
3735
import nl.digitalekabeltelevisie.controller.KVP;
3836
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
3937

@@ -61,8 +59,9 @@ protected AC4PesDataField(PesPacketData pesPacket) {
6159
}
6260

6361

64-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
65-
DefaultMutableTreeNode jTreeNode = super.getJTreeNode(modus,new KVP("AC-4 PES Packet"));
62+
@Override
63+
public KVP getJTreeNode(final int modus) {
64+
KVP jTreeNode = getJTreeNode(modus,new KVP("AC-4 PES Packet"));
6665
addListJTree(jTreeNode, ac4SyncFrames, modus, "AC4 SyncFrames");
6766
return jTreeNode;
6867
}

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/dvbsubtitling/DVBSubtitlingPESDataField.java‎

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

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

32-
import java.awt.*;
33-
import java.awt.image.*;
32+
import java.awt.Color;
33+
import java.awt.Font;
34+
import java.awt.Graphics2D;
35+
import java.awt.Rectangle;
36+
import java.awt.image.BufferedImage;
37+
import java.awt.image.IndexColorModel;
38+
import java.awt.image.WritableRaster;
3439
import java.io.InputStream;
35-
import java.util.*;
40+
import java.util.ArrayList;
41+
import java.util.HashMap;
3642
import java.util.List;
37-
import java.util.logging.*;
43+
import java.util.Map;
44+
import java.util.logging.Level;
45+
import java.util.logging.Logger;
3846

3947
import javax.imageio.ImageIO;
40-
import javax.swing.tree.DefaultMutableTreeNode;
4148

42-
import nl.digitalekabeltelevisie.controller.*;
49+
import nl.digitalekabeltelevisie.controller.KVP;
4350
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
4451
import nl.digitalekabeltelevisie.data.mpeg.pes.PesHeader;
4552
import nl.digitalekabeltelevisie.gui.ImageSource;
@@ -154,9 +161,9 @@ public DVBSubtitlingPESDataField(PesPacketData pesPacket){
154161
* @see nl.digitalekabeltelevisie.controller.TreeNode#getJTreeNode(int)
155162
*/
156163
@Override
157-
public DefaultMutableTreeNode getJTreeNode(int modus) {
164+
public KVP getJTreeNode(int modus) {
158165

159-
DefaultMutableTreeNode s = super.getJTreeNode(modus,new KVP("DVBSubtitlingSegments").addImageSource(this, "DVBSubtitlingSegments"));
166+
KVP s = getJTreeNode(modus,new KVP("DVBSubtitlingSegments").addImageSource(this, "DVBSubtitlingSegments"));
160167
if(pesDataLen>0) { // PES packet with more than just header
161168
s.add(new KVP("data_identifier",data_identifier).setDescription(getDataIDString(data_identifier)));
162169
if(data_identifier==0x20){ // For DVB subtitle streams the data_identifier field shall be coded with the value 0x20. 300 743 V1.3.1 p.20

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/smpte/Smpte2038PesDataField.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package nl.digitalekabeltelevisie.data.mpeg.pes.smpte;
22

3-
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
4-
import nl.digitalekabeltelevisie.util.BitSource;
5-
import nl.digitalekabeltelevisie.util.Utils;
6-
import nl.digitalekabeltelevisie.controller.KVP;
7-
83
import java.util.ArrayList;
94
import java.util.List;
105

11-
import javax.swing.tree.DefaultMutableTreeNode;
6+
import nl.digitalekabeltelevisie.controller.KVP;
7+
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
8+
import nl.digitalekabeltelevisie.util.BitSource;
9+
import nl.digitalekabeltelevisie.util.Utils;
1210

1311
public class Smpte2038PesDataField extends PesPacketData {
1412

15-
final private List<AncillaryDataPacket> ancDataPackets = new ArrayList<AncillaryDataPacket>();
13+
final private List<AncillaryDataPacket> ancDataPackets = new ArrayList<>();
1614

1715
/**
1816
* Constructor for SMPTE2038 Packet
@@ -37,8 +35,8 @@ protected Smpte2038PesDataField(final PesPacketData pesPacket) {
3735
/**
3836
* Handle display of SMPTE 2038 Pes Packet and create node with Ancillary data
3937
*/
40-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
41-
final DefaultMutableTreeNode s = super.getJTreeNode(modus, new KVP("SMPTE 2038 PES Packet"));
38+
public KVP getJTreeNode(int modus) {
39+
KVP s = getJTreeNode(modus, new KVP("SMPTE 2038 PES Packet"));
4240
Utils.addListJTree(s, ancDataPackets, modus, "Ancillary Data");
4341
return s;
4442
}

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/ttml/TtmlPesDataField.java‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,7 @@
2626
*
2727
*/
2828

29-
import static nl.digitalekabeltelevisie.util.Utils.MASK_16BITS;
30-
import static nl.digitalekabeltelevisie.util.Utils.MASK_32BITS;
31-
import static nl.digitalekabeltelevisie.util.Utils.MASK_40BITS;
32-
import static nl.digitalekabeltelevisie.util.Utils.MASK_8BITS;
33-
import static nl.digitalekabeltelevisie.util.Utils.addListJTree;
34-
import static nl.digitalekabeltelevisie.util.Utils.getInt;
35-
import static nl.digitalekabeltelevisie.util.Utils.getLong;
29+
import static nl.digitalekabeltelevisie.util.Utils.*;
3630

3731
import java.io.ByteArrayInputStream;
3832
import java.io.ByteArrayOutputStream;
@@ -44,8 +38,6 @@
4438
import java.util.logging.Logger;
4539
import java.util.zip.GZIPInputStream;
4640

47-
import javax.swing.tree.DefaultMutableTreeNode;
48-
4941
import nl.digitalekabeltelevisie.controller.KVP;
5042
import nl.digitalekabeltelevisie.controller.TreeNode;
5143
import nl.digitalekabeltelevisie.data.mpeg.CRCcheck;
@@ -114,22 +106,18 @@ public Segment(int segment_type, int segment_length, byte[] segment_data_field)
114106
}
115107
}
116108

117-
118-
119109
@Override
120-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
121-
final DefaultMutableTreeNode s = new DefaultMutableTreeNode(new KVP("Ttml Segment"));
122-
s.add(new DefaultMutableTreeNode(new KVP("segment_type",segment_type,segmentTypeList.get(segment_type))));
123-
s.add(new DefaultMutableTreeNode(new KVP("segment_length",segment_length,null)));
124-
s.add(new DefaultMutableTreeNode(new KVP("segment_data_field",segment_data_field,null)));
125-
KVP xmlKvp = new KVP("xml",xml,null);
110+
public KVP getJTreeNode(int modus) {
111+
KVP s = new KVP("Ttml Segment");
112+
s.add(new KVP("segment_type", segment_type, segmentTypeList.get(segment_type)));
113+
s.add(new KVP("segment_length", segment_length));
114+
s.add(new KVP("segment_data_field", segment_data_field));
115+
KVP xmlKvp = new KVP("xml", xml);
126116
xmlKvp.addXMLSource(this, "Ttml Segment");
127-
s.add(new DefaultMutableTreeNode(xmlKvp));
117+
s.add(xmlKvp);
128118
return s;
129-
130-
}
131-
132119

120+
}
133121

134122
@Override
135123
public String getXML() {
@@ -164,13 +152,13 @@ protected TtmlPesDataField(PesPacketData pesPacket) {
164152
}
165153

166154
@Override
167-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
155+
public KVP getJTreeNode(int modus) {
168156

169-
final DefaultMutableTreeNode s = super.getJTreeNode(modus,new KVP("Ttml Subtitling PES Packet"));
170-
s.add(new DefaultMutableTreeNode(new KVP("segment_mediatime",segment_mediatime,"(* 100 microseconds)")));
171-
s.add(new DefaultMutableTreeNode(new KVP("num_of_segments",num_of_segments,null)));
157+
KVP s = getJTreeNode(modus,new KVP("Ttml Subtitling PES Packet"));
158+
s.add(new KVP("segment_mediatime",segment_mediatime,"(* 100 microseconds)"));
159+
s.add(new KVP("num_of_segments",num_of_segments));
172160
addListJTree(s,segmentList,modus,"Segments");
173-
s.add(new DefaultMutableTreeNode(new KVP("crc_32",crc_32,crc32Failed?"error in CRC Check":null)));
161+
s.add(new KVP("crc_32",crc_32,crc32Failed?"error in CRC Check":null));
174162

175163

176164
return s;

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video264/Video14496PESDataField.java‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929

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

32-
import java.util.logging.Logger;
33-
34-
import javax.swing.tree.DefaultMutableTreeNode;
35-
36-
import nl.digitalekabeltelevisie.controller.*;
32+
import nl.digitalekabeltelevisie.controller.KVP;
3733
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
3834
import nl.digitalekabeltelevisie.data.mpeg.pes.video26x.H26xPESDataField;
3935

@@ -42,30 +38,20 @@
4238
*
4339
*/
4440

45-
public class Video14496PESDataField extends H26xPESDataField<NALUnit> implements TreeNode {
46-
47-
private static final Logger logger = Logger.getLogger(Video14496PESDataField.class.getName());
48-
41+
public class Video14496PESDataField extends H26xPESDataField<NALUnit> {
4942

5043
public Video14496PESDataField(final PesPacketData pesPacket) {
5144
super(pesPacket);
5245

5346
}
5447

55-
56-
57-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
58-
final DefaultMutableTreeNode s = super.getJTreeNode(modus,new KVP("Video 14496 PES Packet"));
48+
@Override
49+
public KVP getJTreeNode(int modus) {
50+
KVP s = getJTreeNode(modus,new KVP("Video 14496 PES Packet"));
5951
addListJTree(s,nalUnits,modus,"NAL Units");
6052
return s;
61-
6253
}
6354

64-
65-
66-
/* (non-Javadoc)
67-
* @see nl.digitalekabeltelevisie.data.mpeg.pes.video264.H26xPESDataField#createInstance(byte[], int, int)
68-
*/
6955
@Override
7056
protected NALUnit createNALUnitInstance(final byte[] data, final int i, final int j) {
7157
return new NALUnit(data, i, j);

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video265/Video265PESDataField.java‎

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

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

32-
import javax.swing.tree.DefaultMutableTreeNode;
33-
34-
import nl.digitalekabeltelevisie.controller.*;
32+
import nl.digitalekabeltelevisie.controller.KVP;
3533
import nl.digitalekabeltelevisie.data.mpeg.PesPacketData;
3634
import nl.digitalekabeltelevisie.data.mpeg.pes.video26x.H26xPESDataField;
3735

@@ -40,7 +38,7 @@
4038
*
4139
*/
4240

43-
public class Video265PESDataField extends H26xPESDataField<H265NALUnit> implements TreeNode {
41+
public class Video265PESDataField extends H26xPESDataField<H265NALUnit> {
4442

4543
public Video265PESDataField(final PesPacketData pesPacket) {
4644
super(pesPacket);
@@ -49,8 +47,8 @@ public Video265PESDataField(final PesPacketData pesPacket) {
4947

5048

5149

52-
public DefaultMutableTreeNode getJTreeNode(final int modus) {
53-
final DefaultMutableTreeNode s = super.getJTreeNode(modus,new KVP("Video H.265 PES Packet"));
50+
public KVP getJTreeNode(int modus) {
51+
KVP s = getJTreeNode(modus,new KVP("Video H.265 PES Packet"));
5452
addListJTree(s,nalUnits,modus,"NAL Units");
5553
return s;
5654

0 commit comments

Comments
 (0)