X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmi%2FInstructionView.java;h=b9627aada38a29b075927a0835a9c7e6932d6d3d;hb=4294019fb99a78ffa6802c0765e4efb7f96bd880;hp=35b6933f651368858a58e2a7deb8ac91c92bbe92;hpb=c9d1646a7969181829b65dabb5db89ea7a2da69d;p=Mograsim.git

diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
index 35b6933f..b9627aad 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
@@ -40,6 +40,7 @@ public class InstructionView extends ViewPart implements ContextObserver
 	private MicroInstructionMemory memory;
 	private DisplaySettings displaySettings;
 	private InstructionTableContentProvider provider;
+	private int highlighted = 0;
 
 	@SuppressWarnings("unused")
 	@Override
@@ -66,8 +67,16 @@ public class InstructionView extends ViewPart implements ContextObserver
 		viewerData.horizontalSpan = 3;
 		viewer.getTable().setLayoutData(viewerData);
 
-		displaySettings.addObserver(() -> viewer.refreshLazy());
+		displaySettings.addObserver(() -> viewer.refresh());
 		MachineContext.getInstance().registerObserver(this);
+		setMachine(Optional.ofNullable(MachineContext.getInstance().getMachine()));
+	}
+
+	public void highlight(int index)
+	{
+		viewer.highlightRow(highlighted, false);
+		viewer.highlightRow(index, true);
+		viewer.getTable().setTopIndex(index);
 	}
 
 	@SuppressWarnings("unused")
@@ -117,7 +126,8 @@ public class InstructionView extends ViewPart implements ContextObserver
 	private void deleteColumns()
 	{
 		for (TableViewerColumn col : columns)
-			col.getColumn().dispose();
+			if (col != null)
+				col.getColumn().dispose();
 	}
 
 	private void createColumns()
@@ -139,7 +149,6 @@ public class InstructionView extends ViewPart implements ContextObserver
 
 			createEditingAndLabel(createTableViewerColumn(name, bounds), miDef, i);
 		}
-
 	}
 
 	private void createEditingAndLabel(TableViewerColumn col, MicroInstructionDefinition miDef, int index)
@@ -167,6 +176,7 @@ public class InstructionView extends ViewPart implements ContextObserver
 		}
 		col.setEditingSupport(support);
 		col.setLabelProvider(provider);
+		col.getColumn().setToolTipText(miDef.getParameterDescription(index).orElse(""));
 	}
 
 	private TableViewerColumn createTableViewerColumn(String title, int bound)