Added short titles for MPM columns

[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 a806bd2..81e0f16 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
@@ -28,6 +28,7 @@ import net.mograsim.machine.mi.parameters.ParameterClassification;
 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
 {
@@ -38,14 +39,22 @@ public class InstructionTable
        private MicroInstructionMemory memory;
        private InstructionTableContentProvider provider;
        private final RowHighlighter highlighter;
-       private final ColorProvider cProv;
+       private final FontAndColorHelper cProv;
+
+       private final boolean isEditable;
 
        public InstructionTable(Composite parent, DisplaySettings displaySettings, IThemeManager themeManager)
+       {
+               this(parent, displaySettings, themeManager, true);
+       }
+
+       public InstructionTable(Composite parent, DisplaySettings displaySettings, IThemeManager themeManager, boolean allowEditing)
        {
                viewer = new LazyTableViewer(parent, SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
                this.displaySettings = displaySettings;
-               this.cProv = new ColorProvider(viewer, themeManager);
+               this.cProv = new FontAndColorHelper(viewer, themeManager);
                this.highlighter = new RowHighlighter(viewer, cProv);
+               this.isEditable = allowEditing;
 
                Table table = viewer.getTable();
                table.setHeaderVisible(true);
@@ -90,7 +99,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()
                {
@@ -122,9 +131,17 @@ 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;
+                       if (Preferences.current().getBoolean("net.mograsim.plugin.core.editors.mpm.bitsascolumnname"))
+                               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);
                }
@@ -153,11 +170,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;
@@ -183,31 +195,32 @@ public class InstructionTable
                switch (parameterClassification.getExpectedType())
                {
                case BOOLEAN_IMMEDIATE:
-                       support = new BooleanEditingSupport(viewer, miDef, index);
+                       support = isEditable ? new BooleanEditingSupport(viewer, miDef, index) : null;
                        provider = new ParameterLabelProvider(cProv, index);
                        break;
                case INTEGER_IMMEDIATE:
-                       support = new IntegerEditingSupport(viewer, miDef, index, displaySettings, this.provider);
+                       support = isEditable ? new IntegerEditingSupport(viewer, miDef, index, displaySettings, this.provider) : null;
                        provider = new IntegerColumnLabelProvider(displaySettings, cProv, index);
                        break;
                case MNEMONIC:
-                       support = new MnemonicEditingSupport(viewer, miDef, index, this.provider);
+                       support = isEditable ? new MnemonicEditingSupport(viewer, miDef, index, this.provider) : null;
                        provider = new ParameterLabelProvider(cProv, index);
                        break;
                default:
                        throw new IllegalStateException(
                                        "Unable to create EditingSupport for unknown ParameterType " + parameterClassification.getExpectedType());
                }
-               col.setEditingSupport(support);
+               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;