mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-30 11:43:33 +02:00
2004-08-20 Alain Magloire
Fix for Bug 69071 * model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
This commit is contained in:
parent
b2840b064a
commit
597e819c34
2 changed files with 11 additions and 6 deletions
|
@ -1,3 +1,8 @@
|
|||
2004-08-20 Alain Magloire
|
||||
|
||||
Fix for Bug 69071
|
||||
* model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
|
||||
|
||||
2004-08-09 Bogdan Gheorghe
|
||||
Fix for Bug 71115: Double Indexing
|
||||
Added CContainer support to updateIndexAdd/RemoveResource
|
||||
|
|
|
@ -179,7 +179,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
|
|||
resolvedEntries = (IPathEntry[])listEntries.toArray(NO_PATHENTRIES);
|
||||
if (generateMarkers) {
|
||||
final ICProject finalCProject = cproject;
|
||||
final IPathEntry[] finalEntries = resolvedEntries;
|
||||
final IPathEntry[] finalEntries = (IPathEntry[])listEntries.toArray(NO_PATHENTRIES);
|
||||
Job markerTask = new Job("PathEntry Marker Job") { //$NON-NLS-1$
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
|
||||
|
@ -566,8 +566,8 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
|
|||
if (runInitializer) {
|
||||
// remove the lock.
|
||||
final PathEntryContainerInitializer initializer = getPathEntryContainerInitializer(containerPath.segment(0));
|
||||
final boolean[] ok = {false};
|
||||
if (initializer != null) {
|
||||
final boolean[] ok = {true};
|
||||
// wrap initializer call with Safe runnable in case
|
||||
// initializer would be
|
||||
// causing some grief
|
||||
|
@ -577,16 +577,16 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
|
|||
IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.ERROR,
|
||||
"Exception occurred in container initializer: "+initializer, exception); //$NON-NLS-1$
|
||||
CCorePlugin.log(status);
|
||||
ok[0] = false;
|
||||
}
|
||||
|
||||
public void run() throws Exception {
|
||||
initializer.initialize(containerPath, project);
|
||||
ok[0] = true;
|
||||
}
|
||||
});
|
||||
if (!ok[0]) {
|
||||
containerPut(project, containerPath, null); // flush and notify
|
||||
}
|
||||
}
|
||||
if (!ok[0]) {
|
||||
containerPut(project, containerPath, null); // flush and notify
|
||||
}
|
||||
}
|
||||
// retrieve new value
|
||||
|
|
Loading…
Add table
Reference in a new issue