Non-default values are now highlighted in the InstructionTable

[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 d598c3f..11e57ba 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
@@ -3,14 +3,21 @@ package net.mograsim.plugin.tables.mi;
 import java.util.Arrays;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
 import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TableViewerFocusCellManager;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.ui.themes.IThemeManager;
 
 import net.mograsim.machine.mi.MicroInstructionDefinition;
 import net.mograsim.machine.mi.MicroInstructionMemory;
@@ -22,23 +29,42 @@ import net.mograsim.plugin.tables.LazyTableViewer;
 
 public class InstructionTable
 {
-       protected DisplaySettings displaySettings;
-       protected LazyTableViewer viewer;
+       protected final DisplaySettings displaySettings;
+       protected final LazyTableViewer viewer;
        private TableViewerColumn[] columns = new TableViewerColumn[0];
        private MicroInstructionDefinition miDef;
        private MicroInstructionMemory memory;
        private InstructionTableContentProvider provider;
+       private final ColorProvider cProv;
 
-       public InstructionTable(Composite parent, DisplaySettings displaySettings)
+       public InstructionTable(Composite parent, DisplaySettings displaySettings, IThemeManager themeManager)
        {
-               viewer = new LazyTableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
+               viewer = new LazyTableViewer(parent, SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
                this.displaySettings = displaySettings;
+               this.cProv = new ColorProvider(viewer, themeManager);
 
                Table table = viewer.getTable();
                table.setHeaderVisible(true);
                table.setLinesVisible(true);
                viewer.setUseHashlookup(true);
 
+               TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(viewer, new FocusCellOwnerDrawHighlighter(viewer));
+
+               ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(viewer)
+               {
+                       @Override
+                       protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event)
+                       {
+                               return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+                                               || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
+                                               || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR)
+                                               || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
+                       }
+               };
+               int features = ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
+                               | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION;
+               TableViewerEditor.create(viewer, focusCellManager, actSupport, features);
+
                GridData viewerData = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH);
                viewerData.horizontalSpan = 3;
                viewer.getTable().setLayoutData(viewerData);
@@ -54,6 +80,8 @@ public class InstructionTable
 
        private void createColumns()
        {
+               viewer.getTable().setVisible(false);
+
                int size = miDef.size();
                columns = new TableViewerColumn[size + 1];
 
@@ -97,6 +125,8 @@ public class InstructionTable
                        }
                        calculateOptimalColumnSize(i + 1, columnTitles[i], longestPossibleContents);
                }
+
+               viewer.getTable().setVisible(true);
        }
 
        private static String calculateColumnTitle(int startBit, int endBit)
@@ -107,8 +137,11 @@ public class InstructionTable
        public void bindMicroInstructionMemory(MicroInstructionMemory memory)
        {
                this.memory = memory;
-               this.miDef = memory.getDefinition().getMicroInstructionDefinition();
-               setViewerInput(memory);
+               if (memory != null)
+               {
+                       this.miDef = memory.getDefinition().getMicroInstructionDefinition();
+                       setViewerInput(memory);
+               }
        }
 
        private static final String[] HEX_DIGITS = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F" };
@@ -127,16 +160,15 @@ public class InstructionTable
                {
                case BOOLEAN_IMMEDIATE:
                        support = new BooleanEditingSupport(viewer, miDef, index);
-                       provider = new ParameterLabelProvider(index);
+                       provider = new ParameterLabelProvider(cProv, index);
                        break;
                case INTEGER_IMMEDIATE:
                        support = new IntegerEditingSupport(viewer, miDef, index, displaySettings, this.provider);
-                       provider = new IntegerColumnLabelProvider(displaySettings, index);
+                       provider = new IntegerColumnLabelProvider(displaySettings, cProv, index);
                        break;
                case MNEMONIC:
-//                     viewerColumn.setEditingSupport(editingSupport)
                        support = new MnemonicEditingSupport(viewer, miDef, index, this.provider);
-                       provider = new ParameterLabelProvider(index);
+                       provider = new ParameterLabelProvider(cProv, index);
                        break;
                default:
                        throw new IllegalStateException(
@@ -201,4 +233,10 @@ public class InstructionTable
        {
                Display.getDefault().asyncExec(() -> viewer.refresh());
        }
+
+       public void dispose()
+       {
+               cProv.dispose();
+               viewer.getTable().dispose();
+       }
 }