FCL/sftools/dev/eclipseenv/eclipse: comparison cdt/cdt_6_0_x/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java

equal deleted inserted replaced

-:b32168b846ac
+:723898599d35
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.RejectedExecutionException;
-import org.eclipse.cdt.core.IAddress;
 import org.eclipse.cdt.debug.internal.ui.CDebugImages;
 import org.eclipse.cdt.dsf.concurrent.ConfinedToDsfExecutor;
 import org.eclipse.cdt.dsf.concurrent.CountingRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.DsfExecutor;
 import org.eclipse.cdt.dsf.concurrent.DsfRunnable;
 import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants;
 import org.eclipse.cdt.dsf.concurrent.ImmediateExecutor;
-import org.eclipse.cdt.dsf.concurrent.MultiRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
 import org.eclipse.cdt.dsf.datamodel.DMContexts;
 import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.debug.service.IExpressions;
 import org.eclipse.cdt.dsf.debug.service.IFormattedValues;
 import org.eclipse.cdt.dsf.debug.service.IStack;
 import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionChangedDMEvent;
 import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMAddress;
 import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext;
 import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMData;
+import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMLocation;
 import org.eclipse.cdt.dsf.debug.service.IMemory.IMemoryChangedEvent;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.ISuspendedDMEvent;
 import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext;
 import org.eclipse.cdt.dsf.debug.service.IStack.IVariableDMContext;
 import org.eclipse.cdt.dsf.debug.service.IStack.IVariableDMData;
 import org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat.FormattedValueLabelText;
 import org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat.FormattedValueVMUtil;
 import org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat.IFormattedValueVMContext;
 import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin;
 import org.eclipse.cdt.dsf.service.DsfSession;
+import org.eclipse.cdt.dsf.ui.concurrent.ViewerCountingRequestMonitor;
 import org.eclipse.cdt.dsf.ui.concurrent.ViewerDataRequestMonitor;
 import org.eclipse.cdt.dsf.ui.viewmodel.VMDelta;
 import org.eclipse.cdt.dsf.ui.viewmodel.datamodel.AbstractDMVMProvider;
 import org.eclipse.cdt.dsf.ui.viewmodel.datamodel.IDMVMContext;
 import org.eclipse.cdt.dsf.ui.viewmodel.properties.IElementPropertiesProvider;
 * The label provider delegate.  This VM node will delegate label updates to this provider
 * which can be created by sub-classes.
 *
 * @since 2.0
 */
-private IElementLabelProvider fLabelProvider;
+private final IElementLabelProvider fLabelProvider;
 public class VariableExpressionVMC extends DMVMContext implements IFormattedValueVMContext  {
 private IExpression fExpression;
 // address value changes.
 provider.setColumnInfo(
 IDebugVMConstants.COLUMN_ID__ADDRESS,
 new LabelColumnInfo(new LabelAttribute[] {
 new LabelText(
-MessagesForVariablesVM.VariableVMNode_Address_column__text_format,
+MessagesForVariablesVM.VariableVMNode_Location_column__text_format,
 new String[] { PROP_VARIABLE_ADDRESS }),
-new LabelText(MessagesForVariablesVM.VariableVMNode_Address_column__Error__text_format, new String[] {}),
+new LabelText(MessagesForVariablesVM.VariableVMNode_Location_column__Error__text_format, new String[] {}),
 new LabelBackground(
 DebugUITools.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB())
 {
 { setPropertyNames(new String[] { PROP_VARIABLE_ADDRESS, PROP_VARIABLE_ADDRESS_CHANGED}); }
 *  get the formatted data value for a specific register.
 */
 @ConfinedToDsfExecutor("getSession().getExecutor()")
 protected void fillAddressDataProperties(IPropertiesUpdate update, IExpressionDMAddress address)
 {
-	    IExpressionDMAddress expression = address;
+	if (address instanceof IExpressionDMLocation)
-	    Object expAddress = expression.getAddress();
+		update.setProperty(PROP_VARIABLE_ADDRESS, ((IExpressionDMLocation)address).getLocation());
+	else
-	    String addrString = ""; //$NON-NLS-1$
+		update.setProperty(PROP_VARIABLE_ADDRESS, "0x" + address.getAddress().toString(16)); //$NON-NLS-1$
-	    if (expAddress instanceof IAddress)
-	    	addrString = "0x" + ((IAddress)expAddress).toString(16); //$NON-NLS-1$
-	    else if (expAddress instanceof String)
-	    	addrString = (String)expAddress;
-	    update.setProperty(PROP_VARIABLE_ADDRESS, addrString);
 }
 public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
 if (IDebugVMConstants.COLUMN_ID__VALUE.equals(columnId)) {
 return new TextCellEditor(parent);
 final List<IVariableDMData> localsDMData = new ArrayList<IVariableDMData>();
 // Create the MultiRequestMonitor to handle completion of the set of getModelData() calls.
-final MultiRequestMonitor<DataRequestMonitor<IVariableDMData>> mrm =
+final CountingRequestMonitor crm = new ViewerCountingRequestMonitor(dsfExecutor, update) {
-new MultiRequestMonitor<DataRequestMonitor<IVariableDMData>>(dsfExecutor, null) {
+@Override
-@Override
+public void handleCompleted() {
-public void handleCompleted() {
+// Now that all the calls to getModelData() are complete, we create an
-// Now that all the calls to getModelData() are complete, we create an
+// IExpressionDMContext object for each local variable name, saving them all
-// IExpressionDMContext object for each local variable name, saving them all
+// in an array.
-// in an array.
+if (!isSuccess()) {
-if (!isSuccess()) {
+handleFailedUpdate(update);
-handleFailedUpdate(update);
+return;
-return;
-}
-IExpressionDMContext[] expressionDMCs = new IExpressionDMContext[localsDMData.size()];
-int i = 0;
-for (IVariableDMData localDMData : localsDMData) {
-expressionDMCs[i++] = expressionService.createExpression(frameDmc, localDMData.getName());
-}
-// Lastly, we fill the update from the array of view model context objects
-// that reference the ExpressionDMC objects for the local variables.  This is
-// the last code to run for a given call to updateElementsInSessionThread().
-// We can now leave anonymous-inner-class hell.
-fillUpdateWithVMCs(update, expressionDMCs);
-update.done();
 }
+IExpressionDMContext[] expressionDMCs = new IExpressionDMContext[localsDMData.size()];
+int i = 0;
+for (IVariableDMData localDMData : localsDMData) {
+expressionDMCs[i++] = expressionService.createExpression(frameDmc, localDMData.getName());
+}
+// Lastly, we fill the update from the array of view model context objects
+// that reference the ExpressionDMC objects for the local variables.  This is
+// the last code to run for a given call to updateElementsInSessionThread().
+// We can now leave anonymous-inner-class hell.
+fillUpdateWithVMCs(update, expressionDMCs);
+update.done();
+}
 };
+int countRM = 0;
 // Perform a set of getModelData() calls, one for each local variable's data model
 // context object.  In the handleCompleted() method of the DataRequestMonitor, add the
 // IVariableDMData object to the localsDMData List for later processing (see above).
 for (IVariableDMContext localDMC : localsDMCs) {
 DataRequestMonitor<IVariableDMData> rm =
-new ViewerDataRequestMonitor<IVariableDMData>(dsfExecutor, update) {
+new DataRequestMonitor<IVariableDMData>(dsfExecutor, crm) {
 @Override
-public void handleCompleted() {
+public void handleSuccess() {
 localsDMData.add(getData());
-mrm.requestMonitorDone(this);
+crm.done();
 }
 };
-mrm.add(rm);
 stackFrameService.getVariableData(localDMC, rm);
-}
+countRM++;
+}
+crm.setDoneCount(countRM);
 }
 };
 // Make the asynchronous call to IStack.getLocals().  The results are processed in the
 // DataRequestMonitor.handleCompleted() above.
 e instanceof IMemoryChangedEvent ||
 e instanceof IExpressionChangedDMEvent ||
 (e instanceof PropertyChangeEvent &&
 ((PropertyChangeEvent)e).getProperty() == IDebugVMConstants.PROP_FORMATTED_VALUE_FORMAT_PREFERENCE) )
 {
-// Create a delta that the whole register group has changed.
 return IModelDelta.CONTENT;
 }
 return IModelDelta.NO_CHANGE;
 }
 e instanceof IMemoryChangedEvent ||
 e instanceof IExpressionChangedDMEvent ||
 (e instanceof PropertyChangeEvent &&
 ((PropertyChangeEvent)e).getProperty() == IDebugVMConstants.PROP_FORMATTED_VALUE_FORMAT_PREFERENCE) )
 {
-// Create a delta that the whole register group has changed.
 parentDelta.setFlags(parentDelta.getFlags() | IModelDelta.CONTENT);
 }
 requestMonitor.done();
 }

changeset 129	723898599d35
parent 105	fbceb3d6fb44