mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-02-23 20:44:08 +00:00
parent df420139a3
commit 150d47cf92
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
View file

@ -53,19 +53,19 @@ public class IndexFactory {
projects = (ICProject[]) ArrayUtil.removeNulls(ICProject.class, projects); projects = (ICProject[]) ArrayUtil.removeNulls(ICProject.class, projects);
boolean addDependencies= (options & ADD_DEPENDENCIES) != 0; boolean addDependencies= (options & ADD_DEPENDENCIES) != 0;
boolean addDependent= (options & ADD_DEPENDENT) != 0; boolean addDependent= (options & ADD_DEPENDENT) != 0;
boolean skipProvided= (options & SKIP_PROVIDED) != 0; boolean skipProvided= (options & SKIP_PROVIDED) != 0;
HashMap<IProject, Integer> map= new HashMap<IProject, Integer>(); HashMap<IProject, Integer> map= new HashMap<IProject, Integer>();
Collection<ICProject> selectedProjects= getProjects(projects, addDependencies, addDependent, map, new Integer(1)); Collection<ICProject> selectedProjects= getProjects(projects, addDependencies, addDependent, map, new Integer(1));
HashMap<String, IIndexFragment> fragments= new LinkedHashMap<String, IIndexFragment>(); HashMap<String, IIndexFragment> fragments= new LinkedHashMap<String, IIndexFragment>();
for(ICProject cproject : selectedProjects) { for (ICProject cproject : selectedProjects) {
IIndexFragment pdom= fPDOMManager.getPDOM(cproject); IIndexFragment pdom= fPDOMManager.getPDOM(cproject);
if (pdom != null) { if (pdom != null) {
safeAddFragment(fragments, pdom); safeAddFragment(fragments, pdom);
if(!skipProvided) { if (!skipProvided) {
safeAddProvidedFragments(cproject, fragments); safeAddProvidedFragments(cproject, fragments);
} }
} }
@ -81,11 +81,11 @@ public class IndexFactory {
selectedProjects.clear(); selectedProjects.clear();
// don't clear the map, so projects are not selected again // don't clear the map, so projects are not selected again
selectedProjects= getProjects(projects, true, false, map, new Integer(2)); selectedProjects= getProjects(projects, true, false, map, new Integer(2));
for(ICProject cproject : selectedProjects) { for (ICProject cproject : selectedProjects) {
IIndexFragment pdom= fPDOMManager.getPDOM(cproject); IIndexFragment pdom= fPDOMManager.getPDOM(cproject);
safeAddFragment(fragments, pdom); safeAddFragment(fragments, pdom);
if(!skipProvided) { if (!skipProvided) {
safeAddProvidedFragments(cproject, fragments); 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)); Collection<ICProject> selectedProjects= getProjects(new ICProject[] {project}, true, false, new HashMap<IProject, Integer>(), new Integer(1));
selectedProjects.remove(project); selectedProjects.remove(project);
for(ICProject cproject : selectedProjects) { for (ICProject cproject : selectedProjects) {
safeAddFragment(readOnlyFrag, fPDOMManager.getPDOM(cproject)); 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) { private Collection<ICProject> getProjects(ICProject[] projects, boolean addDependencies, boolean addDependent, HashMap<IProject, Integer> map, Integer markWith) {
List<IProject> projectsToSearch= new ArrayList<IProject>(); List<IProject> projectsToSearch= new ArrayList<IProject>();
for(ICProject cproject : projects) { for (ICProject cproject : projects) {
IProject project= cproject.getProject(); IProject project= cproject.getProject();
checkAddProject(project, map, projectsToSearch, markWith); checkAddProject(project, map, projectsToSearch, markWith);
projectsToSearch.add(project); projectsToSearch.add(project);
@ -150,7 +150,7 @@ public class IndexFactory {
CoreModel cm= CoreModel.getDefault(); CoreModel cm= CoreModel.getDefault();
Collection<ICProject> result= new ArrayList<ICProject>(); 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) { if (entry.getValue() == markWith) {
ICProject cproject= cm.create(entry.getKey()); ICProject cproject= cm.create(entry.getKey());
if (cproject != null) { if (cproject != null) {
@ -180,7 +180,7 @@ public class IndexFactory {
* @param fragment the fragment or null (which will result in no action) * @param fragment the fragment or null (which will result in no action)
*/ */
private void safeAddFragment(Map<String, IIndexFragment> id2fragment, IIndexFragment fragment) { private void safeAddFragment(Map<String, IIndexFragment> id2fragment, IIndexFragment fragment) {
if(fragment!=null) { if (fragment != null) {
try { try {
fragment.acquireReadLock(); fragment.acquireReadLock();
try { try {
@ -206,13 +206,13 @@ public class IndexFactory {
*/ */
private void safeAddProvidedFragments(ICProject cproject, Map<String, IIndexFragment> fragments) { private void safeAddProvidedFragments(ICProject cproject, Map<String, IIndexFragment> fragments) {
ICProjectDescription pd= CoreModel.getDefault().getProjectDescription(cproject.getProject(), false); ICProjectDescription pd= CoreModel.getDefault().getProjectDescription(cproject.getProject(), false);
if(pd!=null) { if (pd != null) {
IndexProviderManager ipm = CCoreInternals.getPDOMManager().getIndexProviderManager(); IndexProviderManager ipm = CCoreInternals.getPDOMManager().getIndexProviderManager();
ICConfigurationDescription cfg= pd.getDefaultSettingConfiguration(); ICConfigurationDescription cfg= pd.getDefaultSettingConfiguration();
if (cfg != null) { if (cfg != null) {
try { try {
IIndexFragment[] pFragments= ipm.getProvidedIndexFragments(cfg); IIndexFragment[] pFragments= ipm.getProvidedIndexFragments(cfg);
for(IIndexFragment fragment : pFragments) { for (IIndexFragment fragment : pFragments) {
safeAddFragment(fragments, fragment); safeAddFragment(fragments, fragment);
} }
} catch(CoreException ce) { } catch(CoreException ce) {

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java
View file

@ -23,13 +23,12 @@ import org.eclipse.cdt.internal.core.pdom.YieldableIndexLock;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
public class WritableCIndex extends CIndex implements IWritableIndex { public class WritableCIndex extends CIndex implements IWritableIndex {
final private IWritableIndexFragment fWritableFragment; final private IWritableIndexFragment fWritableFragment;
private boolean fIsWriteLocked= false; private boolean fIsWriteLocked= false;
private Object fThread; private Object fThread;
public WritableCIndex(IWritableIndexFragment writable, IIndexFragment[] readonly) { public WritableCIndex(IWritableIndexFragment writable, IIndexFragment[] readonly) {
super (concat(writable, readonly)); super(concat(writable, readonly));
fWritableFragment= writable; fWritableFragment= writable;
} }