diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java index 138fdf31b55f..fbff2d7a39bd 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java @@ -15,16 +15,19 @@ */ package com.maddyhome.idea.copyright; +import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.fileTypes.FileTypeExtension; +import com.intellij.util.KeyedLazyInstance; import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider; /** * @author yole */ public class CopyrightUpdaters extends FileTypeExtension { + public static final ExtensionPointName> EP_NAME = ExtensionPointName.create("com.intellij.copyright.updater"); public final static CopyrightUpdaters INSTANCE = new CopyrightUpdaters(); private CopyrightUpdaters() { - super("com.intellij.copyright.updater"); + super(EP_NAME); } } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java index 52a07fcad8e3..10130ec76a44 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java @@ -3,19 +3,23 @@ package com.maddyhome.idea.copyright.ui; import com.intellij.ide.IdeBundle; +import com.intellij.openapi.extensions.BaseExtensionPointName; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; +import com.maddyhome.idea.copyright.CopyrightUpdaters; import com.maddyhome.idea.copyright.util.FileTypeUtil; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; -public class CopyrightFormattingConfigurable extends SearchableConfigurable.Parent.Abstract implements Configurable.NoScroll { +public class CopyrightFormattingConfigurable extends SearchableConfigurable.Parent.Abstract implements Configurable.NoScroll, Configurable.WithEpDependencies { private final Project myProject; private TemplateCommentPanel myPanel; @@ -89,4 +93,10 @@ public class CopyrightFormattingConfigurable extends SearchableConfigurable.Pare } return children; } + + @NotNull + @Override + public Collection> getDependencies() { + return Collections.singletonList(CopyrightUpdaters.EP_NAME); + } }