remove DefaultMutableTreeNode

Author: EricBerendsen

src/main/java/nl/digitalekabeltelevisie/controller/TreeNode.java

@@ -27,8 +27,6 @@
 
 package nl.digitalekabeltelevisie.controller;
 
-import javax.swing.tree.DefaultMutableTreeNode;
-
 import nl.digitalekabeltelevisie.gui.DVBtree;
 
 /**
@@ -39,5 +37,5 @@
  */
 public interface TreeNode {
 
-	DefaultMutableTreeNode getJTreeNode(int modus);
+	KVP getJTreeNode(int modus);
 }

src/main/java/nl/digitalekabeltelevisie/controller/ViewContext.java

@@ -39,8 +39,8 @@
 
 public class ViewContext {
 
-	private List<ChartLabel> shown = new ArrayList<ChartLabel>();
-	private List<ChartLabel> notShown = new ArrayList<ChartLabel>();
+	private List<ChartLabel> shown = new ArrayList<>();
+	private List<ChartLabel> notShown = new ArrayList<>();
 
 	private int startPacket ;
 	private int endPacket;

src/main/java/nl/digitalekabeltelevisie/data/mpeg/AVCHDPacket.java

@@ -32,8 +32,6 @@
 import java.awt.Color;
 import java.util.Arrays;
 
-import javax.swing.tree.DefaultMutableTreeNode;
-
 import nl.digitalekabeltelevisie.controller.KVP;
 import nl.digitalekabeltelevisie.util.RangeHashMap;
 import nl.digitalekabeltelevisie.util.Utils;
@@ -70,21 +68,19 @@ public int getArrivalTimestamp() {
 		return arrivalTimestamp;
 	}
 
-	
 	@Override
-	public DefaultMutableTreeNode getJTreeNode(final int modus) {
+	public KVP getJTreeNode(int modus) {
 
-		final KVP kvp = new KVP(buildNodeLabel());
+		KVP kvp = new KVP(buildNodeLabel());
 		kvp.addHTMLSource(this, "AVCHD Packet");
-		final DefaultMutableTreeNode t = new DefaultMutableTreeNode(kvp);
-		final DefaultMutableTreeNode tpHeaderNode = new DefaultMutableTreeNode(new KVP("tp_extra_header",tp_extra_header,null));
-		tpHeaderNode.add(new DefaultMutableTreeNode(new KVP("Copy_permission_indicator",getCopyPermissionIndicator(),null)));
-		tpHeaderNode.add(new DefaultMutableTreeNode(new KVP("Arrival_time_stamp",arrivalTimestamp,printPCRTime(arrivalTimestamp))));
-		t.add(tpHeaderNode);
-		addMainPacketDetails(modus, t);
-		return t;
+		KVP tpHeaderNode = new KVP("tp_extra_header", tp_extra_header);
+		tpHeaderNode.add(new KVP("Copy_permission_indicator", getCopyPermissionIndicator()));
+		tpHeaderNode.add(new KVP("Arrival_time_stamp", arrivalTimestamp, printPCRTime(arrivalTimestamp)));
+		kvp.add(tpHeaderNode);
+		addMainPacketDetails(modus, kvp);
+		return kvp;
 	}
-	
+
 	@Override
 	public String getHTML() {
 		final StringBuilder s = new StringBuilder();