From 39bf0902755f557d298e476166ba13c99e73ebcf Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Fri, 6 Apr 2007 07:49:32 +0000 Subject: [PATCH] Fixes a warning. --- .../internal/core/pdom/LanguageMappingChangeListener.java | 4 +--- .../org/eclipse/cdt/internal/core/pdom/PDOMManager.java | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/LanguageMappingChangeListener.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/LanguageMappingChangeListener.java index 162bf224806..24035da5736 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/LanguageMappingChangeListener.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/LanguageMappingChangeListener.java @@ -15,9 +15,8 @@ import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElementDelta; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILanguageMappingChangeListener; import org.eclipse.cdt.core.model.ILanguageMappingChangeEvent; -import org.eclipse.cdt.core.model.LanguageManager; +import org.eclipse.cdt.core.model.ILanguageMappingChangeListener; import org.eclipse.cdt.internal.core.model.CElementDelta; import org.eclipse.cdt.internal.core.model.CModelManager; import org.eclipse.core.resources.IFile; @@ -37,7 +36,6 @@ public class LanguageMappingChangeListener implements public LanguageMappingChangeListener(PDOMManager manager) { fManager = manager; - LanguageManager.getInstance().registerLanguageChangeListener(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java index 79c1f452002..f9c5451d857 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java @@ -41,6 +41,7 @@ import org.eclipse.cdt.core.model.ICElementDelta; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.cdt.core.model.ILanguageMappingChangeListener; +import org.eclipse.cdt.core.model.LanguageManager; import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.index.IIndexFragment; import org.eclipse.cdt.internal.core.index.IWritableIndex; @@ -142,10 +143,10 @@ public class PDOMManager implements IWritableIndexManager, IListener { private IndexerStateEvent fIndexerStateEvent= new IndexerStateEvent(); private IElementChangedListener fCModelListener= new CModelListener(this); + private ILanguageMappingChangeListener fLanguageChangeListener = new LanguageMappingChangeListener(this); private IndexFactory fIndexFactory= new IndexFactory(this); private IndexProviderManager manager = new IndexProviderManager(); - private ILanguageMappingChangeListener fLanguageChangeListener = new LanguageMappingChangeListener(this); /** * Serializes creation of new indexer, when acquiring the lock you are @@ -166,7 +167,8 @@ public class PDOMManager implements IWritableIndexManager, IListener { final CoreModel model = CoreModel.getDefault(); model.addElementChangedListener(fCModelListener); - + LanguageManager.getInstance().registerLanguageChangeListener(fLanguageChangeListener); + IProject[] projects= ResourcesPlugin.getWorkspace().getRoot().getProjects(); for (int i = 0; i < projects.length; i++) { IProject project = projects[i];