From 52961638a35c3bf2b808bb09d6cbbaa297bf0565 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 27 May 2005 19:27:55 +0000 Subject: [PATCH] 2005-05-27 Alain Magloire Patch from Dave Daoust to externalize some strings * refactor/org/eclipse/cdt/internal/core/refactoring/rename/RenameElementProcessor.java * src/rg/eclipse/cdt/internal/ui/CUIMessages.properties * src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties * src/org/eclipse/cdt/internal/ui/search/DOMQuery.java * src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java * src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionprocessor2.java * src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java --- core/org.eclipse.cdt.ui/ChangeLog | 10 ++++++++++ .../refactoring/rename/RenameElementProcessor.java | 2 +- .../org/eclipse/cdt/internal/ui/CUIMessages.properties | 1 + .../ui/preferences/PreferencesMessages.properties | 2 ++ .../org/eclipse/cdt/internal/ui/search/DOMQuery.java | 1 - .../internal/ui/search/LevelTreeContentProvider.java | 1 - .../ui/text/contentassist/CCompletionProcessor2.java | 3 ++- .../org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java | 5 +++-- 8 files changed, 19 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 85c3cebeb03..fc87632d5d2 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,13 @@ +2005-05-27 Alain Magloire + Patch from Dave Daoust to externalize some strings + * refactor/org/eclipse/cdt/internal/core/refactoring/rename/RenameElementProcessor.java + * src/rg/eclipse/cdt/internal/ui/CUIMessages.properties + * src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties + * src/org/eclipse/cdt/internal/ui/search/DOMQuery.java + * src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java + * src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionprocessor2.java + * src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java + 2005-05-19 Alain Magloire Fixed PR 95943 * src/org/elcipse/cdt/internla/corext/template/c/TemplateMessages.properties diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java index 8fb63ab2e87..ce9fb17568e 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java @@ -725,7 +725,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc if(( returnType == null) || (returnType.length() == 0) ) return true; - if(getCurrentElementName().startsWith("~")) + if(getCurrentElementName().startsWith("~")) //$NON-NLS-1$ return true; return false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties index 092390869fb..344205d03e6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties @@ -19,6 +19,7 @@ ExceptionDialog.seeErrorLogMessage=See error log for more details. CEditor.contentassist.noCompletions=No completions available CEditor.contentassist.parseError=No completions available due to parse error CEditor.contentassist.timeout=Content Assist parsing has timed out +CEditor.contentassist.badDialect=Unsupported Dialect Exception CAnnotationHover.multipleMarkers=Multiple markers at this line diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties index 3898ed6e8cf..2430dd9bb72 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties @@ -213,6 +213,8 @@ FoldingConfigurationBlock.error.not_exist= The selected folding provider does no #Code Formatting CodeFormatterPreferencePage.title=Code Formatter +CodeFormatterPreferencePage.selectionName=Formatters: +CodeFormatterPreferencePage.emptyName=(NONE) CodeFormatterPreferencePage.description=Code Formatter # --- Linked Resources --- diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/DOMQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/DOMQuery.java index ec9158d42fa..01be2960c25 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/DOMQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/DOMQuery.java @@ -45,7 +45,6 @@ import org.eclipse.cdt.core.search.ICSearchResultCollector; import org.eclipse.cdt.core.search.ICSearchScope; import org.eclipse.cdt.core.search.IMatch; import org.eclipse.cdt.core.search.OffsetLocatable; -import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java index 78a23c6e48f..d21a786eada 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java @@ -20,7 +20,6 @@ import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.core.parser.IOffsetDuple; import org.eclipse.cdt.core.search.BasicSearchMatch; import org.eclipse.cdt.core.search.ILineLocatable; import org.eclipse.cdt.core.search.IMatchLocatable; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java index bbb001846ff..29c2efab4d1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java @@ -46,6 +46,7 @@ public class CCompletionProcessor2 implements IContentAssistProcessor { private String assistPrefix = "CEditor.contentassist"; //$NON-NLS-1$ private String noCompletions = assistPrefix + ".noCompletions"; //$NON-NLS-1$ private String parseError = assistPrefix + ".parseError"; //$NON-NLS-1$ + private String dialectError = assistPrefix + ".badDialect"; //$NON-NLS-1$ public CCompletionProcessor2(IEditorPart editor) { this.editor = editor; @@ -134,7 +135,7 @@ public class CCompletionProcessor2 implements IContentAssistProcessor { return propsArray; } catch (UnsupportedDialectException e) { - errorMessage = "Unsupported Dialect Exception"; + errorMessage = CUIMessages.getString(dialectError); } catch (Throwable e) { errorMessage = e.toString(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java index 283fac0337e..de5103ab92f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java @@ -18,6 +18,7 @@ import java.util.Map; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePreferenceConstants; import org.eclipse.cdt.internal.ui.ICHelpContextIds; +import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages; import org.eclipse.cdt.internal.ui.util.PixelConverter; import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.runtime.IConfigurationElement; @@ -48,7 +49,7 @@ public class CodeFormatterBlock { private static final String ATTR_ID="id"; //$NON-NLS-1$ // This is a hack until we have a default Formatter. // For now it is comment out in the plugin.xml - private static final String NONE="(NONE)"; //$NON-NLS-1$ + private static final String NONE=PreferencesMessages.getString("CodeFormatterPreferencePage.emptyName"); //$NON-NLS-1$ public CodeFormatterBlock(Preferences prefs) { @@ -105,7 +106,7 @@ public class CodeFormatterBlock { ControlFactory.createEmptySpace(control, 2); - Label label = ControlFactory.createLabel(control, "Formatters:"); + Label label = ControlFactory.createLabel(control, PreferencesMessages.getString("CodeFormatterPreferencePage.selectionName")); //$NON-NLS-1$ label.setLayoutData(new GridData()); fFormatterCombo = new Combo(control, SWT.DROP_DOWN | SWT.READ_ONLY); GridData gd = new GridData(GridData.GRAB_HORIZONTAL);