From e5bc58affe2f118668be23ce58a8639b92d97364 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 8 Jan 2020 15:15:01 +0100 Subject: [PATCH] ExtensionPointChangeListener - do not require T as it is not used GitOrigin-RevId: 0a8f6ae7533fef73943bf3cdcae34246b3d0e8af --- .../com/intellij/openapi/extensions/ExtensionPoint.java | 6 +++--- .../openapi/extensions/ExtensionPointChangeListener.java | 5 ++--- .../intellij/openapi/extensions/ExtensionPointName.java | 4 ++-- .../openapi/extensions/ProjectExtensionPointName.java | 4 ++-- .../openapi/extensions/impl/ExtensionPointImpl.java | 4 ++-- .../src/com/intellij/openapi/options/Configurable.java | 8 ++++---- .../intellij/util/xml/impl/DomApplicationComponent.java | 6 +++--- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java index 229592935515..bdacf0d3dd1c 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPoint.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.extensions; import com.intellij.openapi.Disposable; @@ -121,8 +121,8 @@ public interface ExtensionPoint { void addExtensionPointListener(@NotNull ExtensionPointListener listener); void addExtensionPointListener(@NotNull ExtensionPointListener listener, boolean invokeForLoadedExtensions, @Nullable Disposable parentDisposable); - - void addExtensionPointListener(@NotNull ExtensionPointChangeListener listener, boolean invokeForLoadedExtensions, @Nullable Disposable parentDisposable); + + void addExtensionPointListener(@NotNull ExtensionPointChangeListener listener, boolean invokeForLoadedExtensions, @Nullable Disposable parentDisposable); void removeExtensionPointListener(@NotNull ExtensionPointListener extensionPointListener); diff --git a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointChangeListener.java b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointChangeListener.java index e302f5284e05..e5961eb5059b 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointChangeListener.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointChangeListener.java @@ -1,7 +1,6 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.extensions; -@FunctionalInterface -public interface ExtensionPointChangeListener { +public interface ExtensionPointChangeListener { void extensionListChanged(); } diff --git a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java index ab7282b19c9c..0c4905d2407e 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/ExtensionPointName.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.extensions; import com.intellij.openapi.Disposable; @@ -162,7 +162,7 @@ public final class ExtensionPointName extends BaseExtensionPointName { getPointImpl(null).addExtensionPointListener(listener, false, parentDisposable); } - public void addExtensionPointListener(@NotNull ExtensionPointChangeListener listener, + public void addExtensionPointListener(@NotNull ExtensionPointChangeListener listener, @Nullable Disposable parentDisposable) { getPointImpl(null).addExtensionPointListener(listener, false, parentDisposable); } diff --git a/platform/extensions/src/com/intellij/openapi/extensions/ProjectExtensionPointName.java b/platform/extensions/src/com/intellij/openapi/extensions/ProjectExtensionPointName.java index bbb6c65a9058..81d6ef7abc57 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/ProjectExtensionPointName.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/ProjectExtensionPointName.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.extensions; import com.intellij.openapi.Disposable; @@ -65,7 +65,7 @@ public final class ProjectExtensionPointName extends BaseExtensionPointName listener, + @NotNull ExtensionPointChangeListener listener, @Nullable Disposable parentDisposable) { getPointImpl(areaInstance).addExtensionPointListener(listener, false, parentDisposable); } 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 c174436ca787..b351c3cad7de 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.extensions.impl; import com.intellij.diagnostic.ActivityCategory; @@ -719,7 +719,7 @@ public abstract class ExtensionPointImpl implements ExtensionPoint, Iterab } @Override - public void addExtensionPointListener(@NotNull ExtensionPointChangeListener listener, + public void addExtensionPointListener(@NotNull ExtensionPointChangeListener listener, boolean invokeForLoadedExtensions, @Nullable Disposable parentDisposable) { addExtensionPointListener(new ExtensionPointAdapter() { diff --git a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java index bd906d5f3c77..f2d4461d18d1 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java +++ b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.options; import com.intellij.ide.ui.UINumericRange; @@ -121,8 +121,8 @@ import java.util.Collection; * @see ShowSettingsUtil */ public interface Configurable extends UnnamedConfigurable { - ExtensionPointName> APPLICATION_CONFIGURABLE = ExtensionPointName.create("com.intellij.applicationConfigurable"); - ExtensionPointName> PROJECT_CONFIGURABLE = ExtensionPointName.create("com.intellij.projectConfigurable"); + ExtensionPointName> APPLICATION_CONFIGURABLE = new ExtensionPointName<>("com.intellij.applicationConfigurable"); + ExtensionPointName> PROJECT_CONFIGURABLE = new ExtensionPointName<>("com.intellij.projectConfigurable"); /** * Returns the visible name of the configurable component. @@ -187,7 +187,7 @@ public interface Configurable extends UnnamedConfigurable { */ boolean isProjectLevel(); } - + /** * The interface is used for configurable that depends on some dynamic extension points. * If a configurable implements the interface by default the configurable will re-created after adding / removing extensions for the EP. diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java index 7a8b07732d37..b5d9f3cbdaa2 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.util.xml.impl; import com.intellij.openapi.Disposable; @@ -29,7 +29,7 @@ import java.util.Set; /** * @author peter */ -public class DomApplicationComponent { +public final class DomApplicationComponent { private final MultiMap myRootTagName2FileDescription = MultiMap.createSet(); private final Set myAcceptingOtherRootTagNamesDescriptions = new THashSet<>(); private final ImplementationClassCache myCachedImplementationClasses = new ImplementationClassCache(DomImplementationClassEP.EP_NAME); @@ -55,7 +55,7 @@ public class DomApplicationComponent { addChangeListener(DomFileMetaData.EP_NAME, this::extensionsChanged); } - private static void addChangeListener(ExtensionPointName ep, ExtensionPointChangeListener onChange) { + private static void addChangeListener(ExtensionPointName ep, ExtensionPointChangeListener onChange) { Application app = ApplicationManager.getApplication(); if (Disposer.isDisposing(app)) return;