From 39431dc5f5965b9bae6dc3acb4ed64c35a0333cc Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 18 Nov 2011 16:12:29 -0500 Subject: [PATCH] Renamed ICListenerRegisterer -> ICListenerAgent --- .../AbstractBuiltinSpecsDetector.java | 4 +- .../providers/MockListenerRegisterer.java | 2 +- ...erRegisterer.java => ICListenerAgent.java} | 2 +- .../LanguageSettingsProvidersSerializer.java | 52 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) rename core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/{ICListenerRegisterer.java => ICListenerAgent.java} (95%) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuiltinSpecsDetector.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuiltinSpecsDetector.java index b4a5c97e452..61a9c158ee6 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuiltinSpecsDetector.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuiltinSpecsDetector.java @@ -27,7 +27,7 @@ import org.eclipse.cdt.core.IConsoleParser; import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.ProblemMarkerInfo; 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.ICElement; 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.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"; private static final int TICKS_STREAM_MONITOR = 100; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockListenerRegisterer.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockListenerRegisterer.java index 4afb94905ef..1a7fb6b6d7a 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockListenerRegisterer.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockListenerRegisterer.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.Assert; /** * 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 class MockListenerManager { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerRegisterer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerAgent.java similarity index 95% rename from core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerRegisterer.java rename to core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerAgent.java index df953e20808..7322baaa4dd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerRegisterer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICListenerAgent.java @@ -18,7 +18,7 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; * Helper class to allow listeners self-register/dispose. Called by cdt core. * TODO - expand in more detail. */ -public interface ICListenerRegisterer { +public interface ICListenerAgent { public void registerListener(ICConfigurationDescription cfgDescription); public void unregisterListener(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java index 165a28722d9..a2f0fefe6ba 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; 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.ILanguageSettingsProvider; 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 class ListenerAssociation { - private ICListenerRegisterer listener; + private ICListenerAgent listener; private ICConfigurationDescription cfgDescription; - public ListenerAssociation(ICListenerRegisterer li, ICConfigurationDescription cfgd) { + public ListenerAssociation(ICListenerAgent li, ICConfigurationDescription cfgd) { listener = li; cfgDescription = cfgd; } } - private static class LanguageSettingsWorkspaceProvider implements ILanguageSettingsProvider, ICListenerRegisterer { + private static class LanguageSettingsWorkspaceProvider implements ILanguageSettingsProvider, ICListenerAgent { private String providerId; private int projectCount = 0; @@ -164,8 +164,8 @@ public class LanguageSettingsProvidersSerializer { public void registerListener(ICConfigurationDescription cfgDescription) { // keep in mind that rawProvider can change ILanguageSettingsProvider rawProvider = getRawProvider(); - if (rawProvider instanceof ICListenerRegisterer) { - ((ICListenerRegisterer) rawProvider).registerListener(null); + if (rawProvider instanceof ICListenerAgent) { + ((ICListenerAgent) rawProvider).registerListener(null); } } @@ -173,8 +173,8 @@ public class LanguageSettingsProvidersSerializer { public void unregisterListener() { // keep in mind that rawProvider can change ILanguageSettingsProvider rawProvider = getRawProvider(); - if (rawProvider instanceof ICListenerRegisterer) { - ((ICListenerRegisterer) rawProvider).unregisterListener(); + if (rawProvider instanceof ICListenerAgent) { + ((ICListenerAgent) rawProvider).unregisterListener(); } } } @@ -313,10 +313,10 @@ public class LanguageSettingsProvidersSerializer { } } - List oldListeners = selectListeners(rawGlobalWorkspaceProviders.values()); - List newListeners = selectListeners(rawProviders); + List oldListeners = selectListeners(rawGlobalWorkspaceProviders.values()); + List newListeners = selectListeners(rawProviders); - for (ICListenerRegisterer oldListener : oldListeners) { + for (ICListenerAgent oldListener : oldListeners) { if (!isObjectInTheList(newListeners, oldListener)) { LanguageSettingsWorkspaceProvider wspProvider = (LanguageSettingsWorkspaceProvider) globalWorkspaceProviders.get(((ILanguageSettingsProvider)oldListener).getId()); 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)) { LanguageSettingsWorkspaceProvider wspProvider = (LanguageSettingsWorkspaceProvider) globalWorkspaceProviders.get(((ILanguageSettingsProvider)newListener).getId()); if (wspProvider != null && wspProvider.getProjectCount() > 0) { @@ -854,7 +854,7 @@ projects: return false; } - private static boolean isListenerInTheListOfAssociations(Collection list, ICListenerRegisterer element) { + private static boolean isListenerInTheListOfAssociations(Collection list, ICListenerAgent element) { // list.contains(element) won't do it as we are interested in exact object, not in equal object for (ListenerAssociation la : list) { if (la.listener == element) @@ -867,14 +867,14 @@ projects: * Get a providers list including only providers of type ICListenerRegisterer * for a given project description - collecting from all configurations. */ - private static List getListeners(ICProjectDescription prjDescription) { - List listeners = new ArrayList(); + private static List getListeners(ICProjectDescription prjDescription) { + List listeners = new ArrayList(); if (prjDescription != null) { for (ICConfigurationDescription cfgDescription : prjDescription.getConfigurations()) { List providers = cfgDescription.getLanguageSettingProviders(); for (ILanguageSettingsProvider provider : providers) { - if (provider instanceof ICListenerRegisterer) { - ICListenerRegisterer listener = (ICListenerRegisterer) provider; + if (provider instanceof ICListenerAgent) { + ICListenerAgent listener = (ICListenerAgent) provider; if (!isObjectInTheList(listeners, listener)) { listeners.add(listener); } @@ -885,11 +885,11 @@ projects: return listeners; } - private static List selectListeners(Collection values) { - List listeners = new ArrayList(); + private static List selectListeners(Collection values) { + List listeners = new ArrayList(); for (ILanguageSettingsProvider provider : values) { - if (provider instanceof ICListenerRegisterer) - listeners.add((ICListenerRegisterer) provider); + if (provider instanceof ICListenerAgent) + listeners.add((ICListenerAgent) provider); } return listeners; } @@ -903,8 +903,8 @@ projects: if (prjDescription != null) { for (ICConfigurationDescription cfgDescription : prjDescription.getConfigurations()) { List providers = cfgDescription.getLanguageSettingProviders(); - List listeners = selectListeners(providers); - for (ICListenerRegisterer listener : listeners) { + List listeners = selectListeners(providers); + for (ICListenerAgent listener : listeners) { if (!isListenerInTheListOfAssociations(associations, listener)) { associations.add(new ListenerAssociation(listener, cfgDescription)); } @@ -929,10 +929,10 @@ projects: assertConsistency(oldPrjDescription); // TODO - remove me assertConsistency(newPrjDescription); // TODO - remove me - List oldListeners = getListeners(oldPrjDescription); + List oldListeners = getListeners(oldPrjDescription); List newAssociations = getListenersAssociations(newPrjDescription); - for (ICListenerRegisterer oldListener : oldListeners) { + for (ICListenerAgent oldListener : oldListeners) { if (!isListenerInTheListOfAssociations(newAssociations, oldListener)) { int count = 0; if (oldListener instanceof LanguageSettingsWorkspaceProvider) { @@ -950,7 +950,7 @@ projects: } for (ListenerAssociation newListenerAssociation : newAssociations) { - ICListenerRegisterer newListener = newListenerAssociation.listener; + ICListenerAgent newListener = newListenerAssociation.listener; if (!isObjectInTheList(oldListeners, newListener)) { int count = 1; if (newListener instanceof LanguageSettingsWorkspaceProvider) {