From c386b8a64d658ea6d71ddd9e8b3e789d68fe0417 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 21 Oct 2011 13:50:38 +0200 Subject: [PATCH] inline PluginsFacade, as the thing it facades is in the same module --- .../impl/FileTemplateManagerImpl.java | 4 +-- .../application/impl/PluginsFacade.java | 29 ------------------- .../com/intellij/diagnostic/ITNReporter.java | 4 +-- .../intellij/diagnostic/IdeErrorsDialog.java | 5 ++-- .../intellij/help/impl/HelpManagerImpl.java | 4 +-- .../intellij/ide/plugins/PluginManager.java | 14 --------- .../com/intellij/idea/IdeaApplication.java | 3 +- .../actionSystem/impl/ActionManagerImpl.java | 9 +++--- .../application/impl/ApplicationImpl.java | 10 ------- .../keymap/impl/ui/ActionsTreeUtil.java | 4 +-- .../openapi/project/impl/ProjectImpl.java | 3 +- .../wm/impl/welcomeScreen/WelcomeScreen.java | 3 +- .../intellij/idea/IdeaTestApplication.java | 15 +--------- 13 files changed, 18 insertions(+), 89 deletions(-) delete mode 100644 platform/platform-api/src/com/intellij/openapi/application/impl/PluginsFacade.java diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java index b1dff37fb479..323560f5efff 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java @@ -21,11 +21,11 @@ import com.intellij.ide.fileTemplates.FileTemplate; import com.intellij.ide.fileTemplates.FileTemplateManager; import com.intellij.ide.fileTemplates.InternalTemplateBean; import com.intellij.ide.plugins.IdeaPluginDescriptorImpl; +import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.plugins.cl.PluginClassLoader; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.PathManager; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.components.ExportableComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; @@ -137,7 +137,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Expo private void loadDefaultTemplates() { final Set processedUrls = new HashSet(); - for (PluginDescriptor plugin : PluginsFacade.INSTANCE.getPlugins()) { + for (PluginDescriptor plugin : PluginManager.getPlugins()) { if (plugin instanceof IdeaPluginDescriptorImpl && ((IdeaPluginDescriptorImpl)plugin).isEnabled()) { final ClassLoader loader = plugin.getPluginClassLoader(); if (loader instanceof PluginClassLoader && ((PluginClassLoader)loader).getUrls().isEmpty()) { diff --git a/platform/platform-api/src/com/intellij/openapi/application/impl/PluginsFacade.java b/platform/platform-api/src/com/intellij/openapi/application/impl/PluginsFacade.java deleted file mode 100644 index b4412a009e04..000000000000 --- a/platform/platform-api/src/com/intellij/openapi/application/impl/PluginsFacade.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.openapi.application.impl; - -import com.intellij.ide.plugins.IdeaPluginDescriptor; -import com.intellij.openapi.extensions.PluginId; - -/** - * @author max - */ -public abstract class PluginsFacade { - public static PluginsFacade INSTANCE; - - public abstract IdeaPluginDescriptor getPlugin(PluginId id); - public abstract IdeaPluginDescriptor[] getPlugins(); -} diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java index ebce38d7310e..a7bd989d84d4 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java @@ -23,12 +23,12 @@ import com.intellij.errorreport.error.NoSuchEAPUserException; import com.intellij.ide.BrowserUtil; import com.intellij.ide.DataManager; import com.intellij.ide.plugins.IdeaPluginDescriptor; +import com.intellij.ide.plugins.PluginManager; import com.intellij.idea.IdeaLogger; import com.intellij.notification.*; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.diagnostic.ErrorReportSubmitter; import com.intellij.openapi.diagnostic.IdeaLoggingEvent; import com.intellij.openapi.diagnostic.SubmittedReportInfo; @@ -216,7 +216,7 @@ public class ITNReporter extends ErrorReportSubmitter { if (t != null) { final PluginId pluginId = IdeErrorsDialog.findPluginId(t); if (pluginId != null) { - final IdeaPluginDescriptor ideaPluginDescriptor = PluginsFacade.INSTANCE.getPlugin(pluginId); + final IdeaPluginDescriptor ideaPluginDescriptor = PluginManager.getPlugin(pluginId); if (ideaPluginDescriptor != null && !ideaPluginDescriptor.isBundled()) { descBuilder.append("Plugin ").append(ideaPluginDescriptor.getName()).append(" version: ").append(ideaPluginDescriptor.getVersion()).append("\n"); } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index 0b28f4bf3888..88a50c44c538 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -14,7 +14,6 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.diagnostic.ErrorReportSubmitter; import com.intellij.openapi.diagnostic.IdeaLoggingEvent; import com.intellij.openapi.diagnostic.Logger; @@ -309,7 +308,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene return; } - IdeaPluginDescriptor plugin = PluginsFacade.INSTANCE.getPlugin(pluginId); + IdeaPluginDescriptor plugin = PluginManager.getPlugin(pluginId); final Ref hasDependants = new Ref(false); PluginManager.checkDependants(plugin, new Function() { @Override @@ -439,7 +438,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene } } else { - text.append(DiagnosticBundle.message("error.list.message.blame.plugin", PluginsFacade.INSTANCE.getPlugin(pluginId).getName())); + text.append(DiagnosticBundle.message("error.list.message.blame.plugin", PluginManager.getPlugin(pluginId).getName())); } text.append(" ").append(DiagnosticBundle.message("error.list.message.info", DateFormatUtil.formatPrettyDateTime(message.getDate()), diff --git a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java index a297003676a9..72c8be14e1f6 100644 --- a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java @@ -20,9 +20,9 @@ import com.intellij.ide.BrowserUtil; import com.intellij.ide.IdeBundle; import com.intellij.ide.plugins.HelpSetPath; import com.intellij.ide.plugins.IdeaPluginDescriptor; +import com.intellij.ide.plugins.PluginManager; import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.application.impl.ApplicationInfoImpl; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.ui.Messages; @@ -86,7 +86,7 @@ public class HelpManagerImpl extends HelpManager { HelpSet helpSet = new HelpSet(null, new URL (urlToHelp)); // merge plugins help sets - IdeaPluginDescriptor[] pluginDescriptors = PluginsFacade.INSTANCE.getPlugins(); + IdeaPluginDescriptor[] pluginDescriptors = PluginManager.getPlugins(); for (IdeaPluginDescriptor pluginDescriptor : pluginDescriptors) { HelpSetPath[] sets = pluginDescriptor.getHelpSets(); for (HelpSetPath hsPath : sets) { diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java index 02dc1b63160b..a1109b41aaa1 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java @@ -28,7 +28,6 @@ import com.intellij.notification.Notifications; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.extensions.LogProvider; @@ -97,16 +96,6 @@ public class PluginManager { public static long startupStart; public static final float PLUGINS_PROGRESS_MAX_VALUE = 0.3f; - public static class Facade extends PluginsFacade { - public IdeaPluginDescriptor getPlugin(PluginId id) { - return PluginManager.getPlugin(id); - } - - public IdeaPluginDescriptor[] getPlugins() { - return PluginManager.getPlugins(); - } - } - private static IdeaPluginDescriptorImpl[] ourPlugins; private static Map ourPluginClasses; @@ -179,9 +168,6 @@ public class PluginManager { try { ClassloaderUtil.clearJarURLCache(); - //noinspection AssignmentToStaticFieldFromInstanceMethod - PluginsFacade.INSTANCE = new Facade(); - Class aClass = Class.forName(mainClass); final Method method = aClass.getDeclaredMethod(methodName, ArrayUtil.EMPTY_STRING_ARRAY.getClass()); method.setAccessible(true); diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java index f756ca8d7f1a..49af8ffddc52 100644 --- a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java +++ b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java @@ -27,7 +27,6 @@ import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.application.impl.ApplicationInfoImpl; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.ExtensionPoint; import com.intellij.openapi.extensions.Extensions; @@ -102,7 +101,7 @@ public class IdeaApplication { protected ApplicationStarter getStarter() { if (myArgs.length > 0) { final Application app = ApplicationManager.getApplication(); - PluginsFacade.INSTANCE.getPlugins(); //TODO[max] make it clearer plugins should initialize before querying for extpoints. + PluginManager.getPlugins(); ExtensionPoint point = Extensions.getRootArea().getExtensionPoint(ExtensionPoints.APPLICATION_STARTER); final ApplicationStarter[] starters = point.getExtensions(); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java index 12b77c7f07b2..48cd2a40ea03 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java @@ -31,7 +31,6 @@ import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.ex.ApplicationManagerEx; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.PluginId; @@ -198,7 +197,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat private void registerPluginActions() { - final IdeaPluginDescriptor[] plugins = PluginsFacade.INSTANCE.getPlugins(); + final IdeaPluginDescriptor[] plugins = PluginManager.getPlugins(); for (IdeaPluginDescriptor plugin : plugins) { if (PluginManager.shouldSkipPlugin(plugin)) continue; final List elementList = plugin.getActionsDescriptionElements(); @@ -329,7 +328,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat */ @Nullable private AnAction processActionElement(Element element, final ClassLoader loader, PluginId pluginId) { - final IdeaPluginDescriptor plugin = PluginsFacade.INSTANCE.getPlugin(pluginId); + final IdeaPluginDescriptor plugin = PluginManager.getPlugin(pluginId); ResourceBundle bundle = getActionsResourceBundle(loader, plugin); if (!ACTION_ELEMENT_NAME.equals(element.getName())) { @@ -471,7 +470,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat } private AnAction processGroupElement(Element element, final ClassLoader loader, PluginId pluginId) { - final IdeaPluginDescriptor plugin = PluginsFacade.INSTANCE.getPlugin(pluginId); + final IdeaPluginDescriptor plugin = PluginManager.getPlugin(pluginId); ResourceBundle bundle = getActionsResourceBundle(loader, plugin); if (!GROUP_ELEMENT_NAME.equals(element.getName())) { @@ -932,7 +931,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat @NonNls private static String getPluginInfo(@Nullable PluginId id) { if (id != null) { - final IdeaPluginDescriptor plugin = PluginsFacade.INSTANCE.getPlugin(id); + final IdeaPluginDescriptor plugin = PluginManager.getPlugin(id); if (plugin != null) { String name = plugin.getName(); if (name == null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java index 5eeb81bbae05..255322e13048 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java @@ -207,16 +207,6 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application mySplash = splash; myName = appName; - PluginsFacade.INSTANCE = new PluginsFacade() { - public IdeaPluginDescriptor getPlugin(PluginId id) { - return PluginManager.getPlugin(id); - } - - public IdeaPluginDescriptor[] getPlugins() { - return PluginManager.getPlugins(); - } - }; - myIsInternal = isInternal; myTestModeFlag = isUnitTestMode; myHeadlessMode = isHeadless; diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java index 31c2d54b3ac7..53464e46d5fa 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java @@ -17,11 +17,11 @@ package com.intellij.openapi.keymap.impl.ui; import com.intellij.ide.actionMacro.ActionMacro; import com.intellij.ide.plugins.IdeaPluginDescriptor; +import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.ui.search.SearchUtil; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.actionSystem.ex.QuickList; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.extensions.PluginId; @@ -73,7 +73,7 @@ public class ActionsTreeUtil { final KeymapManagerEx keymapManager = KeymapManagerEx.getInstanceEx(); ActionManagerEx managerEx = ActionManagerEx.getInstanceEx(); final List plugins = new ArrayList(); - Collections.addAll(plugins, PluginsFacade.INSTANCE.getPlugins()); + Collections.addAll(plugins, PluginManager.getPlugins()); Collections.sort(plugins, new Comparator() { public int compare(IdeaPluginDescriptor o1, IdeaPluginDescriptor o2) { return o1.getName().compareTo(o2.getName()); diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java index 6c46ebbcbccd..24895f4689d0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java @@ -26,7 +26,6 @@ import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.application.impl.ApplicationInfoImpl; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.components.StorageScheme; import com.intellij.openapi.components.TrackingPathMacroSubstitutor; @@ -206,7 +205,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { } public void loadProjectComponents() { - final IdeaPluginDescriptor[] plugins = PluginsFacade.INSTANCE.getPlugins(); + final IdeaPluginDescriptor[] plugins = PluginManager.getPlugins(); for (IdeaPluginDescriptor plugin : plugins) { if (PluginManager.shouldSkipPlugin(plugin)) continue; loadComponentsConfiguration(plugin.getProjectComponents(), plugin, isDefault()); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java index adc9e96b5547..5ea3982072cd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java @@ -25,7 +25,6 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ActionButtonLook; import com.intellij.openapi.actionSystem.impl.PresentationFactory; import com.intellij.openapi.application.ex.ApplicationInfoEx; -import com.intellij.openapi.application.impl.PluginsFacade; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.io.FileUtil; @@ -352,7 +351,7 @@ public class WelcomeScreen implements Disposable { private void createListOfPlugins(final JPanel installedPluginsPanel, final JPanel bundledPluginsPanel) { //Create the list of installed plugins List installedPlugins = - new ArrayList(Arrays.asList(PluginsFacade.INSTANCE.getPlugins())); + new ArrayList(Arrays.asList(PluginManager.getPlugins())); if (installedPlugins.size() == 0) { addListItemToPlugins(installedPluginsPanel, diff --git a/platform/testFramework/src/com/intellij/idea/IdeaTestApplication.java b/platform/testFramework/src/com/intellij/idea/IdeaTestApplication.java index 26a92b02d5d5..12d368da4731 100644 --- a/platform/testFramework/src/com/intellij/idea/IdeaTestApplication.java +++ b/platform/testFramework/src/com/intellij/idea/IdeaTestApplication.java @@ -15,7 +15,6 @@ */ package com.intellij.idea; -import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.DataProvider; @@ -23,8 +22,6 @@ import com.intellij.openapi.application.Result; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; -import com.intellij.openapi.application.impl.PluginsFacade; -import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.Nullable; @@ -33,16 +30,6 @@ public class IdeaTestApplication extends CommandLineApplication implements Dispo private IdeaTestApplication() { super(true, true, true); - - PluginsFacade.INSTANCE = new PluginsFacade() { - public IdeaPluginDescriptor getPlugin(PluginId id) { - return PluginManager.getPlugin(id); - } - - public IdeaPluginDescriptor[] getPlugins() { - return PluginManager.getPlugins(); - } - }; } public void setDataProvider(@Nullable DataProvider dataContext) { @@ -57,7 +44,7 @@ public class IdeaTestApplication extends CommandLineApplication implements Dispo public static synchronized IdeaTestApplication getInstance(@Nullable final String configPath) { if (ourInstance == null) { new IdeaTestApplication(); - PluginsFacade.INSTANCE.getPlugins(); //initialization + PluginManager.getPlugins(); final ApplicationEx app = ApplicationManagerEx.getApplicationEx(); new WriteAction() { protected void run(Result result) throws Throwable {