mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

Renamed ICListenerRegisterer -> ICListenerAgent

Browse source
This commit is contained in:
Andrew Gvozdev 2011-11-18 16:12:29 -05:00
parent d444164f53
commit 39431dc5f5
4 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuiltinSpecsDetector.java
View file

@ -27,7 +27,7 @@ import org.eclipse.cdt.core.IConsoleParser;
import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.IMarkerGenerator;
import org.eclipse.cdt.core.ProblemMarkerInfo; import org.eclipse.cdt.core.ProblemMarkerInfo;
import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.index.IIndexManager;
import org.eclipse.cdt.core.language.settings.providers.ICListenerRegisterer; import org.eclipse.cdt.core.language.settings.providers.ICListenerAgent;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
@ -68,7 +68,7 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.w3c.dom.Element; import org.w3c.dom.Element;
public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSettingsOutputScanner implements ICListenerRegisterer { public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSettingsOutputScanner implements ICListenerAgent {
public static final Object JOB_FAMILY_BUILTIN_SPECS_DETECTOR = "org.eclipse.cdt.make.core.scannerconfig.AbstractBuiltinSpecsDetector"; public static final Object JOB_FAMILY_BUILTIN_SPECS_DETECTOR = "org.eclipse.cdt.make.core.scannerconfig.AbstractBuiltinSpecsDetector";
private static final int TICKS_STREAM_MONITOR = 100; private static final int TICKS_STREAM_MONITOR = 100;

2
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockListenerRegisterer.java
View file

@ -20,7 +20,7 @@ import org.eclipse.core.runtime.Assert;
/** /**
* Language Settings Provider that keeps count how many times it has been registered. * Language Settings Provider that keeps count how many times it has been registered.
*/ */
public class MockListenerRegisterer extends LanguageSettingsSerializable implements ILanguageSettingsEditableProvider, ICListenerRegisterer { public class MockListenerRegisterer extends LanguageSettingsSerializable implements ILanguageSettingsEditableProvider, ICListenerAgent {
private static MockListenerManager mockListenerManager = new MockListenerManager(); private static MockListenerManager mockListenerManager = new MockListenerManager();
private static class MockListenerManager { private static class MockListenerManager {

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerRegisterer.java → core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerAgent.java
View file

@ -18,7 +18,7 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
* Helper class to allow listeners self-register/dispose. Called by cdt core. * Helper class to allow listeners self-register/dispose. Called by cdt core.
* TODO - expand in more detail. * TODO - expand in more detail.
*/ */
public interface ICListenerRegisterer { public interface ICListenerAgent {
public void registerListener(ICConfigurationDescription cfgDescription); public void registerListener(ICConfigurationDescription cfgDescription);
public void unregisterListener(); public void unregisterListener();
} }

52
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java
View file

@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.language.settings.providers.ICListenerRegisterer; import org.eclipse.cdt.core.language.settings.providers.ICListenerAgent;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider; import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
@ -80,16 +80,16 @@ public class LanguageSettingsProvidersSerializer {
private static ListenerList fLanguageSettingsChangeListeners = new ListenerList(ListenerList.IDENTITY); private static ListenerList fLanguageSettingsChangeListeners = new ListenerList(ListenerList.IDENTITY);
private static class ListenerAssociation { private static class ListenerAssociation {
private ICListenerRegisterer listener; private ICListenerAgent listener;
private ICConfigurationDescription cfgDescription; private ICConfigurationDescription cfgDescription;
public ListenerAssociation(ICListenerRegisterer li, ICConfigurationDescription cfgd) { public ListenerAssociation(ICListenerAgent li, ICConfigurationDescription cfgd) {
listener = li; listener = li;
cfgDescription = cfgd; cfgDescription = cfgd;
} }
} }
private static class LanguageSettingsWorkspaceProvider implements ILanguageSettingsProvider, ICListenerRegisterer { private static class LanguageSettingsWorkspaceProvider implements ILanguageSettingsProvider, ICListenerAgent {
private String providerId; private String providerId;
private int projectCount = 0; private int projectCount = 0;
@ -164,8 +164,8 @@ public class LanguageSettingsProvidersSerializer {
public void registerListener(ICConfigurationDescription cfgDescription) { public void registerListener(ICConfigurationDescription cfgDescription) {
// keep in mind that rawProvider can change // keep in mind that rawProvider can change
ILanguageSettingsProvider rawProvider = getRawProvider(); ILanguageSettingsProvider rawProvider = getRawProvider();
if (rawProvider instanceof ICListenerRegisterer) { if (rawProvider instanceof ICListenerAgent) {
((ICListenerRegisterer) rawProvider).registerListener(null); ((ICListenerAgent) rawProvider).registerListener(null);
} }
} }
@ -173,8 +173,8 @@ public class LanguageSettingsProvidersSerializer {
public void unregisterListener() { public void unregisterListener() {
// keep in mind that rawProvider can change // keep in mind that rawProvider can change
ILanguageSettingsProvider rawProvider = getRawProvider(); ILanguageSettingsProvider rawProvider = getRawProvider();
if (rawProvider instanceof ICListenerRegisterer) { if (rawProvider instanceof ICListenerAgent) {
((ICListenerRegisterer) rawProvider).unregisterListener(); ((ICListenerAgent) rawProvider).unregisterListener();
} }
} }
} }
@ -313,10 +313,10 @@ public class LanguageSettingsProvidersSerializer {
} }
} }
List<ICListenerRegisterer> oldListeners = selectListeners(rawGlobalWorkspaceProviders.values()); List<ICListenerAgent> oldListeners = selectListeners(rawGlobalWorkspaceProviders.values());
List<ICListenerRegisterer> newListeners = selectListeners(rawProviders); List<ICListenerAgent> newListeners = selectListeners(rawProviders);
for (ICListenerRegisterer oldListener : oldListeners) { for (ICListenerAgent oldListener : oldListeners) {
if (!isObjectInTheList(newListeners, oldListener)) { if (!isObjectInTheList(newListeners, oldListener)) {
LanguageSettingsWorkspaceProvider wspProvider = (LanguageSettingsWorkspaceProvider) globalWorkspaceProviders.get(((ILanguageSettingsProvider)oldListener).getId()); LanguageSettingsWorkspaceProvider wspProvider = (LanguageSettingsWorkspaceProvider) globalWorkspaceProviders.get(((ILanguageSettingsProvider)oldListener).getId());
if (wspProvider != null && wspProvider.getProjectCount() > 0) { if (wspProvider != null && wspProvider.getProjectCount() > 0) {
@ -325,7 +325,7 @@ public class LanguageSettingsProvidersSerializer {
} }
} }
for (ICListenerRegisterer newListener : newListeners) { for (ICListenerAgent newListener : newListeners) {
if (!isObjectInTheList(oldListeners, newListener)) { if (!isObjectInTheList(oldListeners, newListener)) {
LanguageSettingsWorkspaceProvider wspProvider = (LanguageSettingsWorkspaceProvider) globalWorkspaceProviders.get(((ILanguageSettingsProvider)newListener).getId()); LanguageSettingsWorkspaceProvider wspProvider = (LanguageSettingsWorkspaceProvider) globalWorkspaceProviders.get(((ILanguageSettingsProvider)newListener).getId());
if (wspProvider != null && wspProvider.getProjectCount() > 0) { if (wspProvider != null && wspProvider.getProjectCount() > 0) {
@ -854,7 +854,7 @@ projects:
return false; return false;
} }
private static boolean isListenerInTheListOfAssociations(Collection<ListenerAssociation> list, ICListenerRegisterer element) { private static boolean isListenerInTheListOfAssociations(Collection<ListenerAssociation> list, ICListenerAgent element) {
// list.contains(element) won't do it as we are interested in exact object, not in equal object // list.contains(element) won't do it as we are interested in exact object, not in equal object
for (ListenerAssociation la : list) { for (ListenerAssociation la : list) {
if (la.listener == element) if (la.listener == element)
@ -867,14 +867,14 @@ projects:
* Get a providers list including only providers of type ICListenerRegisterer * Get a providers list including only providers of type ICListenerRegisterer
* for a given project description - collecting from all configurations. * for a given project description - collecting from all configurations.
*/ */
private static List<ICListenerRegisterer> getListeners(ICProjectDescription prjDescription) { private static List<ICListenerAgent> getListeners(ICProjectDescription prjDescription) {
List<ICListenerRegisterer> listeners = new ArrayList<ICListenerRegisterer>(); List<ICListenerAgent> listeners = new ArrayList<ICListenerAgent>();
if (prjDescription != null) { if (prjDescription != null) {
for (ICConfigurationDescription cfgDescription : prjDescription.getConfigurations()) { for (ICConfigurationDescription cfgDescription : prjDescription.getConfigurations()) {
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders(); List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
for (ILanguageSettingsProvider provider : providers) { for (ILanguageSettingsProvider provider : providers) {
if (provider instanceof ICListenerRegisterer) { if (provider instanceof ICListenerAgent) {
ICListenerRegisterer listener = (ICListenerRegisterer) provider; ICListenerAgent listener = (ICListenerAgent) provider;
if (!isObjectInTheList(listeners, listener)) { if (!isObjectInTheList(listeners, listener)) {
listeners.add(listener); listeners.add(listener);
} }
@ -885,11 +885,11 @@ projects:
return listeners; return listeners;
} }
private static List<ICListenerRegisterer> selectListeners(Collection<ILanguageSettingsProvider> values) { private static List<ICListenerAgent> selectListeners(Collection<ILanguageSettingsProvider> values) {
List<ICListenerRegisterer> listeners = new ArrayList<ICListenerRegisterer>(); List<ICListenerAgent> listeners = new ArrayList<ICListenerAgent>();
for (ILanguageSettingsProvider provider : values) { for (ILanguageSettingsProvider provider : values) {
if (provider instanceof ICListenerRegisterer) if (provider instanceof ICListenerAgent)
listeners.add((ICListenerRegisterer) provider); listeners.add((ICListenerAgent) provider);
} }
return listeners; return listeners;
} }
@ -903,8 +903,8 @@ projects:
if (prjDescription != null) { if (prjDescription != null) {
for (ICConfigurationDescription cfgDescription : prjDescription.getConfigurations()) { for (ICConfigurationDescription cfgDescription : prjDescription.getConfigurations()) {
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders(); List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
List<ICListenerRegisterer> listeners = selectListeners(providers); List<ICListenerAgent> listeners = selectListeners(providers);
for (ICListenerRegisterer listener : listeners) { for (ICListenerAgent listener : listeners) {
if (!isListenerInTheListOfAssociations(associations, listener)) { if (!isListenerInTheListOfAssociations(associations, listener)) {
associations.add(new ListenerAssociation(listener, cfgDescription)); associations.add(new ListenerAssociation(listener, cfgDescription));
} }
@ -929,10 +929,10 @@ projects:
assertConsistency(oldPrjDescription); // TODO - remove me assertConsistency(oldPrjDescription); // TODO - remove me
assertConsistency(newPrjDescription); // TODO - remove me assertConsistency(newPrjDescription); // TODO - remove me
List<ICListenerRegisterer> oldListeners = getListeners(oldPrjDescription); List<ICListenerAgent> oldListeners = getListeners(oldPrjDescription);
List<ListenerAssociation> newAssociations = getListenersAssociations(newPrjDescription); List<ListenerAssociation> newAssociations = getListenersAssociations(newPrjDescription);
for (ICListenerRegisterer oldListener : oldListeners) { for (ICListenerAgent oldListener : oldListeners) {
if (!isListenerInTheListOfAssociations(newAssociations, oldListener)) { if (!isListenerInTheListOfAssociations(newAssociations, oldListener)) {
int count = 0; int count = 0;
if (oldListener instanceof LanguageSettingsWorkspaceProvider) { if (oldListener instanceof LanguageSettingsWorkspaceProvider) {
@ -950,7 +950,7 @@ projects:
} }
for (ListenerAssociation newListenerAssociation : newAssociations) { for (ListenerAssociation newListenerAssociation : newAssociations) {
ICListenerRegisterer newListener = newListenerAssociation.listener; ICListenerAgent newListener = newListenerAssociation.listener;
if (!isObjectInTheList(oldListeners, newListener)) { if (!isObjectInTheList(oldListeners, newListener)) {
int count = 1; int count = 1;
if (newListener instanceof LanguageSettingsWorkspaceProvider) { if (newListener instanceof LanguageSettingsWorkspaceProvider) {