MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WIP plugins: rename

Browse Source 
GitOrigin-RevId: 362b1ffd447677828d7503f5b546fb6a38dbda83
This commit is contained in:
Eugene Petrenko
2021-07-13 17:53:18 +00:00
committed by intellij-monorepo-bot
parent fa8c307fa7
commit 7ee08d5921
10 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/InstallFromDiskAction.java
+3 -3
View File
@@ -3,7 +3,7 @@ package com.intellij.ide.plugins;
import com.intellij.icons.AllIcons;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
@@ -18,7 +18,7 @@ public class InstallFromDiskAction extends DumbAwareAction {
@Override
public void update(@NotNull AnActionEvent e) {
if (!PluginManagerConfigurableForOrg.getInstance().allowInstallFromDisk()) {
if (!PluginManagerFilters.getInstance().allowInstallFromDisk()) {
getTemplatePresentation().setEnabled(false);
getTemplatePresentation().setDescription(IdeBundle.message("action.InstallFromDiskAction.not.allowed.description"));
}
@@ -28,7 +28,7 @@ public class InstallFromDiskAction extends DumbAwareAction {
public void actionPerformed(@NotNull AnActionEvent e) {
Project project = e.getProject();
if (!PluginManagerConfigurableForOrg.getInstance().allowInstallFromDisk()) {
if (!PluginManagerFilters.getInstance().allowInstallFromDisk()) {
Messages.showErrorDialog(project, IdeBundle.message("action.InstallFromDiskAction.not.allowed.description"), IdeBundle.message("action.InstallFromDiskAction.text"));
return;
}
platform/platform-impl/src/com/intellij/ide/plugins/PluginInstallOperation.java
+2 -2
View File
@@ -7,7 +7,7 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.plugins.marketplace.MarketplaceRequests;
import com.intellij.ide.plugins.marketplace.statistics.PluginManagerUsageCollector;
import com.intellij.ide.plugins.marketplace.statistics.enums.InstallationSourceEnum;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationGroup;
import com.intellij.notification.NotificationType;
@@ -236,7 +236,7 @@ public final class PluginInstallOperation {
private boolean prepareToInstall(@NotNull PluginNode pluginNode,
@NotNull List<PluginId> pluginIds) throws IOException {
if (!checkMissingDependencies(pluginNode, pluginIds)) return false;
if (!PluginManagerConfigurableForOrg.getInstance().allowInstallingPlugin(pluginNode)) {
if (!PluginManagerFilters.getInstance().allowInstallingPlugin(pluginNode)) {
LOG.warn("The plugin " + pluginNode.getPluginId() + " is not allowed to install for the organization");
return false;
}
platform/platform-impl/src/com/intellij/ide/plugins/PluginInstaller.java
+2 -2
View File
@@ -8,7 +8,7 @@ import com.intellij.ide.plugins.marketplace.MarketplacePluginDownloadService;
import com.intellij.ide.plugins.marketplace.PluginSignatureChecker;
import com.intellij.ide.plugins.marketplace.statistics.PluginManagerUsageCollector;
import com.intellij.ide.plugins.marketplace.statistics.enums.InstallationSourceEnum;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.application.PathManager;
@@ -246,7 +246,7 @@ public final class PluginInstaller {
return false;
}
if (!PluginManagerConfigurableForOrg.getInstance().allowInstallingPlugin(pluginDescriptor)) {
if (!PluginManagerFilters.getInstance().allowInstallingPlugin(pluginDescriptor)) {
String message = IdeBundle.message("dialog.message.plugin.is.not.allowed", pluginDescriptor.getName());
MessagesEx.showWarningDialog(parent, message, IdeBundle.message("dialog.title.install.plugin"));
return false;
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java
+2 -2
View File
@@ -10,7 +10,7 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.plugins.certificates.PluginCertificateManager;
import com.intellij.ide.plugins.marketplace.MarketplaceRequests;
import com.intellij.ide.plugins.newui.*;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationInfo;
@@ -1689,7 +1689,7 @@ public final class PluginManagerConfigurable
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
if (!PluginManagerConfigurableForOrg.getInstance().allowInstallFromDisk()) {
if (!PluginManagerFilters.getInstance().allowInstallFromDisk()) {
Messages.showErrorDialog(e.getProject(), IdeBundle.message("action.InstallFromDiskAction.not.allowed.description"), IdeBundle.message("action.InstallFromDiskAction.text"));
return;
}
platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java
+2 -2
View File
@@ -4,7 +4,7 @@ package com.intellij.ide.plugins.newui;
import com.intellij.icons.AllIcons;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.plugins.*;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
@@ -89,7 +89,7 @@ public class ListPluginComponent extends JPanel {
myPluginModel = pluginModel;
mySearchListener = searchListener;
myMarketplace = marketplace;
myIsAllowed = PluginManagerConfigurableForOrg.getInstance().isPluginAllowed(!marketplace, plugin);
myIsAllowed = PluginManagerFilters.getInstance().isPluginAllowed(!marketplace, plugin);
pluginModel.addComponent(this);
setOpaque(true);
platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java
+2 -3
View File
@@ -8,7 +8,7 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.IdeEventQueue;
import com.intellij.ide.plugins.*;
import com.intellij.ide.plugins.marketplace.MarketplaceRequests;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.IdeUrlTrackingParametersProvider;
@@ -16,7 +16,6 @@ import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.ex.ApplicationInfoEx;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.HtmlChunk;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.BrowserHyperlinkListener;
@@ -525,7 +524,7 @@ public class PluginDetailsPageComponent extends MultiPanel {
public void showPluginImpl(@NotNull IdeaPluginDescriptor pluginDescriptor, @Nullable IdeaPluginDescriptor updateDescriptor) {
myPlugin = pluginDescriptor;
PluginManagerConfigurableForOrg org = PluginManagerConfigurableForOrg.getInstance();
PluginManagerFilters org = PluginManagerFilters.getInstance();
myUpdateDescriptor = updateDescriptor != null && org.isPluginAllowed(!myMarketplace, updateDescriptor) ? updateDescriptor : null;
myIsPluginAllowed = org.isPluginAllowed(!myMarketplace, pluginDescriptor);
showPlugin();
platform/platform-impl/src/com/intellij/ide/plugins/org/PluginManagerConfigurableForOrg.kt → platform/platform-impl/src/com/intellij/ide/plugins/org/PluginManagerFilters.kt
+2 -2
View File
@@ -13,10 +13,10 @@ import com.intellij.util.xmlb.annotations.XCollection
* restrictions in the UI for the plugin management.
*/
@Service(Service.Level.APP)
class PluginManagerConfigurableForOrg {
class PluginManagerFilters {
companion object {
@JvmStatic
fun getInstance(): PluginManagerConfigurableForOrg = service()
fun getInstance(): PluginManagerFilters = service()
}
private val state
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/InstallAndEnableTask.java
+2 -2
View File
@@ -7,7 +7,7 @@ import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.ide.plugins.PluginNode;
import com.intellij.ide.plugins.RepositoryHelper;
import com.intellij.ide.plugins.marketplace.MarketplaceRequests;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
@@ -48,7 +48,7 @@ final class InstallAndEnableTask extends Task.Modal {
List<IdeaPluginDescriptor> descriptors =
new ArrayList<>(RepositoryHelper.mergePluginsFromRepositories(marketplacePlugins, myCustomPlugins, true));
var org = PluginManagerConfigurableForOrg.getInstance();
var org = PluginManagerFilters.getInstance();
for (IdeaPluginDescriptor descriptor : PluginManagerCore.getPlugins()) {
if (!descriptor.isEnabled() && PluginManagerCore.isCompatible(descriptor) && org.allowInstallingPlugin(descriptor)) {
descriptors.add(descriptor);
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserService.kt
+2 -2
View File
@@ -6,7 +6,7 @@ import com.intellij.ide.plugins.*
import com.intellij.ide.plugins.advertiser.PluginData
import com.intellij.ide.plugins.advertiser.PluginFeatureCacheService
import com.intellij.ide.plugins.marketplace.MarketplaceRequests
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg
import com.intellij.ide.plugins.org.PluginManagerFilters
import com.intellij.ide.ui.PluginBooleanOptionDescriptor
import com.intellij.notification.NotificationAction
import com.intellij.notification.NotificationType
@@ -67,7 +67,7 @@ open class PluginAdvertiserService {
}
}
val org = PluginManagerConfigurableForOrg.getInstance()
val org = PluginManagerFilters.getInstance()
//include disabled plugins
ids.filter { (pluginId, _) ->
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java
+2 -2
View File
@@ -3,7 +3,7 @@ package com.intellij.openapi.updateSettings.impl.pluginsAdvertisement;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.plugins.*;
import com.intellij.ide.plugins.org.PluginManagerConfigurableForOrg;
import com.intellij.ide.plugins.org.PluginManagerFilters;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
@@ -94,7 +94,7 @@ public final class PluginsAdvertiserDialog extends DialogWrapper {
return false;
}
var org = PluginManagerConfigurableForOrg.getInstance();
var org = PluginManagerFilters.getInstance();
var notAllowedToInstallPlugins = nodes
.stream()
.filter(descriptor -> !org.allowInstallingPlugin(descriptor))