mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-13 03:55:22 +02:00
Code Issues Wiki Activity

Fix for 67656: [Indexer] getting called twice after creating a project with a file system

Browse source
This commit is contained in:
Bogdan Gheorghe 2004-06-29 18:11:08 +00:00
parent fe9c5ad64b
commit 513a464497
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/ChangeLog
View file

@ -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 2004-06-24 Alain Magloire
Fix for 68226 Fix for 68226

3
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java
View file

@ -495,6 +495,9 @@ public class DeltaProcessor {
if (element != null) { if (element != null) {
updateIndexAddResource(element, delta); updateIndexAddResource(element, delta);
elementAdded(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; return true;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSearchPreferencePage.java
View file

@ -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() { fExternLinks.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) { public void widgetDefaultSelected(SelectionEvent e) {
} }

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
View file

@ -264,6 +264,9 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
private IFile getCanonicalFile(IFile originalFile){ private IFile getCanonicalFile(IFile originalFile){
if (originalFile == null)
return null;
File tempFile = originalFile.getRawLocation().toFile(); File tempFile = originalFile.getRawLocation().toFile();
String canonicalPath = null; String canonicalPath = null;
try { try {

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/NewSearchResultCollector.java
View file

@ -100,9 +100,6 @@ public class NewSearchResultCollector extends BasicSearchResultCollector {
linksFile.createLink(externalMatchLocation,IResource.NONE,null); linksFile.createLink(externalMatchLocation,IResource.NONE,null);
int number = store.getInt(CSearchPage.EXTERNALMATCH_VISIBLE); int number = store.getInt(CSearchPage.EXTERNALMATCH_VISIBLE);
if (number==0){ if (number==0){
linksFile.setDerived(true);
}
else{
linksFile.setTeamPrivateMember(true); linksFile.setTeamPrivateMember(true);
} }