X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMachineLaunchConfigType.java;h=27aca7e18311bbca780dc63630a7749aa116b744;hb=435134a2171ff1092eb87cbd1abe5fd3935118cc;hp=03c481a59520550e877bd336d838d9299300f5c5;hpb=350f07ad55e5be633a85910d4634a7b16008412e;p=Mograsim.git diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java index 03c481a5..27aca7e1 100644 --- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java +++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MachineLaunchConfigType.java @@ -1,18 +1,19 @@ package net.mograsim.plugin.launch; -import java.io.IOException; - +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.LaunchConfigurationDelegate; +import net.mograsim.machine.MachineDefinition; import net.mograsim.plugin.MograsimActivator; +import net.mograsim.plugin.nature.MachineContext; +import net.mograsim.plugin.nature.ProjectMachineContext; public class MachineLaunchConfigType extends LaunchConfigurationDelegate { @@ -23,25 +24,26 @@ public class MachineLaunchConfigType extends LaunchConfigurationDelegate public MachineLaunchConfigType() { this.resChangedListener = this::resourceChanged; + ResourcesPlugin.getWorkspace().addResourceChangeListener(resChangedListener, + // IResourceChangeEvent.POST_BUILD | + IResourceChangeEvent.POST_CHANGE | + // IResourceChangeEvent.PRE_BUILD | + // IResourceChangeEvent.PRE_CLOSE | + // IResourceChangeEvent.PRE_DELETE | + // IResourceChangeEvent.PRE_REFRESH | + 0); } @Override public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - ResourcesPlugin.getWorkspace().addResourceChangeListener(resChangedListener, - IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_BUILD - | IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_REFRESH); - System.out.println("launch"); - // TODO start a machine - ProcessBuilder pb = new ProcessBuilder("cmd", "/c", "\"echo Press Enter... &&pause>NUL && echo finished\""); - try - { - launch.addProcess(DebugPlugin.newProcess(launch, pb.start(), "")); - } - catch (IOException e) - { - e.printStackTrace(); - } + String projName = configuration.getAttribute(PROJECT_ATTR, ""); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName); + MachineContext machineContext = ProjectMachineContext.getMachineContextOf(project); + MachineDefinition machineDefinition = machineContext.getMachineDefinition().orElseThrow(); + + MachineDebugTarget debugTarget = new MachineDebugTarget(new MachineProcess(launch, machineDefinition)); + debugTarget.setExecutionSpeed(10d); } private void resourceChanged(IResourceChangeEvent event)