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

Applied additional 209793 patch to fix regression in original patch.

Browse source
This commit is contained in:
John Cortell 2008-01-10 20:03:01 +00:00
parent b5db13b841
commit da553be6cd
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayValue;
import org.eclipse.cdt.debug.core.model.CVariableFormat; import org.eclipse.cdt.debug.core.model.CVariableFormat;
import org.eclipse.cdt.debug.core.model.ICStackFrame; import org.eclipse.cdt.debug.core.model.ICStackFrame;
import org.eclipse.cdt.debug.core.model.ICType; import org.eclipse.cdt.debug.core.model.ICType;
import org.eclipse.cdt.debug.core.model.ICValue;
import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IExpression; import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.core.model.IValue;
@ -55,7 +56,6 @@ public class CExpression extends CLocalVariable implements IExpression {
fText = cdiExpression.getExpressionText(); fText = cdiExpression.getExpressionText();
fCDIExpression = cdiExpression; fCDIExpression = cdiExpression;
fStackFrame = frame; fStackFrame = frame;
setInitialFormat();
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -220,7 +220,7 @@ public class CExpression extends CLocalVariable implements IExpression {
if ( fType == null ) { if ( fType == null ) {
synchronized( this ) { synchronized( this ) {
if ( fType == null ) { if ( fType == null ) {
fType = ((AbstractCValue)fValue).getType(); fType = ((ICValue)fValue).getType();
} }
} }
} }

10
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
View file

@ -104,7 +104,9 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
} }
fIsEnabled = ( parent instanceof AbstractCValue ) ? ((AbstractCValue)parent).getParentVariable().isEnabled() : !isBookkeepingEnabled(); fIsEnabled = ( parent instanceof AbstractCValue ) ? ((AbstractCValue)parent).getParentVariable().isEnabled() : !isBookkeepingEnabled();
getCDISession().getEventManager().addEventListener( this ); getCDISession().getEventManager().addEventListener( this );
setInitialFormat(); if ( cdiVariableObject != null ) {
setInitialFormat();
}
} }
/** /**
@ -119,7 +121,9 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
fIsEnabled = !isBookkeepingEnabled(); fIsEnabled = !isBookkeepingEnabled();
setStatus( ICDebugElementStatus.ERROR, MessageFormat.format( CoreModelMessages.getString( "CVariable.1" ), new String[]{ errorMessage } ) ); //$NON-NLS-1$ setStatus( ICDebugElementStatus.ERROR, MessageFormat.format( CoreModelMessages.getString( "CVariable.1" ), new String[]{ errorMessage } ) ); //$NON-NLS-1$
getCDISession().getEventManager().addEventListener( this ); getCDISession().getEventManager().addEventListener( this );
setInitialFormat(); if ( cdiVariableObject != null ) {
setInitialFormat();
}
} }
/* /*
@ -764,7 +768,7 @@ public abstract class CVariable extends AbstractCVariable implements ICDIEventLi
/** /**
* restore the format stored previously for this variable. * restore the format stored previously for this variable.
* Only sets explictly retrieved formats in order to maintain defaults. * Only sets explicitly retrieved formats in order to maintain defaults.
*/ */
protected void setInitialFormat() { protected void setInitialFormat() {
try { try {