Cosmetics - JavaDoc and code formatting

2 files changed, 125 insertions, 152 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java
index d2149f8fd6e..4e84a94fdfe 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/envvar/IEnvironmentVariableProvider.java
@@ -14,28 +14,25 @@ import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 
 /**
- * 
  * this interface represent the environment variable provider - the main entry-point
  * to be used for querying the build environment
- * 
+ *
  * @since 3.0
  * @noextend This class is not intended to be subclassed by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface IEnvironmentVariableProvider{
-
+public interface IEnvironmentVariableProvider {
 	/**
-	 * 
-	 * 
-	 * @return the reference to the IBuildEnvironmentVariable interface representing 
+	 * @return the reference to the IBuildEnvironmentVariable interface representing
 	 * the variable of a given name
+	 *
 	 * @param variableName environment variable name
-	 * if environment variable names are case insensitive in the current OS, 
+	 * if environment variable names are case insensitive in the current OS,
 	 * the environment variable provider will query the getVariable method of suppliers always
 	 * passing it the uppercase variable name not depending on the case of the variableName
-	 * passed to the IEnvironmentVariableProvider.getVariable() method. This will prevent the 
+	 * passed to the IEnvironmentVariableProvider.getVariable() method. This will prevent the
 	 * supplier from answering different values for the same variable given the names that differ
-	 * only by case. E.g. if the current OS does not support case sensitive variables both of the 
+	 * only by case. E.g. if the current OS does not support case sensitive variables both of the
 	 * calls below:
 	 *
 	 *   provider.getVariable("FOO",level,includeParentContexts);
@@ -48,42 +45,60 @@ public interface IEnvironmentVariableProvider{
 	 *    2. IManagedProject to represent the managed project
 	 *    3. IWorkspace to represent the workspace
 	 *    4. null to represent the system environment passed to eclipse
+	 *
 	 * @deprecated use {@link IEnvironmentVariableProvider#getVariable(String, IConfiguration, boolean)} instead
 	 */
 	@Deprecated
-	public IBuildEnvironmentVariable getVariable(
-				String variableName, Object level, boolean includeParentLevels, boolean resolveMacros);
-
-	public IEnvironmentVariable getVariable(String variableName,
-			IConfiguration cfg, boolean resolveMacros);
+	public IBuildEnvironmentVariable getVariable(String variableName, Object level, boolean includeParentLevels, boolean resolveMacros);
 
 	/**
+	 * Get variable for the given configuration, normally including those defined in project properties
+	 * and workspace preferences.
 	 *
-	 * if environment variable names are case insensitive in the current OS, 
+	 * See also {@code CCorePlugin.getDefault().getBuildEnvironmentManager().getVariable(String name, ICConfigurationDescription cfg, boolean resolveMacros)}
+	 *
+	 * @param variableName - name of the variable (not including $ sign).
+	 * @param cfg - configuration or {@code null} for workspace preferences only.
+	 * @param resolveMacros - if {@code true} expand macros, {@code false} otherwise.
+	 * @return variable defined for the configuration or the workspace.
+	 *    Returns {@code null} if variable is not defined.
+	 */
+	public IEnvironmentVariable getVariable(String variableName, IConfiguration cfg, boolean resolveMacros);
+
+	/**
+	 * if environment variable names are case insensitive in the current OS,
 	 * the environment variable provider will remove the duplicates of the variables if their names
 	 * differ only by case
 	 * @deprecated use {@link IEnvironmentVariableProvider#getVariables(IConfiguration, boolean)} instead
 	 *
-	 * @return the array of IBuildEnvironmentVariable that represents the environment variables 
+	 * @return the array of IBuildEnvironmentVariable that represents the environment variables
 	 */
 	@Deprecated
-	public IBuildEnvironmentVariable[] getVariables(
-				Object level, boolean includeParentLevels, boolean resolveMacros);
-
-	public IEnvironmentVariable[] getVariables(
-			IConfiguration cfg, boolean resolveMacros);
+	public IBuildEnvironmentVariable[] getVariables(Object level, boolean includeParentLevels, boolean resolveMacros);
 
 	/**
+	 * Get variables for the given configuration, normally including those defined in project properties
+	 * and workspace preferences.
 	 *
+	 * See also {@code CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(ICConfigurationDescription cfg, boolean resolveMacros)}
+	 *
+	 * @param cfg - configuration or {@code null} for workspace preferences only.
+	 * @param resolveMacros - if {@code true} expand macros, {@code false} otherwise.
+	 * @return array of variables defined for the configuration or the workspace.
+	 *    Returns an empty array if no variables are defined.
+	 */
+	public IEnvironmentVariable[] getVariables(IConfiguration cfg, boolean resolveMacros);
+
+	/**
 	 * @return the String representing default system delimiter. That is the ":" for Unix-like
-	 * systems and the ";" for Win32 systems. This method will be used by the 
-	 * tool-integrator provided variable supplier e.g. in order to concatenate the list of paths into the 
+	 * systems and the ";" for Win32 systems. This method will be used by the
+	 * tool-integrator provided variable supplier e.g. in order to concatenate the list of paths into the
 	 * environment variable, etc.
 	 */
 	public String getDefaultDelimiter();
 
 	/**
-	 * @return true if the OS supports case sensitive variables (Unix-like systems) or false 
+	 * @return true if the OS supports case sensitive variables (Unix-like systems) or false
 	 * if it does not (Win32 systems)
 	 */
 	public boolean isVariableCaseSensitive();
@@ -97,29 +112,26 @@ public interface IEnvironmentVariableProvider{
 
 
 	/**
-	 * returns the array of String that holds the build paths of the specified type
+	 * @return the array of String that holds the build paths of the specified type
+	 *
 	 * @param configuration represent the configuration for which the paths were changed
-	 * @param buildPathType can be set to one of the IEnvVarBuildPath.BUILDPATH _xxx 
-	 * (the IEnvVarBuildPath will represent the build environment variables, see also 
+	 * @param buildPathType can be set to one of the IEnvVarBuildPath.BUILDPATH _xxx
+	 * (the IEnvVarBuildPath will represent the build environment variables, see also
 	 * the "Specifying the Includes and Library paths environment variables",
 	 * the "envVarBuildPath schema" and the "Expected CDT/MBS code changes" sections)
 	 */
 	String[] getBuildPaths(IConfiguration configuration, int buildPathType);
 
 	/**
-	 *
-	 * adds the listener that will return notifications about the include and library paths changes. 
+	 * adds the listener that will return notifications about the include and library paths changes.
 	 * The ManagedBuildManager will register the change listener and will notify all registered
-	 * Scanned Info Change Listeners about the include paths change. 
-	 */ 
-	void subscribe(
-		IEnvironmentBuildPathsChangeListener listener);
+	 * Scanned Info Change Listeners about the include paths change.
+	 */
+	void subscribe(IEnvironmentBuildPathsChangeListener listener);
 
 	/**
-	 *
-	 * removes the include and library paths change listener 
-	 */ 
-	void unsubscribe(
-		IEnvironmentBuildPathsChangeListener listener);
+	 * removes the include and library paths change listener
+	 */
+	void unsubscribe(IEnvironmentBuildPathsChangeListener listener);
 }
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java
index a77661eecc6..a00a8fd4329 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java
@@ -35,10 +35,8 @@ import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor;
  * build environment functionality to the MBS
  *
  * @since 3.0
- *
  */
-public class EnvironmentVariableProvider implements
-		IEnvironmentVariableProvider {
+public class EnvironmentVariableProvider implements IEnvironmentVariableProvider {
 //	private static final QualifiedName fBuildPathVarProperty = new QualifiedName(ManagedBuilderCorePlugin.getUniqueIdentifier(), "buildPathVar");	//$NON-NLS-1$
 
 //	private static final String DELIMITER_WIN32 = ";";  //$NON-NLS-1$
@@ -58,20 +56,17 @@ public class EnvironmentVariableProvider implements
 	 * paths from environment variable values
 	 *
 	 * @since 3.0
-	 *
 	 */
 	static public class DefaultBuildPathResolver implements IBuildPathResolver {
 		private String fDelimiter;
 
-		public DefaultBuildPathResolver(String delimiter){
+		public DefaultBuildPathResolver(String delimiter) {
 			fDelimiter = delimiter;
 		}
 
 		@Override
-		public String[] resolveBuildPaths(int pathType, String variableName,
-				String variableValue, IConfiguration configuration) {
-
-			if(fDelimiter == null || "".equals(fDelimiter)) //$NON-NLS-1$
+		public String[] resolveBuildPaths(int pathType, String variableName, String variableValue, IConfiguration configuration) {
+			if (fDelimiter == null || "".equals(fDelimiter)) //$NON-NLS-1$
 				return new String[]{variableValue};
 
 			List<String> list = EnvVarOperationProcessor.convertToList(variableValue,fDelimiter);
@@ -80,46 +75,39 @@ public class EnvironmentVariableProvider implements
 
 	}
 
-	protected EnvironmentVariableProvider(IEnvironmentVariableManager mngr){
+	protected EnvironmentVariableProvider(IEnvironmentVariableManager mngr) {
 		fMngr = mngr;
 	}
 
-	public static EnvironmentVariableProvider getDefault(){
-		if(fInstance == null){
+	public static EnvironmentVariableProvider getDefault() {
+		if (fInstance == null) {
 			fInstance = new EnvironmentVariableProvider(CCorePlugin.getDefault().getBuildEnvironmentManager());
 			fInstance.fBuildPathVarCheckAllowed = true;
 		}
 		return fInstance;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getVariable()
-	 */
 	@Override
-	public IBuildEnvironmentVariable getVariable(String variableName,
-			Object level, boolean includeParentLevels, boolean resolveMacros) {
-
-		if(variableName == null || "".equals(variableName)) //$NON-NLS-1$
+	public IBuildEnvironmentVariable getVariable(String variableName, Object level, boolean includeParentLevels, boolean resolveMacros) {
+		if (variableName == null || "".equals(variableName)) //$NON-NLS-1$
 			return null;
 
-		if(level instanceof IConfiguration){
+		if (level instanceof IConfiguration) {
 			return wrap(getVariable(variableName, (IConfiguration)level, resolveMacros));
 		}
 		return null;
 	}
 
 	@Override
-	public IEnvironmentVariable getVariable(String variableName,
-			IConfiguration cfg, boolean resolveMacros){
+	public IEnvironmentVariable getVariable(String variableName, IConfiguration cfg, boolean resolveMacros) {
 		return getVariable(variableName, cfg, resolveMacros, true);
 	}
 
-	public IEnvironmentVariable getVariable(String variableName,
-			IConfiguration cfg, boolean resolveMacros, boolean checkBuildPaths){
+	public IEnvironmentVariable getVariable(String variableName, IConfiguration cfg, boolean resolveMacros, boolean checkBuildPaths) {
 		ICConfigurationDescription des = ManagedBuildManager.getDescriptionForConfiguration(cfg);
-		if(des != null){
+		if (des != null) {
 			IEnvironmentVariable variable = fMngr.getVariable(variableName, des, resolveMacros);
-			if(checkBuildPaths && resolveMacros && fBuildPathVarCheckAllowed)
+			if (checkBuildPaths && resolveMacros && fBuildPathVarCheckAllowed)
 				checkBuildPathVariable(cfg, variableName, variable);
 			return variable;
 		}
@@ -127,130 +115,109 @@ public class EnvironmentVariableProvider implements
 	}
 
 	@Override
-	public IEnvironmentVariable[] getVariables(IConfiguration cfg, boolean resolveMacros){
+	public IEnvironmentVariable[] getVariables(IConfiguration cfg, boolean resolveMacros) {
 		return getVariables(cfg, resolveMacros, true);
 	}
 
-	public IEnvironmentVariable[] getVariables(IConfiguration cfg, boolean resolveMacros, boolean checkBuildPaths){
+	public IEnvironmentVariable[] getVariables(IConfiguration cfg, boolean resolveMacros, boolean checkBuildPaths) {
 		ICConfigurationDescription des = ManagedBuildManager.getDescriptionForConfiguration(cfg);
-		if(des != null){
+		if (des != null) {
 			IEnvironmentVariable vars[] = fMngr.getVariables(des, resolveMacros);
-			if(checkBuildPaths && resolveMacros && fBuildPathVarCheckAllowed)
+			if (checkBuildPaths && resolveMacros && fBuildPathVarCheckAllowed)
 				checkBuildPathVariables(cfg,vars);
 			return vars;
 		}
 		return new IBuildEnvironmentVariable[0];
 	}
 
-	public static IBuildEnvironmentVariable wrap(IEnvironmentVariable var){
-		if(var == null)
+	public static IBuildEnvironmentVariable wrap(IEnvironmentVariable var) {
+		if (var == null)
 			return null;
-		if(var instanceof IBuildEnvironmentVariable)
+		if (var instanceof IBuildEnvironmentVariable)
 			return (IBuildEnvironmentVariable)var;
 		return new BuildEnvVar(var);
 	}
 
-	public static IBuildEnvironmentVariable[] wrap(IEnvironmentVariable vars[]){
-		if(vars == null)
+	public static IBuildEnvironmentVariable[] wrap(IEnvironmentVariable vars[]) {
+		if (vars == null)
 			return null;
-		if(vars instanceof IBuildEnvironmentVariable[])
+		if (vars instanceof IBuildEnvironmentVariable[])
 			return (IBuildEnvironmentVariable[])vars;
 
 		IBuildEnvironmentVariable[] buildVars = new IBuildEnvironmentVariable[vars.length];
-		for(int i = 0; i < vars.length; i++){
+		for(int i = 0; i < vars.length; i++) {
 			buildVars[i] = wrap(vars[i]);
 		}
 		return buildVars;
 	}
 
-/*	protected ICConfigurationDescription getDescription(IConfiguration cfg){
+/*	protected ICConfigurationDescription getDescription(IConfiguration cfg) {
 		IProject project = cfg.getOwner().getProject();
 		ICProjectDescription des = CoreModel.getDefault().getProjectDescription(project, false);
-		if(des != null){
+		if (des != null) {
 			return des.getConfigurationById(cfg.getId());
 		}
 		return null;
 	}
 */
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getVariables()
-	 */
 	@Override
-	public IBuildEnvironmentVariable[] getVariables(Object level,
-			boolean includeParentLevels, boolean resolveMacros) {
-
-		if(level instanceof IConfiguration){
+	public IBuildEnvironmentVariable[] getVariables(Object level, boolean includeParentLevels, boolean resolveMacros) {
+		if (level instanceof IConfiguration) {
 			return wrap(getVariables((IConfiguration)level, resolveMacros));
 		}
 		return new IBuildEnvironmentVariable[0];
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getDefaultDelimiter()
-	 */
 	@Override
 	public String getDefaultDelimiter() {
 		return fMngr.getDefaultDelimiter();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#isVariableCaseSensitive()
-	 */
 	@Override
 	public boolean isVariableCaseSensitive() {
 		return fMngr.isVariableCaseSensitive();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getSuppliers()
-	 */
 	@Override
 	public IEnvironmentVariableSupplier[] getSuppliers(Object level) {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getBuildPaths()
-	 */
 	@Override
-	public String[] getBuildPaths(IConfiguration configuration,
-			int buildPathType) {
+	public String[] getBuildPaths(IConfiguration configuration, int buildPathType) {
 		ITool tools[] = configuration.getFilteredTools();
 		List<String> list = new ArrayList<String>();
 
-		for(int i = 0; i < tools.length; i++){
-			IEnvVarBuildPath pathDescriptors[] = tools[i].getEnvVarBuildPaths();
+		for (ITool tool : tools) {
+			IEnvVarBuildPath pathDescriptors[] = tool.getEnvVarBuildPaths();
 
-			if(pathDescriptors == null || pathDescriptors.length == 0)
+			if (pathDescriptors == null || pathDescriptors.length == 0)
 				continue;
 
-			for(int j = 0; j < pathDescriptors.length; j++){
-				IEnvVarBuildPath curPathDes = pathDescriptors[j];
-				if(curPathDes.getType() != buildPathType)
+			for (IEnvVarBuildPath curPathDes : pathDescriptors) {
+				if (curPathDes.getType() != buildPathType)
 					continue;
 
 				String vars[] = curPathDes.getVariableNames();
-				if(vars == null || vars.length == 0)
+				if (vars == null || vars.length == 0)
 					continue;
 
 				IBuildPathResolver pathResolver = curPathDes.getBuildPathResolver();
-				if(pathResolver == null){
+				if (pathResolver == null) {
 					String delimiter = curPathDes.getPathDelimiter();
-					if(delimiter == null)
+					if (delimiter == null)
 						delimiter = getDefaultDelimiter();
 					pathResolver = new DefaultBuildPathResolver(delimiter);
 				}
 
-				for(int k = 0; k < vars.length; k++){
-					String varName = vars[k];
-
+				for (String varName : vars) {
 					IEnvironmentVariable var = getVariable(varName,configuration,true, false);
-					if(var == null)
+					if (var == null)
 						continue;
 
 					String varValue = var.getValue();
 					String paths[] = pathResolver.resolveBuildPaths(buildPathType,varName,varValue,configuration);
-					if(paths != null && paths.length != 0)
+					if (paths != null && paths.length != 0)
 						list.addAll(Arrays.asList(paths));
 				}
 			}
@@ -259,45 +226,39 @@ public class EnvironmentVariableProvider implements
 		return list.toArray(new String[list.size()]);
 	}
 
-	/*
-	 * returns a list of registered listeners
+	/**
+	 * @return a list of registered listeners
 	 */
-	private List<IEnvironmentBuildPathsChangeListener> getListeners(){
-		if(fListeners == null)
+	private List<IEnvironmentBuildPathsChangeListener> getListeners() {
+		if (fListeners == null)
 			fListeners = new ArrayList<IEnvironmentBuildPathsChangeListener>();
 		return fListeners;
 	}
 
-	/*
+	/**
 	 * notifies registered listeners
 	 */
-	private void notifyListeners(IConfiguration configuration, int buildPathType){
+	private void notifyListeners(IConfiguration configuration, int buildPathType) {
 		List<IEnvironmentBuildPathsChangeListener> listeners = getListeners();
 		for (IEnvironmentBuildPathsChangeListener listener : listeners) {
 			listener.buildPathsChanged(configuration,buildPathType);
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#subscribe()
-	 */
 	@Override
 	public synchronized void subscribe(IEnvironmentBuildPathsChangeListener listener) {
-		if(listener == null)
+		if (listener == null)
 			return;
 
 		List<IEnvironmentBuildPathsChangeListener> listeners = getListeners();
 
-		if(!listeners.contains(listener))
+		if (!listeners.contains(listener))
 			listeners.add(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#unsubscribe()
-	 */
 	@Override
 	public synchronized void unsubscribe(IEnvironmentBuildPathsChangeListener listener) {
-		if(listener == null)
+		if (listener == null)
 			return;
 
 		List<IEnvironmentBuildPathsChangeListener> listeners = getListeners();
@@ -305,39 +266,39 @@ public class EnvironmentVariableProvider implements
 		listeners.remove(listener);
 	}
 
-	/*
+	/**
 	 * performs a check of the build path variables for the given configuration
 	 * If the build variables are changed, the notification is sent
 	 */
-	public void checkBuildPathVariables(IConfiguration configuration){
+	public void checkBuildPathVariables(IConfiguration configuration) {
 		checkBuildPathVariables(configuration, getVariables(configuration ,true, false));
 	}
 
-	/*
+	/**
 	 * performs a check of the build path variables of the specified type
 	 * for the given configuration
 	 * If the build variables are changed, the notification is sent
 	 */
-	public void checkBuildPathVariables(IConfiguration configuration,int buildPathType){
+	public void checkBuildPathVariables(IConfiguration configuration,int buildPathType) {
 		EnvVarCollector cr = new EnvVarCollector();
 		cr.add(getVariables(configuration, true, false));
 		checkBuildPathVariables(configuration,buildPathType,cr);
 	}
 
-	/*
+	/**
 	 * performs a check of the build path variables
 	 * for the given configuration given the set of the variables
 	 * defined for this configuration
 	 * If the build variables are changed, the notification is sent
 	 */
-	protected void checkBuildPathVariables(IConfiguration configuration, IEnvironmentVariable vars[]){
+	protected void checkBuildPathVariables(IConfiguration configuration, IEnvironmentVariable vars[]) {
 		EnvVarCollector cr = new EnvVarCollector();
 		cr.add(vars);
 		checkBuildPathVariables(configuration,IEnvVarBuildPath.BUILDPATH_INCLUDE,cr);
 		checkBuildPathVariables(configuration,IEnvVarBuildPath.BUILDPATH_LIBRARY,cr);
 	}
 
-	/*
+	/**
 	 * performs a check of whether the given variable is the build path variable
 	 * and if true checks whether it is changed.
 	 * In the case of it is changed all other build path variables are checked
@@ -345,12 +306,12 @@ public class EnvironmentVariableProvider implements
 	 * If it is not changed, other build path variables are not checked
 	 * In the case of the given variable is not the build path one, this method does nothing
 	 */
-	protected void checkBuildPathVariable(IConfiguration configuration, String varName, IEnvironmentVariable var){
+	protected void checkBuildPathVariable(IConfiguration configuration, String varName, IEnvironmentVariable var) {
 		checkBuildPathVariable(configuration, IEnvVarBuildPath.BUILDPATH_INCLUDE, varName, var);
 		checkBuildPathVariable(configuration, IEnvVarBuildPath.BUILDPATH_LIBRARY, varName, var);
 	}
 
-	/*
+	/**
 	 * performs a check of whether the given variable is the build path variable
 	 * of the specified type and if true checks whether it is changed.
 	 * In the case of it is changed all other build path variables of that type are checked
@@ -358,11 +319,11 @@ public class EnvironmentVariableProvider implements
 	 * If it is not changed, other build path variables are not checked
 	 * In the case of the given variable is not the build path one, this method does nothing
 	 */
-	protected void checkBuildPathVariable(IConfiguration configuration, int buildPathType, String varName, IEnvironmentVariable var){
+	protected void checkBuildPathVariable(IConfiguration configuration, int buildPathType, String varName, IEnvironmentVariable var) {
 		StoredBuildPathEnvironmentContainer buildPathVars = getStoredBuildPathVariables(buildPathType);
-		if(buildPathVars == null)
+		if (buildPathVars == null)
 			return;
-		if(buildPathVars.isVariableChanged(varName,var,configuration)){
+		if (buildPathVars.isVariableChanged(varName,var,configuration)) {
 			EnvVarCollector cr = new EnvVarCollector();
 			cr.add(getVariables(configuration, true, false));
 			buildPathVars.synchronize(cr,configuration);
@@ -370,44 +331,44 @@ public class EnvironmentVariableProvider implements
 		}
 	}
 
-	/*
+	/**
 	 * performs a check of the build path variables of the specified type
 	 * for the given configuration given the set of the variables
 	 * defined for this configuration.
 	 * If the build variables are changed, the notification is sent
 	 */
-	protected void checkBuildPathVariables(IConfiguration configuration, int buildPathType, EnvVarCollector varSet){
+	protected void checkBuildPathVariables(IConfiguration configuration, int buildPathType, EnvVarCollector varSet) {
 		StoredBuildPathEnvironmentContainer buildPathVars = getStoredBuildPathVariables(buildPathType);
-		if(buildPathVars == null)
+		if (buildPathVars == null)
 			return;
-		if(buildPathVars.checkBuildPathChange(varSet,configuration)){
+		if (buildPathVars.checkBuildPathChange(varSet,configuration)) {
 			notifyListeners(configuration, buildPathType);
 		}
 	}
 
-	/*
+	/**
 	 * returns the container of the build variables of the specified type
 	 */
-	protected StoredBuildPathEnvironmentContainer getStoredBuildPathVariables(int buildPathType){
+	protected StoredBuildPathEnvironmentContainer getStoredBuildPathVariables(int buildPathType) {
 		return buildPathType == IEnvVarBuildPath.BUILDPATH_LIBRARY ?
 				getStoredLibraryBuildPathVariables() :
 				getStoredIncludeBuildPathVariables();
 	}
 
-	/*
+	/**
 	 * returns the container of the Include path variables
 	 */
-	protected StoredBuildPathEnvironmentContainer getStoredIncludeBuildPathVariables(){
-		if(fIncludeStoredBuildPathVariables == null)
+	protected StoredBuildPathEnvironmentContainer getStoredIncludeBuildPathVariables() {
+		if (fIncludeStoredBuildPathVariables == null)
 			fIncludeStoredBuildPathVariables = new StoredBuildPathEnvironmentContainer(IEnvVarBuildPath.BUILDPATH_INCLUDE);
 		return fIncludeStoredBuildPathVariables;
 	}
 
-	/*
+	/**
 	 * returns the container of the Library path variables
 	 */
-	protected StoredBuildPathEnvironmentContainer getStoredLibraryBuildPathVariables(){
-		if(fLibraryStoredBuildPathVariables == null)
+	protected StoredBuildPathEnvironmentContainer getStoredLibraryBuildPathVariables() {
+		if (fLibraryStoredBuildPathVariables == null)
 			fLibraryStoredBuildPathVariables = new StoredBuildPathEnvironmentContainer(IEnvVarBuildPath.BUILDPATH_LIBRARY);
 		return fLibraryStoredBuildPathVariables;
 	}