Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2008-06-30 13:01:15 -0400
committereutarass2008-06-30 13:01:15 -0400
commit3f41d7b2a98dce4b3727b295fc6214611905d979 (patch)
treea8a6b6ead6bdc1fac4b2d17a819d164c9315d33f /plugins/org.eclipse.tm.tcf.dsf.ui
parent5bee2ee892316f6baaad8de993a61d3352e9aec5 (diff)
downloadorg.eclipse.tcf-3f41d7b2a98dce4b3727b295fc6214611905d979.tar.gz
org.eclipse.tcf-3f41d7b2a98dce4b3727b295fc6214611905d979.tar.xz
org.eclipse.tcf-3f41d7b2a98dce4b3727b295fc6214611905d979.zip
Bug 238564: [tcf] Migrate to TM 3.0 / DSF 1.0
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.dsf.ui')
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java9
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF
index 657d91f78..7b5750f97 100644
--- a/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.ui,
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.eclipse.cdt.debug.core.model
diff --git a/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java
index b4407ab26..ff57c02e2 100644
--- a/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java
+++ b/plugins/org.eclipse.tm.tcf.dsf.ui/src/org/eclipse/tm/internal/tcf/dsf/ui/AdapterFactory.java
@@ -14,12 +14,14 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.cdt.debug.core.model.ISteppingModeTarget;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.dd.dsf.concurrent.Immutable;
import org.eclipse.dd.dsf.debug.ui.actions.DsfResumeCommand;
import org.eclipse.dd.dsf.debug.ui.actions.DsfStepIntoCommand;
import org.eclipse.dd.dsf.debug.ui.actions.DsfStepOverCommand;
import org.eclipse.dd.dsf.debug.ui.actions.DsfStepReturnCommand;
+import org.eclipse.dd.dsf.debug.ui.actions.DsfSteppingModeTarget;
import org.eclipse.dd.dsf.debug.ui.actions.DsfSuspendCommand;
import org.eclipse.dd.dsf.debug.ui.sourcelookup.DsfSourceDisplayAdapter;
import org.eclipse.dd.dsf.service.DsfSession;
@@ -61,6 +63,7 @@ public class AdapterFactory implements IAdapterFactory, DsfSession.SessionEndedL
final DsfStepReturnCommand step_return_command;
final DsfSuspendCommand suspend_command;
final DsfResumeCommand resume_command;
+ final DsfSteppingModeTarget steppin_mode_target;
final TcfTerminateCommand terminate_command;
final IDebugModelProvider debug_model_provider;
final TCFDSFLaunch lunch;
@@ -81,14 +84,16 @@ public class AdapterFactory implements IAdapterFactory, DsfSession.SessionEndedL
}
session.registerModelAdapter(ISourceDisplay.class, source_display_adapter);
- step_into_command = new DsfStepIntoCommand(session);
- step_over_command = new DsfStepOverCommand(session);
+ steppin_mode_target = new DsfSteppingModeTarget();
+ step_into_command = new DsfStepIntoCommand(session, steppin_mode_target);
+ step_over_command = new DsfStepOverCommand(session, steppin_mode_target);
step_return_command = new DsfStepReturnCommand(session);
suspend_command = new DsfSuspendCommand(session);
resume_command = new DsfResumeCommand(session);
terminate_command = new TcfTerminateCommand(session);
//breakpoint_command = new BreakpointCommand();
//memory_retrieval = new DsfMemoryBlockRetrieval(ITCFConstants.ID_TCF_DEBUG_MODEL, );
+ session.registerModelAdapter(ISteppingModeTarget.class, steppin_mode_target);
session.registerModelAdapter(IStepIntoHandler.class, step_into_command);
session.registerModelAdapter(IStepOverHandler.class, step_over_command);
session.registerModelAdapter(IStepReturnHandler.class, step_return_command);

Back to the top