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

Fix for PR 102058: Per file discovery + Extended Scanner Info + C Project does not work.

Browse source 
Fixed a bug with unitial updating of discovered scanner info.
This commit is contained in:
Vladimir Hirsl 2005-06-29 05:00:42 +00:00
parent 295e397a5a
commit a4b032301a
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
View file

@ -125,7 +125,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
* @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager#updateDiscoveredInfo(org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo, java.util.List) * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager#updateDiscoveredInfo(org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo, java.util.List)
*/ */
public void updateDiscoveredInfo(IDiscoveredPathInfo info, List changedResources) throws CoreException { public void updateDiscoveredInfo(IDiscoveredPathInfo info, List changedResources) throws CoreException {
if (fDiscoveredMap.get(info.getProject()) != null) { if (fDiscoveredMap.get(info.getProject()) != info) {
IDiscoveredScannerInfoSerializable serializable = info.getSerializable(); IDiscoveredScannerInfoSerializable serializable = info.getSerializable();
if (serializable != null) { if (serializable != null) {
IProject project = info.getProject(); IProject project = info.getProject();

11
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredScannerInfoStore.java
View file

@ -105,8 +105,7 @@ public class DiscoveredScannerInfoStore {
private Document getDocument(IProject project) throws CoreException { private Document getDocument(IProject project) throws CoreException {
// Get the document // Get the document
Document document = null; Document document = (Document) fDocumentMap.get(project);
document = (Document) fDocumentMap.get(project);
if (document == null) { if (document == null) {
try { try {
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
@ -154,9 +153,8 @@ public class DiscoveredScannerInfoStore {
/** /**
* @param document * @param document
* @param project * @param project
* @throws CoreException
*/ */
private void upgradeDocument(Document document, IProject project) throws CoreException { private void upgradeDocument(Document document, IProject project) {
Element rootElem = (Element) document.getElementsByTagName(SI_ELEM).item(0); //$NON-NLS-1$ Element rootElem = (Element) document.getElementsByTagName(SI_ELEM).item(0); //$NON-NLS-1$
ProcessingInstruction pi = document.createProcessingInstruction(SCD_STORE_VERSION, "version=\"2.0\""); //$NON-NLS-1$ ProcessingInstruction pi = document.createProcessingInstruction(SCD_STORE_VERSION, "version=\"2.0\""); //$NON-NLS-1$
document.insertBefore(pi, rootElem); document.insertBefore(pi, rootElem);
@ -173,9 +171,8 @@ public class DiscoveredScannerInfoStore {
* @param scannerInfo * @param scannerInfo
* @param rootElement * @param rootElement
* @param doc * @param doc
* @throws CoreException
*/ */
private void saveDiscoveredScannerInfo(IDiscoveredScannerInfoSerializable serializable, Document doc) throws CoreException { private void saveDiscoveredScannerInfo(IDiscoveredScannerInfoSerializable serializable, Document doc) {
NodeList rootList = doc.getElementsByTagName(SI_ELEM); NodeList rootList = doc.getElementsByTagName(SI_ELEM);
if (rootList.getLength() > 0) { if (rootList.getLength() > 0) {
Element rootElem = (Element) rootList.item(0); Element rootElem = (Element) rootList.item(0);
@ -295,6 +292,8 @@ public class DiscoveredScannerInfoStore {
// project deleted // project deleted
scProjectDeleted(project); scProjectDeleted(project);
} }
// remove from cache
fDocumentMap.put(project, null);
} }
return false; return false;
} }