Disable new JDT index until issues have been sorted out
(saw dom tests deadlock and bad performance all throughout our tests)
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 5e58ca8..70a347d 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
@@ -173,6 +173,8 @@
 			}
 		}
 
+//{ObjectTeams: disable new index until performance and deadlock issues have been sorted out:
+/* orig:
 		if (runRescan) {
 			// Force a rescan when re-enabling automatic indexing since we may have missed an update
 			this.rescanJob.schedule();
@@ -187,6 +189,8 @@
 				// Don't care
 			}
 		}
+  :giro */
+// SH}
 	}
 
 	/**
@@ -935,7 +939,11 @@
 				return;
 			}
 		}
+//{ObjectTeams: disable new index until performance and deadlock issues have been sorted out:
+/* orig:
 		this.rescanJob.schedule();
+  :giro */
+// SH}
 	}
 
 	/**
@@ -975,6 +983,8 @@
 	}
 
 	public void waitForIndex(IProgressMonitor monitor) {
+//{ObjectTeams: disable new index until performance and deadlock issues have been sorted out:
+/* orig:
 		try {
 			boolean shouldRescan = false;
 			synchronized (this.automaticIndexingMutex) {
@@ -989,6 +999,8 @@
 		} catch (InterruptedException e) {
 			throw new OperationCanceledException();
 		}
+  :giro */
+// SH}
 	}
 
 	public void waitForIndex(int waitingPolicy, IProgressMonitor monitor) {
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 07b1080..adc2310 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
@@ -19,8 +19,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.internal.core.JavaModelManager;
@@ -237,12 +235,17 @@
 	}
 
 	public static boolean isEnabled() {
+//{ObjectTeams: disable new index until performance and deadlock issues have been sorted out:
+		return true;
+/* orig:
 		IPreferencesService preferenceService = Platform.getPreferencesService();
 		if (preferenceService == null) {
 			return true;
 		}
 		return !preferenceService.getBoolean(JavaCore.PLUGIN_ID, "disableNewJavaIndex", false, //$NON-NLS-1$
 				null);
+  :giro */
+// SH}
 	}
 
 	public static Nd createNd(File databaseFile, ChunkCache chunkCache) {