projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatically add the default Mograsim memory block to the launch
[Mograsim.git]
/
plugins
/
net.mograsim.plugin.core
/
src
/
net
/
mograsim
/
plugin
/
tables
/
mi
/
InstructionView.java
diff --git
a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
index
801082d
..
214bd8c
100644
(file)
--- a/
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
+++ b/
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/mi/InstructionView.java
@@
-5,8
+5,6
@@
import java.io.InputStream;
import java.util.Optional;
import org.eclipse.core.resources.IFile;
import java.util.Optional;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.ui.DebugUITools;
@@
-30,7
+28,6
@@
import net.mograsim.machine.mi.MicroInstructionMemoryParseException;
import net.mograsim.machine.mi.MicroInstructionMemoryParser;
import net.mograsim.plugin.launch.MachineDebugContextListener;
import net.mograsim.plugin.launch.MachineDebugTarget;
import net.mograsim.machine.mi.MicroInstructionMemoryParser;
import net.mograsim.plugin.launch.MachineDebugContextListener;
import net.mograsim.plugin.launch.MachineDebugTarget;
-import net.mograsim.plugin.launch.MachineLaunchConfigType.MachineLaunchParams;
import net.mograsim.plugin.nature.MachineContext;
import net.mograsim.plugin.nature.ProjectMachineContext;
import net.mograsim.plugin.tables.DisplaySettings;
import net.mograsim.plugin.nature.MachineContext;
import net.mograsim.plugin.nature.ProjectMachineContext;
import net.mograsim.plugin.tables.DisplaySettings;
@@
-68,10
+65,7
@@
public class InstructionView extends EditorPart
newTarget.ifPresent(target ->
{
newTarget.ifPresent(target ->
{
- MachineLaunchParams params = target.getLaunchParams();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(params.getProjectPath());
-
- if (file.equals(project.getFile(params.getMpmPath())))
+ if (file.equals(target.getMPMFile()))
{
Machine m = target.getMachine();
target.getMachine().addActiveMicroInstructionChangedListener(instChangeListener);
{
Machine m = target.getMachine();
target.getMachine().addActiveMicroInstructionChangedListener(instChangeListener);
@@
-238,7
+232,8
@@
public class InstructionView extends EditorPart
@Override
public void dispose()
{
@Override
public void dispose()
{
- memory.deregisterCellModifiedListener(cellModifiedListener);
+ if (memory != null)
+ memory.deregisterCellModifiedListener(cellModifiedListener);
super.dispose();
}
super.dispose();
}