Cosmetics/JavaDoc.

1 files changed, 22 insertions, 26 deletions

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeConfigurationDataProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeConfigurationDataProvider.java
index a4558200d73..068e4c45199 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeConfigurationDataProvider.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/MakeConfigurationDataProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Intel Corporation and others.
+ * Copyright (c) 2007, 2013 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,8 +17,8 @@ import org.eclipse.cdt.core.settings.model.extension.impl.CDefaultConfigurationD
 import org.eclipse.cdt.core.settings.model.util.CDataSerializer;
 import org.eclipse.cdt.core.settings.model.util.UserAndDiscoveredEntryDataSerializer;
 import org.eclipse.cdt.make.internal.core.scannerconfig.CDataDiscoveredInfoCalculator;
-import org.eclipse.cdt.make.internal.core.scannerconfig.CDataDiscoveredInfoProcessor;
 import org.eclipse.cdt.make.internal.core.scannerconfig.CDataDiscoveredInfoCalculator.DiscoveredSettingInfo;
+import org.eclipse.cdt.make.internal.core.scannerconfig.CDataDiscoveredInfoProcessor;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -40,46 +40,42 @@ public class MakeConfigurationDataProvider extends CDefaultConfigurationDataProv
 	protected String getStorageId() {
 		return STORAGE_ID;
 	}
-	
+
 	@Override
-	public CConfigurationData applyConfiguration(
-			ICConfigurationDescription des,
-			ICConfigurationDescription baseDescription,
-			CConfigurationData base, IProgressMonitor monitor)
-			throws CoreException {
-		CConfigurationData result = super.applyConfiguration(des, baseDescription, base, monitor);
-		if(!des.isPreferenceConfiguration())
-			updateDiscoveredInfo(des.getProjectDescription().getProject(), result);
+	public CConfigurationData applyConfiguration(ICConfigurationDescription cfgDescription,
+			ICConfigurationDescription baseCfgDescription, CConfigurationData baseData,
+			IProgressMonitor monitor) throws CoreException {
+
+		CConfigurationData result = super.applyConfiguration(cfgDescription, baseCfgDescription, baseData, monitor);
+		if(!cfgDescription.isPreferenceConfiguration())
+			updateDiscoveredInfo(cfgDescription.getProjectDescription().getProject(), result);
 		return result;
 	}
 
 	@Override
-	public CConfigurationData loadConfiguration(ICConfigurationDescription des,
-			IProgressMonitor monitor) throws CoreException {
-		CConfigurationData result = super.loadConfiguration(des, monitor);
-		if(!des.isPreferenceConfiguration())
-			updateDiscoveredInfo(des.getProjectDescription().getProject(), result);
+	public CConfigurationData loadConfiguration(ICConfigurationDescription cfgDescription, IProgressMonitor monitor) throws CoreException {
+		CConfigurationData result = super.loadConfiguration(cfgDescription, monitor);
+		if(!cfgDescription.isPreferenceConfiguration())
+			updateDiscoveredInfo(cfgDescription.getProjectDescription().getProject(), result);
 		return result;
 	}
 
-	protected void updateDiscoveredInfo(IProject project, CConfigurationData cfgData){
+	protected void updateDiscoveredInfo(IProject project, CConfigurationData cfgData) {
 		updateDiscoveredInfo(project, cfgData, getInfoCalculator(), getInfoProcessor());
 	}
-	
+
 	public static void updateDiscoveredInfo(IProject project, CConfigurationData cfgData,
-			CDataDiscoveredInfoCalculator calculator,
-			CDataDiscoveredInfoProcessor processor){
-		
+			CDataDiscoveredInfoCalculator calculator, CDataDiscoveredInfoProcessor processor) {
+
 		DiscoveredSettingInfo dsInfo = calculator.getSettingInfos(project, cfgData);
-		
 		processor.applyDiscoveredInfo(cfgData, dsInfo);
 	}
-	
-	protected CDataDiscoveredInfoProcessor getInfoProcessor(){
+
+	protected CDataDiscoveredInfoProcessor getInfoProcessor( ){
 		return MakeDiscoveredInfoProcessor.getDefault();
 	}
-	
-	protected CDataDiscoveredInfoCalculator getInfoCalculator(){
+
+	protected CDataDiscoveredInfoCalculator getInfoCalculator() {
 		return CDataDiscoveredInfoCalculator.getDefault();
 	}