diff options
Diffstat (limited to 'org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/indexer/Indexer.java')
| -rw-r--r-- | org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/nd/indexer/Indexer.java | 36 |
1 files changed, 17 insertions, 19 deletions
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 767e9808d4..adc43da93c 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 @@ -50,10 +50,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobGroup; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; -import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; -import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaElementDelta; import org.eclipse.jdt.core.IJavaModelStatusConstants; @@ -73,7 +69,6 @@ import org.eclipse.jdt.internal.core.JavaModel; import org.eclipse.jdt.internal.core.JavaModelManager; import org.eclipse.jdt.internal.core.nd.IReader; import org.eclipse.jdt.internal.core.nd.Nd; -import org.eclipse.jdt.internal.core.nd.db.ChunkCache; import org.eclipse.jdt.internal.core.nd.db.Database; import org.eclipse.jdt.internal.core.nd.db.IndexException; import org.eclipse.jdt.internal.core.nd.java.FileFingerprint; @@ -102,18 +97,21 @@ public final class Indexer { public static boolean DEBUG_INSERTIONS; public static boolean DEBUG_SELFTEST; public static int DEBUG_LOG_SIZE_MB; - private static IPreferenceChangeListener listener = new IPreferenceChangeListener() { - @Override - public void preferenceChange(PreferenceChangeEvent event) { - if (JavaIndex.ENABLE_NEW_JAVA_INDEX.equals(event.getKey())) { - if (JavaIndex.isEnabled()) { - getInstance().rescanAll(); - } else { - ChunkCache.getSharedInstance().clear(); - } - } - } - }; + + // New index is disabled, see bug 544898 +// private static final String ENABLE_NEW_JAVA_INDEX = "enableNewJavaIndex"; //$NON-NLS-1$ +// private static IPreferenceChangeListener listener = new IPreferenceChangeListener() { +// @Override +// public void preferenceChange(PreferenceChangeEvent event) { +// if (ENABLE_NEW_JAVA_INDEX.equals(event.getKey())) { +// if (JavaIndex.isEnabled()) { +// getInstance().rescanAll(); +// } else { +// ChunkCache.getSharedInstance().clear(); +// } +// } +// } +// }; // This is an arbitrary constant that is larger than the maximum number of ticks // reported by SubMonitor and small enough that it won't overflow a long when multiplied by a large @@ -166,8 +164,8 @@ public final class Indexer { synchronized (mutex) { if (indexer == null) { indexer = new Indexer(JavaIndex.getGlobalNd(), ResourcesPlugin.getWorkspace().getRoot()); - IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(JavaCore.PLUGIN_ID); - preferences.addPreferenceChangeListener(listener); +// IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode(JavaCore.PLUGIN_ID); +// preferences.addPreferenceChangeListener(listener); } return indexer; } |