1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00

Bug 214398: Small cleanup

Change-Id: Iff09cb9815bfc9913ad6cc69a94e6fe8f4cb4251
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
This commit is contained in:
Marc Khouzam 2015-01-20 11:21:10 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent f03ce33b71
commit b36c74eb6a
2 changed files with 5 additions and 5 deletions

View file

@ -347,7 +347,7 @@
commandId="org.eclipse.cdt.debug.ui.command.loadAllSymbols"> commandId="org.eclipse.cdt.debug.ui.command.loadAllSymbols">
<activeWhen> <activeWhen>
<with variable="selection"> <with variable="selection">
<iterate operator="or"> <iterate operator="and">
<instanceof value="org.eclipse.cdt.dsf.debug.ui.viewmodel.modules.ModulesVMNode$ModuleVMContext"> <instanceof value="org.eclipse.cdt.dsf.debug.ui.viewmodel.modules.ModulesVMNode$ModuleVMContext">
</instanceof> </instanceof>
</iterate> </iterate>

View file

@ -61,7 +61,7 @@ public class DsfLoadSymbolsCommandHandler extends AbstractHandler {
@Override @Override
public void run() { public void run() {
if (all) { if (all) {
queueLoadAllSymbols(dsfSession, selection); queueLoadAllSymbols(dsfSession);
} else { } else {
// load symbols of specific element // load symbols of specific element
for (Object o : selection.toList()) { for (Object o : selection.toList()) {
@ -72,7 +72,7 @@ public class DsfLoadSymbolsCommandHandler extends AbstractHandler {
}); });
} }
@ConfinedToDsfExecutor("fSession.getExecutor()") @ConfinedToDsfExecutor("session.getExecutor()")
private void queueLoadSymbols(final DsfSession session, final Object module) { private void queueLoadSymbols(final DsfSession session, final Object module) {
if (!(module instanceof IDMVMContext)) if (!(module instanceof IDMVMContext))
return; return;
@ -96,8 +96,8 @@ public class DsfLoadSymbolsCommandHandler extends AbstractHandler {
} }
} }
@ConfinedToDsfExecutor("fSession.getExecutor()") @ConfinedToDsfExecutor("session.getExecutor()")
private void queueLoadAllSymbols(final DsfSession session, IStructuredSelection selection) { private void queueLoadAllSymbols(final DsfSession session) {
IAdaptable debugContext = DebugUITools.getDebugContext(); IAdaptable debugContext = DebugUITools.getDebugContext();
IDMContext dmcontext = (IDMContext) debugContext.getAdapter(IDMContext.class); IDMContext dmcontext = (IDMContext) debugContext.getAdapter(IDMContext.class);
ISymbolDMContext symDmc = DMContexts.getAncestorOfType(dmcontext, ISymbolDMContext.class); ISymbolDMContext symDmc = DMContexts.getAncestorOfType(dmcontext, ISymbolDMContext.class);