From 8def1f711a19acc5abfe4dd552fb55dd6f98a285 Mon Sep 17 00:00:00 2001 From: Randy Rohrbach Date: Tue, 1 Jun 2010 22:31:57 +0000 Subject: [PATCH] Bugzilla 312098 : [Memory Browser] do not create a rendering automatically when Memory Browser is opened. Additional cleanup per John Cortell suggestions/issues. Randy --- .../memory/memorybrowser/GoToAddressBarWidget.java | 14 ++++++-------- .../ui/memory/memorybrowser/messages.properties | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java index b80e8a590ba..2ac6262b5c8 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java @@ -77,15 +77,13 @@ public class GoToAddressBarWidget { } }); fEmptyExpression = new ControlDecoration(expression, SWT.LEFT | SWT.CENTER); - fEmptyExpression.setDescriptionText("Enter an expression to position rendering"); - FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault() - .getFieldDecoration(FieldDecorationRegistry.DEC_REQUIRED); - fEmptyExpression.setImage(fieldDecoration.getImage()); + fEmptyExpression.setDescriptionText(Messages.getString("GoToAddressBarWidget.EnterExpressionMessage")); //$NON-NLS-1$ + FieldDecoration fieldDec = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_REQUIRED); + fEmptyExpression.setImage(fieldDec.getImage()); fWrongExpression = new ControlDecoration(expression, SWT.LEFT | SWT.TOP); - fieldDecoration = FieldDecorationRegistry.getDefault() - .getFieldDecoration(FieldDecorationRegistry.DEC_ERROR); - fWrongExpression.setImage(fieldDecoration.getImage()); + fieldDec = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR); + fWrongExpression.setImage(fieldDec.getImage()); fWrongExpression.hide(); // leave enough room for decorators @@ -96,7 +94,7 @@ public class GoToAddressBarWidget { } protected void updateButtons() { - boolean empty = fExpression.getText().trim().length() == 0; + boolean empty = getExpressionText().length() == 0; fOKNewTabButton.setEnabled(!empty); fOKButton.setEnabled(!empty); diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/messages.properties b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/messages.properties index c9e0a006727..2d97247cd7d 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/messages.properties +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/messages.properties @@ -9,6 +9,7 @@ # Ted R Williams (Wind River Systems, Inc.) - initial implementation ############################################################################### +GoToAddressBarWidget.EnterExpressionMessage=Enter an expression GoToAddressBarWidget.Go=Go GoToAddressBarWidget.Go=Go GoToAddressBarWidget.NewTab=New Tab