Added a constructor for ModelSplitterParams; added a TODO

[Mograsim.git] / plugins / net.mograsim.plugin.core / src / net / mograsim / plugin / tables / mi / InstructionTable.java

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 d7c2327..25c0f71 100644 (file)
--- 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,6 +27,7 @@ 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;
@@ -98,7 +101,7 @@ public class InstructionTable
                int size = miDef.size();
                columns = new TableViewerColumn[size + 1];
 
-               TableViewerColumn col = createTableViewerColumn("Address");
+               TableViewerColumn col = createTableViewerColumn("Address", null);
                columns[0] = col;
                col.setLabelProvider(new AddressLabelProvider()
                {
@@ -130,9 +133,18 @@ public class InstructionTable
                {
                        int startBit = bit - 1;
                        int endBit = bit = bit - classes[i].getExpectedBits();
-                       String columnTitle = calculateColumnTitle(startBit, endBit);
+
+                       String columnTitle;
+                       String bitString = startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
+                       // TODO add a listener
+                       if (MograsimActivator.instance().getPluginPrefs().getBoolean(MPM_EDITOR_BITS_AS_COLUMN_NAME))
+                               columnTitle = bitString;
+                       else
+                               columnTitle = miDef.getParameterTitle(i).orElse(bitString);
                        columnTitles[i] = columnTitle;
-                       col = createTableViewerColumn(columnTitle);
+                       String columnTooltip = miDef.getParameterDescription(i).orElse(null);
+
+                       col = createTableViewerColumn(columnTitle, columnTooltip);
                        columns[i + 1] = col;
                        createEditingAndLabel(col, miDef, i);
                }
@@ -161,11 +173,6 @@ public class InstructionTable
                viewer.getTable().setVisible(true);
        }
 
-       private static String calculateColumnTitle(int startBit, int endBit)
-       {
-               return startBit == endBit ? Integer.toString(startBit) : startBit + "..." + endBit;
-       }
-
        public void bindMicroInstructionMemory(MicroInstructionMemory memory)
        {
                this.memory = memory;
@@ -209,14 +216,14 @@ public class InstructionTable
                if (isEditable)
                        col.setEditingSupport(support);
                col.setLabelProvider(provider);
-               col.getColumn().setToolTipText(miDef.getParameterDescription(index).orElse(""));
        }
 
-       private TableViewerColumn createTableViewerColumn(String title)
+       private TableViewerColumn createTableViewerColumn(String title, String toolTip)
        {
                TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);
                TableColumn column = viewerColumn.getColumn();
                column.setText(title);
+               column.setToolTipText(toolTip);
                column.setResizable(true);
                column.setMoveable(false);
                return viewerColumn;