mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-12 19:45:22 +02:00
Fix for 67656: [Indexer] getting called twice after creating a project with a file system
This commit is contained in:
parent
fe9c5ad64b
commit
513a464497
5 changed files with 11 additions and 4 deletions
|
@ -1,3 +1,7 @@
|
|||
2004-06-28 Bogdan Gheorghe
|
||||
Fix for 67656: [Indexer] getting called twice after creating a project with a file system
|
||||
* model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java
|
||||
|
||||
2004-06-24 Alain Magloire
|
||||
|
||||
Fix for 68226
|
||||
|
|
|
@ -495,6 +495,9 @@ public class DeltaProcessor {
|
|||
if (element != null) {
|
||||
updateIndexAddResource(element, delta);
|
||||
elementAdded(element, delta);
|
||||
//If new project has been added, don't need to add the children
|
||||
//as the indexing job will do that for us
|
||||
if (element.getElementType() == ICElement.C_PROJECT) return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ public class CSearchPreferencePage extends PreferencePage
|
|||
}
|
||||
});
|
||||
|
||||
fExternLinks = createComboBox(group,PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.EnableMarkerLinkType"),new String[]{PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Visible"),PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")},PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
fExternLinks = createComboBox(group,PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.EnableMarkerLinkType"),new String[]{PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")},PreferencesMessages.getString("CSearchPreferences.ExternalSearchLinks.Invisible")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
|
||||
fExternLinks.addSelectionListener(new SelectionListener() {
|
||||
public void widgetDefaultSelected(SelectionEvent e) {
|
||||
}
|
||||
|
|
|
@ -264,6 +264,9 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
|
|||
|
||||
private IFile getCanonicalFile(IFile originalFile){
|
||||
|
||||
if (originalFile == null)
|
||||
return null;
|
||||
|
||||
File tempFile = originalFile.getRawLocation().toFile();
|
||||
String canonicalPath = null;
|
||||
try {
|
||||
|
|
|
@ -100,9 +100,6 @@ public class NewSearchResultCollector extends BasicSearchResultCollector {
|
|||
linksFile.createLink(externalMatchLocation,IResource.NONE,null);
|
||||
int number = store.getInt(CSearchPage.EXTERNALMATCH_VISIBLE);
|
||||
if (number==0){
|
||||
linksFile.setDerived(true);
|
||||
}
|
||||
else{
|
||||
linksFile.setTeamPrivateMember(true);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue