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

Fix for bug 79678: NPE in Expression.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2004-12-09 03:56:03 +00:00
parent c5cef415ab
commit c52e89c95f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,7 @@
2004-12-08 Mikhail Khodjaiants
Fix for bug 79678: NPE in Expression.
* CExpression.java
2004-12-01 Mikhail Khodjaiants 2004-12-01 Mikhail Khodjaiants
New fix for bug 80034: Expressions view does not display correct no. of elements in array. New fix for bug 80034: Expressions view does not display correct no. of elements in array.
* CValueFactory.java * CValueFactory.java

7
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java
View file

@ -33,6 +33,8 @@ import org.eclipse.debug.core.model.IValue;
*/ */
public class CExpression extends CVariable implements IExpression { public class CExpression extends CVariable implements IExpression {
private String fText;
private ICDIExpression fCDIExpression; private ICDIExpression fCDIExpression;
private CStackFrame fStackFrame; private CStackFrame fStackFrame;
@ -46,7 +48,8 @@ public class CExpression extends CVariable implements IExpression {
*/ */
public CExpression( CStackFrame frame, ICDIExpression cdiExpression, ICDIVariableDescriptor varObject ) { public CExpression( CStackFrame frame, ICDIExpression cdiExpression, ICDIVariableDescriptor varObject ) {
super( frame, varObject ); super( frame, varObject );
setFormat( CVariableFormat.getFormat( CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_DEFAULT_EXPRESSION_FORMAT ))) ; setFormat( CVariableFormat.getFormat( CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_DEFAULT_EXPRESSION_FORMAT ) ) );
fText = cdiExpression.getExpressionText();
fCDIExpression = cdiExpression; fCDIExpression = cdiExpression;
fStackFrame = frame; fStackFrame = frame;
} }
@ -55,7 +58,7 @@ public class CExpression extends CVariable implements IExpression {
* @see org.eclipse.debug.core.model.IExpression#getExpressionText() * @see org.eclipse.debug.core.model.IExpression#getExpressionText()
*/ */
public String getExpressionText() { public String getExpressionText() {
return fCDIExpression.getExpressionText(); return fText;
} }
/* (non-Javadoc) /* (non-Javadoc)