From 150d47cf92221e6d6b8099a6dca6e5b4c9c8b6f2 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Wed, 23 Feb 2011 20:44:08 +0000
Subject: [PATCH] Cosmetics.

---
 .../cdt/internal/core/index/IndexFactory.java | 22 +++++++++----------
 .../internal/core/index/WritableCIndex.java   |  3 +--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
index 58babe891a3..78886af53b8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
@@ -53,19 +53,19 @@ public class IndexFactory {
 		projects = (ICProject[]) ArrayUtil.removeNulls(ICProject.class, projects);
 		
 		boolean addDependencies= (options & ADD_DEPENDENCIES) != 0;
-		boolean addDependent=    (options & ADD_DEPENDENT) != 0;
+		boolean addDependent= (options & ADD_DEPENDENT) != 0;
 		boolean skipProvided= (options & SKIP_PROVIDED) != 0;
 		
 		HashMap<IProject, Integer> map= new HashMap<IProject, Integer>();
 		Collection<ICProject> selectedProjects= getProjects(projects, addDependencies, addDependent, map, new Integer(1));
 		
 		HashMap<String, IIndexFragment> fragments= new LinkedHashMap<String, IIndexFragment>();
-		for(ICProject cproject : selectedProjects) {
+		for (ICProject cproject : selectedProjects) {
 			IIndexFragment pdom= fPDOMManager.getPDOM(cproject);
 			if (pdom != null) {
 				safeAddFragment(fragments, pdom);
 				
-				if(!skipProvided) {
+				if (!skipProvided) {
 					safeAddProvidedFragments(cproject, fragments);
 				}
 			}
@@ -81,11 +81,11 @@ public class IndexFactory {
 			selectedProjects.clear();
 			// don't clear the map, so projects are not selected again
 			selectedProjects= getProjects(projects, true, false, map, new Integer(2));
-			for(ICProject cproject : selectedProjects) {
+			for (ICProject cproject : selectedProjects) {
 				IIndexFragment pdom= fPDOMManager.getPDOM(cproject);
 				safeAddFragment(fragments, pdom);
 				
-				if(!skipProvided) {
+				if (!skipProvided) {
 					safeAddProvidedFragments(cproject, fragments);
 				}
 			}
@@ -107,7 +107,7 @@ public class IndexFactory {
 		Collection<ICProject> selectedProjects= getProjects(new ICProject[] {project}, true, false, new HashMap<IProject, Integer>(), new Integer(1));		
 		selectedProjects.remove(project);
 		
-		for(ICProject cproject : selectedProjects) {
+		for (ICProject cproject : selectedProjects) {
 			safeAddFragment(readOnlyFrag, fPDOMManager.getPDOM(cproject));
 		}
 				
@@ -118,7 +118,7 @@ public class IndexFactory {
 	private Collection<ICProject> getProjects(ICProject[] projects, boolean addDependencies, boolean addDependent, HashMap<IProject, Integer> map, Integer markWith) {
 		List<IProject> projectsToSearch= new ArrayList<IProject>();
 		
-		for(ICProject cproject : projects) {
+		for (ICProject cproject : projects) {
 			IProject project= cproject.getProject();
 			checkAddProject(project, map, projectsToSearch, markWith);
 			projectsToSearch.add(project);
@@ -150,7 +150,7 @@ public class IndexFactory {
 		
 		CoreModel cm= CoreModel.getDefault();
 		Collection<ICProject> result= new ArrayList<ICProject>();
-		for(Map.Entry<IProject, Integer> entry : map.entrySet()) {
+		for (Map.Entry<IProject, Integer> entry : map.entrySet()) {
 			if (entry.getValue() == markWith) {
 				ICProject cproject= cm.create(entry.getKey());
 				if (cproject != null) {
@@ -180,7 +180,7 @@ public class IndexFactory {
 	 * @param fragment the fragment or null (which will result in no action)
 	 */
 	private void safeAddFragment(Map<String, IIndexFragment> id2fragment, IIndexFragment fragment) {
-		if(fragment!=null) {
+		if (fragment != null) {
 			try {
 				fragment.acquireReadLock();
 				try {
@@ -206,13 +206,13 @@ public class IndexFactory {
 	 */
 	private void safeAddProvidedFragments(ICProject cproject, Map<String, IIndexFragment> fragments) {
 		ICProjectDescription pd= CoreModel.getDefault().getProjectDescription(cproject.getProject(), false);
-		if(pd!=null) {
+		if (pd != null) {
 			IndexProviderManager ipm = CCoreInternals.getPDOMManager().getIndexProviderManager();
 			ICConfigurationDescription cfg= pd.getDefaultSettingConfiguration();
 			if (cfg != null) {
 				try {
 					IIndexFragment[] pFragments= ipm.getProvidedIndexFragments(cfg);
-					for(IIndexFragment fragment : pFragments) {
+					for (IIndexFragment fragment : pFragments) {
 						safeAddFragment(fragments, fragment);
 					}
 				} catch(CoreException ce) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java
index a88f9e4e0b5..8bd8489a716 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java
@@ -23,13 +23,12 @@ import org.eclipse.cdt.internal.core.pdom.YieldableIndexLock;
 import org.eclipse.core.runtime.CoreException;
 
 public class WritableCIndex extends CIndex implements IWritableIndex {
-
 	final private IWritableIndexFragment fWritableFragment;
 	private boolean fIsWriteLocked= false;
 	private Object fThread;
 
 	public WritableCIndex(IWritableIndexFragment writable, IIndexFragment[] readonly) {
-		super (concat(writable, readonly));
+		super(concat(writable, readonly));
 		fWritableFragment= writable;
 	}