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

[219009] TraditionalRendering.getSelectedBytes() ignores selection

Browse source
This commit is contained in:
Ted Williams 2008-03-11 05:02:05 +00:00
parent 5d2e5b52e0
commit 8f63cc5bbf
3 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/traditional/IMemorySelection.java
View file

@ -12,6 +12,8 @@ public interface IMemorySelection
public BigInteger getEnd(); public BigInteger getEnd();
public BigInteger getStartLow();
public void setStart(BigInteger high, BigInteger low); public void setStart(BigInteger high, BigInteger low);
public void setEnd(BigInteger high, BigInteger low); public void setEnd(BigInteger high, BigInteger low);

4
plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/traditional/Rendering.java
View file

@ -1237,6 +1237,10 @@ public class Rendering extends Composite implements IDebugEventSetListener
return fStartLow; return fStartLow;
} }
public BigInteger getStartLow() {
return fStartLow;
}
public BigInteger getEnd() public BigInteger getEnd()
{ {
// if there is no end, return null // if there is no end, return null

36
plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/traditional/TraditionalRendering.java
View file

@ -20,6 +20,7 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.dd.debug.memory.renderings.traditional.Rendering.Selection;
import org.eclipse.debug.core.DebugException; 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.IMemoryBlockExtension;
@ -982,20 +983,45 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
// selection is terminology for caret position // selection is terminology for caret position
public BigInteger getSelectedAddress() { public BigInteger getSelectedAddress() {
return fRendering.getCaretAddress(); IMemorySelection selection = fRendering.getSelection();
if (selection == null || selection.getStart() == null)
return fRendering.getCaretAddress();
return selection.getStartLow();
} }
public MemoryByte[] getSelectedAsBytes() { public MemoryByte[] getSelectedAsBytes() {
try try
{ {
return fRendering.getViewportCache().getBytes( // default to the caret address and the cell count size
fRendering.getCaretAddress(), fRendering.getBytesPerColumn()); BigInteger startAddr = fRendering.getCaretAddress();
int byteCount = fRendering.getBytesPerColumn();
// Now see if there's a selection
IMemorySelection selection = fRendering.getSelection();
if (selection != null && selection.getStart() != null)
{
// The implementation is such that just having a caret somewhere
// (without multiple cells being selected) constitutes a selection,
// except for when the rendering is in its initial state. I.e.,
// just because we get here doesn't mean the user has selected more
// than one cell.
startAddr = getSelectedAddress();
if (selection.getHigh() != null)
{
byteCount = selection.getHigh().subtract(selection.getLow()).intValue() * fRendering.getAddressableSize();
}
}
return fRendering.getViewportCache().getBytes(startAddr, byteCount);
} }
catch(DebugException de) catch(DebugException de)
{ {
// FIXME log? // FIXME log?
return null; return null;
} }
} }
public void goToAddress(final BigInteger address) throws DebugException { public void goToAddress(final BigInteger address) throws DebugException {