mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Removed public visibility from DialogMessages class. Externalized

Browse source 
strings were never intended to be a part of the public API.
This commit is contained in:
Sergey Prigogin 2013-11-30 22:34:35 -08:00
parent a9f9839cc9
commit eb421c9fec
7 changed files with 38 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.ui/.settings/.api_filters
View file

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.cdt.ui" version="2"> <component id="org.eclipse.cdt.ui" version="2">
<resource path="src/org/eclipse/cdt/ui/dialogs/DialogsMessages.java" type="org.eclipse.cdt.ui.dialogs.DialogsMessages">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.cdt.ui.dialogs.DialogsMessages"/>
<message_argument value="org.eclipse.cdt.ui_5.7.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/cdt/ui/refactoring/actions/Messages.java" type="org.eclipse.cdt.ui.refactoring.actions.Messages"> <resource path="src/org/eclipse/cdt/ui/refactoring/actions/Messages.java" type="org.eclipse.cdt.ui.refactoring.actions.Messages">
<filter id="305365105"> <filter id="305365105">
<message_arguments> <message_arguments>

15
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.preferences; 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.ICProjectDescriptionPreferences;
import org.eclipse.cdt.core.settings.model.ICProjectDescriptionWorkspacePreferences; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionWorkspacePreferences;
import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage; 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.ui.dialogs.ICOptionContainer;
import org.eclipse.cdt.utils.ui.controls.ControlFactory; 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= (GridData) group.getLayoutData();
gd.grabExcessHorizontalSpace= true; gd.grabExcessHorizontalSpace= true;
gd.horizontalAlignment= GridData.FILL; gd.horizontalAlignment= GridData.FILL;
fAutoUpdateButton= ControlFactory.createCheckBox(group, DialogsMessages.IndexerStrategyBlock_autoUpdate); fAutoUpdateButton= ControlFactory.createCheckBox(group, PreferencesMessages.IndexerStrategyBlock_autoUpdate);
fImmediateUpdateButton= ControlFactory.createCheckBox(group, DialogsMessages.IndexerStrategyBlock_immediateUpdate); fImmediateUpdateButton= ControlFactory.createCheckBox(group, PreferencesMessages.IndexerStrategyBlock_immediateUpdate);
fAutoUpdateButton.addSelectionListener(updateEnablement); fAutoUpdateButton.addSelectionListener(updateEnablement);
if (IndexerPreferencePage.showBuildConfiguration()) { if (IndexerPreferencePage.showBuildConfiguration()) {
group= ControlFactory.createGroup(composite, DialogsMessages.IndexerStrategyBlock_buildConfigGroup, 1); group= ControlFactory.createGroup(composite, PreferencesMessages.IndexerStrategyBlock_buildConfigGroup, 1);
gd= (GridData) group.getLayoutData(); gd= (GridData) group.getLayoutData();
gd.grabExcessHorizontalSpace= true; gd.grabExcessHorizontalSpace= true;
gd.horizontalAlignment= GridData.FILL; gd.horizontalAlignment= GridData.FILL;
fUseActiveBuildButton= ControlFactory.createRadioButton(group, DialogsMessages.IndexerStrategyBlock_activeBuildConfig, null, null); fUseActiveBuildButton= ControlFactory.createRadioButton(group, PreferencesMessages.IndexerStrategyBlock_activeBuildConfig, null, null);
fUseFixedBuildConfig= ControlFactory.createRadioButton(group, DialogsMessages.IndexerStrategyBlock_specificBuildConfig, null, null); fUseFixedBuildConfig= ControlFactory.createRadioButton(group, PreferencesMessages.IndexerStrategyBlock_specificBuildConfig, null, null);
} }
initializeValues(); initializeValues();
} }

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java
View file

@ -555,7 +555,14 @@ public final class PreferencesMessages extends NLS {
public static String ScalabilityPreferencePage_parserSettings_group_label; public static String ScalabilityPreferencePage_parserSettings_group_label;
public static String ScalabilityPreferencePage_skipTrivialExpressions_label; public static String ScalabilityPreferencePage_skipTrivialExpressions_label;
public static String ScalabilityPreferencePage_maximumTrivialExpressions_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() { private PreferencesMessages() {
// Do not instantiate // Do not instantiate
} }

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
View file

@ -621,3 +621,10 @@ ScalabilityPreferencePage_preferenceOnlyForNewEditors=Some options do not affect
ScalabilityPreferencePage_parserSettings_group_label= Parser settings ScalabilityPreferencePage_parserSettings_group_label= Parser settings
ScalabilityPreferencePage_skipTrivialExpressions_label= Skip trivial expressions in initializer lists ScalabilityPreferencePage_skipTrivialExpressions_label= Skip trivial expressions in initializer lists
ScalabilityPreferencePage_maximumTrivialExpressions_label= Maximum number of trivial expressions in initializer lists to parse: 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

49
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.java
View file

@ -15,43 +15,25 @@ package org.eclipse.cdt.ui.dialogs;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
/** class DialogsMessages extends 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 */
public static String AbstractIndexerPage_fileSizeLimit; public static String AbstractIndexerPage_fileSizeLimit;
/** @since 5.1 */
public static String AbstractIndexerPage_heuristicIncludes; public static String AbstractIndexerPage_heuristicIncludes;
public static String AbstractIndexerPage_indexAllFiles; public static String AbstractIndexerPage_indexAllFiles;
/** @since 5.1 */
public static String AbstractIndexerPage_indexAllHeaders; public static String AbstractIndexerPage_indexAllHeaders;
/** @since 5.1 */
public static String AbstractIndexerPage_indexAllHeadersC; public static String AbstractIndexerPage_indexAllHeadersC;
/** @since 5.1 */
public static String AbstractIndexerPage_indexAllHeadersCpp; public static String AbstractIndexerPage_indexAllHeadersCpp;
/** @since 5.3 */
public static String AbstractIndexerPage_indexOpenedFiles; public static String AbstractIndexerPage_indexOpenedFiles;
public static String AbstractIndexerPage_indexUpFront; public static String AbstractIndexerPage_indexUpFront;
public static String AbstractIndexerPage_skipAllReferences; public static String AbstractIndexerPage_skipAllReferences;
/** @since 5.1 */
public static String AbstractIndexerPage_skipImplicitReferences; public static String AbstractIndexerPage_skipImplicitReferences;
/** @since 5.2 */
public static String AbstractIndexerPage_skipTypeAndMacroReferences; public static String AbstractIndexerPage_skipTypeAndMacroReferences;
public static String AbstractIndexerPage_skipTypeReferences; public static String AbstractIndexerPage_skipTypeReferences;
public static String AbstractIndexerPage_skipMacroReferences; public static String AbstractIndexerPage_skipMacroReferences;
public static String CacheSizeBlock_MB; public static String CacheSizeBlock_MB;
public static String IndexerBlock_fixedBuildConfig; public static String IndexerBlock_fixedBuildConfig;
/** @since 5.3 */
public static String IndexerBlock_indexerOptions; public static String IndexerBlock_indexerOptions;
public static String IndexerStrategyBlock_activeBuildConfig; public static String IndexerBlock_buildConfigGroup;
public static String IndexerStrategyBlock_autoUpdate; public static String IndexerBlock_activeBuildConfig;
public static String IndexerStrategyBlock_buildConfigGroup;
public static String IndexerStrategyBlock_immediateUpdate;
public static String IndexerStrategyBlock_specificBuildConfig;
public static String IndexerStrategyBlock_strategyGroup;
public static String PreferenceScopeBlock_enableProjectSettings; public static String PreferenceScopeBlock_enableProjectSettings;
public static String PreferenceScopeBlock_preferenceLink; public static String PreferenceScopeBlock_preferenceLink;
public static String PreferenceScopeBlock_storeWithProject; public static String PreferenceScopeBlock_storeWithProject;
@ -66,56 +48,33 @@ public class DialogsMessages extends NLS {
public static String DocCommentOwnerBlock_SelectDocToolDescription; public static String DocCommentOwnerBlock_SelectDocToolDescription;
public static String DocCommentOwnerCombo_None; public static String DocCommentOwnerCombo_None;
public static String DocCommentOwnerComposite_DocumentationToolGroupTitle; public static String DocCommentOwnerComposite_DocumentationToolGroupTitle;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_ConsumeNo; public static String RegexErrorParserOptionPage_ConsumeNo;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_ConsumeYes; public static String RegexErrorParserOptionPage_ConsumeYes;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_DescriptionColumn; public static String RegexErrorParserOptionPage_DescriptionColumn;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_EatColumn; public static String RegexErrorParserOptionPage_EatColumn;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_FileColumn; public static String RegexErrorParserOptionPage_FileColumn;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_LineColumn; public static String RegexErrorParserOptionPage_LineColumn;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_LinkToPreferencesMessage; public static String RegexErrorParserOptionPage_LinkToPreferencesMessage;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_Pattern_Column; public static String RegexErrorParserOptionPage_Pattern_Column;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_SeverityColumn; public static String RegexErrorParserOptionPage_SeverityColumn;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_SeverityError; public static String RegexErrorParserOptionPage_SeverityError;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_SeverityIgnore; public static String RegexErrorParserOptionPage_SeverityIgnore;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_SeverityInfo; public static String RegexErrorParserOptionPage_SeverityInfo;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_SeverityWarning; public static String RegexErrorParserOptionPage_SeverityWarning;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_Title; public static String RegexErrorParserOptionPage_Title;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_TooltipConsume; public static String RegexErrorParserOptionPage_TooltipConsume;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_TooltipDescription; public static String RegexErrorParserOptionPage_TooltipDescription;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_TooltipFile; public static String RegexErrorParserOptionPage_TooltipFile;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_TooltipLine; public static String RegexErrorParserOptionPage_TooltipLine;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_TooltipPattern; public static String RegexErrorParserOptionPage_TooltipPattern;
/** @since 5.2 */
public static String RegexErrorParserOptionPage_TooltipSeverity; public static String RegexErrorParserOptionPage_TooltipSeverity;
/** @since 5.2 */
public static String RegularExpression_EmptyPattern; public static String RegularExpression_EmptyPattern;
/** @since 5.2 */
public static String RegularExpression_Validate; public static String RegularExpression_Validate;
/** @since 5.2 */
public static String RegularExpression_Enter; public static String RegularExpression_Enter;
static { static {
// initialize resource bundle // initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, DialogsMessages.class); NLS.initializeMessages(DialogsMessages.class.getName(), DialogsMessages.class);
} }
private DialogsMessages() { private DialogsMessages() {

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DialogsMessages.properties
View file

@ -40,12 +40,8 @@ DocCommentOwnerCombo_None=None
DocCommentOwnerComposite_DocumentationToolGroupTitle=Documentation tool comments DocCommentOwnerComposite_DocumentationToolGroupTitle=Documentation tool comments
IndexerBlock_fixedBuildConfig=Use a fixed build configuration IndexerBlock_fixedBuildConfig=Use a fixed build configuration
IndexerBlock_indexerOptions=Indexer options IndexerBlock_indexerOptions=Indexer options
IndexerStrategyBlock_strategyGroup=Indexing strategy IndexerBlock_buildConfigGroup=Build configuration for the indexer
IndexerStrategyBlock_autoUpdate=Automatically update the index IndexerBlock_activeBuildConfig=Use active build configuration
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
RegexErrorParserOptionPage_ConsumeNo=No RegexErrorParserOptionPage_ConsumeNo=No
RegexErrorParserOptionPage_ConsumeYes= RegexErrorParserOptionPage_ConsumeYes=
RegexErrorParserOptionPage_DescriptionColumn=Description RegexErrorParserOptionPage_DescriptionColumn=Description

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
View file

@ -222,10 +222,10 @@ public class IndexerBlock extends AbstractCOptionPage {
fIndexerPageComposite.setLayout(new TabFolderLayout()); fIndexerPageComposite.setLayout(new TabFolderLayout());
if (needBuildConfigOptions()) { 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= (GridData) group.getLayoutData();
gd.grabExcessHorizontalSpace= true; 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); fUseFixedBuildConfig= ControlFactory.createRadioButton(group, DialogsMessages.IndexerBlock_fixedBuildConfig, null, null);
fBuildConfigComboBox= ControlFactory.createSelectCombo(group, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ fBuildConfigComboBox= ControlFactory.createSelectCombo(group, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
final SelectionAdapter listener = new SelectionAdapter() { final SelectionAdapter listener = new SelectionAdapter() {