X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionTable.java;h=25c0f7176d68d003846ce5736e7604bb9e51abf3;hb=161ecd36b6dcfe0e38cee3fd6ea8ad42d0705777;hp=2632f392513a5db18aa717de75c39ca7b32476a6;hpb=d1abde47b23153d899b3d39bcb2794acb83c6e68;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
index 2632f392..25c0f717 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionTable.java
@@ -1,5 +1,7 @@
 package net.mograsim.plugin.tables.mi;
 
+import static net.mograsim.plugin.preferences.PluginPreferences.MPM_EDITOR_BITS_AS_COLUMN_NAME;
+
 import java.util.Arrays;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -25,10 +27,10 @@ import net.mograsim.machine.mi.MicroInstructionDefinition;
 import net.mograsim.machine.mi.MicroInstructionMemory;
 import net.mograsim.machine.mi.parameters.MnemonicFamily;
 import net.mograsim.machine.mi.parameters.ParameterClassification;
+import net.mograsim.plugin.MograsimActivator;
 import net.mograsim.plugin.tables.AddressLabelProvider;
 import net.mograsim.plugin.tables.DisplaySettings;
 import net.mograsim.plugin.tables.LazyTableViewer;
-import net.mograsim.preferences.Preferences;
 
 public class InstructionTable
 {
@@ -132,19 +134,15 @@ public class InstructionTable
 			int startBit = bit - 1;
 			int endBit = bit = bit - classes[i].getExpectedBits();
 
-			String description = miDef.getParameterDescription(i).orElse(null);
+			String columnTitle;
 			String bitString = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
-			String columnTitle, columnTooltip;
-			if (useDescriptionAsColumnTitle(description))
-			{
-				columnTitle = description;
-				columnTooltip = bitString;
-			} else
-			{
+			// TODO add a listener
+			if (MograsimActivator.instance().getPluginPrefs().getBoolean(MPM_EDITOR_BITS_AS_COLUMN_NAME))
 				columnTitle = bitString;
-				columnTooltip = description;
-			}
+			else
+				columnTitle = miDef.getParameterTitle(i).orElse(bitString);
 			columnTitles[i] = columnTitle;
+			String columnTooltip = miDef.getParameterDescription(i).orElse(null);
 
 			col = createTableViewerColumn(columnTitle, columnTooltip);
 			columns[i + 1] = col;
@@ -175,11 +173,6 @@ public class InstructionTable
 		viewer.getTable().setVisible(true);
 	}
 
-	private static boolean useDescriptionAsColumnTitle(String description)
-	{
-		return description != null && Preferences.current().getBoolean("net.mograsim.plugin.core.editors.mpm.descriptionascolumnname");
-	}
-
 	public void bindMicroInstructionMemory(MicroInstructionMemory memory)
 	{
 		this.memory = memory;