diff options
author | Stefan Xenos | 2017-04-20 16:36:30 +0000 |
---|---|---|
committer | Stefan Xenos | 2017-04-20 16:36:30 +0000 |
commit | 0f0e27af7d70ac3f9cf3267972825ceb0d8cd0d5 (patch) | |
tree | e3767d86293e4c32b67c8c6c2771d989383892da /org.eclipse.jdt.core | |
parent | 2e345a420f925595f85afc3af7c22dc809e5653f (diff) | |
download | eclipse.jdt.core-0f0e27af7d70ac3f9cf3267972825ceb0d8cd0d5.tar.gz eclipse.jdt.core-0f0e27af7d70ac3f9cf3267972825ceb0d8cd0d5.tar.xz eclipse.jdt.core-0f0e27af7d70ac3f9cf3267972825ceb0d8cd0d5.zip |
Bug 515496 - [newindex] Disable the new indexer by default
Change-Id: If354e437b7f6e55c55efe525169f740dab3138bf
Diffstat (limited to 'org.eclipse.jdt.core')
-rw-r--r-- | org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java | 2 | ||||
-rw-r--r-- | org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/JavaIndex.java | 3 |
2 files changed, 3 insertions, 2 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 614d019ae9..ff152ab37e 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 @@ -19,6 +19,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; import org.eclipse.jdt.internal.core.nd.db.ChunkCache; +import org.eclipse.jdt.internal.core.nd.java.JavaIndex; /** * JavaCore eclipse preferences initializer. @@ -107,6 +108,7 @@ 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$ // 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/java/JavaIndex.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/java/JavaIndex.java index 5d06a269e4..bf8c69eef7 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 @@ -223,8 +223,7 @@ public class JavaIndex { if (preferenceService == null) { return true; } - return !preferenceService.getBoolean(JavaCore.PLUGIN_ID, DISABLE_NEW_JAVA_INDEX, false, //$NON-NLS-1$ - null); + return !preferenceService.getBoolean(JavaCore.PLUGIN_ID, DISABLE_NEW_JAVA_INDEX, false, null); } public static Nd createNd(File databaseFile, ChunkCache chunkCache) { |