mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 13:25:45 +02:00
Code Issues Wiki Activity

Fixed way in which the new Add Watchpoint action gets its context from the memory rendering.

Browse source
This commit is contained in:
John Cortell 2008-02-14 20:40:26 +00:00
parent e0716ec914
commit 60dd429b5c
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnMemoryActionDelegate.java
View file

@ -4,13 +4,13 @@ package org.eclipse.cdt.debug.internal.ui.actions;
import java.math.BigInteger; import java.math.BigInteger;
import org.eclipse.cdt.debug.internal.core.model.CMemoryBlockExtension; import org.eclipse.cdt.debug.internal.core.model.CMemoryBlockExtension;
import org.eclipse.cdt.debug.internal.ui.actions.AddWatchpointDialog;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.cdt.debug.ui.ICMemorySelection; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlock;
import org.eclipse.debug.core.model.IMemoryBlockExtension;
import org.eclipse.debug.core.model.MemoryByte; import org.eclipse.debug.core.model.MemoryByte;
import org.eclipse.debug.internal.ui.memory.provisional.AbstractAsyncTableRendering; import org.eclipse.debug.ui.memory.IRepositionableMemoryRendering;
import org.eclipse.debug.ui.memory.AbstractMemoryRendering;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
@ -50,19 +50,23 @@ public class AddWatchpointOnMemoryActionDelegate extends AddWatchpointActionDele
String address = ""; //$NON-NLS-1$ String address = ""; //$NON-NLS-1$
String range = "1"; //$NON-NLS-1$ String range = "1"; //$NON-NLS-1$
if (obj instanceof AbstractAsyncTableRendering) { if (obj instanceof IAdaptable) {
AbstractAsyncTableRendering r = (AbstractAsyncTableRendering) obj; IRepositionableMemoryRendering rendering = (IRepositionableMemoryRendering) ((IAdaptable)obj).getAdapter(IRepositionableMemoryRendering.class);
memorySpace = getMemorySpace(r.getMemoryBlock(), memorySpace); if (rendering != null) {
address = getSelectedAddress(r.getSelectedAddress(), address); int addressableSize = 1;
range = getRange(r.getSelectedAsBytes(), range); IMemoryBlock memblock = rendering.getMemoryBlock();
} else if (obj instanceof ICMemorySelection) { if (memblock instanceof IMemoryBlockExtension) {
ICMemorySelection sel = (ICMemorySelection) obj; try {
memorySpace = getMemorySpace(sel.getContainingBlock(), memorySpace); addressableSize = ((IMemoryBlockExtension)memblock).getAddressableSize();
address = getSelectedAddress(sel.getAddress(), address); } catch (DebugException e) {
range = sel.getUnits().toString(); CDebugUIPlugin.log(e);
} else if (obj instanceof AbstractMemoryRendering) { }
AbstractMemoryRendering r = (AbstractMemoryRendering) obj; }
address = getSelectedAddress(BigInteger.valueOf(r.getMemoryBlock().getStartAddress()), address);
memorySpace = getMemorySpace(rendering.getMemoryBlock(), memorySpace);
address = getSelectedAddress(rendering.getSelectedAddress(), address);
range = getRange(rendering.getSelectedAsBytes(), addressableSize, range);
}
} }
AddWatchpointDialog dlg = new AddWatchpointDialog(CDebugUIPlugin.getActiveWorkbenchShell(), AddWatchpointDialog dlg = new AddWatchpointDialog(CDebugUIPlugin.getActiveWorkbenchShell(),
@ -91,9 +95,9 @@ public class AddWatchpointOnMemoryActionDelegate extends AddWatchpointActionDele
return def; return def;
} }
private String getRange(MemoryByte[] selectedBytes, String def) { private String getRange(MemoryByte[] selectedBytes, int addressableSize, String def) {
if (selectedBytes != null && selectedBytes.length > 0) { if (selectedBytes != null && selectedBytes.length > 0) {
return Integer.toString(selectedBytes.length); return Integer.toString(selectedBytes.length / addressableSize);
} }
return def; return def;
} }