From eb421c9fec26f44d562160e6e6c36c9ebf418a3b Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sat, 30 Nov 2013 22:34:35 -0800 Subject: [PATCH] Removed public visibility from DialogMessages class. Externalized strings were never intended to be a part of the public API. --- .../org.eclipse.cdt.ui/.settings/.api_filters | 8 +++ .../ui/preferences/IndexerStrategyBlock.java | 15 +++--- .../ui/preferences/PreferencesMessages.java | 9 +++- .../PreferencesMessages.properties | 7 +++ .../cdt/ui/dialogs/DialogsMessages.java | 49 ++----------------- .../cdt/ui/dialogs/DialogsMessages.properties | 8 +-- .../eclipse/cdt/ui/dialogs/IndexerBlock.java | 4 +- 7 files changed, 38 insertions(+), 62 deletions(-) diff --git a/core/org.eclipse.cdt.ui/.settings/.api_filters b/core/org.eclipse.cdt.ui/.settings/.api_filters index 55723afdab0..792064e6a14 100644 --- a/core/org.eclipse.cdt.ui/.settings/.api_filters +++ b/core/org.eclipse.cdt.ui/.settings/.api_filters @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java index 71ef2dcb537..dbbb9a42a3a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation + * Markus Schorn - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; @@ -27,7 +27,6 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionPreferences; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionWorkspacePreferences; import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage; -import org.eclipse.cdt.ui.dialogs.DialogsMessages; import org.eclipse.cdt.ui.dialogs.ICOptionContainer; import org.eclipse.cdt.utils.ui.controls.ControlFactory; @@ -69,21 +68,21 @@ public class IndexerStrategyBlock extends AbstractCOptionPage { } }; - Group group= ControlFactory.createGroup(composite, DialogsMessages.IndexerStrategyBlock_strategyGroup, 1); + Group group= ControlFactory.createGroup(composite, PreferencesMessages.IndexerStrategyBlock_strategyGroup, 1); gd= (GridData) group.getLayoutData(); gd.grabExcessHorizontalSpace= true; gd.horizontalAlignment= GridData.FILL; - fAutoUpdateButton= ControlFactory.createCheckBox(group, DialogsMessages.IndexerStrategyBlock_autoUpdate); - fImmediateUpdateButton= ControlFactory.createCheckBox(group, DialogsMessages.IndexerStrategyBlock_immediateUpdate); + fAutoUpdateButton= ControlFactory.createCheckBox(group, PreferencesMessages.IndexerStrategyBlock_autoUpdate); + fImmediateUpdateButton= ControlFactory.createCheckBox(group, PreferencesMessages.IndexerStrategyBlock_immediateUpdate); fAutoUpdateButton.addSelectionListener(updateEnablement); if (IndexerPreferencePage.showBuildConfiguration()) { - group= ControlFactory.createGroup(composite, DialogsMessages.IndexerStrategyBlock_buildConfigGroup, 1); + group= ControlFactory.createGroup(composite, PreferencesMessages.IndexerStrategyBlock_buildConfigGroup, 1); gd= (GridData) group.getLayoutData(); gd.grabExcessHorizontalSpace= true; gd.horizontalAlignment= GridData.FILL; - fUseActiveBuildButton= ControlFactory.createRadioButton(group, DialogsMessages.IndexerStrategyBlock_activeBuildConfig, null, null); - fUseFixedBuildConfig= ControlFactory.createRadioButton(group, DialogsMessages.IndexerStrategyBlock_specificBuildConfig, null, null); + fUseActiveBuildButton= ControlFactory.createRadioButton(group, PreferencesMessages.IndexerStrategyBlock_activeBuildConfig, null, null); + fUseFixedBuildConfig= ControlFactory.createRadioButton(group, PreferencesMessages.IndexerStrategyBlock_specificBuildConfig, null, null); } initializeValues(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java index 2b7fc5d6c4b..92fb421dbd1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java @@ -555,7 +555,14 @@ public final class PreferencesMessages extends NLS { public static String ScalabilityPreferencePage_parserSettings_group_label; public static String ScalabilityPreferencePage_skipTrivialExpressions_label; public static String ScalabilityPreferencePage_maximumTrivialExpressions_label; - + + public static String IndexerStrategyBlock_activeBuildConfig; + public static String IndexerStrategyBlock_autoUpdate; + public static String IndexerStrategyBlock_buildConfigGroup; + public static String IndexerStrategyBlock_immediateUpdate; + public static String IndexerStrategyBlock_specificBuildConfig; + public static String IndexerStrategyBlock_strategyGroup; + private PreferencesMessages() { // Do not instantiate } 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 5fbc879261f..9b605b5458f 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 @@ -621,3 +621,10 @@ ScalabilityPreferencePage_preferenceOnlyForNewEditors=Some options do not affect ScalabilityPreferencePage_parserSettings_group_label= Parser settings ScalabilityPreferencePage_skipTrivialExpressions_label= Skip trivial expressions in initializer lists ScalabilityPreferencePage_maximumTrivialExpressions_label= Maximum number of trivial expressions in initializer lists to parse: + +IndexerStrategyBlock_strategyGroup=Indexing strategy +IndexerStrategyBlock_autoUpdate=Automatically update the index +IndexerStrategyBlock_immediateUpdate=Update index immediately after every file-save +IndexerStrategyBlock_buildConfigGroup=Build configuration for the indexer +IndexerStrategyBlock_activeBuildConfig=Use active build configuration +IndexerStrategyBlock_specificBuildConfig=Use the build configuration specified in the project's indexer settings diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.java index a40485fee5d..dc5eee9f9c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.java @@ -15,43 +15,25 @@ package org.eclipse.cdt.ui.dialogs; import org.eclipse.osgi.util.NLS; -/** - * @noextend This class is not intended to be subclassed by clients. - * @noinstantiate This class is not intended to be instantiated by clients. - */ -public class DialogsMessages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.ui.dialogs.DialogsMessages"; //$NON-NLS-1$ - /** @since 5.2 */ +class DialogsMessages extends NLS { public static String AbstractIndexerPage_fileSizeLimit; - /** @since 5.1 */ public static String AbstractIndexerPage_heuristicIncludes; public static String AbstractIndexerPage_indexAllFiles; - /** @since 5.1 */ public static String AbstractIndexerPage_indexAllHeaders; - /** @since 5.1 */ public static String AbstractIndexerPage_indexAllHeadersC; - /** @since 5.1 */ public static String AbstractIndexerPage_indexAllHeadersCpp; - /** @since 5.3 */ public static String AbstractIndexerPage_indexOpenedFiles; public static String AbstractIndexerPage_indexUpFront; public static String AbstractIndexerPage_skipAllReferences; - /** @since 5.1 */ public static String AbstractIndexerPage_skipImplicitReferences; - /** @since 5.2 */ public static String AbstractIndexerPage_skipTypeAndMacroReferences; public static String AbstractIndexerPage_skipTypeReferences; public static String AbstractIndexerPage_skipMacroReferences; public static String CacheSizeBlock_MB; public static String IndexerBlock_fixedBuildConfig; - /** @since 5.3 */ public static String IndexerBlock_indexerOptions; - public static String IndexerStrategyBlock_activeBuildConfig; - public static String IndexerStrategyBlock_autoUpdate; - public static String IndexerStrategyBlock_buildConfigGroup; - public static String IndexerStrategyBlock_immediateUpdate; - public static String IndexerStrategyBlock_specificBuildConfig; - public static String IndexerStrategyBlock_strategyGroup; + public static String IndexerBlock_buildConfigGroup; + public static String IndexerBlock_activeBuildConfig; public static String PreferenceScopeBlock_enableProjectSettings; public static String PreferenceScopeBlock_preferenceLink; public static String PreferenceScopeBlock_storeWithProject; @@ -66,56 +48,33 @@ public class DialogsMessages extends NLS { public static String DocCommentOwnerBlock_SelectDocToolDescription; public static String DocCommentOwnerCombo_None; public static String DocCommentOwnerComposite_DocumentationToolGroupTitle; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_ConsumeNo; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_ConsumeYes; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_DescriptionColumn; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_EatColumn; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_FileColumn; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_LineColumn; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_LinkToPreferencesMessage; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_Pattern_Column; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_SeverityColumn; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_SeverityError; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_SeverityIgnore; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_SeverityInfo; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_SeverityWarning; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_Title; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_TooltipConsume; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_TooltipDescription; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_TooltipFile; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_TooltipLine; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_TooltipPattern; - /** @since 5.2 */ public static String RegexErrorParserOptionPage_TooltipSeverity; - /** @since 5.2 */ public static String RegularExpression_EmptyPattern; - /** @since 5.2 */ public static String RegularExpression_Validate; - /** @since 5.2 */ public static String RegularExpression_Enter; static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, DialogsMessages.class); + NLS.initializeMessages(DialogsMessages.class.getName(), DialogsMessages.class); } private DialogsMessages() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.properties index 5255e982f88..472e8ed5355 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.properties @@ -40,12 +40,8 @@ DocCommentOwnerCombo_None=None DocCommentOwnerComposite_DocumentationToolGroupTitle=Documentation tool comments IndexerBlock_fixedBuildConfig=Use a fixed build configuration IndexerBlock_indexerOptions=Indexer options -IndexerStrategyBlock_strategyGroup=Indexing strategy -IndexerStrategyBlock_autoUpdate=Automatically update the index -IndexerStrategyBlock_immediateUpdate=Update index immediately after every file-save -IndexerStrategyBlock_buildConfigGroup=Build configuration for the indexer -IndexerStrategyBlock_activeBuildConfig=Use active build configuration -IndexerStrategyBlock_specificBuildConfig=Use the build configuration specified in the project's indexer settings +IndexerBlock_buildConfigGroup=Build configuration for the indexer +IndexerBlock_activeBuildConfig=Use active build configuration RegexErrorParserOptionPage_ConsumeNo=No RegexErrorParserOptionPage_ConsumeYes= RegexErrorParserOptionPage_DescriptionColumn=Description diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index a9de49fe8a3..744cb6cb2fa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -222,10 +222,10 @@ public class IndexerBlock extends AbstractCOptionPage { fIndexerPageComposite.setLayout(new TabFolderLayout()); if (needBuildConfigOptions()) { - fBuildConfigGroup= group= ControlFactory.createGroup(composite, DialogsMessages.IndexerStrategyBlock_buildConfigGroup, 1); + fBuildConfigGroup= group= ControlFactory.createGroup(composite, DialogsMessages.IndexerBlock_buildConfigGroup, 1); gd= (GridData) group.getLayoutData(); gd.grabExcessHorizontalSpace= true; - fUseActiveBuildButton= ControlFactory.createRadioButton(group, DialogsMessages.IndexerStrategyBlock_activeBuildConfig, null, null); + fUseActiveBuildButton= ControlFactory.createRadioButton(group, DialogsMessages.IndexerBlock_activeBuildConfig, null, null); fUseFixedBuildConfig= ControlFactory.createRadioButton(group, DialogsMessages.IndexerBlock_fixedBuildConfig, null, null); fBuildConfigComboBox= ControlFactory.createSelectCombo(group, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ final SelectionAdapter listener = new SelectionAdapter() {