Skip to content

Commit ed7f9d7

Browse files
EricBerendsenEricBerendsen
committed
remove deprecated setXXXSource methods
1 parent 5213411 commit ed7f9d7

21 files changed

+49
-71
lines changed

‎src/main/java/nl/digitalekabeltelevisie/controller/KVP.java

-24
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,6 @@ public enum FIELD_TYPE {
129129
*/
130130
private String crumb;
131131

132-
@Deprecated
133-
public void setHtmlSource(HTMLSource htmlSource) {
134-
detailViews.add(new DetailView(htmlSource, ""));
135-
}
136-
137132
private JMenuItem subMenu;
138133
private Object owner;
139134
private String labelAppend = "";
@@ -422,13 +417,6 @@ public static STRING_DISPLAY getStringDisplay() {
422417
public static void setStringDisplay(STRING_DISPLAY stringDisplay) {
423418
KVP.stringDisplay = stringDisplay;
424419
}
425-
/**
426-
* @param imageSource the imageSource to set
427-
*/
428-
@Deprecated
429-
public void setImageSource(ImageSource imageSource) {
430-
detailViews.add(new DetailView(imageSource,""));
431-
}
432420

433421
public String getPlainText(){
434422
return toString(STRING_DISPLAY.PLAIN, NUMBER_DISPLAY.BOTH);
@@ -481,18 +469,6 @@ public byte[] getByteValue() {
481469
}
482470

483471

484-
485-
@Deprecated
486-
public void setTableSource(TableSource tableSource) {
487-
detailViews.add(new DetailView(tableSource,""));
488-
}
489-
490-
491-
@Deprecated
492-
public void setXmlSource(XMLSource xmlSource) {
493-
detailViews.add(new DetailView(xmlSource,""));
494-
}
495-
496472
public String getCrumb() {
497473
if(crumb!=null) {
498474
return crumb;

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/dsmcc/ServiceDSMCC.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -206,7 +206,7 @@ private DefaultMutableTreeNode buildTree(final BIOPMessage biopMessage, final S
206206
if(biopMessage instanceof BIOPDirectoryMessage){
207207
final BIOPDirectoryMessage dir = (BIOPDirectoryMessage) biopMessage;
208208
final DSMFile dsmFile = new DSMFile(dir,label);
209-
kvp.setHtmlSource(dsmFile);
209+
kvp.addHTMLSource(dsmFile,"directory_message");
210210

211211
final JMenuItem objectMenu = new JMenuItem("Export (sub)tree...");
212212
objectMenu.setActionCommand(DVBtree.EXPORT);
@@ -224,13 +224,13 @@ private DefaultMutableTreeNode buildTree(final BIOPMessage biopMessage, final S
224224
final JMenuItem objectMenu = new JMenuItem("Save as...");
225225
objectMenu.setActionCommand(DVBtree.SAVE);
226226
final DSMFile dsmFile = new DSMFile(biopMessage,label);
227-
kvp.setHtmlSource(dsmFile);
227+
kvp.addHTMLSource(dsmFile,"file_message");
228228

229229
kvp.setSubMenuAndOwner(objectMenu,dsmFile);
230230

231231
}else if(biopMessage instanceof BIOPStreamEventMessage){
232232
final DSMFile dsmFile = new DSMFile(biopMessage,label);
233-
kvp.setHtmlSource(dsmFile);
233+
kvp.addHTMLSource(dsmFile,"stream_event_message");
234234
}
235235
return treeNode;
236236
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* http://www.digitalekabeltelevisie.nl/dvb_inspector
55
*
6-
* This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
6+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
77
*
88
* This file is part of DVB Inspector.
99
*
@@ -123,7 +123,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
123123
s.add(new DefaultMutableTreeNode(new KVP("segment_length",segment_length,null)));
124124
s.add(new DefaultMutableTreeNode(new KVP("segment_data_field",segment_data_field,null)));
125125
KVP xmlKvp = new KVP("xml",xml,null);
126-
xmlKvp.setXmlSource(this);
126+
xmlKvp.addXMLSource(this, "Ttml Segment");
127127
s.add(new DefaultMutableTreeNode(xmlKvp));
128128
return s;
129129

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video/common/Cea608.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -402,21 +402,23 @@ void addRawCCDataToTree(final int modus, final DefaultMutableTreeNode s) {
402402
for( Entry<Integer, Map<Long, List<Construct>>> typeEntry:allCcData.entrySet()) {
403403
final Map<Long, List<Construct>> typeEntryValue = typeEntry.getValue();
404404
final KVP typeNodeKvp = new KVP("type",typeEntry.getKey(),Construct.cc_type_list.get(typeEntry.getKey()));
405-
typeNodeKvp.setHtmlSource(() -> typeEntryValue.values().
405+
typeNodeKvp.addHTMLSource(() -> typeEntryValue.values().
406406
stream().
407407
flatMap(Collection::stream).
408408
map(HTMLSource::getHTML).
409-
collect(Collectors.joining("<br>"))
409+
collect(Collectors.joining("<br>")),
410+
"cc_data"
410411
);
411412
DefaultMutableTreeNode typeNode = new DefaultMutableTreeNode(typeNodeKvp);
412413
ccDataTree.add(typeNode);
413414

414415
for(Entry<Long, List<Construct>> ptsEntry: typeEntryValue.entrySet()) {
415416
final List<Construct> constructList = ptsEntry.getValue();
416417
final KVP kvp = new KVP("pts",ptsEntry.getKey(),printTimebase90kHz(ptsEntry.getKey()));
417-
kvp.setHtmlSource(() -> constructList.stream().
418+
kvp.addHTMLSource(() -> constructList.stream().
418419
map(HTMLSource::getHTML).
419-
collect(Collectors.joining("<br>"))
420+
collect(Collectors.joining("<br>")),
421+
"pts"
420422
);
421423

422424

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BAT.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -66,14 +66,14 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
6666

6767
KVP kvpBat = new KVP("BAT");
6868
if(!networks.isEmpty()) {
69-
kvpBat.setTableSource(this::getTableModel);
69+
kvpBat.addTableSource(this::getTableModel, "BAT");
7070
}
7171
final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvpBat);
7272
for(int bouquetNo:new TreeSet<>(networks.keySet())) {
7373

7474
KVP kvp = new KVP("bouquet_id",bouquetNo, Utils.getBouquetIDString(bouquetNo));
7575
if(hasTransportStreams(bouquetNo)) {
76-
kvp.setTableSource(()->getTableForBouqetID(bouquetNo));
76+
kvp.addTableSource(()->getTableForBouqetID(bouquetNo), "bouquet_id "+bouquetNo);
7777
}
7878
final DefaultMutableTreeNode n = new DefaultMutableTreeNode(kvp);
7979
final BATsection [] sections = networks.get(bouquetNo);

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BATsection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -117,7 +117,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
117117
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
118118
KVP kvp = (KVP) t.getUserObject();
119119
if(!transportStreamList.isEmpty()) {
120-
kvp.setTableSource(this::getTableModel);
120+
kvp.addTableSource(this::getTableModel, "bat");
121121
}
122122
t.add(new DefaultMutableTreeNode(new KVP("network_descriptors_lengt", getNetworkDescriptorsLength(), null)));
123123
Utils.addListJTree(t, networkDescriptorList, modus, "network_descriptors");

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2021 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -80,7 +80,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
8080

8181
KVP kvp = new KVP("CAT");
8282
if(hasCADescriptors()) {
83-
kvp.setTableSource(this::getTableModel);
83+
kvp.addTableSource(this::getTableModel, "cat");
8484
}
8585
final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp);
8686

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAsection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2012 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -64,7 +64,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
6464
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
6565
if(!descriptorList.isEmpty()) {
6666
KVP kvp = (KVP) t.getUserObject();
67-
kvp.setTableSource(this);
67+
kvp.addTableSource(this, "cat");
6868
}
6969
Utils.addListJTree(t, descriptorList, modus, "descriptors");
7070
return t;

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PAT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* http://www.digitalekabeltelevisie.nl/dvb_inspector
55
*
6-
* This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
6+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
77
*
88
* This file is part of DVB Inspector.
99
*
@@ -100,7 +100,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
100100
final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp);
101101

102102
if (pat != null) {
103-
kvp.setTableSource(this::getTableModel);
103+
kvp.addTableSource(this::getTableModel, "PAT");
104104
for (PATsection element : pat) {
105105
if(element!= null){
106106
if(!Utils.simpleModus(modus)){ // show all versions

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PATsection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){
144144

145145
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
146146
KVP kvp = (KVP) t.getUserObject();
147-
kvp.setTableSource(this);
147+
kvp.addTableSource(this, "PAT");
148148

149149
Utils.addListJTree(t,programs,modus,"programs");
150150
return t;

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -94,7 +94,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
9494

9595
KVP sdtKvp = new KVP("SDT");
9696
if(!networks.isEmpty()) {
97-
sdtKvp.setTableSource(this::getTableForSdt);
97+
sdtKvp.addTableSource(this::getTableForSdt, "SDT");
9898
}
9999
final DefaultMutableTreeNode t = new DefaultMutableTreeNode(sdtKvp);
100100

@@ -103,7 +103,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
103103
final Map<Integer, SDTsection[]> networkSections = networks.get(orgNetworkId);
104104

105105
KVP kvpOrgNetwork = new KVP("original_network_id", orgNetworkId, Utils.getOriginalNetworkIDString(orgNetworkId));
106-
kvpOrgNetwork.setTableSource(() -> getTableForOriginalNetwork(orgNetworkId));
106+
kvpOrgNetwork.addTableSource(() -> getTableForOriginalNetwork(orgNetworkId), "SDT original_network_id: " + orgNetworkId);
107107
final DefaultMutableTreeNode n = new DefaultMutableTreeNode(kvpOrgNetwork);
108108
t.add(n);
109109

@@ -112,7 +112,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
112112
SDTsection[] sections = networkSections.get(transport_stream_id);
113113

114114
KVP kvpTsId = new KVP("transport_stream_id", transport_stream_id, null);
115-
kvpTsId.setTableSource(() -> getTableForTransportStreamID(orgNetworkId, transport_stream_id));
115+
kvpTsId.addTableSource(() -> getTableForTransportStreamID(orgNetworkId, transport_stream_id),"SDT transport_stream_id: "+transport_stream_id);
116116

117117
final DefaultMutableTreeNode m = new DefaultMutableTreeNode(kvpTsId);
118118
n.add(m);

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDTsection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -221,7 +221,7 @@ private List<Service> buildServicesList(final byte[] data, final int offset, fin
221221
public DefaultMutableTreeNode getJTreeNode(final int modus){
222222

223223
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
224-
((KVP) t.getUserObject()).setTableSource(this::getTableModel);
224+
((KVP) t.getUserObject()).addTableSource(this::getTableModel, "SDT Section");
225225

226226
t.add(new DefaultMutableTreeNode(new KVP("original_network_id",originalNetworkID,Utils.getOriginalNetworkIDString(originalNetworkID))));
227227

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -56,7 +56,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
5656
KVP kvp = new KVP("TDT");
5757
final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp);
5858
if(!tdtSectionList.isEmpty()) {
59-
kvp.setTableSource(this::getTableModel);
59+
kvp.addTableSource(this::getTableModel, "TDT");
6060
}
6161

6262
for (TDTsection tdTsection : tdtSectionList) {

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDTsection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -65,7 +65,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){
6565

6666
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
6767
KVP kvp = (KVP)t.getUserObject();
68-
kvp.setTableSource(this::getTableModel);
68+
kvp.addTableSource(this::getTableModel, "TDT Section");
6969
t.add(new DefaultMutableTreeNode(new KVP("UTC_time",UTC_time,Utils.getUTCFormattedString(UTC_time))));
7070
return t;
7171
}

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* http://www.digitalekabeltelevisie.nl/dvb_inspector
44
*
5-
* This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
5+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
66
*
77
* This file is part of DVB Inspector.
88
*
@@ -60,7 +60,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) {
6060

6161
KVP kvp = new KVP("TOT");
6262
if(!totSectionList.isEmpty()) {
63-
kvp.setTableSource(this::getTableModel);
63+
kvp.addTableSource(this::getTableModel, "TOT");
6464
}
6565
final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp);
6666

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOTsection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){
8383

8484
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
8585
KVP kvp = (KVP)t.getUserObject();
86-
kvp.setTableSource(this::getTableModel);
86+
kvp.addTableSource(this::getTableModel, "TOT Section");
8787
t.add(new DefaultMutableTreeNode(new KVP("UTC_time",UTC_time,Utils.getUTCFormattedString(UTC_time))));
8888
if(!Utils.simpleModus(modus)){
8989
t.add(new DefaultMutableTreeNode(new KVP("descriptors_loop_length",descriptorsLoopLength,null)));

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FNTsection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* http://www.digitalekabeltelevisie.nl/dvb_inspector
55
*
6-
* This code is Copyright 2009-2019 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
6+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
77
*
88
* This file is part of DVB Inspector.
99
*
@@ -201,7 +201,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){
201201

202202
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
203203
KVP kvp = (KVP) t.getUserObject();
204-
kvp.setTableSource(this::getTableModel);
204+
kvp.addTableSource(this::getTableModel, "FNT");
205205

206206
t.add(new DefaultMutableTreeNode(new KVP("network_descriptors_loop_length",network_descriptors_loop_length,null)));
207207
Utils.addListJTree(t,networkDescriptorList,modus,"network_descriptors");

‎src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FSTsection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* http://www.digitalekabeltelevisie.nl/dvb_inspector
55
*
6-
* This code is Copyright 2009-2019 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
6+
* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl)
77
*
88
* This file is part of DVB Inspector.
99
*
@@ -269,7 +269,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){
269269

270270
final DefaultMutableTreeNode t = super.getJTreeNode(modus);
271271
KVP kvp = (KVP) t.getUserObject();
272-
kvp.setTableSource(this::getTableModel);
272+
kvp.addTableSource(this::getTableModel, "FST");
273273

274274

275275
Utils.addListJTree(t,serviceList,modus,"service_loop");

0 commit comments

Comments
 (0)