From ed7f9d7a2f997f184fc467b3acff81500623d7e2 Mon Sep 17 00:00:00 2001 From: Eric Berendsen Date: Sun, 8 Sep 2024 22:44:46 +0200 Subject: [PATCH] remove deprecated setXXXSource methods --- .../controller/KVP.java | 24 ------------------- .../data/mpeg/dsmcc/ServiceDSMCC.java | 8 +++---- .../data/mpeg/pes/ttml/TtmlPesDataField.java | 4 ++-- .../data/mpeg/pes/video/common/Cea608.java | 10 ++++---- .../data/mpeg/psi/BAT.java | 6 ++--- .../data/mpeg/psi/BATsection.java | 4 ++-- .../data/mpeg/psi/CAT.java | 4 ++-- .../data/mpeg/psi/CAsection.java | 4 ++-- .../data/mpeg/psi/PAT.java | 4 ++-- .../data/mpeg/psi/PATsection.java | 2 +- .../data/mpeg/psi/SDT.java | 8 +++---- .../data/mpeg/psi/SDTsection.java | 4 ++-- .../data/mpeg/psi/TDT.java | 4 ++-- .../data/mpeg/psi/TDTsection.java | 4 ++-- .../data/mpeg/psi/TOT.java | 4 ++-- .../data/mpeg/psi/TOTsection.java | 2 +- .../data/mpeg/psi/nonstandard/FNTsection.java | 4 ++-- .../data/mpeg/psi/nonstandard/FSTsection.java | 4 ++-- .../data/mpeg/psi/nonstandard/M7Fastscan.java | 4 ++-- .../data/mpeg/psi/nonstandard/ONTSection.java | 2 +- .../psi/nonstandard/OperatorFastscan.java | 10 ++++---- 21 files changed, 49 insertions(+), 71 deletions(-) diff --git a/src/main/java/nl/digitalekabeltelevisie/controller/KVP.java b/src/main/java/nl/digitalekabeltelevisie/controller/KVP.java index 7c8816cd..cdf11a2b 100644 --- a/src/main/java/nl/digitalekabeltelevisie/controller/KVP.java +++ b/src/main/java/nl/digitalekabeltelevisie/controller/KVP.java @@ -129,11 +129,6 @@ public enum FIELD_TYPE { */ private String crumb; - @Deprecated - public void setHtmlSource(HTMLSource htmlSource) { - detailViews.add(new DetailView(htmlSource, "")); - } - private JMenuItem subMenu; private Object owner; private String labelAppend = ""; @@ -422,13 +417,6 @@ public static STRING_DISPLAY getStringDisplay() { public static void setStringDisplay(STRING_DISPLAY stringDisplay) { KVP.stringDisplay = stringDisplay; } - /** - * @param imageSource the imageSource to set - */ - @Deprecated - public void setImageSource(ImageSource imageSource) { - detailViews.add(new DetailView(imageSource,"")); - } public String getPlainText(){ return toString(STRING_DISPLAY.PLAIN, NUMBER_DISPLAY.BOTH); @@ -481,18 +469,6 @@ public byte[] getByteValue() { } - - @Deprecated - public void setTableSource(TableSource tableSource) { - detailViews.add(new DetailView(tableSource,"")); - } - - - @Deprecated - public void setXmlSource(XMLSource xmlSource) { - detailViews.add(new DetailView(xmlSource,"")); - } - public String getCrumb() { if(crumb!=null) { return crumb; diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/dsmcc/ServiceDSMCC.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/dsmcc/ServiceDSMCC.java index 0346efc9..d524e4e1 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/dsmcc/ServiceDSMCC.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/dsmcc/ServiceDSMCC.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -206,7 +206,7 @@ private DefaultMutableTreeNode buildTree(final BIOPMessage biopMessage, final S if(biopMessage instanceof BIOPDirectoryMessage){ final BIOPDirectoryMessage dir = (BIOPDirectoryMessage) biopMessage; final DSMFile dsmFile = new DSMFile(dir,label); - kvp.setHtmlSource(dsmFile); + kvp.addHTMLSource(dsmFile,"directory_message"); final JMenuItem objectMenu = new JMenuItem("Export (sub)tree..."); objectMenu.setActionCommand(DVBtree.EXPORT); @@ -224,13 +224,13 @@ private DefaultMutableTreeNode buildTree(final BIOPMessage biopMessage, final S final JMenuItem objectMenu = new JMenuItem("Save as..."); objectMenu.setActionCommand(DVBtree.SAVE); final DSMFile dsmFile = new DSMFile(biopMessage,label); - kvp.setHtmlSource(dsmFile); + kvp.addHTMLSource(dsmFile,"file_message"); kvp.setSubMenuAndOwner(objectMenu,dsmFile); }else if(biopMessage instanceof BIOPStreamEventMessage){ final DSMFile dsmFile = new DSMFile(biopMessage,label); - kvp.setHtmlSource(dsmFile); + kvp.addHTMLSource(dsmFile,"stream_event_message"); } return treeNode; } diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/ttml/TtmlPesDataField.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/ttml/TtmlPesDataField.java index 54a7cfd8..a15cd0da 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/ttml/TtmlPesDataField.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/ttml/TtmlPesDataField.java @@ -3,7 +3,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * -* This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) +* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -123,7 +123,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { s.add(new DefaultMutableTreeNode(new KVP("segment_length",segment_length,null))); s.add(new DefaultMutableTreeNode(new KVP("segment_data_field",segment_data_field,null))); KVP xmlKvp = new KVP("xml",xml,null); - xmlKvp.setXmlSource(this); + xmlKvp.addXMLSource(this, "Ttml Segment"); s.add(new DefaultMutableTreeNode(xmlKvp)); return s; diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video/common/Cea608.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video/common/Cea608.java index c3667d99..5d162ee0 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video/common/Cea608.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/pes/video/common/Cea608.java @@ -402,11 +402,12 @@ void addRawCCDataToTree(final int modus, final DefaultMutableTreeNode s) { for( Entry>> typeEntry:allCcData.entrySet()) { final Map> typeEntryValue = typeEntry.getValue(); final KVP typeNodeKvp = new KVP("type",typeEntry.getKey(),Construct.cc_type_list.get(typeEntry.getKey())); - typeNodeKvp.setHtmlSource(() -> typeEntryValue.values(). + typeNodeKvp.addHTMLSource(() -> typeEntryValue.values(). stream(). flatMap(Collection::stream). map(HTMLSource::getHTML). - collect(Collectors.joining("
")) + collect(Collectors.joining("
")), + "cc_data" ); DefaultMutableTreeNode typeNode = new DefaultMutableTreeNode(typeNodeKvp); ccDataTree.add(typeNode); @@ -414,9 +415,10 @@ void addRawCCDataToTree(final int modus, final DefaultMutableTreeNode s) { for(Entry> ptsEntry: typeEntryValue.entrySet()) { final List constructList = ptsEntry.getValue(); final KVP kvp = new KVP("pts",ptsEntry.getKey(),printTimebase90kHz(ptsEntry.getKey())); - kvp.setHtmlSource(() -> constructList.stream(). + kvp.addHTMLSource(() -> constructList.stream(). map(HTMLSource::getHTML). - collect(Collectors.joining("
")) + collect(Collectors.joining("
")), + "pts" ); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BAT.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BAT.java index 27ff5af2..c7e8f5b9 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BAT.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BAT.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -66,14 +66,14 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { KVP kvpBat = new KVP("BAT"); if(!networks.isEmpty()) { - kvpBat.setTableSource(this::getTableModel); + kvpBat.addTableSource(this::getTableModel, "BAT"); } final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvpBat); for(int bouquetNo:new TreeSet<>(networks.keySet())) { KVP kvp = new KVP("bouquet_id",bouquetNo, Utils.getBouquetIDString(bouquetNo)); if(hasTransportStreams(bouquetNo)) { - kvp.setTableSource(()->getTableForBouqetID(bouquetNo)); + kvp.addTableSource(()->getTableForBouqetID(bouquetNo), "bouquet_id "+bouquetNo); } final DefaultMutableTreeNode n = new DefaultMutableTreeNode(kvp); final BATsection [] sections = networks.get(bouquetNo); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BATsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BATsection.java index ec779d28..8629d54f 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BATsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/BATsection.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -117,7 +117,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { final DefaultMutableTreeNode t = super.getJTreeNode(modus); KVP kvp = (KVP) t.getUserObject(); if(!transportStreamList.isEmpty()) { - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "bat"); } t.add(new DefaultMutableTreeNode(new KVP("network_descriptors_lengt", getNetworkDescriptorsLength(), null))); Utils.addListJTree(t, networkDescriptorList, modus, "network_descriptors"); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAT.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAT.java index 611de907..cd1bed3e 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAT.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAT.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2021 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -80,7 +80,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { KVP kvp = new KVP("CAT"); if(hasCADescriptors()) { - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "cat"); } final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAsection.java index d4150fc8..53f2abd8 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/CAsection.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2012 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -64,7 +64,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { final DefaultMutableTreeNode t = super.getJTreeNode(modus); if(!descriptorList.isEmpty()) { KVP kvp = (KVP) t.getUserObject(); - kvp.setTableSource(this); + kvp.addTableSource(this, "cat"); } Utils.addListJTree(t, descriptorList, modus, "descriptors"); return t; diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PAT.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PAT.java index ec04a606..0002460d 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PAT.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PAT.java @@ -3,7 +3,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -100,7 +100,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp); if (pat != null) { - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "PAT"); for (PATsection element : pat) { if(element!= null){ if(!Utils.simpleModus(modus)){ // show all versions diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PATsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PATsection.java index e11c1969..a2cc8300 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PATsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/PATsection.java @@ -144,7 +144,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){ final DefaultMutableTreeNode t = super.getJTreeNode(modus); KVP kvp = (KVP) t.getUserObject(); - kvp.setTableSource(this); + kvp.addTableSource(this, "PAT"); Utils.addListJTree(t,programs,modus,"programs"); return t; diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDT.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDT.java index 597640bd..62dad83c 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDT.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDT.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -94,7 +94,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { KVP sdtKvp = new KVP("SDT"); if(!networks.isEmpty()) { - sdtKvp.setTableSource(this::getTableForSdt); + sdtKvp.addTableSource(this::getTableForSdt, "SDT"); } final DefaultMutableTreeNode t = new DefaultMutableTreeNode(sdtKvp); @@ -103,7 +103,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { final Map networkSections = networks.get(orgNetworkId); KVP kvpOrgNetwork = new KVP("original_network_id", orgNetworkId, Utils.getOriginalNetworkIDString(orgNetworkId)); - kvpOrgNetwork.setTableSource(() -> getTableForOriginalNetwork(orgNetworkId)); + kvpOrgNetwork.addTableSource(() -> getTableForOriginalNetwork(orgNetworkId), "SDT original_network_id: " + orgNetworkId); final DefaultMutableTreeNode n = new DefaultMutableTreeNode(kvpOrgNetwork); t.add(n); @@ -112,7 +112,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { SDTsection[] sections = networkSections.get(transport_stream_id); KVP kvpTsId = new KVP("transport_stream_id", transport_stream_id, null); - kvpTsId.setTableSource(() -> getTableForTransportStreamID(orgNetworkId, transport_stream_id)); + kvpTsId.addTableSource(() -> getTableForTransportStreamID(orgNetworkId, transport_stream_id),"SDT transport_stream_id: "+transport_stream_id); final DefaultMutableTreeNode m = new DefaultMutableTreeNode(kvpTsId); n.add(m); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDTsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDTsection.java index 891eb807..e36d7540 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDTsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/SDTsection.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -221,7 +221,7 @@ private List buildServicesList(final byte[] data, final int offset, fin public DefaultMutableTreeNode getJTreeNode(final int modus){ final DefaultMutableTreeNode t = super.getJTreeNode(modus); - ((KVP) t.getUserObject()).setTableSource(this::getTableModel); + ((KVP) t.getUserObject()).addTableSource(this::getTableModel, "SDT Section"); t.add(new DefaultMutableTreeNode(new KVP("original_network_id",originalNetworkID,Utils.getOriginalNetworkIDString(originalNetworkID)))); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDT.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDT.java index ef069c1f..00a559ea 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDT.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDT.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2022 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -56,7 +56,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { KVP kvp = new KVP("TDT"); final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp); if(!tdtSectionList.isEmpty()) { - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "TDT"); } for (TDTsection tdTsection : tdtSectionList) { diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDTsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDTsection.java index 2b5afa5a..4883a281 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDTsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TDTsection.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -65,7 +65,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){ final DefaultMutableTreeNode t = super.getJTreeNode(modus); KVP kvp = (KVP)t.getUserObject(); - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "TDT Section"); t.add(new DefaultMutableTreeNode(new KVP("UTC_time",UTC_time,Utils.getUTCFormattedString(UTC_time)))); return t; } diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOT.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOT.java index e0a6bf85..0e52ceef 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOT.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOT.java @@ -2,7 +2,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2020 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -60,7 +60,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus) { KVP kvp = new KVP("TOT"); if(!totSectionList.isEmpty()) { - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "TOT"); } final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOTsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOTsection.java index 40191464..37216c9f 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOTsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/TOTsection.java @@ -83,7 +83,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){ final DefaultMutableTreeNode t = super.getJTreeNode(modus); KVP kvp = (KVP)t.getUserObject(); - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "TOT Section"); t.add(new DefaultMutableTreeNode(new KVP("UTC_time",UTC_time,Utils.getUTCFormattedString(UTC_time)))); if(!Utils.simpleModus(modus)){ t.add(new DefaultMutableTreeNode(new KVP("descriptors_loop_length",descriptorsLoopLength,null))); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FNTsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FNTsection.java index de289e29..32b15025 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FNTsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FNTsection.java @@ -3,7 +3,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2019 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -201,7 +201,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){ final DefaultMutableTreeNode t = super.getJTreeNode(modus); KVP kvp = (KVP) t.getUserObject(); - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "FNT"); t.add(new DefaultMutableTreeNode(new KVP("network_descriptors_loop_length",network_descriptors_loop_length,null))); Utils.addListJTree(t,networkDescriptorList,modus,"network_descriptors"); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FSTsection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FSTsection.java index 81f94abc..cdee5efa 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FSTsection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/FSTsection.java @@ -3,7 +3,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * - * This code is Copyright 2009-2019 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) + * This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -269,7 +269,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){ final DefaultMutableTreeNode t = super.getJTreeNode(modus); KVP kvp = (KVP) t.getUserObject(); - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "FST"); Utils.addListJTree(t,serviceList,modus,"service_loop"); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/M7Fastscan.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/M7Fastscan.java index 2d59ba98..2da64bf8 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/M7Fastscan.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/M7Fastscan.java @@ -4,7 +4,7 @@ * * http://www.digitalekabeltelevisie.nl/dvb_inspector * -* This code is Copyright 2009-2021 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) +* This code is Copyright 2009-2024 by Eric Berendsen (e_berendsen@digitalekabeltelevisie.nl) * * This file is part of DVB Inspector. * @@ -160,7 +160,7 @@ public DefaultMutableTreeNode getJTreeNode(int modus) { if(ontSections!=null) { KVP kvp = new KVP("ONT"); DefaultMutableTreeNode ont = new DefaultMutableTreeNode(kvp); - kvp.setTableSource(this::getTableModelOnt); + kvp.addTableSource(this::getTableModelOnt, "ONT"); for (final ONTSection ontSection : ontSections) { if(ontSection!= null){ AbstractPSITabel.addSectionVersionsToJTree(ont, ontSection, modus); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/ONTSection.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/ONTSection.java index 55f8b361..46b5e711 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/ONTSection.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/ONTSection.java @@ -171,7 +171,7 @@ public DefaultMutableTreeNode getJTreeNode(final int modus){ final DefaultMutableTreeNode t = super.getJTreeNode(modus); KVP kvp = (KVP) t.getUserObject(); - kvp.setTableSource(this::getTableModel); + kvp.addTableSource(this::getTableModel, "ONT Section"); t.add(new DefaultMutableTreeNode(new KVP("bouquet_descriptors_loop_length",bouquet_descriptors_loop_length,null))); Utils.addListJTree(t,bouquetDescriptorList,modus,"bouquet_descriptors"); diff --git a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/OperatorFastscan.java b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/OperatorFastscan.java index 081b895c..a848b7d3 100644 --- a/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/OperatorFastscan.java +++ b/src/main/java/nl/digitalekabeltelevisie/data/mpeg/psi/nonstandard/OperatorFastscan.java @@ -79,11 +79,11 @@ public OperatorFastscan(int pid, M7Fastscan m7Fastscan) { public DefaultMutableTreeNode getJTreeNode(int modus) { final KVP networkKVP = new KVP("Pid",pid,getOperatorSubListName()); if(fntSections==null){ - networkKVP.setHtmlSource(() -> "FNT Missing"); + networkKVP.addHTMLSource(() -> "FNT Missing", "FNT Missing"); }else if(fstSections==null){ - networkKVP.setHtmlSource(() -> "FST Missing"); + networkKVP.addHTMLSource(() -> "FST Missing","FST Missing"); }else { - networkKVP.setTableSource(this::getTableModel); + networkKVP.addTableSource(this::getTableModel, "Operator Fastscan"); } final DefaultMutableTreeNode n = new DefaultMutableTreeNode(networkKVP); @@ -91,7 +91,7 @@ public DefaultMutableTreeNode getJTreeNode(int modus) { if(fstSections!=null) { KVP fstKvp = new KVP("FST"); DefaultMutableTreeNode fst = new DefaultMutableTreeNode(fstKvp); - fstKvp.setTableSource(this::getFstTableModel); + fstKvp.addTableSource(this::getFstTableModel, "FST"); for (final FSTsection fstSection : fstSections) { if(fstSection!= null){ AbstractPSITabel.addSectionVersionsToJTree(fst, fstSection, modus); @@ -104,7 +104,7 @@ public DefaultMutableTreeNode getJTreeNode(int modus) { if (fntSections != null) { KVP fntKvp = new KVP("FNT"); DefaultMutableTreeNode fnt = new DefaultMutableTreeNode(fntKvp); - fntKvp.setTableSource(this::getFntTableModel); + fntKvp.addTableSource(this::getFntTableModel, "FNT"); for (final FNTsection fntSection : fntSections) { if (fntSection != null) { AbstractPSITabel.addSectionVersionsToJTree(fnt, fntSection, modus);