|
Lines 239-249
Link Here
|
| 239 |
progress.setWorkRemaining(1); |
239 |
progress.setWorkRemaining(1); |
| 240 |
|
240 |
|
| 241 |
//don't bother processing saved delta if forced full re-index is needed |
241 |
//don't bother processing saved delta if forced full re-index is needed |
| 242 |
boolean stillNeedFullReIndex = forcedFullReIndexNeeded; |
|
|
| 243 |
if(!forcedFullReIndexNeeded) { |
242 |
if(!forcedFullReIndexNeeded) { |
| 244 |
//if there is a delta attempt to process it |
243 |
/* if there is a delta attempt to process it |
|
|
244 |
* else need to do a full workspace index |
| 245 |
*/ |
| 245 |
if(savedStateDelta != null) { |
246 |
if(savedStateDelta != null) { |
| 246 |
stillNeedFullReIndex = false; |
247 |
forcedFullReIndexNeeded = false; |
| 247 |
try { |
248 |
try { |
| 248 |
//deal with reporting progress |
249 |
//deal with reporting progress |
| 249 |
SubMonitor savedStateProgress = progress.newChild(1, SubMonitor.SUPPRESS_NONE); |
250 |
SubMonitor savedStateProgress = progress.newChild(1, SubMonitor.SUPPRESS_NONE); |
|
Lines 256-271
Link Here
|
| 256 |
//process any remaining batched up resources to index |
257 |
//process any remaining batched up resources to index |
| 257 |
visitor.processBatchedResourceEvents(); |
258 |
visitor.processBatchedResourceEvents(); |
| 258 |
} catch (CoreException e) { |
259 |
} catch (CoreException e) { |
| 259 |
stillNeedFullReIndex = true; |
260 |
forcedFullReIndexNeeded = true; |
| 260 |
Logger.logException(this.fName + ": Could not process saved state. " + //$NON-NLS-1$ |
261 |
Logger.logException(this.fName + ": Could not process saved state. " + //$NON-NLS-1$ |
| 261 |
"Forced to do a full workspace re-index.", e); //$NON-NLS-1$ |
262 |
"Forced to do a full workspace re-index.", e); //$NON-NLS-1$ |
| 262 |
} |
263 |
} |
|
|
264 |
} else { |
| 265 |
forcedFullReIndexNeeded = true; |
| 263 |
} |
266 |
} |
| 264 |
} |
267 |
} |
| 265 |
progress.worked(1); |
268 |
progress.worked(1); |
| 266 |
|
269 |
|
| 267 |
//if need to process the entire workspace do so in another job |
270 |
//if need to process the entire workspace do so in another job |
| 268 |
if(stillNeedFullReIndex){ |
271 |
if(forcedFullReIndexNeeded){ |
| 269 |
this.fWorkspaceVisitorJob = new WorkspaceVisitorJob(); |
272 |
this.fWorkspaceVisitorJob = new WorkspaceVisitorJob(); |
| 270 |
this.fWorkspaceVisitorJob.schedule(); |
273 |
this.fWorkspaceVisitorJob.schedule(); |
| 271 |
} |
274 |
} |
|
Lines 652-660
Link Here
|
| 652 |
} |
655 |
} |
| 653 |
visitChildren = true; |
656 |
visitChildren = true; |
| 654 |
} |
657 |
} |
| 655 |
visitChildren = false; |
|
|
| 656 |
} else { |
| 657 |
visitChildren = false; |
| 658 |
} |
658 |
} |
| 659 |
|
659 |
|
| 660 |
//batch up resource changes before sending them out |
660 |
//batch up resource changes before sending them out |
