From b6281e282ddb05750db3f5c5ad6d9954b93d7daa Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Fri, 18 May 2007 09:03:56 +0000 Subject: [PATCH] Bug #187397: wording adjusted --- .../src/org/eclipse/cdt/ui/newui/ExpDialog.java | 14 ++++++++++---- .../cdt/ui/newui/PluginResources.properties | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java index 1d7011c3147..a153666dcb7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java @@ -34,7 +34,9 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry; public class ExpDialog extends AbstractPropertyDialog { protected static final String TO_ALL = UIMessages.getString("ExpDialog.5"); //$NON-NLS-1$ - + protected static final String EMPTY_NAME = UIMessages.getString("ExpDialog.8"); //$NON-NLS-1$ + protected static final String EMPTY_VALUE = UIMessages.getString("ExpDialog.10"); //$NON-NLS-1$ + public String[] sel_types = null; public String[] sel_langs = null; private Text txt1; @@ -219,14 +221,18 @@ public class ExpDialog extends AbstractPropertyDialog { message.setText(EMPTY_STR); String name; boolean enabled = true; - if (kind == ICSettingEntry.MACRO) + if (kind == ICSettingEntry.MACRO) name = txt1.getText().trim(); else name = txt2.getText().trim(); if (name.length() == 0) { enabled = false; - if (!anew) - message.setText(UIMessages.getString("ExpDialog.8")); //$NON-NLS-1$ + if (!anew) { + if (kind == ICSettingEntry.MACRO) + message.setText(EMPTY_NAME); + else + message.setText(EMPTY_VALUE); + } } if (enabled && existing != null && existing.contains(name)) { message.setText(UIMessages.getString("ExpDialog.9")); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties index b4f4696a1c3..48faccac54a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties @@ -471,12 +471,13 @@ ExpDialog.0=To all configurations ExpDialog.1=Save to: ExpDialog.2=Languages ExpDialog.3=Content types -ExpDialog.4=Is workspace path +ExpDialog.4=Is a workspace path ExpDialog.5=Apply to all ExpDialog.6=Name: ExpDialog.7=Value: ExpDialog.8=Name cannot be empty \! ExpDialog.9=The same name already exists \! +ExpDialog.10=Value cannot be empty \! ConfigMultiSelectionDialog.0=Select configurations ConfigMultiSelectionDialog.1=At least 2 configurations should be selected SymbolDialog.0=Name: