cleanup: added MultiItemsHolder.DEBUG to control debug output on the console

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiConfiguration.java

@@ -112,7 +112,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#createFileInfo(org.eclipse.core.runtime.IPath)
 	 */
 	public IFileInfo createFileInfo(IPath path) {
-		System.out.println("Strange multi access: MultiConfiguration.createFileInfo(1)"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.createFileInfo(1)"); //$NON-NLS-1$
 		return curr().createFileInfo(path);
 	}
 
@@ -120,7 +121,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#createFileInfo(org.eclipse.core.runtime.IPath, java.lang.String, java.lang.String)
 	 */
 	public IFileInfo createFileInfo(IPath path, String id, String name) {
-		System.out.println("Strange multi access: MultiConfiguration.createFileInfo(3)"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.createFileInfo(3)"); //$NON-NLS-1$
 		return curr().createFileInfo(path, id, name);
 	}
 
@@ -129,16 +131,17 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 */
 	public IFileInfo createFileInfo(IPath path, IFolderInfo base,
 			ITool baseTool, String id, String name) {
-		System.out.println("Bad multi access: MultiConfiguration.createFileInfo(5)"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.createFileInfo(5)"); //$NON-NLS-1$
 		return null; // curr().createFileInfo(path, base, baseTool, id, name);
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#createFileInfo(org.eclipse.core.runtime.IPath, org.eclipse.cdt.managedbuilder.core.IFileInfo, java.lang.String, java.lang.String)
 	 */
-	public IFileInfo createFileInfo(IPath path, IFileInfo base, String id,
+	public IFileInfo createFileInfo(IPath path, IFileInfo base, String id, String name) {
-			String name) {
+		if (DEBUG)
-		System.out.println("Bad multi access: MultiConfiguration.createFileInfo(4)"); //$NON-NLS-1$
+			System.out.println("Bad multi access: MultiConfiguration.createFileInfo(4)"); //$NON-NLS-1$
 		return null; // curr().createFileInfo(path, base, id, name);
 	}
 
@@ -146,7 +149,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#createFolderInfo(org.eclipse.core.runtime.IPath)
 	 */
 	public IFolderInfo createFolderInfo(IPath path) {
-		System.out.println("Bad multi access: MultiConfiguration.createFolderInfo()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.createFolderInfo()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -154,16 +158,17 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#createFolderInfo(org.eclipse.core.runtime.IPath, java.lang.String, java.lang.String)
 	 */
 	public IFolderInfo createFolderInfo(IPath path, String id, String name) {
-		System.out.println("Bad multi access: MultiConfiguration.createFolderInfo(3)"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.createFolderInfo(3)"); //$NON-NLS-1$
 		return null;
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#createFolderInfo(org.eclipse.core.runtime.IPath, org.eclipse.cdt.managedbuilder.core.IFolderInfo, java.lang.String, java.lang.String)
 	 */
-	public IFolderInfo createFolderInfo(IPath path, IFolderInfo base,
+	public IFolderInfo createFolderInfo(IPath path, IFolderInfo base, String id, String name) {
-			String id, String name) {
+		if (DEBUG)
-		System.out.println("Bad multi access: MultiConfiguration.createFolderInfo(4)"); //$NON-NLS-1$
+			System.out.println("Bad multi access: MultiConfiguration.createFolderInfo(4)"); //$NON-NLS-1$
 		return null; // do nothing now
 	}
 
@@ -171,7 +176,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#createResourceConfiguration(org.eclipse.core.resources.IFile)
 	 */
 	public IResourceConfiguration createResourceConfiguration(IFile file) {
-		System.out.println("Bad multi access: MultiConfiguration.createResourceConfiguration()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.createResourceConfiguration()"); //$NON-NLS-1$
 		return null; // do nothing now
 	}
 
@@ -180,7 +186,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 */
 	public IToolChain createToolChain(IToolChain superClass, String Id,
 			String name, boolean isExtensionElement) {
-		System.out.println("Bad multi access: MultiConfiguration.createToolChain()");		 //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.createToolChain()");		 //$NON-NLS-1$
 		return null; // do nothing
 	}
 
@@ -196,7 +203,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 			String[] inputResources,
 			IPath inputLocation, 
 			IPath outputLocation) {
-		System.out.println("Strange multi access: MultiConfiguration.generateToolCommandLineInfo()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.generateToolCommandLineInfo()"); //$NON-NLS-1$
 		return curr().generateToolCommandLineInfo(
 				sourceExtension, 
 				flags, 
@@ -284,7 +292,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getBuildData()
 	 */
 	public CBuildData getBuildData() {
-		System.out.println("Strange multi access: MultiConfiguration.getBuildData()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getBuildData()"); //$NON-NLS-1$
 		return curr().getBuildData();
 	}
 
@@ -329,7 +338,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getConfigurationData()
 	 */
 	public CConfigurationData getConfigurationData() {
-		System.out.println("Strange multi access: MultiConfiguration.getConfigurationData()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getConfigurationData()"); //$NON-NLS-1$
 		return curr().getConfigurationData();
 	}
 
@@ -481,7 +491,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getParent()
 	 */
 	public IConfiguration getParent() {
-		System.out.println("Bad multi access: MultiConfiguration.getParent()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.getParent()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -541,7 +552,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getProjectType()
 	 */
 	public IProjectType getProjectType() {
-		System.out.println("Strange multi access: MultiConfiguration.getProjectType()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getProjectType()"); //$NON-NLS-1$
 		return curr().getProjectType();
 	}
 
@@ -549,7 +561,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getResourceConfiguration(java.lang.String)
 	 */
 	public IResourceConfiguration getResourceConfiguration(String path) {
-		System.out.println("Bad multi access: MultiConfiguration.getResourceConfiguration()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.getResourceConfiguration()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -557,7 +570,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getResourceConfigurations()
 	 */
 	public IResourceConfiguration[] getResourceConfigurations() {
-		System.out.println("Bad multi access: MultiConfiguration.getResourceConfigurations()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.getResourceConfigurations()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -584,7 +598,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getResourceInfoById(java.lang.String)
 	 */
 	public IResourceInfo getResourceInfoById(String id) {
-		System.out.println("Bad multi access: MultiConfiguration.getResourceInfoById()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfiguration.getResourceInfoById()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -614,7 +629,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getSourceEntries()
 	 */
 	public ICSourceEntry[] getSourceEntries() {
-		System.out.println("Strange multi access: MultiConfiguration.getSourceEntries()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getSourceEntries()"); //$NON-NLS-1$
 		return curr().getSourceEntries();
 	}
 
@@ -622,7 +638,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getTargetTool()
 	 */
 	public ITool getTargetTool() {
-		System.out.println("Strange multi access: MultiConfiguration.getTargetTool()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getTargetTool()"); //$NON-NLS-1$
 		return curr().getTargetTool();
 	}
 
@@ -630,7 +647,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getTool(java.lang.String)
 	 */
 	public ITool getTool(String id) {
-		System.out.println("Strange multi access: MultiConfiguration.getTool()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getTool()"); //$NON-NLS-1$
 		return curr().getTool(id);
 	}
 
@@ -652,7 +670,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getToolFromInputExtension(java.lang.String)
 	 */
 	public ITool getToolFromInputExtension(String sourceExtension) {
-		System.out.println("Strange multi access: MultiConfiguration.getToolFromInputExtension()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getToolFromInputExtension()"); //$NON-NLS-1$
 		return curr().getToolFromInputExtension(sourceExtension);
 	}
 
@@ -660,7 +679,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getToolFromOutputExtension(java.lang.String)
 	 */
 	public ITool getToolFromOutputExtension(String extension) {
-		System.out.println("Strange multi access: MultiConfiguration.getToolFromOutputExtension()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getToolFromOutputExtension()"); //$NON-NLS-1$
 		return curr().getToolFromOutputExtension(extension);
 	}
 
@@ -668,7 +688,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getTools()
 	 */
 	public ITool[] getTools() {
-		System.out.println("Strange multi access: MultiConfiguration.getTools()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getTools()"); //$NON-NLS-1$
 		return curr().getTools();
 	}
 
@@ -676,7 +697,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getToolsBySuperClassId(java.lang.String)
 	 */
 	public ITool[] getToolsBySuperClassId(String id) {
-		System.out.println("Strange multi access: MultiConfiguration.getToolsBySuperClassId()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getToolsBySuperClassId()"); //$NON-NLS-1$
 		return curr().getToolsBySuperClassId(id);
 	}
 
@@ -684,7 +706,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#getUserObjects(java.lang.String)
 	 */
 	public String[] getUserObjects(String extension) {
-		System.out.println("Strange multi access: MultiConfiguration.getUserObjects()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getUserObjects()"); //$NON-NLS-1$
 		return curr().getUserObjects(extension);
 	}
 
@@ -722,7 +745,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#isExtensionElement()
 	 */
 	public boolean isExtensionElement() {
-		System.out.println("Strange multi access: MultiConfiguration.isExtensionElement()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.isExtensionElement()"); //$NON-NLS-1$
 		return curr().isExtensionElement();
 	}
 
@@ -730,7 +754,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IConfiguration#isHeaderFile(java.lang.String)
 	 */
 	public boolean isHeaderFile(String ext) {
-		System.out.println("Strange multi access: MultiConfiguration.isHeaderFile()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.isHeaderFile()"); //$NON-NLS-1$
 		return curr().isHeaderFile(ext);
 	}
 
@@ -1013,7 +1038,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IBuildObject#getBaseId()
 	 */
 	public String getBaseId() {
-		System.out.println("Strange multi access: MultiConfiguration.getBaseId()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getBaseId()"); //$NON-NLS-1$
 		return curr().getBaseId();
 	}
 
@@ -1028,8 +1054,9 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IBuildObject#getManagedBuildRevision()
 	 */
 	public String getManagedBuildRevision() {
-		System.out.println("Strange multi access: MultiConfiguration.getMngBuildRevision()"); //$NON-NLS-1$
+		if (DEBUG)
-		 return curr().getManagedBuildRevision();
+			System.out.println("Strange multi access: MultiConfiguration.getMngBuildRevision()"); //$NON-NLS-1$
+		return curr().getManagedBuildRevision();
 	}
 
 	/* (non-Javadoc)
@@ -1043,7 +1070,8 @@ public class MultiConfiguration extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IBuildObject#getVersion()
 	 */
 	public PluginVersionIdentifier getVersion() {
-		System.out.println("Strange multi access: MultiConfiguration.getVersion()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange multi access: MultiConfiguration.getVersion()"); //$NON-NLS-1$
 		return curr().getVersion();
 	}
 

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiResourceInfo.java

@@ -99,7 +99,8 @@ public abstract class MultiResourceInfo extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.managedbuilder.core.IResourceInfo#getResourceData()
 	 */
 	public CResourceData getResourceData() {
-		System.out.println("Strange call: MultiResourceInfo.getResourceData()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Strange call: MultiResourceInfo.getResourceData()"); //$NON-NLS-1$
 		return fRis[curr].getResourceData();
 	}
 
@@ -363,6 +364,7 @@ public abstract class MultiResourceInfo extends MultiItemsHolder implements
 			fRis[i].setVersion(version);
 	}
 
+	@Override
 	public Object[] getItems() {
 		return fRis;
 	}

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiItemsHolder.java

@@ -19,6 +19,9 @@ import org.eclipse.cdt.internal.core.settings.model.MultiFolderDescription;
  *
  */
 public abstract class MultiItemsHolder implements ICMultiItemsHolder {
+	/** @since 5.2 */
+	protected static final boolean DEBUG = false;
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.settings.model.ICMultiItemsHolder#getItems()
 	 */

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java

@@ -133,7 +133,8 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage
 	 * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getConfiguration()
 	 */
 	public ICConfigurationDescription getConfiguration() {
-		System.out.println("Bad multi access: MultiLanguageSetting.getConfiguration()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiLanguageSetting.getConfiguration()"); //$NON-NLS-1$
 		return null; // CFGs are different
 	}
 
@@ -141,7 +142,8 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage
 	 * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getId()
 	 */
 	public String getId() { // IDs are different
-		System.out.println("Bad multi access: MultiLanguageSetting.getId()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiLanguageSetting.getId()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -156,7 +158,8 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage
 	 * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getParent()
 	 */
 	public ICSettingContainer getParent() {
-		System.out.println("Bad multi access: MultiLanguageSetting.getParent()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiLanguageSetting.getParent()"); //$NON-NLS-1$
 		return null; // Parents are different
 	}
 

core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiConfigDescription.java

@@ -66,7 +66,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 */
 	public ICConfigExtensionReference create(String extensionPoint,
 			String extension) throws CoreException {
-		System.out.println("Bad multi access: MultiConfigDescription.create()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.create()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}
 
@@ -76,7 +77,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	public ICExternalSetting createExternalSetting(String[] languageIDs,
 			String[] contentTypeIds, String[] extensions,
 			ICSettingEntry[] entries) throws WriteAccessException {
-		System.out.println("Bad multi access: MultiConfigDescription.createExtSett()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.createExtSett()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -86,7 +88,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	public ICFileDescription createFileDescription(IPath path,
 			ICResourceDescription base) throws CoreException,
 			WriteAccessException {
-		System.out.println("Bad multi access: MultiConfigDescription.createFileDesc()");		
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.createFileDesc()");		 //$NON-NLS-1$
 		return null;
 	}
 	/* (non-Javadoc)
@@ -95,7 +98,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	public ICFolderDescription createFolderDescription(IPath path,
 			ICFolderDescription base) throws CoreException,
 			WriteAccessException {
-		System.out.println("Bad multi access: MultiConfigDescription.createFolderDesc()");		
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.createFolderDesc()");		 //$NON-NLS-1$
 		return null;
 	}
 
@@ -103,7 +107,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#get(java.lang.String)
 	 */
 	public ICConfigExtensionReference[] get(String extensionPointID) {
-		System.out.println("Bad multi access: MultiConfigDescription.get()");		
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.get()");		 //$NON-NLS-1$
 		return null;
 	}
 
@@ -111,7 +116,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getBuildSetting()
 	 */
 	public ICBuildSetting getBuildSetting() {
-		System.out.println("Bad multi access: MultiConfigDescription.getBuildSetting()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getBuildSetting()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -145,7 +151,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getConfigurationData()
 	 */
 	public CConfigurationData getConfigurationData() {
-		System.out.println("Bad multi access: MultiConfigDescription.getCfgData()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getCfgData()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -180,7 +187,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getExternalSettingsProviderIds()
 	 */
 	public String[] getExternalSettingsProviderIds() {
-		System.out.println("Bad multi access: MultiConfigDescription.getExtSettProviderIds()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getExtSettProviderIds()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -209,7 +217,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 */
 	public ICLanguageSetting getLanguageSettingForFile(IPath path,
 			boolean ignoreExludeStatus) {
-		System.out.println("Bad multi access: MultiConfigDescription.getLangSettForFile()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getLangSettForFile()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -230,7 +239,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getReferenceInfo()
 	 */
 	public Map<String, String> getReferenceInfo() {
-		System.out.println("Bad multi access: MultiConfigDescription.getReferenceInfo()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getReferenceInfo()"); //$NON-NLS-1$
 		return Collections.emptyMap();
 	}
 
@@ -296,7 +306,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getSessionProperty(org.eclipse.core.runtime.QualifiedName)
 	 */
 	public Object getSessionProperty(QualifiedName name) {
-		System.out.println("Bad multi access: MultiConfigDescription.getSessionProperty()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getSessionProperty()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}
 
@@ -311,7 +322,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getTargetPlatformSetting()
 	 */
 	public ICTargetPlatformSetting getTargetPlatformSetting() {
-		System.out.println("Bad multi access: MultiConfigDescription.getTargetPlatfSetting()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getTargetPlatfSetting()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}
 
@@ -396,7 +408,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 */
 	public void setConfigurationData(String buildSystemId,
 			CConfigurationData data) throws WriteAccessException {
-		System.out.println("Bad multi access: MultiConfigDescription.getConfigurationData()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getConfigurationData()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}
 
@@ -404,7 +417,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setDescription(java.lang.String)
 	 */
 	public void setDescription(String des) throws WriteAccessException {
-		System.out.println("Bad multi access: MultiConfigDescription.setDescription()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.setDescription()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}
 
@@ -420,7 +434,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setName(java.lang.String)
 	 */
 	public void setName(String name) throws WriteAccessException {
-		System.out.println("Bad multi access: MultiConfigDescription.setName()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.setName()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}
 
@@ -476,14 +491,14 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getId()
 	 */
 	public String getId() {
-		return fCfgs[0].getId() + "_etc";
+		return fCfgs[0].getId() + "_etc"; //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getName()
 	 */
 	public String getName() {
-		return "Multiple Config Description";
+		return "Multiple Config Description"; //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
@@ -544,7 +559,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 */
 	public ICStorageElement getStorage(String id, boolean create)
 			throws CoreException {
-		System.out.println("Bad multi access: MultiConfigDescription.getStorage()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.getStorage()"); //$NON-NLS-1$
 		return null;
 	}
 	
@@ -552,7 +568,8 @@ public class MultiConfigDescription extends MultiItemsHolder implements
 	 * @see org.eclipse.cdt.core.settings.model.ICSettingsStorage#getStorage(java.lang.String, boolean)
 	 */
 	public ICStorageElement importStorage(String id, ICStorageElement el) throws UnsupportedOperationException, CoreException {
-		System.out.println("Bad multi access: MultiConfigDescription.importStorage()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiConfigDescription.importStorage()"); //$NON-NLS-1$
 		return null;
 	}
 

core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFileDescription.java

@@ -29,7 +29,8 @@ public class MultiFileDescription extends MultiResourceDescription implements
 	 * @see org.eclipse.cdt.core.settings.model.ICFileDescription#getLanguageSetting()
 	 */
 	public ICLanguageSetting getLanguageSetting() {
-		System.out.println("Limited multi access: MultiFileDescription.getLanguageSetting()");
+		if (DEBUG)
+			System.out.println("Limited multi access: MultiFileDescription.getLanguageSetting()"); //$NON-NLS-1$
 		return ((ICFileDescription)fRess[0]).getLanguageSetting();
 	}
 

core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFolderDescription.java

@@ -36,7 +36,8 @@ public class MultiFolderDescription extends MultiResourceDescription implements
 	 */
 	public ICLanguageSetting createLanguageSettingForContentTypes(
 			String languageId, String[] typeIds) throws CoreException {
-		System.out.println("Bad multi access: MultiFolderDescription.createLanguageSettingForContentType()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiFolderDescription.createLanguageSettingForContentType()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -45,7 +46,8 @@ public class MultiFolderDescription extends MultiResourceDescription implements
 	 */
 	public ICLanguageSetting createLanguageSettingForExtensions(
 			String languageId, String[] extensions) throws CoreException {
-		System.out.println("Bad multi access: MultiFolderDescription.createLanguageSettingForExt()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiFolderDescription.createLanguageSettingForExt()"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -85,7 +87,8 @@ public class MultiFolderDescription extends MultiResourceDescription implements
 	 */
 	public ICResourceDescription getNestedResourceDescription(IPath relPath,
 			boolean exactPath) {
-		System.out.println("Bad multi access: MultiFolderDescription.getNestedResourceDescription(path, exact)");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiFolderDescription.getNestedResourceDescription(path, exact)"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -93,7 +96,8 @@ public class MultiFolderDescription extends MultiResourceDescription implements
 	 * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#getNestedResourceDescriptions(int)
 	 */
 	public ICResourceDescription[] getNestedResourceDescriptions(int kind) {
-		System.out.println("Bad multi access: MultiFolderDescription.getNestedResourceDescriptions(kind)");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiFolderDescription.getNestedResourceDescriptions(kind)"); //$NON-NLS-1$
 		return null;
 	}
 
@@ -101,7 +105,8 @@ public class MultiFolderDescription extends MultiResourceDescription implements
 	 * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#getNestedResourceDescriptions()
 	 */
 	public ICResourceDescription[] getNestedResourceDescriptions() {
-		System.out.println("Bad multi access: MultiFolderDescription.getNestedResourceDescriptions()");
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiFolderDescription.getNestedResourceDescriptions()"); //$NON-NLS-1$
 		return null;
 	}
 

core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiResourceDescription.java

@@ -52,7 +52,8 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen
 	 * @see org.eclipse.cdt.core.settings.model.ICResourceDescription#getParentFolderDescription()
 	 */
 	public ICFolderDescription getParentFolderDescription() {
-		System.out.println("Bad multi access: MultiResourceDescription.getParentFolderDescription()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiResourceDescription.getParentFolderDescription()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}
 
@@ -101,7 +102,8 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen
 	 * @see org.eclipse.cdt.core.settings.model.ICSettingContainer#getChildSettings()
 	 */
 	public ICSettingObject[] getChildSettings() {
-		System.out.println("Bad multi access: MultiResourceDescription.getChildSettings()"); //$NON-NLS-1$
+		if (DEBUG)
+			System.out.println("Bad multi access: MultiResourceDescription.getChildSettings()"); //$NON-NLS-1$
 		throw new UnsupportedOperationException();
 	}