From a7c0f2524f2ac87c1d5f6e6a0613bd125a1016cf Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Wed, 17 Mar 2004 15:26:34 +0000 Subject: [PATCH] externalize strings from Tanya Wolff --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../cdt/ui/browser/typeinfo/AllTypesCache.java | 12 ++++++------ .../cdt/ui/browser/typeinfo/TypeSelectionDialog.java | 2 +- .../corext/refactoring/RenameRefactoring.java | 2 +- .../refactoring/rename/RenameElementProcessor.java | 10 +++++----- .../ui/refactoring/UserInterfaceStarter.java | 2 +- .../internal/ui/refactoring/refactoringui.properties | 2 ++ .../cdt/internal/ui/editor/MouseClickListener.java | 10 +++++----- .../ui/preferences/CEditorPreferencePage.java | 4 ++-- .../ui/preferences/PreferencesMessages.properties | 2 ++ .../ui/search/actions/OpenDeclarationsAction.java | 2 +- .../text/contentassist/ContentAssistPreference.java | 2 +- 12 files changed, 30 insertions(+), 23 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 15117c46939..209c5d7ca21 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -4,6 +4,9 @@ 2004-03-16 Hoda Amer Fix for bug#54324 Refactor: Invoke rename refactoring from editor +2004-03-16 Tanya Wolff + Externalized strings and marked non-translatable ones. + 2004-03-15 Hoda Amer Fix for [Bug 54323] Refactor: Menu item from outline view diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/AllTypesCache.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/AllTypesCache.java index 5684db06e55..e216797526e 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/AllTypesCache.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/AllTypesCache.java @@ -202,30 +202,30 @@ public class AllTypesCache { for (int i= 0; i < types.length; ++i) { switch (types[i]) { case ICElement.C_NAMESPACE: - pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.NAMESPACE, ICSearchConstants.DECLARATIONS, false)); + pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.NAMESPACE, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$ break; case ICElement.C_CLASS: // fall through case ICElement.C_TEMPLATE_CLASS: - pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.CLASS, ICSearchConstants.DECLARATIONS, false)); + pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.CLASS, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$ break; case ICElement.C_STRUCT: // fall through case ICElement.C_TEMPLATE_STRUCT: - pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.STRUCT, ICSearchConstants.DECLARATIONS, false)); + pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.STRUCT, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$ break; case ICElement.C_UNION: // fall through case ICElement.C_TEMPLATE_UNION: - pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.UNION, ICSearchConstants.DECLARATIONS, false)); + pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.UNION, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$ break; case ICElement.C_ENUMERATION: - pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.ENUM, ICSearchConstants.DECLARATIONS, false)); + pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.ENUM, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$ break; case ICElement.C_TYPEDEF: - pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.TYPEDEF, ICSearchConstants.DECLARATIONS, false)); + pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.TYPEDEF, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$ break; default: diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java index f9a1bf36c73..e1e3f1b2736 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java @@ -31,7 +31,7 @@ public class TypeSelectionDialog extends TwoPaneElementSelector { private static final char END_SYMBOL= '<'; private static final char ANY_STRING= '*'; - private final static String scopeResolutionOperator= "::"; + private final static String scopeResolutionOperator= "::"; //$NON-NLS-1$ private StringMatcher fMatcher; private StringMatcher fQualifierMatcher; diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/RenameRefactoring.java b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/RenameRefactoring.java index e1a79ea7f84..0173f98d33e 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/RenameRefactoring.java +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/RenameRefactoring.java @@ -151,6 +151,6 @@ public class RenameRefactoring extends Refactoring implements IProcessorBasedRef if (isAvailable()) return getName(); else - return "No refactoring available to process: " + fElement; + return "No refactoring available to process: " + fElement; //$NON-NLS-1$ } } 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 223b7526e26..e23a771ee55 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 @@ -58,7 +58,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc private ICElement fCElement = null; private SearchResultGroup[] fReferences; private TextChangeManager fChangeManager; - private final String QUALIFIER = "::"; + private final String QUALIFIER = "::"; //$NON-NLS-1$ private boolean fUpdateReferences; @@ -117,7 +117,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc */ public String getCurrentElementName() { if(fCElement == null) - return ""; + return ""; //$NON-NLS-1$ String name = fCElement.getElementName(); if (name.indexOf(QUALIFIER) != -1){ return (name.substring(name.lastIndexOf(QUALIFIER) + 2, name.length())); @@ -148,7 +148,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc public RefactoringStatus checkNewElementName(String newName){ if ((fCElement == null) || (!(fCElement instanceof ISourceReference)) || (fCElement instanceof ITranslationUnit)) { - return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); + return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$ } Assert.isNotNull(newName, "new name"); //$NON-NLS-1$ @@ -209,7 +209,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc public RefactoringStatus checkActivation() throws CoreException { RefactoringStatus result= null; if ((fCElement == null) || (!(fCElement instanceof ISourceReference)) || (fCElement instanceof ITranslationUnit)) { - return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); + return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$ } return Checks.checkIfTuBroken(fCElement); @@ -346,7 +346,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc if(structure.getElementType() == ICElement.C_CLASS){ orPattern.addPattern(SearchEngine.createSearchPattern( searchPrefix, ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false )); - orPattern.addPattern(SearchEngine.createSearchPattern( "~"+ searchPrefix, + orPattern.addPattern(SearchEngine.createSearchPattern( "~"+ searchPrefix, //$NON-NLS-1$ ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false )); } } diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/UserInterfaceStarter.java b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/UserInterfaceStarter.java index e18343221b3..69fc28271e4 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/UserInterfaceStarter.java +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/UserInterfaceStarter.java @@ -70,7 +70,7 @@ public class UserInterfaceStarter { { MessageDialog.openInformation(parent, refactoring.getName(), - "No user interface found"); + RefactoringMessages.getString("UserInterfaceStarter.No_ui_found")); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/refactoringui.properties b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/refactoringui.properties index c230d633d4e..714fedfaf7d 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/refactoringui.properties +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/refactoringui.properties @@ -581,3 +581,5 @@ ChangeTypeWizard.computationInterrupted=Computation of valid types was interrupt ChangeTypeWizard.grayed_types= Type ''{0}'' cannot be used as a replacement for type ''{1}'' ChangeTypeWizard.with_itself= Cannot replace type ''{0}'' with itself ChangeTypeInputPage.Select_Type=Press "Compute" to determine allowable supertypes + +UserInterfaceStarter.No_ui_found=No user interface found \ No newline at end of file diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java index 7db0d7742f2..236acb9314d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java @@ -137,7 +137,7 @@ IPropertyChangeListener{ try { text.redrawRange(offset, length, true); } catch (IllegalArgumentException x) { - org.eclipse.cdt.internal.core.model.Util.log(x, "Error in CEditor.MouseClickListener.repairRepresentation", ICLogConstants.CDT); + org.eclipse.cdt.internal.core.model.Util.log(x, "Error in CEditor.MouseClickListener.repairRepresentation", ICLogConstants.CDT); //$NON-NLS-1$ } } @@ -408,9 +408,9 @@ IPropertyChangeListener{ else{ String selWord = null; String slas = document.get(start,1); - if (slas.equals("\n") || - slas.equals("\t") || - slas.equals(" ")) + if (slas.equals("\n") || //$NON-NLS-1$ + slas.equals("\t") || //$NON-NLS-1$ + slas.equals(" ")) //$NON-NLS-1$ { selWord =document.get(start+1, end - start - 1); @@ -429,7 +429,7 @@ IPropertyChangeListener{ charX == '>') return null; - if (selWord.equals("#include")) + if (selWord.equals("#include")) //$NON-NLS-1$ { //get start of next identifier diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java index d61fe2c35f8..aefcb757ae9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java @@ -925,7 +925,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP item.setControl(createContentAssistPage(folder)); item = new TabItem(folder, SWT.NONE); - item.setText("Navigation"); + item.setText(PreferencesMessages.getString("CEditorPreferencePage.Navigation")); //$NON-NLS-1$ item.setImage(CPluginImages.get(CPluginImages.IMG_OBJS_TUNIT)); item.setControl(createNavPage(folder)); @@ -945,7 +945,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP navComposite.setLayout(layout); Button navCheck = new Button(navComposite,SWT.CHECK); - navCheck.setText("Enable Hyperlink Navigation"); + navCheck.setText(PreferencesMessages.getString("CEditorPreferencePage.Enable_Hyperlink_Navigation")); //$NON-NLS-1$ GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; navCheck.setLayoutData(gd); 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 5b443b5afc7..5df63ea1826 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 @@ -112,3 +112,5 @@ CEditorPreferencePage.behaviorPage.printMargin=Show print &margin CEditorPreferencePage.textFont.changeButton=C&hange... TemplatePreferencePage.Viewer.preview=Preview: BuildConsolePreferencePage.fieldEditors.buildConsoleLines=&Build console lines: +CEditorPreferencePage.Navigation=Navigation +CEditorPreferencePage.Enable_Hyperlink_Navigation=Enable Hyperlink Navigation diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java index 18d467bb868..56b394d0998 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java @@ -279,7 +279,7 @@ public class OpenDeclarationsAction extends Action implements IUpdate { progressMonitor.run(true, true, runnable); if (elementsFound.isEmpty() == true) { - MessageDialog.openInformation(getShell(),CSearchMessages.getString("CSearchOperation.operationUnavailable.title"), CSearchMessages.getString("CSearchOperation.operationUnavailable.message")); //$NON-NLS-1$ + MessageDialog.openInformation(getShell(),CSearchMessages.getString("CSearchOperation.operationUnavailable.title"), CSearchMessages.getString("CSearchOperation.operationUnavailable.message")); //$NON-NLS-1$ //$NON-NLS-2$ return; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java index bc27082f197..06050b626cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java @@ -152,7 +152,7 @@ public class ContentAssistPreference { boolean useDotAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_DOT); boolean useArrowAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_ARROW); boolean useDoubleColonAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_DOUBLECOLON); - String triggers = ""; + String triggers = ""; //$NON-NLS-1$ if (useDotAsTrigger){ triggers += "."; //$NON-NLS-1$ }