Added Wizard for mem file creation

[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 7b17f24..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
@@ -38,19 +38,20 @@ public class InstructionTable
        private MicroInstructionMemory memory;
        private InstructionTableContentProvider provider;
        private final RowHighlighter highlighter;
-       private final ColorProvider cProv;
+       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));
 
@@ -257,7 +258,7 @@ public class InstructionTable
                Display.getDefault().asyncExec(() -> viewer.refresh());
        }
 
-       public void dispose()
+       private void dispose()
        {
                cProv.dispose();
                viewer.getTable().dispose();