1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00

fixed junit test failure

This commit is contained in:
David Inglis 2003-12-12 18:28:23 +00:00
parent 938c206289
commit 987e8fadf3

View file

@ -340,7 +340,7 @@ public class CModelManager implements IResourceChangeListener {
} else { } else {
ICProject cproject = celement.getCProject(); ICProject cproject = celement.getCProject();
CProjectInfo info = (CProjectInfo)peekAtInfo(cproject); CProjectInfo info = (CProjectInfo)peekAtInfo(cproject);
if (info.vBin != null) { if (info != null && info.vBin != null) {
if (peekAtInfo(info.vBin) != null) { if (peekAtInfo(info.vBin) != null) {
IBinary[] bins = info.vBin.getBinaries(); IBinary[] bins = info.vBin.getBinaries();
for (int i = 0; i < bins.length; i++) { for (int i = 0; i < bins.length; i++) {
@ -353,7 +353,7 @@ public class CModelManager implements IResourceChangeListener {
} }
} }
} }
if (info.vLib != null) { if (info != null && info.vLib != null) {
if (peekAtInfo(info.vLib) != null) { if (peekAtInfo(info.vLib) != null) {
IArchive[] ars = info.vLib.getArchives(); IArchive[] ars = info.vLib.getArchives();
for (int i = 0; i < ars.length; i++) { for (int i = 0; i < ars.length; i++) {
@ -803,6 +803,13 @@ public class CModelManager implements IResourceChangeListener {
binaryRunners.put(project, new BinaryRunner(project)); binaryRunners.put(project, new BinaryRunner(project));
} }
} }
} else if (0 != (delta.getFlags() & IResourceDelta.REMOVED)) {
IProject project = (IProject) resource;
BinaryRunner runner = (BinaryRunner) binaryRunners.remove(project);
if (runner != null) {
runner.stop();
}
binaryParsersMap.remove(project);
} }
break; break;
} }
@ -874,10 +881,5 @@ public class CModelManager implements IResourceChangeListener {
public void deleting(IProject project){ public void deleting(IProject project){
// discard all indexing jobs for this project // discard all indexing jobs for this project
this.getIndexManager().discardJobs(project.getName()); this.getIndexManager().discardJobs(project.getName());
BinaryRunner runner = (BinaryRunner) binaryRunners.remove(project);
if (runner != null) {
runner.stop();
}
binaryParsersMap.remove(project);
} }
} }