From 88d0024075520406cf894927e8b3a9f9766ec59c Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Fri, 11 Apr 2014 18:53:34 -0700 Subject: [PATCH] Bug 432547 - Introduce separate size limits for indexing of source and header files --- .../core/pdom/AbstractIndexerTask.java | 44 ++++++++--------- .../pdom/indexer/AbstractPDOMIndexer.java | 3 +- .../core/pdom/indexer/IndexerPreferences.java | 7 ++- .../core/pdom/indexer/PDOMIndexerTask.java | 5 +- .../cdt/ui/dialogs/AbstractIndexerPage.java | 47 +++++++++++++++---- .../cdt/ui/dialogs/CacheSizeBlock.java | 4 +- .../cdt/ui/dialogs/DialogsMessages.java | 4 +- .../cdt/ui/dialogs/DialogsMessages.properties | 4 +- 8 files changed, 78 insertions(+), 40 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index f1a186946ab..0fac8494ce3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -93,7 +93,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { LinkageTask(int linkageID) { fLinkageID= linkageID; - fLocationTasks= new HashMap(); + fLocationTasks= new HashMap<>(); } boolean requestUpdate(IIndexFileLocation ifl, IIndexFragmentFile ifile, Object tu, @@ -164,7 +164,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { fVersionTasks= Collections.singletonList(fc); break; case 1: - List newList= new ArrayList(2); + List newList= new ArrayList<>(2); newList.add(fVersionTasks.get(0)); newList.add(fc); fVersionTasks= newList; @@ -298,20 +298,21 @@ public abstract class AbstractIndexerTask extends PDOMWriter { private boolean fIndexFilesWithoutConfiguration= true; private boolean fIndexAllHeaderVersions = false; private Set fHeadersToIndexAllVersions = Collections.emptySet(); - private List fRequestsPerLinkage= new ArrayList(); - private Map fIndexContentCache= new LRUCache(500); - private Map fIndexFilesCache= new LRUCache(5000); - private Map fOneLinkageTasks= new HashMap(); + private List fRequestsPerLinkage= new ArrayList<>(); + private Map fIndexContentCache= new LRUCache<>(500); + private Map fIndexFilesCache= new LRUCache<>(5000); + private Map fOneLinkageTasks= new HashMap<>(); private Object[] fFilesToUpdate; - private List fFilesToRemove = new ArrayList(); + private List fFilesToRemove = new ArrayList<>(); private int fASTOptions; - private int fForceNumberFiles= 0; + private int fForceNumberFiles; protected IWritableIndex fIndex; private ITodoTaskUpdater fTodoTaskUpdater; private final boolean fIsFastIndexer; - private long fFileSizeLimit= 0; + private long fTranslationUnitSizeLimit; + private long fIncludedFileSizeLimit; private InternalFileContentProvider fCodeReaderFactory; private int fSwallowOutOfMemoryError= 5; /** @@ -329,7 +330,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { fFilesToUpdate= filesToUpdate; Collections.addAll(fFilesToRemove, filesToRemove); incrementRequestedFilesCount(fFilesToUpdate.length + fFilesToRemove.size()); - fUrgentTasks = new LinkedList(); + fUrgentTasks = new LinkedList<>(); } public final void setIndexHeadersWithoutContext(UnusedHeaderStrategy mode) { @@ -356,8 +357,9 @@ public abstract class AbstractIndexerTask extends PDOMWriter { fForceNumberFiles= number; } - public final void setFileSizeLimit(long limit) { - fFileSizeLimit= limit; + public final void setFileSizeLimits(long translationUnitSizeLimit, long includedFileSizeLimit) { + fTranslationUnitSizeLimit= translationUnitSizeLimit; + fIncludedFileSizeLimit= includedFileSizeLimit; } public void setIndexAllHeaderVersions(boolean indexAllHeaderVersions) { @@ -520,8 +522,8 @@ public abstract class AbstractIndexerTask extends PDOMWriter { try { try { // Split into sources and headers, remove excluded sources. - HashMap> files= new HashMap>(); - final ArrayList indexFilesToRemove= new ArrayList(); + HashMap> files= new HashMap<>(); + final ArrayList indexFilesToRemove= new ArrayList<>(); extractFiles(files, indexFilesToRemove, monitor); setResume(true); @@ -574,7 +576,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { } } // Extract files from the urgent task. - files = new HashMap>(); + files = new HashMap<>(); fFilesToUpdate = urgentTask.fFilesToUpdate; fForceNumberFiles = urgentTask.fForceNumberFiles; fFilesToRemove = urgentTask.fFilesToRemove; @@ -697,7 +699,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { private void addPerLinkage(int linkageID, IIndexFileLocation ifl, HashMap> files) { List list= files.get(linkageID); if (list == null) { - list= new LinkedList(); + list= new LinkedList<>(); files.put(linkageID, list); } list.add(ifl); @@ -952,7 +954,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { // File was not parsed, because there is a dependency that needs to be // handled before. if (dependencies == null) - dependencies= new HashSet(); + dependencies= new HashSet<>(); if (dependencies.add(d.fIndexFile)) { if (parseFile(d.fTu, language, d.fIndexFile.getLocation(), scannerInfo, new FileContext(ctxFile, d.fIndexFile), monitor) == null) done= false; @@ -1161,7 +1163,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { if (isSource) { options |= ILanguage.OPTION_IS_SOURCE_UNIT; } - if (fFileSizeLimit > 0 && fResolver.getFileSize(codeReader.getFileLocation()) > fFileSizeLimit) { + if (fTranslationUnitSizeLimit > 0 && fResolver.getFileSize(codeReader.getFileLocation()) > fTranslationUnitSizeLimit) { if (fShowActivity) { trace("Indexer: Skipping large file " + codeReader.getFileLocation()); //$NON-NLS-1$ } @@ -1174,7 +1176,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { IndexBasedFileContentProvider ibfcp = new IndexBasedFileContentProvider(fIndex, fResolver, language.getLinkageID(), fileContentProvider, this); ibfcp.setContextToHeaderGap(ctx2header); - ibfcp.setFileSizeLimit(fFileSizeLimit); + ibfcp.setFileSizeLimit(fIncludedFileSizeLimit); ibfcp.setHeadersToIndexAllVersions(fHeadersToIndexAllVersions); ibfcp.setIndexAllHeaderVersions(fIndexAllHeaderVersions); fCodeReaderFactory= ibfcp; @@ -1206,8 +1208,8 @@ public abstract class AbstractIndexerTask extends PDOMWriter { private void writeToIndex(final int linkageID, IASTTranslationUnit ast, FileContent codeReader, FileContext ctx, IProgressMonitor pm) throws CoreException, InterruptedException { - HashSet enteredFiles= new HashSet(); - ArrayList orderedFileKeys= new ArrayList(); + HashSet enteredFiles= new HashSet<>(); + ArrayList orderedFileKeys= new ArrayList<>(); final IIndexFileLocation topIfl = fResolver.resolveASTPath(ast.getFilePath()); FileContentKey topKey = new FileContentKey(linkageID, topIfl, ast.getSignificantMacros()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/AbstractPDOMIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/AbstractPDOMIndexer.java index 54fdbbcf65b..2ea27172fe2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/AbstractPDOMIndexer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/AbstractPDOMIndexer.java @@ -30,7 +30,8 @@ public abstract class AbstractPDOMIndexer implements IPDOMIndexer { fProperties.put(IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_ALTERNATE_LANG, String.valueOf(false)); fProperties.put(IndexerPreferences.KEY_INDEX_ON_OPEN, String.valueOf(false)); fProperties.put(IndexerPreferences.KEY_INCLUDE_HEURISTICS, String.valueOf(true)); - fProperties.put(IndexerPreferences.KEY_SKIP_FILES_LARGER_THAN_MB, String.valueOf(IndexerPreferences.DEFAULT_FILE_SIZE_LIMIT)); + fProperties.put(IndexerPreferences.KEY_SKIP_FILES_LARGER_THAN_MB, String.valueOf(IndexerPreferences.DEFAULT_FILE_SIZE_LIMIT_MB)); + fProperties.put(IndexerPreferences.KEY_SKIP_INCLUDED_FILES_LARGER_THAN_MB, String.valueOf(IndexerPreferences.DEFAULT_INCLUDED_FILE_SIZE_LIMIT_MB)); fProperties.put(IndexerPreferences.KEY_SKIP_ALL_REFERENCES, String.valueOf(false)); fProperties.put(IndexerPreferences.KEY_SKIP_IMPLICIT_REFERENCES, String.valueOf(false)); fProperties.put(IndexerPreferences.KEY_SKIP_TYPE_REFERENCES, String.valueOf(false)); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/IndexerPreferences.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/IndexerPreferences.java index 0aea04efffa..cf866d13a04 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/IndexerPreferences.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/IndexerPreferences.java @@ -59,6 +59,7 @@ public class IndexerPreferences { public static final String KEY_SKIP_MACRO_REFERENCES= "skipMacroReferences"; //$NON-NLS-1$ public static final String KEY_UPDATE_POLICY= "updatePolicy"; //$NON-NLS-1$ public static final String KEY_SKIP_FILES_LARGER_THAN_MB = "skipFilesLargerThanMB"; //$NON-NLS-1$ + public static final String KEY_SKIP_INCLUDED_FILES_LARGER_THAN_MB = "skipIncludedFilesLargerThanMB"; //$NON-NLS-1$ private static final String KEY_INDEXER_PREFS_SCOPE = "preferenceScope"; //$NON-NLS-1$ private static final String KEY_INDEX_IMPORT_LOCATION = "indexImportLocation"; //$NON-NLS-1$ @@ -70,7 +71,8 @@ public class IndexerPreferences { private static final String DEFAULT_INDEX_IMPORT_LOCATION = ".settings/cdt-index.zip"; //$NON-NLS-1$ private static final int DEFAULT_UPDATE_POLICY= 0; - public static final int DEFAULT_FILE_SIZE_LIMIT = 8; + public static final int DEFAULT_FILE_SIZE_LIMIT_MB = 8; + public static final int DEFAULT_INCLUDED_FILE_SIZE_LIMIT_MB = 16; private static final String QUALIFIER = CCorePlugin.PLUGIN_ID; private static final String INDEXER_NODE = "indexer"; //$NON-NLS-1$ @@ -326,7 +328,8 @@ public class IndexerPreferences { prefs.putBoolean(KEY_INDEX_UNUSED_HEADERS_WITH_ALTERNATE_LANG, false); prefs.putBoolean(KEY_INDEX_ON_OPEN, false); prefs.putBoolean(KEY_INCLUDE_HEURISTICS, true); - prefs.putInt(KEY_SKIP_FILES_LARGER_THAN_MB, DEFAULT_FILE_SIZE_LIMIT); + prefs.putInt(KEY_SKIP_FILES_LARGER_THAN_MB, DEFAULT_FILE_SIZE_LIMIT_MB); + prefs.putInt(KEY_SKIP_INCLUDED_FILES_LARGER_THAN_MB, DEFAULT_INCLUDED_FILE_SIZE_LIMIT_MB); prefs.putBoolean(KEY_SKIP_ALL_REFERENCES, false); prefs.putBoolean(KEY_SKIP_IMPLICIT_REFERENCES, false); prefs.putBoolean(KEY_SKIP_TYPE_REFERENCES, false); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java index 54ed38f1dbd..a39f8b143ad 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java @@ -62,8 +62,9 @@ public abstract class PDOMIndexerTask extends AbstractIndexerTask implements IPD setShowScannerProblems(checkDebugOption(TRACE_SCANNER_PROBLEMS, TRUE)); setShowSyntaxProblems(checkDebugOption(TRACE_SYNTAX_PROBLEMS, TRUE)); setShowProblems(checkDebugOption(TRACE_PROBLEMS, TRUE)); - final long limit = getIntProperty(IndexerPreferences.KEY_SKIP_FILES_LARGER_THAN_MB, 0); - setFileSizeLimit(limit * 1024 * 1024); + final long fileLimit = getIntProperty(IndexerPreferences.KEY_SKIP_FILES_LARGER_THAN_MB, 0); + final long includedFileLimit = getIntProperty(IndexerPreferences.KEY_SKIP_INCLUDED_FILES_LARGER_THAN_MB, 0); + setFileSizeLimits(fileLimit * 1024 * 1024, includedFileLimit * 1024 * 1024); setIndexAllHeaderVersions(checkProperty(IndexerPreferences.KEY_INDEX_ALL_HEADER_VERSIONS)); setHeadersToIndexAllVersions(getStringSet(IndexerPreferences.KEY_INDEX_ALL_VERSIONS_SPECIFIC_HEADERS)); if (checkProperty(IndexerPreferences.KEY_SKIP_ALL_REFERENCES)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java index 98f33ae03ad..587842d3745 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractIndexerPage.java @@ -52,6 +52,7 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage { private Button fIndexOnOpen; private Button fIncludeHeuristics; private IntegerFieldEditor fFileSizeLimit; + private IntegerFieldEditor fIncludedFileSizeLimit; private Button fSkipReferences; private Button fSkipImplicitReferences; private Button fSkipMacroAndTypeReferences; @@ -91,8 +92,13 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage { gl.marginHeight = 0; gl.marginWidth = 0; page.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Composite group= new Composite(page, SWT.NONE); - + group.setLayout(gl= new GridLayout(3, false)); + gl.marginHeight = 0; + gl.marginWidth= 0; + group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + fAllSources= createAllFilesButton(group); IProject prj= getCurrentProject(); if (prj == null || !CProject.hasCCNature(prj)) { @@ -111,21 +117,26 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage { }); Label label = ControlFactory.createLabel(group, DialogsMessages.AbstractIndexerPage_indexAllVersionsSpecificHeaders); + int indent = pixelConverter.convertHorizontalDLUsToPixels(12); GridData layoutData = new GridData(); layoutData.horizontalSpan = 3; - layoutData.horizontalIndent = 10; + layoutData.horizontalIndent = indent; label.setLayoutData(layoutData); fIndexAllVersionsSpecificHeaders = ControlFactory.createTextField(group); layoutData = new GridData(GridData.FILL_HORIZONTAL); layoutData.horizontalSpan = 3; - layoutData.horizontalIndent = 10; + layoutData.horizontalIndent = indent; fIndexAllVersionsSpecificHeaders.setLayoutData(layoutData); fIndexOnOpen= createIndexOnOpenButton(group); fIncludeHeuristics= createIncludeHeuristicsButton(group); - fFileSizeLimit= createFileSizeLimit(group); + group= new Composite(page, SWT.NONE); + fFileSizeLimit= createFileSizeLimit(group, IndexerPreferences.KEY_SKIP_FILES_LARGER_THAN_MB, + DialogsMessages.AbstractIndexerPage_fileSizeLimit); + fIncludedFileSizeLimit= createFileSizeLimit(group, IndexerPreferences.KEY_SKIP_INCLUDED_FILES_LARGER_THAN_MB, + DialogsMessages.AbstractIndexerPage_includedFileSizeLimit); group.setLayout(gl= new GridLayout(3, false)); gl.marginHeight = 0; gl.marginWidth= 0; @@ -188,10 +199,24 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage { } } if (size <= 0) { - size= IndexerPreferences.DEFAULT_FILE_SIZE_LIMIT; + size= IndexerPreferences.DEFAULT_FILE_SIZE_LIMIT_MB; } fFileSizeLimit.setStringValue(String.valueOf(size)); } + if (fIncludedFileSizeLimit != null) { + Object prop= properties.get(IndexerPreferences.KEY_SKIP_INCLUDED_FILES_LARGER_THAN_MB); + int size= 0; + if (prop != null) { + try { + size= Integer.parseInt(prop.toString()); + } catch (NumberFormatException e) { + } + } + if (size <= 0) { + size= IndexerPreferences.DEFAULT_INCLUDED_FILE_SIZE_LIMIT_MB; + } + fIncludedFileSizeLimit.setStringValue(String.valueOf(size)); + } if (fSkipReferences != null) { boolean skipReferences= TRUE.equals(properties.get(IndexerPreferences.KEY_SKIP_ALL_REFERENCES)); fSkipReferences.setSelection(skipReferences); @@ -240,6 +265,9 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage { if (fFileSizeLimit != null) { props.put(IndexerPreferences.KEY_SKIP_FILES_LARGER_THAN_MB, String.valueOf(fFileSizeLimit.getIntValue())); } + if (fIncludedFileSizeLimit != null) { + props.put(IndexerPreferences.KEY_SKIP_INCLUDED_FILES_LARGER_THAN_MB, String.valueOf(fIncludedFileSizeLimit.getIntValue())); + } if (fSkipReferences != null) { props.put(IndexerPreferences.KEY_SKIP_ALL_REFERENCES, String.valueOf(fSkipReferences.getSelection())); } @@ -309,6 +337,9 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage { if (!fFileSizeLimit.isValid()) { setErrorMessage(fFileSizeLimit.getErrorMessage()); setValid(false); + } else if (!fIncludedFileSizeLimit.isValid()) { + setErrorMessage(fIncludedFileSizeLimit.getErrorMessage()); + setValid(false); } else { setValid(true); } @@ -354,10 +385,10 @@ public abstract class AbstractIndexerPage extends AbstractCOptionPage { return result; } - private IntegerFieldEditor createFileSizeLimit(Composite group) { - IntegerFieldEditor result= new IntegerFieldEditor(IndexerPreferences.KEY_SKIP_FILES_LARGER_THAN_MB, DialogsMessages.AbstractIndexerPage_fileSizeLimit, group, 5); + private IntegerFieldEditor createFileSizeLimit(Composite group, String key, String label) { + IntegerFieldEditor result= new IntegerFieldEditor(key, label, group, 5); result.setValidRange(1, 100000); - ControlFactory.createLabel(group, DialogsMessages.CacheSizeBlock_MB); + ControlFactory.createLabel(group, DialogsMessages.Megabyte); Text control = result.getTextControl(group); LayoutUtil.setWidthHint(control, pixelConverter.convertWidthInCharsToPixels(10)); LayoutUtil.setHorizontalGrabbing(control, false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java index 3edf9241595..3fc8ba6be70 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java @@ -95,7 +95,7 @@ public class CacheSizeBlock extends AbstractCOptionPage { control = fDBAbsoluteLimit.getTextControl(cacheComp); LayoutUtil.setWidthHint(control, pixelConverter.convertWidthInCharsToPixels(10)); LayoutUtil.setHorizontalGrabbing(control, false); - ControlFactory.createLabel(cacheComp, DialogsMessages.CacheSizeBlock_MB); + ControlFactory.createLabel(cacheComp, DialogsMessages.Megabyte); Label codeReaderLabel= ControlFactory.createLabel(cacheComp, DialogsMessages.CacheSizeBlock_headerFileCache); fCodeReaderLimit= new IntegerFieldEditor(CodeReaderCache.CODE_READER_BUFFER, DialogsMessages.CacheSizeBlock_absoluteLimit, cacheComp, 4); @@ -103,7 +103,7 @@ public class CacheSizeBlock extends AbstractCOptionPage { control = fCodeReaderLimit.getTextControl(cacheComp); LayoutUtil.setWidthHint(control, pixelConverter.convertWidthInCharsToPixels(10)); LayoutUtil.setHorizontalGrabbing(control, false); - ControlFactory.createLabel(cacheComp, DialogsMessages.CacheSizeBlock_MB); + ControlFactory.createLabel(cacheComp, DialogsMessages.Megabyte); gl= (GridLayout) cacheComp.getLayout(); gl.numColumns= 3; 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 2dc6104a500..c3d136fb688 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 @@ -18,13 +18,13 @@ import org.eclipse.osgi.util.NLS; class DialogsMessages extends NLS { public static String AbstractIndexerPage_fileSizeLimit; + public static String AbstractIndexerPage_includedFileSizeLimit; public static String AbstractIndexerPage_heuristicIncludes; public static String AbstractIndexerPage_indexAllFiles; public static String AbstractIndexerPage_indexAllHeaders; public static String AbstractIndexerPage_indexAllHeadersC; public static String AbstractIndexerPage_indexAllHeadersCpp; public static String AbstractIndexerPage_indexOpenedFiles; - public static String AbstractIndexerPage_indexUpFront; public static String AbstractIndexerPage_skipAllReferences; public static String AbstractIndexerPage_skipImplicitReferences; public static String AbstractIndexerPage_skipTypeAndMacroReferences; @@ -32,7 +32,7 @@ class DialogsMessages extends NLS { public static String AbstractIndexerPage_skipMacroReferences; public static String AbstractIndexerPage_indexAllHeaderVersions; public static String AbstractIndexerPage_indexAllVersionsSpecificHeaders; - public static String CacheSizeBlock_MB; + public static String Megabyte; public static String IndexerBlock_fixedBuildConfig; public static String IndexerBlock_indexerOptions; public static String IndexerBlock_buildConfigGroup; 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 d31fb07bccc..e0c3072764d 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 @@ -16,13 +16,13 @@ PreferenceScopeBlock_enableProjectSettings=Enable project specific settings PreferenceScopeBlock_storeWithProject=Store settings with project PreferenceScopeBlock_preferenceLink=Configure Workspace Settings... AbstractIndexerPage_fileSizeLimit=Skip files larger than: +AbstractIndexerPage_includedFileSizeLimit=Skip included files larger than: AbstractIndexerPage_heuristicIncludes=Allow heuristic resolution of includes AbstractIndexerPage_indexAllFiles=Index source files not included in the build AbstractIndexerPage_indexAllHeaders=Index unused headers AbstractIndexerPage_indexAllHeadersC=Index unused headers as C files AbstractIndexerPage_indexAllHeadersCpp=Index unused headers as C++ files AbstractIndexerPage_indexOpenedFiles=Index source and header files opened in editor -AbstractIndexerPage_indexUpFront=Files to index up-front: AbstractIndexerPage_skipAllReferences=Skip all references (Call Hierarchy and Search will not work) AbstractIndexerPage_skipImplicitReferences=Skip implicit references (e.g. overloaded operators) AbstractIndexerPage_skipTypeAndMacroReferences=Skip type and macro references (Search for these references will not work) @@ -34,7 +34,7 @@ CacheSizeBlock_cacheLimitGroup=Cache limits CacheSizeBlock_indexDatabaseCache=Index database cache: CacheSizeBlock_limitRelativeToMaxHeapSize=Limit relative to the maximum heap size: CacheSizeBlock_absoluteLimit=Absolute Limit: -CacheSizeBlock_MB=MB +Megabyte=MB CacheSizeBlock_headerFileCache=Header file cache (used by refactoring): DocCommentOwnerBlock_DocToolLabel=Documentation tool: DocCommentOwnerBlock_EnableProjectSpecificSettings=Enable project specific settings