X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionTable.java;h=d7c232728942037fe61a40c654f4b5ad93da9207;hb=278fa8f97a6ba31f3cbdd0c65d370563b943eca9;hp=11e57baa942b06f9d772627fa67f184d3354b989;hpb=6b01ce390c1bb33d133902479645abfcc293704f;p=Mograsim.git

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 11e57baa..d7c23272 100644
--- 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,29 @@ public class InstructionTable
 	private MicroInstructionDefinition miDef;
 	private MicroInstructionMemory memory;
 	private InstructionTableContentProvider provider;
-	private final ColorProvider cProv;
+	private final RowHighlighter highlighter;
+	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);
 		table.setLinesVisible(true);
 		viewer.setUseHashlookup(true);
+		table.addDisposeListener(e -> dispose());
 
 		TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(viewer, new FocusCellOwnerDrawHighlighter(viewer));
 
@@ -87,7 +100,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];
 
@@ -159,22 +191,23 @@ 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(""));
 	}
@@ -234,9 +267,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);
+	}
 }