From 0db6222faf228eb156ae047a028c77b477995b53 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 5 Feb 2019 07:44:09 +0100 Subject: [PATCH] make names more consistent --- .../extensions/impl/ExtensionPointImpl.java | 58 ++++++++++--------- .../impl/InterfaceExtensionPoint.java | 2 +- 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java index 1ad0c1f282f8..9693bab18773 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java @@ -41,12 +41,18 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { protected final ExtensionsAreaImpl myOwner; private final PluginDescriptor myDescriptor; - @NotNull protected Set myExtensionAdapters = Collections.emptySet(); // guarded by this + // guarded by this + @NotNull + protected Set myAdapters = Collections.emptySet(); + + @NotNull + // guarded by this + private List myLoadedAdapters = Collections.emptyList(); + @SuppressWarnings("unchecked") @NotNull - private ExtensionPointListener[] myEPListeners = ExtensionPointListener.EMPTY_ARRAY; // guarded by this - @NotNull - private List myLoadedAdapters = Collections.emptyList(); // guarded by this + // guarded by this + private ExtensionPointListener[] myListeners = ExtensionPointListener.EMPTY_ARRAY; @Nullable protected Class myExtensionClass; @@ -143,7 +149,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { } private void notifyListenersOnAdd(@NotNull T extension, @Nullable PluginDescriptor pluginDescriptor) { - for (ExtensionPointListener listener : myEPListeners) { + for (ExtensionPointListener listener : myListeners) { try { listener.extensionAdded(extension, pluginDescriptor); } @@ -200,7 +206,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { return !cache.isEmpty(); } synchronized (this) { - return myExtensionAdapters.size() + myLoadedAdapters.size() > 0; + return myAdapters.size() + myLoadedAdapters.size() > 0; } } @@ -210,7 +216,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { if (processingAdaptersNow) { throw new IllegalStateException("Recursive processAdapters() detected. You must have called 'getExtensions()' from within your extension constructor - don't. Either pass extension via constructor parameter or call getExtensions() later."); } - int totalSize = myExtensionAdapters.size() + myLoadedAdapters.size(); + int totalSize = myAdapters.size() + myLoadedAdapters.size(); Class extensionClass = getExtensionClass(); @SuppressWarnings("unchecked") T[] result = (T[])Array.newInstance(extensionClass, totalSize); @@ -221,11 +227,11 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { processingAdaptersNow = true; try { ExtensionComponentAdapter[] adapters = new ExtensionComponentAdapter[totalSize]; - myExtensionAdapters.toArray(adapters); - ArrayUtil.copy(myLoadedAdapters, adapters, myExtensionAdapters.size()); + myAdapters.toArray(adapters); + ArrayUtil.copy(myLoadedAdapters, adapters, myAdapters.size()); LoadingOrder.sort(adapters); - myExtensionAdapters = new LinkedHashSet<>(adapters.length); - ContainerUtil.addAll(myExtensionAdapters, adapters); + myAdapters = new LinkedHashSet<>(adapters.length); + ContainerUtil.addAll(myAdapters, adapters); Set loaded = ContainerUtil.newHashOrEmptySet(myLoadedAdapters); OpenTHashSet duplicates = new OpenTHashSet<>(adapters.length); @@ -263,9 +269,9 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { catch (Exception e) { LOG.error(e); } - myExtensionAdapters.remove(adapter); + myAdapters.remove(adapter); } - myExtensionAdapters = Collections.emptySet(); + myAdapters = Collections.emptySet(); if (extensionIndex != result.length) { result = Arrays.copyOf(result, extensionIndex); @@ -279,7 +285,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { // used in upsource public synchronized void removeUnloadableExtensions() { - ExtensionComponentAdapter[] adapters = myExtensionAdapters.toArray(ExtensionComponentAdapter.EMPTY_ARRAY); + ExtensionComponentAdapter[] adapters = myAdapters.toArray(ExtensionComponentAdapter.EMPTY_ARRAY); for (ExtensionComponentAdapter adapter : adapters) { try { adapter.getComponentImplementation(); @@ -322,7 +328,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { @Override public synchronized void unregisterExtension(@NotNull Class extensionClass) { - for (ExtensionComponentAdapter adapter : ContainerUtil.concat(myExtensionAdapters, myLoadedAdapters)) { + for (ExtensionComponentAdapter adapter : ContainerUtil.concat(myAdapters, myLoadedAdapters)) { if (adapter.getAssignableToClassName().equals(extensionClass.getCanonicalName())) { unregisterExtensionAdapter(adapter); return; @@ -352,7 +358,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { } private void notifyListenersOnRemove(@NotNull T extensionObject, PluginDescriptor pluginDescriptor) { - for (ExtensionPointListener listener : myEPListeners) { + for (ExtensionPointListener listener : myListeners) { try { listener.extensionRemoved(extensionObject, pluginDescriptor); } @@ -384,15 +390,15 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { // true if added private boolean addListener(@NotNull ExtensionPointListener listener) { - if (ArrayUtil.indexOf(myEPListeners, listener) != -1) return false; + if (ArrayUtil.indexOf(myListeners, listener) != -1) return false; //noinspection unchecked - myEPListeners = ArrayUtil.append(myEPListeners, listener, n->n==0?ExtensionPointListener.EMPTY_ARRAY:new ExtensionPointListener[n]); + myListeners = ArrayUtil.append(myListeners, listener, n-> n == 0 ? ExtensionPointListener.EMPTY_ARRAY : new ExtensionPointListener[n]); return true; } private boolean removeListener(@NotNull ExtensionPointListener listener) { - if (ArrayUtil.indexOf(myEPListeners, listener) == -1) return false; + if (ArrayUtil.indexOf(myListeners, listener) == -1) return false; //noinspection unchecked - myEPListeners = ArrayUtil.remove(myEPListeners, listener, n->n==0?ExtensionPointListener.EMPTY_ARRAY:new ExtensionPointListener[n]); + myListeners = ArrayUtil.remove(myListeners, listener, n-> n == 0 ? ExtensionPointListener.EMPTY_ARRAY : new ExtensionPointListener[n]); return true; } @@ -435,7 +441,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { @Override public synchronized void reset() { - myExtensionAdapters = Collections.emptySet(); + myAdapters = Collections.emptySet(); for (T extension : getExtensionList()) { unregisterExtension(extension); } @@ -468,10 +474,10 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { } synchronized void registerExtensionAdapter(@NotNull ExtensionComponentAdapter adapter) { - if (myExtensionAdapters == Collections.emptySet()) { - myExtensionAdapters = new LinkedHashSet<>(); + if (myAdapters == Collections.emptySet()) { + myAdapters = new LinkedHashSet<>(); } - myExtensionAdapters.add(adapter); + myAdapters.add(adapter); clearCache(); } @@ -482,7 +488,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { private void unregisterExtensionAdapter(@NotNull ExtensionComponentAdapter adapter) { try { - if (!myExtensionAdapters.isEmpty() && myExtensionAdapters.remove(adapter)) { + if (!myAdapters.isEmpty() && myAdapters.remove(adapter)) { return; } @@ -532,7 +538,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { @TestOnly final synchronized void notifyAreaReplaced(@NotNull ExtensionsArea oldArea) { - for (final ExtensionPointListener listener : myEPListeners) { + for (final ExtensionPointListener listener : myListeners) { if (listener instanceof ExtensionPointAndAreaListener) { ((ExtensionPointAndAreaListener)listener).areaReplaced(oldArea); } diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionPoint.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionPoint.java index 1113b3925358..c2bf41f3733f 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionPoint.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionPoint.java @@ -32,7 +32,7 @@ public final class InterfaceExtensionPoint extends ExtensionPointImpl { @Override public synchronized void reset() { - for (Object extensionAdapter : myExtensionAdapters) { + for (Object extensionAdapter : myAdapters) { myOwner.getPicoContainer().unregisterComponent(((ComponentAdapter)extensionAdapter).getComponentKey()); } super.reset();