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 2632f39..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
@@ -132,19 +132,14 @@ 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
-                       {
+                       if (Preferences.current().getBoolean("net.mograsim.plugin.core.editors.mpm.bitsascolumnname"))
                                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 +170,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;