[facets API] mark some interfaces in Facets API as NonExtendable
authornik <Nikolay.Chashnikov@jetbrains.com>
Fri, 13 Dec 2019 09:51:36 +0000 (12:51 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Fri, 13 Dec 2019 12:03:34 +0000 (12:03 +0000)
They aren't supposed to be overridden in plugins, and such overrides may cause problems when we provide alternative implementation of Facets API via the new workspace model.

GitOrigin-RevId: 2c4b8b01d684ca6453bacce923f171894417954f

13 files changed:
platform/lang-api/src/com/intellij/facet/FacetFinder.java
platform/lang-api/src/com/intellij/facet/FacetManager.java
platform/lang-api/src/com/intellij/facet/FacetModel.java
platform/lang-api/src/com/intellij/facet/FacetModificationTrackingService.java
platform/lang-api/src/com/intellij/facet/ModifiableFacetModel.java
platform/lang-api/src/com/intellij/facet/ProjectFacetManager.java
platform/lang-api/src/com/intellij/facet/ProjectWideFacetListenersRegistry.java
platform/lang-api/src/com/intellij/facet/pointers/FacetPointer.java
platform/lang-api/src/com/intellij/facet/pointers/FacetPointersManager.java
platform/lang-api/src/com/intellij/facet/ui/FacetEditor.java
platform/lang-api/src/com/intellij/facet/ui/FacetEditorContext.java
platform/lang-api/src/com/intellij/facet/ui/FacetValidatorsManager.java
platform/lang-api/src/com/intellij/facet/ui/MultipleFacetEditorHelper.java

index 5c548ee69a1fc6533f34cd7611d9a9f9cc0662bb..aa6a5da704883f77ce71ba750cb85f871f60c157 100644 (file)
@@ -18,16 +18,18 @@ package com.intellij.facet;
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.openapi.util.ModificationTracker;
-import org.jetbrains.annotations.Nullable;
+import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
 /**
  * @author nik
  */
 
 import java.util.Collection;
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public abstract class FacetFinder {
 
   public static FacetFinder getInstance(Project project) {
 public abstract class FacetFinder {
 
   public static FacetFinder getInstance(Project project) {
index 1a340c0d17cc62b3f7e7d46305efda0076d19452..a951999284dcbd63e29f498531af550eb4344914 100644 (file)
@@ -4,12 +4,14 @@ package com.intellij.facet;
 
 import com.intellij.openapi.module.Module;
 import com.intellij.util.messages.Topic;
 
 import com.intellij.openapi.module.Module;
 import com.intellij.util.messages.Topic;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @author nik
  */
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public abstract class FacetManager implements FacetModel {
   public static final Topic<FacetManagerListener> FACETS_TOPIC = Topic.create("facet changes", FacetManagerListener.class, Topic.BroadcastDirection.TO_PARENT);
 
 public abstract class FacetManager implements FacetModel {
   public static final Topic<FacetManagerListener> FACETS_TOPIC = Topic.create("facet changes", FacetManagerListener.class, Topic.BroadcastDirection.TO_PARENT);
 
index 11dda1bcc7c3d19f5449fe4b2de3888fd6227c71..00906988dc65c656067646f658cdb66285aa70c5 100644 (file)
@@ -2,6 +2,7 @@
 
 package com.intellij.facet;
 
 
 package com.intellij.facet;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -10,6 +11,7 @@ import java.util.Collection;
 /**
  * @author nik
  */
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public interface FacetModel {
   /**
    * Returns all facets in the module sorted in such a way that a facet will occur before any of its subfacets
 public interface FacetModel {
   /**
    * Returns all facets in the module sorted in such a way that a facet will occur before any of its subfacets
index 88ac8f6ee8f1673925fea40655d67e3dbe7d80a8..93924a15278c78ce2c47650e8790e076407807f7 100644 (file)
 
 package com.intellij.facet;
 
 
 package com.intellij.facet;
 
-import org.jetbrains.annotations.NotNull;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleServiceManager;
 import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.openapi.util.ModificationTrackerListener;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleServiceManager;
 import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.openapi.util.ModificationTrackerListener;
-import com.intellij.openapi.Disposable;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author nik
  */
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public abstract class FacetModificationTrackingService {
 
   public static FacetModificationTrackingService getInstance(@NotNull Module module) {
 public abstract class FacetModificationTrackingService {
 
   public static FacetModificationTrackingService getInstance(@NotNull Module module) {
index 4664e52adbadfd4f9cff89f22ee675c2217d1a6d..b2123e80bc9f6d32dd377aa8effa0a2d0894a972 100644 (file)
 
 package com.intellij.facet;
 
 
 package com.intellij.facet;
 
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.roots.ProjectModelExternalSource;
 import com.intellij.openapi.roots.ProjectModelExternalSource;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
-import com.intellij.openapi.Disposable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author nik
  */
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public interface ModifiableFacetModel extends FacetModel {
 
   void addFacet(Facet facet);
 public interface ModifiableFacetModel extends FacetModel {
 
   void addFacet(Facet facet);
index 1cbc548d0f22e8cbcb6ced24c351bf9f200237ff..e43d67c568a155eb9618c64d8df2b46a7d11cae9 100644 (file)
@@ -19,6 +19,7 @@ package com.intellij.facet;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -26,6 +27,7 @@ import java.util.List;
 /**
  * @author nik
  */
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public abstract class ProjectFacetManager {
 
   public static ProjectFacetManager getInstance(@NotNull Project project) {
 public abstract class ProjectFacetManager {
 
   public static ProjectFacetManager getInstance(@NotNull Project project) {
index 98c5eb92b119da52c19847fa7890f044b33b8c92..08984fe1883681a5f80dc93617c2c6b13a166c6c 100644 (file)
 
 package com.intellij.facet;
 
 
 package com.intellij.facet;
 
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author nik
  */
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public abstract class ProjectWideFacetListenersRegistry {
 
   public static ProjectWideFacetListenersRegistry getInstance(Project project) {
 public abstract class ProjectWideFacetListenersRegistry {
 
   public static ProjectWideFacetListenersRegistry getInstance(Project project) {
index b741aae7a63037e496a0f130ffa1327536db7124..d14228024a251eb4cbf3085fd682167bee914e3e 100644 (file)
@@ -22,12 +22,14 @@ import com.intellij.openapi.module.ModifiableModuleModel;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.FacetsProvider;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.FacetsProvider;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @author nik
  */
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public interface FacetPointer<F extends Facet> {
 
   @NotNull
 public interface FacetPointer<F extends Facet> {
 
   @NotNull
index f1efa14704cd49cb7d7d7018018ba9302d1d8a92..bdca20ac37e623f55ef68466225880289c575cca 100644 (file)
@@ -4,8 +4,10 @@ package com.intellij.facet.pointers;
 import com.intellij.facet.Facet;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
 import com.intellij.facet.Facet;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import org.jetbrains.annotations.NotNull;
 
+@ApiStatus.NonExtendable
 public abstract class FacetPointersManager {
   public static FacetPointersManager getInstance(Project project) {
     return project.getComponent(FacetPointersManager.class);
 public abstract class FacetPointersManager {
   public static FacetPointersManager getInstance(Project project) {
     return project.getComponent(FacetPointersManager.class);
index ad4d01a261bcba3d82a6ca08e060f3c06a9ba347..3e2c57b00e44c362c671de3538062fefedbe1353 100644 (file)
 
 package com.intellij.facet.ui;
 
 
 package com.intellij.facet.ui;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author nik
  */
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public interface FacetEditor {
 
   FacetEditorTab[] getEditorTabs();
 public interface FacetEditor {
 
   FacetEditorTab[] getEditorTabs();
index 4a479b95747e1c9b79a0df1e88eb2944aa5023e1..86cd6c1b02edfe8bbddb268107baa92f3faadc76 100644 (file)
@@ -29,6 +29,7 @@ import com.intellij.openapi.roots.ui.configuration.FacetsProvider;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -36,6 +37,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author nik
  */
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public interface FacetEditorContext extends UserDataHolder {
 
   @NotNull
 public interface FacetEditorContext extends UserDataHolder {
 
   @NotNull
index f25c30028697807b5c03bcf8d642e695cc897599..150b87a469a464a878f3348ef14235f8ef95f25d 100644 (file)
 
 package com.intellij.facet.ui;
 
 
 package com.intellij.facet.ui;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import javax.swing.*;
 
 /**
  * @author nik
  */
 import javax.swing.*;
 
 /**
  * @author nik
  */
+@ApiStatus.NonExtendable
 public interface FacetValidatorsManager {
 
   void registerValidator(FacetEditorValidator validator, JComponent... componentsToWatch);
 public interface FacetValidatorsManager {
 
   void registerValidator(FacetEditorValidator validator, JComponent... componentsToWatch);
index c4d36af0f33882fd0df1c5951edb46acd5399823..a46e9e0c2a715579860c7ffdaaf8a847f5f340f3 100644 (file)
@@ -18,6 +18,7 @@ package com.intellij.facet.ui;
 
 import com.intellij.util.NotNullFunction;
 import com.intellij.util.ui.ThreeStateCheckBox;
 
 import com.intellij.util.NotNullFunction;
 import com.intellij.util.ui.ThreeStateCheckBox;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -27,6 +28,7 @@ import javax.swing.*;
  *
  * @author nik
  */
  *
  * @author nik
  */
+@ApiStatus.NonExtendable
 public interface MultipleFacetEditorHelper {
 
   /**
 public interface MultipleFacetEditorHelper {
 
   /**