From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Sun, 15 Sep 2019 13:52:29 +0000 (+0200)
Subject: Fixed InstructionView containing every column twice
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=fd1283a93a477d9dea769aa19d9791fcb0fa38ee;hp=93f106a691015a63a6c5af27406b94303385698a;p=Mograsim.git

Fixed InstructionView containing every column twice
---

diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
index b9627aad..3af070f3 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
@@ -126,18 +126,19 @@ public class InstructionView extends ViewPart implements ContextObserver
 	private void deleteColumns()
 	{
 		for (TableViewerColumn col : columns)
-			if (col != null)
-				col.getColumn().dispose();
+			col.getColumn().dispose();
 	}
 
 	private void createColumns()
 	{
+		int size = miDef.size();
+		columns = new TableViewerColumn[size + 1];
+
 		TableViewerColumn col = createTableViewerColumn("Address", 200);
+		columns[0] = col;
 		col.setLabelProvider(new AddressLabelProvider());
 
-		int size = miDef.size();
 		int bit = 0;
-		columns = new TableViewerColumn[size];
 		ParameterClassification[] classes = miDef.getParameterClassifications();
 
 		for (int i = 0; i < size; i++)
@@ -147,7 +148,9 @@ public class InstructionView extends ViewPart implements ContextObserver
 			String name = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
 			int bounds = 20 + 20 * classes[i].getExpectedBits();
 
-			createEditingAndLabel(createTableViewerColumn(name, bounds), miDef, i);
+			col = createTableViewerColumn(name, bounds);
+			columns[i + 1] = col;
+			createEditingAndLabel(col, miDef, i);
 		}
 	}