mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 378590: [sd90] Sometimes, includes won't appear in project explorer

Browse source 
after project creation
This commit is contained in:
Andrew Gvozdev 2012-07-11 11:02:13 -04:00
parent b3d33570ed
commit c6e1d1e6ab
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
View file

@ -34,6 +34,9 @@ import org.eclipse.cdt.core.IBinaryParser;
import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive; import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive;
import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsChangeEvent;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsChangeListener;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ElementChangedEvent; import org.eclipse.cdt.core.model.ElementChangedEvent;
@ -87,7 +90,9 @@ import org.eclipse.core.runtime.content.IContentTypeManager;
import org.eclipse.core.runtime.content.IContentTypeManager.ContentTypeChangeEvent; import org.eclipse.core.runtime.content.IContentTypeManager.ContentTypeChangeEvent;
import org.eclipse.core.runtime.content.IContentTypeManager.IContentTypeChangeListener; import org.eclipse.core.runtime.content.IContentTypeManager.IContentTypeChangeListener;
public class CModelManager implements IResourceChangeListener, IContentTypeChangeListener, ICProjectDescriptionListener { public class CModelManager implements IResourceChangeListener, IContentTypeChangeListener,
ICProjectDescriptionListener, ILanguageSettingsChangeListener {
public static boolean VERBOSE = false; public static boolean VERBOSE = false;
/** /**
@ -197,6 +202,9 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
// Register the Core Model on the ContentTypeManager // Register the Core Model on the ContentTypeManager
// it needs to know about changes. // it needs to know about changes.
Platform.getContentTypeManager().addContentTypeChangeListener(factory); Platform.getContentTypeManager().addContentTypeChangeListener(factory);
// Register to listen on language settings changes from LSP providers
LanguageSettingsManager.registerLanguageSettingsChangeListener(factory);
} }
} }
return factory; return factory;
@ -837,7 +845,7 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
/** /**
* Registers the given delta with this manager. This API is to be * Registers the given delta with this manager. This API is to be
* used to registerd deltas that are created explicitly by the C * used to register deltas that are created explicitly by the C
* Model. Deltas created as translations of <code>IResourceDeltas</code> * Model. Deltas created as translations of <code>IResourceDeltas</code>
* are to be registered with <code>#registerResourceDelta</code>. * are to be registered with <code>#registerResourceDelta</code>.
*/ */
@ -969,6 +977,31 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
ContentTypeProcessor.processContentTypeChanges(events); ContentTypeProcessor.processContentTypeChanges(events);
} }
@Override
public void handleEvent(ILanguageSettingsChangeEvent event) {
try {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(event.getProjectName());
// Recalculate cached settings
CoreModel.getDefault().updateProjectDescriptions(new IProject[] {project}, null);
// Notify listeners
ICProject cproject = CModelManager.getDefault().getCModel().getCProject(project);
CElementDelta delta = new CElementDelta(cproject);
// just add all possible flags, listeners tend to recalculate themselves anyway
int flag = ICElementDelta.F_CHANGED_PATHENTRY_PROJECT
| ICElementDelta.F_CHANGED_PATHENTRY_INCLUDE
| ICElementDelta.F_CHANGED_PATHENTRY_MACRO
| ICElementDelta.F_ADDED_PATHENTRY_LIBRARY
| ICElementDelta.F_REMOVED_PATHENTRY_LIBRARY
| ICElementDelta.F_PATHENTRY_REORDER;
delta.changed(cproject, flag);
fire(delta, ElementChangedEvent.POST_CHANGE);
} catch (CoreException e) {
CCorePlugin.log(e);
}
}
public void fire(int eventType) { public void fire(int eventType) {
fire(null, eventType); fire(null, eventType);
} }
@ -1277,9 +1310,13 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
} }
public void shutdown() { public void shutdown() {
// Unregister from language settings changes
LanguageSettingsManager.unregisterLanguageSettingsChangeListener(factory);
// Remove ourself from the DescriptorManager. // Remove ourself from the DescriptorManager.
CProjectDescriptionManager.getInstance().removeCProjectDescriptionListener(this); CProjectDescriptionManager.getInstance().removeCProjectDescriptionListener(this);
// CCorePlugin.getDefault().getCDescriptorManager().removeDescriptorListener(factory); // CCorePlugin.getDefault().getCDescriptorManager().removeDescriptorListener(factory);
// Remove ourself from the ContentTypeManager // Remove ourself from the ContentTypeManager
Platform.getContentTypeManager().removeContentTypeChangeListener(factory); Platform.getContentTypeManager().removeContentTypeChangeListener(factory);