X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmemory%2FMemoryTableContentProvider.java;h=3d67c9dcd4ccdbc18b42555017001f3a175dd8a1;hb=96dd446ab936b4db82d0bd94f90e20442a4d86af;hp=95d18358fa1fdf1566db2a0f5ce9053f3b454596;hpb=5d7d8cbfe74873cffa0682d66e8812b58c2b47f9;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
index 95d18358..3d67c9dc 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
@@ -6,9 +6,9 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Display;
 
 import net.mograsim.machine.MainMemory;
-import net.mograsim.machine.MemoryObserver;
+import net.mograsim.machine.Memory.MemoryCellModifiedListener;
 
-public class MemoryTableContentProvider implements ILazyContentProvider, MemoryObserver
+public class MemoryTableContentProvider implements ILazyContentProvider, MemoryCellModifiedListener
 {
 	private long lower;
 	private TableViewer viewer;
@@ -54,9 +54,12 @@ public class MemoryTableContentProvider implements ILazyContentProvider, MemoryO
 	@Override
 	public void updateElement(int index)
 	{
-		long address = lower + index;
-		if (address <= memory.getDefinition().getMaximalAddress())
-			viewer.replace(new MemoryTableRow(address, memory), index);
+		if (index < amount)
+		{
+			long address = lower + index;
+			if (address <= memory.getDefinition().getMaximalAddress())
+				viewer.replace(new MemoryTableRow(address, memory), index);
+		}
 	}
 
 	@Override
@@ -65,9 +68,9 @@ public class MemoryTableContentProvider implements ILazyContentProvider, MemoryO
 		this.viewer = (TableViewer) viewer;
 		this.memory = (MainMemory) newInput;
 		if (oldInput != null)
-			((MainMemory) oldInput).deregisterObserver(this);
+			((MainMemory) oldInput).deregisterCellModifiedListener(this);
 		if (memory != null)
-			memory.registerObserver(this);
+			memory.registerCellModifiedListener(this);
 		setLowerBound(0L);
 	}