mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Bug 126262, applied Ling Wang's patch.

Browse source
This commit is contained in:
Ken Ryall 2007-05-10 03:32:23 +00:00
parent aeb075a51b
commit d6d4754b00
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 QNX Software Systems and others. * Copyright (c) 2000, 2007 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,18 +7,21 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Ling Wang (Nokia) - 126262
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.internal.core.model; package org.eclipse.cdt.debug.internal.core.model;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.ICDebugConstants; import org.eclipse.cdt.debug.core.ICDebugConstants;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent;
import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;
import org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent; import org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue;
import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable;
import org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor;
import org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayValue; 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;
@ -67,8 +70,9 @@ public class CExpression extends CLocalVariable implements IExpression {
public void handleDebugEvents( ICDIEvent[] events ) { public void handleDebugEvents( ICDIEvent[] events ) {
for( int i = 0; i < events.length; i++ ) { for( int i = 0; i < events.length; i++ ) {
ICDIEvent event = events[i]; ICDIEvent event = events[i];
ICDIObject source = event.getSource();
if ( event instanceof ICDIResumedEvent ) { if ( event instanceof ICDIResumedEvent ) {
ICDIObject source = event.getSource();
if ( source != null ) { if ( source != null ) {
ICDITarget cdiTarget = source.getTarget(); ICDITarget cdiTarget = source.getTarget();
if ( getCDITarget().equals( cdiTarget ) ) { if ( getCDITarget().equals( cdiTarget ) ) {
@ -77,6 +81,26 @@ public class CExpression extends CLocalVariable implements IExpression {
} }
} }
} }
if ( event instanceof ICDIChangedEvent ) {
// If a variable is changed (by user or program),
// we should re-evaluate expressions.
// Though it's better we check if the changed variable
// is part of the expression, the effort required is not
// worth the gain.
// This is partial fix to bug 126262. It makes CDT behavior
// in line with JDT.
// The remaining problem (with both CDT & JDT) is:
// Due to platform bug, the change will not show up in
// Expression View until the view is redrawn (e.g. after stepping,
// or when the view is uncovered from background). In other words,
// if the Expression View is at the front (not covered) when the
// variable is changed, the change won't be reflected in the view.
if ( source instanceof ICDIVariable) {
setChanged( false );
resetValue();
}
}
} }
super.handleDebugEvents( events ); super.handleDebugEvents( events );
} }