diff options
| author | Stefan Xenos | 2017-04-24 16:31:53 +0000 |
|---|---|---|
| committer | Stefan Xenos | 2017-04-24 16:31:53 +0000 |
| commit | 73805afd59910a4c2e54adf141d62100ce5ba84e (patch) | |
| tree | af1c58dcb2f597223c5043f4410be792c5e371cc /org.eclipse.jdt.core | |
| parent | c84b39352d62fb14489e035ddc1d4d8a4531d844 (diff) | |
| download | eclipse.jdt.core-73805afd59910a4c2e54adf141d62100ce5ba84e.tar.gz eclipse.jdt.core-73805afd59910a4c2e54adf141d62100ce5ba84e.tar.xz eclipse.jdt.core-73805afd59910a4c2e54adf141d62100ce5ba84e.zip | |
Bug 515534 - Add a button for rebuilding the indexI20170425-2000
Invert the name and semantics of the preference for
enabling the new index.
Change-Id: I44aec8e34b1906e5b2e7da201aabcab0a4bc6f78
Diffstat (limited to 'org.eclipse.jdt.core')
3 files changed, 8 insertions, 4 deletions
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java index ff152ab37e..24cbbe0e2b 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java @@ -108,7 +108,8 @@ public class JavaCorePreferenceInitializer extends AbstractPreferenceInitializer defaultOptionsMap.put(ChunkCache.CHUNK_CACHE_SIZE_MB, Double.toString(ChunkCache.CHUNK_CACHE_SIZE_MB_DEFAULT)); defaultOptionsMap.put(ChunkCache.CHUNK_CACHE_SIZE_PERCENT, Double.toString(ChunkCache.CHUNK_CACHE_SIZE_PERCENT_DEFAULT)); - defaultOptionsMap.put(JavaIndex.DISABLE_NEW_JAVA_INDEX, "true"); //$NON-NLS-1$ + defaultOptionsMap.put(JavaIndex.ENABLE_NEW_JAVA_INDEX, + Boolean.toString(JavaIndex.ENABLE_NEW_JAVA_INDEX_DEFAULT)); // Time out for parameter names defaultOptionsMap.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "50"); //$NON-NLS-1$ diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/indexer/Indexer.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/indexer/Indexer.java index a175a360e9..b149447f92 100644 --- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/indexer/Indexer.java +++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/indexer/Indexer.java @@ -101,7 +101,7 @@ public final class Indexer { private static IPreferenceChangeListener listener = new IPreferenceChangeListener() { @Override public void preferenceChange(PreferenceChangeEvent event) { - if (JavaIndex.DISABLE_NEW_JAVA_INDEX.equals(event.getKey())) { + if (JavaIndex.ENABLE_NEW_JAVA_INDEX.equals(event.getKey())) { if (JavaIndex.isEnabled()) { getInstance().rescanAll(); } else { diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/JavaIndex.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/JavaIndex.java index bf8c69eef7..e212fc8245 100644 --- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/JavaIndex.java +++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/JavaIndex.java @@ -37,12 +37,14 @@ import org.eclipse.jdt.internal.core.nd.indexer.FileStateCache; import org.eclipse.jdt.internal.core.nd.util.CharArrayUtils; public class JavaIndex { - public static final String DISABLE_NEW_JAVA_INDEX = "disableNewJavaIndex"; //$NON-NLS-1$ // Version constants static final int CURRENT_VERSION = Nd.version(1, 49); static final int MAX_SUPPORTED_VERSION = Nd.version(1, 49); static final int MIN_SUPPORTED_VERSION = Nd.version(1, 49); + public static final String ENABLE_NEW_JAVA_INDEX = "enableNewJavaIndex"; //$NON-NLS-1$ + public static final boolean ENABLE_NEW_JAVA_INDEX_DEFAULT = false; + // Fields for the search header public static final FieldSearchIndex<NdResourceFile> FILES; public static final FieldSearchIndex<NdTypeId> SIMPLE_INDEX; @@ -223,7 +225,8 @@ public class JavaIndex { if (preferenceService == null) { return true; } - return !preferenceService.getBoolean(JavaCore.PLUGIN_ID, DISABLE_NEW_JAVA_INDEX, false, null); + return preferenceService.getBoolean(JavaCore.PLUGIN_ID, ENABLE_NEW_JAVA_INDEX, ENABLE_NEW_JAVA_INDEX_DEFAULT, + null); } public static Nd createNd(File databaseFile, ChunkCache chunkCache) { |