From 43456f1f7f6f8fadffe47c44a0e0adee06b16b92 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Thu, 9 Oct 2008 05:32:50 +0000 Subject: [PATCH] [233111] - [expressions] Changing an expression name in the view should not accept an empty expression --- .../expression/WatchExpressionCellModifier.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/WatchExpressionCellModifier.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/WatchExpressionCellModifier.java index 10d3d6d00fa..04c4dbbb1de 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/WatchExpressionCellModifier.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/WatchExpressionCellModifier.java @@ -53,13 +53,18 @@ public class WatchExpressionCellModifier implements ICellModifier { public void modify(Object element, String property, Object value) { if (!IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(property)) return; if (!(value instanceof String)) return; - + + String strValue = ((String)value).trim(); IWatchExpression expression = getWatchExpression(element); + IExpressionManager expressionManager = DebugPlugin.getDefault().getExpressionManager(); if (expression != null) { - expression.setExpressionText((String)value); - } else if (element instanceof NewExpressionVMC && ((String)value).trim().length() != 0) { - IExpressionManager expressionManager = DebugPlugin.getDefault().getExpressionManager(); - IWatchExpression watchExpression = expressionManager.newWatchExpression((String)value); + if (strValue.length() != 0) { + expression.setExpressionText(strValue); + } else { + expressionManager.removeExpression(expression); + } + } else if (element instanceof NewExpressionVMC && strValue.length() != 0) { + IWatchExpression watchExpression = expressionManager.newWatchExpression(strValue); expressionManager.addExpression(watchExpression); } }