remove deprecated setXXXSource methods

EricBerendsen · Sep 8, 2024 · ed7f9d7 · ed7f9d7
1 parent 5213411
commit ed7f9d7
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 71 deletions.
diff --git 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
@@ -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
@@ -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
@@ -402,21 +402,23 @@ void addRawCCDataToTree(final int modus, final DefaultMutableTreeNode s) {
 		for( Entry<Integer, Map<Long, List<Construct>>> typeEntry:allCcData.entrySet()) {
 			final Map<Long, List<Construct>> 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("<br>"))
+					collect(Collectors.joining("<br>")),
+					"cc_data"
 					);
 			DefaultMutableTreeNode typeNode = new DefaultMutableTreeNode(typeNodeKvp);
 			ccDataTree.add(typeNode);
 
 			for(Entry<Long, List<Construct>> ptsEntry: typeEntryValue.entrySet()) {
 				final List<Construct> 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("<br>"))
+								collect(Collectors.joining("<br>")),
+								"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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Integer, SDTsection[]> 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
@@ -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<Service> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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");