mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

Replaced the deprecated "evaluateExpressionTtoString" method of "ICDITarget.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2004-10-22 17:56:46 +00:00
parent bed0f1da44
commit d24ad69f5e
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debug/org.eclipse.cdt.debug.core/ChangeLog
View file

@ -1,4 +1,10 @@
2004-10-24 Alain Magloire 2004-10-22 Mikhail Khodjaiants
Replaced the deprecated "evaluateExpressionTtoString" method of "ICDITarget.
* CDebugTarget.java
* CStackFrame.java
* CExtendedMemoryBlockRetrieval.java
2004-10-22 Alain Magloire
Provide a context for ICDITarget.evaluateExpressionTtoString() Provide a context for ICDITarget.evaluateExpressionTtoString()
* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CExtendedMemoryBlockRetrieval.java
View file

@ -54,9 +54,6 @@ public class CExtendedMemoryBlockRetrieval implements IExtendedMemoryBlockRetrie
} }
IDebugTarget target = selected.getDebugTarget(); IDebugTarget target = selected.getDebugTarget();
if ( target instanceof CDebugTarget ) { if ( target instanceof CDebugTarget ) {
if ( address == null ) {
address = ((CDebugTarget)target).evaluateExpressionToString( expression );
}
if ( address != null ) { if ( address != null ) {
try { try {
BigInteger a = ( address.startsWith( "0x" ) ) ? new BigInteger( address.substring( 2 ), 16 ) : new BigInteger( address ); //$NON-NLS-1$ BigInteger a = ( address.startsWith( "0x" ) ) ? new BigInteger( address.substring( 2 ), 16 ) : new BigInteger( address ); //$NON-NLS-1$

11
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
View file

@ -16,7 +16,6 @@ import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.cdt.core.IAddressFactory;
@ -1866,16 +1865,6 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
fMemoryBlockRetrieval = memoryBlockRetrieval; fMemoryBlockRetrieval = memoryBlockRetrieval;
} }
public String evaluateExpressionToString( String expression ) throws DebugException {
try {
return getCDITarget().evaluateExpressionToString( expression );
}
catch( CDIException e ) {
targetRequestFailed( e.getMessage(), null );
}
return null;
}
protected void failed( String message, Throwable e ) { protected void failed( String message, Throwable e ) {
MultiStatus ms = new MultiStatus( CDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, message, null ); MultiStatus ms = new MultiStatus( CDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, message, null );
ms.add( new Status( IStatus.ERROR, CDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, e.getMessage(), e ) ); ms.add( new Status( IStatus.ERROR, CDebugModel.getPluginIdentifier(), ICDebugInternalConstants.STATUS_CODE_ERROR, e.getMessage(), e ) );

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
View file

@ -661,7 +661,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
*/ */
public String evaluateExpressionToString( String expression ) throws DebugException { public String evaluateExpressionToString( String expression ) throws DebugException {
try { try {
return getCDITarget().evaluateExpressionToString( expression ); return getCDITarget().evaluateExpressionToString( getCDIStackFrame(), expression );
} }
catch( CDIException e ) { catch( CDIException e ) {
targetRequestFailed( e.getMessage(), null ); targetRequestFailed( e.getMessage(), null );