X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Feditors%2FMemoryEditor.java;fp=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Feditors%2FMemoryEditor.java;h=507adae920d02de816a733923f4f4c717228886a;hb=9719314d2cb5e435e61e730939d2cd1a92f9a924;hp=2b02852270b3a3e0eff402130d353b400a5ff54f;hpb=62135d025507bee58eb20bef4bb4251b8f2a697d;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java
index 2b028522..507adae9 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java
@@ -1,6 +1,7 @@
 package net.mograsim.plugin.editors;
 
-import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 
 import org.eclipse.core.resources.IFile;
@@ -24,8 +25,10 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
 
 import net.mograsim.machine.MainMemory;
+import net.mograsim.machine.MainMemoryDefinition;
+import net.mograsim.machine.Memory.MemoryCellModifiedListener;
 import net.mograsim.machine.mi.MicroInstructionMemoryParseException;
-import net.mograsim.machine.standard.memory.WordAddressableMemory;
+import net.mograsim.machine.standard.memory.MainMemoryParser;
 import net.mograsim.plugin.asm.AsmNumberUtil;
 import net.mograsim.plugin.nature.MachineContext;
 import net.mograsim.plugin.nature.ProjectMachineContext;
@@ -49,6 +52,15 @@ public class MemoryEditor extends EditorPart
 	private MemoryTableContentProvider provider;
 	private DisplaySettings displaySettings;
 
+	private boolean dirty;
+
+	private final MemoryCellModifiedListener memListener;
+
+	public MemoryEditor()
+	{
+		memListener = this::cellModified;
+	}
+
 	@Override
 	public void createPartControl(Composite parent)
 	{
@@ -178,7 +190,14 @@ public class MemoryEditor extends EditorPart
 			context.activateMachine();
 
 			setPartName(fileInput.getName());
-			open(fileInput.getFile());
+			try
+			{
+				open(fileInput.getFile());
+			}
+			catch (Exception e)
+			{
+				throw new PartInitException("Failed to read input!", e);
+			}
 		} else
 			throw new IllegalArgumentException("MemoryEditor can only be used with Files");
 
@@ -194,20 +213,40 @@ public class MemoryEditor extends EditorPart
 			SafeRunnable.getRunner().run(() -> save(((IFileEditorInput) input).getFile(), monitor));
 	}
 
-	private void save(IFile file, IProgressMonitor monitor) throws CoreException
+	private void save(IFile file, IProgressMonitor monitor) throws CoreException, IOException
 	{
-		file.setContents(new ByteArrayInputStream("actual contents will go here".getBytes()), 0, monitor);
+		if (memory == null)
+		{
+			throw new MicroInstructionMemoryParseException("Failed to write MainMemory to File. No MainMemory assigned.");
+		}
+		try (InputStream toWrite = MainMemoryParser.write(memory))
+		{
+			file.setContents(toWrite, 0, monitor);
+			setDirty(false);
+		}
 	}
 
-	private void open(IFile file)
+	private void open(IFile file) throws IOException, CoreException
 	{
-		// TODO actually parse the file
-		memory = new WordAddressableMemory(context.getMachineDefinition()
-				.orElseThrow(() -> new MicroInstructionMemoryParseException("No MachineDefinition assigned!")).getMainMemoryDefinition());
+		MainMemoryDefinition memDef = context.getMachineDefinition()
+				.orElseThrow(() -> new MicroInstructionMemoryParseException("No MachineDefinition assigned!")).getMainMemoryDefinition();
+		memory = MainMemoryParser.parseMemory(memDef, file.getContents());
+		memory.registerCellModifiedListener(memListener);
 		if (viewer != null)
 			viewer.setInput(memory);
 	}
 
+	private void cellModified(@SuppressWarnings("unused") long address)
+	{
+		setDirty(true);
+	}
+
+	private void setDirty(boolean newDirty)
+	{
+		dirty = newDirty;
+		firePropertyChange(PROP_DIRTY);
+	}
+
 	@Override
 	public void doSaveAs()
 	{
@@ -217,8 +256,7 @@ public class MemoryEditor extends EditorPart
 	@Override
 	public boolean isDirty()
 	{
-		// TODO
-		return false;
+		return dirty;
 	}
 
 	@Override
@@ -236,7 +274,8 @@ public class MemoryEditor extends EditorPart
 	@Override
 	public void dispose()
 	{
-		// TODO Auto-generated method stub
+		if (memory != null)
+			memory.deregisterCellModifiedListener(memListener);
 		super.dispose();
 	}
 }
\ No newline at end of file