Fix for 87982, 88127

3 files changed, 69 insertions, 15 deletions

diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
index 13bd7c06494..86866c452b2 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
@@ -51,6 +51,9 @@ public class AutomatedIntegrationSuite extends TestSuite {
 	public static Test suite() {
 		final AutomatedIntegrationSuite suite = new AutomatedIntegrationSuite();
 		
+		//TODO: BOG Take this out once null indexer id added to suite project creation
+		CCorePlugin.getDefault().getCoreModel().getIndexManager().setEnableUpdates(false);
+		
 		// Add all success tests
 		suite.addTest(CDescriptorTests.suite());
 		//suite.addTest(GCCErrorParserTests.suite());
diff --git a/core/org.eclipse.cdt.core/index/ChangeLog b/core/org.eclipse.cdt.core/index/ChangeLog
index 2138ce41d5a..9437fb50736 100644
--- a/core/org.eclipse.cdt.core/index/ChangeLog
+++ b/core/org.eclipse.cdt.core/index/ChangeLog
@@ -1,3 +1,6 @@
+2005-03-15 Bogdan Gheorghe

+	Added a check for closed projects to update code

+	

 2005-03-14 Bogdan Gheorghe

 	Added update code for old indexer projects

 	

diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
index ea8594da8de..681e7819338 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/IndexManager.java
@@ -27,13 +27,18 @@ import org.eclipse.cdt.internal.core.search.processing.JobManager;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -66,6 +71,7 @@ public class IndexManager extends JobManager{
     private int		upgradeIndexProblems = 0;
    
 	private ReadWriteMonitor monitor = new ReadWriteMonitor();
+	private boolean enableUpdates = true;
 	
     /**
      * Create an indexer only on request
@@ -92,6 +98,29 @@ public class IndexManager extends JobManager{
         
     }
     
+    private class UpdateIndexVersionJob extends Job{
+		private final IProject project;
+		public UpdateIndexVersionJob( IProject project, String name ){
+			super( name );
+			this.project = project;
+		}
+
+		protected IStatus run(IProgressMonitor monitor) {
+			IWorkspaceRunnable job = new IWorkspaceRunnable( ){
+				public void run(IProgressMonitor monitor){
+					doProjectUpgrade(project);
+					doSourceIndexerUpgrade(project);
+				}
+			};
+			try {
+				CCorePlugin.getWorkspace().run(job, project, 0, null);
+			} catch (CoreException e) {
+			}
+			return Status.OK_STATUS;
+		}
+	}
+	
+    
     
 	/**
 	 * Flush current state
@@ -121,7 +150,8 @@ public class IndexManager extends JobManager{
 		//where neccesary
 		for (int i=0; i<projects.length; i++){
 			try {
-				initializeIndexer(projects[i]);
+				if (projects[i].isAccessible())
+					initializeIndexer(projects[i]);
 			} catch (CoreException e) {}
 		}
 		
@@ -148,10 +178,18 @@ public class IndexManager extends JobManager{
 			}
 			
 			//Make sure that we have an indexer ID
-			if (indexerID == null) {
+			if (indexerID == null && 
+				enableUpdates) {
 				//No persisted info on file? Must be old project - run temp. upgrade
-				indexerID = doProjectUpgrade(project);
-				doSourceIndexerUpgrade(project);
+					UpdateIndexVersionJob job = new UpdateIndexVersionJob(project, "Update Index Version" ); //$NON-NLS-1$
+				
+					IProgressMonitor group = this.getIndexJobProgressGroup();
+					
+					job.setRule( project );
+					if( group != null )
+						job.setProgressGroup( group, 0 );
+					job.setPriority( Job.SHORT );
+					job.schedule();	
 			}
 			
 			//If we're asking for the null indexer,return null
@@ -386,10 +424,21 @@ public class IndexManager extends JobManager{
 				indexerID = (String) project.getSessionProperty(indexerIDKey);
 			} catch (CoreException e) {}
 			
-			//Any persisted indexders would have been loaded in the initialization
-			//Create the indexer and store it
-			indexer = getIndexer(indexerID);
-			indexerMap.put(project,indexer);
+			//Project was either closed at startup or imported
+			if (indexerID == null &&
+				project.isAccessible()){
+			   	try {
+					indexer=initializeIndexer(project);
+				} catch (CoreException e1) {}
+			}
+			else{
+				//Create the indexer and store it
+				indexer = getIndexer(indexerID);
+			}
+			
+			//Make sure we're not putting null in map
+			if (indexer != null)
+				indexerMap.put(project,indexer);
 			
 			monitor.exitRead();
 		}
@@ -429,9 +478,7 @@ public class IndexManager extends JobManager{
 			project.setSessionProperty(SourceIndexer.activationKey,new Boolean(upgradeIndexEnabled));
 			project.setSessionProperty(SourceIndexer.problemsActivationKey, new Integer( upgradeIndexProblems ));	
 	
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
+		} catch (CoreException e) {}
 	}
 
 	private static void saveIndexerEnabled (boolean indexerEnabled, Element rootElement, Document doc ) {
@@ -499,11 +546,9 @@ public class IndexManager extends JobManager{
 			project.setSessionProperty(IndexManager.indexerIDKey, indexerID);	
 			//project.setSessionProperty(indexerUIIDKey, indexerPageID);
 	
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
+		} catch (CoreException e) {}
 		
-		return null;
+		return indexerID;
 	}
 
 
@@ -593,4 +638,7 @@ protected ICDTIndexer getIndexer(String indexerId) {
    	}
    }
    
+	public void setEnableUpdates(boolean enableUpdates) {
+		this.enableUpdates = enableUpdates;
+	}
 }