Fixed crashbug in ActiveInstructionPreviewContentProvider

[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 11e57ba..6ffc93e 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
@@ -12,6 +12,8 @@ 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.graphics.Color;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -35,18 +37,21 @@ public class InstructionTable
        private MicroInstructionDefinition miDef;
        private MicroInstructionMemory memory;
        private InstructionTableContentProvider provider;
-       private final ColorProvider cProv;
+       private final RowHighlighter highlighter;
+       private final FontAndColorHelper cProv;
 
        public InstructionTable(Composite parent, DisplaySettings displaySettings, IThemeManager themeManager)
        {
                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);
 
                Table table = viewer.getTable();
                table.setHeaderVisible(true);
                table.setLinesVisible(true);
                viewer.setUseHashlookup(true);
+               table.addDisposeListener(e -> dispose());
 
                TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(viewer, new FocusCellOwnerDrawHighlighter(viewer));
 
@@ -87,7 +92,26 @@ public class InstructionTable
 
                TableViewerColumn col = createTableViewerColumn("Address");
                columns[0] = col;
-               col.setLabelProvider(new AddressLabelProvider());
+               col.setLabelProvider(new AddressLabelProvider()
+               {
+                       @Override
+                       public Color getBackground(Object element)
+                       {
+                               return cProv.getBackground(element, -1);
+                       }
+
+                       @Override
+                       public Color getForeground(Object element)
+                       {
+                               return cProv.getForeground(element, -1);
+                       }
+
+                       @Override
+                       public Font getFont(Object element)
+                       {
+                               return cProv.getFont(element, -1);
+                       }
+               });
 
                String[] columnTitles = new String[size];
 
@@ -234,9 +258,14 @@ public class InstructionTable
                Display.getDefault().asyncExec(() -> viewer.refresh());
        }
 
-       public void dispose()
+       private void dispose()
        {
                cProv.dispose();
                viewer.getTable().dispose();
        }
+
+       public void highlight(int row)
+       {
+               highlighter.highlight(row);
+       }
 }