mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 16:56:04 +02:00
Code Issues Wiki Activity

More traces disabled

Browse source
This commit is contained in:
Andrew Gvozdev 2011-11-02 17:40:16 -04:00
parent 6fb9b00592
commit 568cdaa634
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuiltinSpecsDetector.java
View file

@ -40,6 +40,7 @@ import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.internal.core.ConsoleOutputSniffer;
import org.eclipse.cdt.internal.core.XmlUtil;
import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsLogger;
import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsProvidersSerializer;
import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.cdt.make.internal.core.MakeMessages;
@ -236,18 +237,14 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
}
public void registerListener(ICConfigurationDescription cfgDescription) {
currentCfgDescription = cfgDescription;
// TODO - remove me
CCorePlugin.log(new Status(IStatus.INFO,CCorePlugin.PLUGIN_ID,
getPrefixForLog() + "Added listener [" + System.identityHashCode(this) + "] " + this));
LanguageSettingsLogger.logInfo(getPrefixForLog() + "registerListener [" + System.identityHashCode(this) + "] " + this);
currentCfgDescription = cfgDescription;
execute();
}
public void unregisterListener() {
// TODO - remove me
CCorePlugin.log(new Status(IStatus.INFO,CCorePlugin.PLUGIN_ID,
getPrefixForLog() + "Removed listener [" + System.identityHashCode(this) + "] " + this));
LanguageSettingsLogger.logInfo(getPrefixForLog() + "unregisterListener [" + System.identityHashCode(this) + "] " + this);
}
protected void execute() {
@ -284,9 +281,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
job.schedule();
// TODO - remove me
CCorePlugin.log(new Status(IStatus.INFO,CCorePlugin.PLUGIN_ID,
getPrefixForLog() + "Execution scheduled [" + System.identityHashCode(this) + "] " + this));
LanguageSettingsLogger.logInfo(getPrefixForLog() + "Execution scheduled [" + System.identityHashCode(this) + "] " + this);
}
/**
@ -428,9 +423,8 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
if (detectedSettingEntries != null && detectedSettingEntries.size() > 0) {
collected = detectedSettingEntries.size();
IStatus status = new Status(IStatus.INFO, MakeCorePlugin.PLUGIN_ID, getPrefixForLog()
LanguageSettingsLogger.logInfo(getPrefixForLog()
+ getClass().getSimpleName() + " collected " + detectedSettingEntries.size() + " entries" + " for language " + currentLanguageId);
MakeCorePlugin.log(status);
setSettingEntries(currentCfgDescription, currentResource, currentLanguageId, detectedSettingEntries);
}

8
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractLanguageSettingsOutputScanner.java
View file

@ -36,6 +36,7 @@ import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.internal.core.XmlUtil;
import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsLogger;
import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.cdt.utils.EFSExtensionManager;
import org.eclipse.core.filesystem.EFS;
@ -47,10 +48,8 @@ import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.content.IContentTypeManager;
import org.w3c.dom.Element;
@ -315,15 +314,12 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett
}
return str + ": ";
}
protected void setSettingEntries(List<ICLanguageSettingEntry> entries) {
setSettingEntries(currentCfgDescription, currentResource, currentLanguageId, entries);
// TODO - for debugging only, eventually remove
IStatus status = new Status(IStatus.INFO, MakeCorePlugin.PLUGIN_ID, getPrefixForLog()
LanguageSettingsLogger.logInfo(getPrefixForLog()
+ getClass().getSimpleName() + " collected " + (entries!=null ? ("" + entries.size()) : "null") + " entries for " + currentResource);
MakeCorePlugin.log(status);
}
protected String determineLanguage() {