mirror of
https://gitflic.ru/project/openide/openide.git
synced 2025-12-16 22:51:17 +07:00
[python] removed duplicated statistics collection group (PY-57292, FUS-2053)
python.packages.dialog used to duplicate package.management.ui and ui.dialogs GitOrigin-RevId: ffd186bed9a3748bff170896bbe186069d9d707b
This commit is contained in:
committed by
intellij-monorepo-bot
parent
ae0413924c
commit
3246953b6a
@@ -493,7 +493,6 @@
|
|||||||
<toolWindowExtractorMode id="Python Packages" mode="mirror"/>
|
<toolWindowExtractorMode id="Python Packages" mode="mirror"/>
|
||||||
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.sdk.add.PyAddNewEnvCollector"/>
|
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.sdk.add.PyAddNewEnvCollector"/>
|
||||||
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.packaging.statistics.PythonPackagesToolwindowStatisticsCollector"/>
|
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.packaging.statistics.PythonPackagesToolwindowStatisticsCollector"/>
|
||||||
<statistics.counterUsagesCollector implementationClass="com.jetbrains.python.packaging.statistics.PythonPackagesDialogStatisticsCollector"/>
|
|
||||||
|
|
||||||
<vcs.envCustomizer implementation="com.jetbrains.python.sdk.PyVirtualEnvVcsCustomizer"/>
|
<vcs.envCustomizer implementation="com.jetbrains.python.sdk.PyVirtualEnvVcsCustomizer"/>
|
||||||
|
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
|
||||||
package com.jetbrains.python.packaging.statistics
|
|
||||||
|
|
||||||
import com.intellij.internal.statistic.eventLog.EventLogGroup
|
|
||||||
import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector
|
|
||||||
|
|
||||||
class PythonPackagesDialogStatisticsCollector : CounterUsagesCollector() {
|
|
||||||
override fun getGroup(): EventLogGroup = GROUP
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
private val GROUP = EventLogGroup("python.packages.dialog", 1)
|
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
val packagingOperationEvent = GROUP.registerEvent("packages.changed")
|
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
val packagingDialogEvent = GROUP.registerEvent("dialog.opened")
|
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
val packageUninstalledEvent = GROUP.registerEvent("package.uninstalled")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -19,7 +19,6 @@ import com.intellij.webcore.packaging.*;
|
|||||||
import com.jetbrains.python.PyBundle;
|
import com.jetbrains.python.PyBundle;
|
||||||
import com.jetbrains.python.PySdkBundle;
|
import com.jetbrains.python.PySdkBundle;
|
||||||
import com.jetbrains.python.packaging.*;
|
import com.jetbrains.python.packaging.*;
|
||||||
import com.jetbrains.python.packaging.statistics.PythonPackagesDialogStatisticsCollector;
|
|
||||||
import com.jetbrains.python.packaging.bridge.PythonPackageManagementServiceBridge;
|
import com.jetbrains.python.packaging.bridge.PythonPackageManagementServiceBridge;
|
||||||
import com.jetbrains.python.sdk.PySdkExtKt;
|
import com.jetbrains.python.sdk.PySdkExtKt;
|
||||||
import com.jetbrains.python.sdk.PythonSdkUtil;
|
import com.jetbrains.python.sdk.PythonSdkUtil;
|
||||||
@@ -258,28 +257,4 @@ public class PyInstalledPackagesPanel extends InstalledPackagesPanel {
|
|||||||
protected @NotNull PackagesNotificationPanel createNotificationPanel() {
|
protected @NotNull PackagesNotificationPanel createNotificationPanel() {
|
||||||
return new PyPackagesNotificationPanel();
|
return new PyPackagesNotificationPanel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected @NotNull ManagePackagesDialog createManagePackagesDialog() {
|
|
||||||
PythonPackagesDialogStatisticsCollector.getPackagingDialogEvent().log(myProject);
|
|
||||||
return new ManagePackagesDialog(myProject,
|
|
||||||
myPackageManagementService,
|
|
||||||
new PackageManagementService.Listener() {
|
|
||||||
@Override
|
|
||||||
public void operationStarted(String packageName) {
|
|
||||||
PythonPackagesDialogStatisticsCollector.getPackagingOperationEvent().log(myProject);
|
|
||||||
myNotificationArea.hide();
|
|
||||||
myPackagesTable.setPaintBusy(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void operationFinished(String packageName,
|
|
||||||
@Nullable PackageManagementService.ErrorDescription errorDescription) {
|
|
||||||
myNotificationArea.showResult(packageName, errorDescription);
|
|
||||||
myPackagesTable.clearSelection();
|
|
||||||
doUpdatePackages(myPackageManagementService);
|
|
||||||
}
|
|
||||||
}, createNotificationPanel());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import com.jetbrains.python.PySdkBundle;
|
|||||||
import com.jetbrains.python.packaging.*;
|
import com.jetbrains.python.packaging.*;
|
||||||
import com.jetbrains.python.packaging.PyPIPackageUtil.PackageDetails;
|
import com.jetbrains.python.packaging.PyPIPackageUtil.PackageDetails;
|
||||||
import com.jetbrains.python.packaging.requirement.PyRequirementRelation;
|
import com.jetbrains.python.packaging.requirement.PyRequirementRelation;
|
||||||
import com.jetbrains.python.packaging.statistics.PythonPackagesDialogStatisticsCollector;
|
|
||||||
import com.jetbrains.python.psi.LanguageLevel;
|
import com.jetbrains.python.psi.LanguageLevel;
|
||||||
import com.jetbrains.python.sdk.PythonSdkType;
|
import com.jetbrains.python.sdk.PythonSdkType;
|
||||||
import com.jetbrains.python.sdk.PythonSdkUtil;
|
import com.jetbrains.python.sdk.PythonSdkUtil;
|
||||||
@@ -242,7 +241,6 @@ public class PyPackageManagementService extends PackageManagementServiceEx {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void uninstallPackages(List<? extends InstalledPackage> installedPackages, @NotNull Listener listener) {
|
public void uninstallPackages(List<? extends InstalledPackage> installedPackages, @NotNull Listener listener) {
|
||||||
PythonPackagesDialogStatisticsCollector.getPackageUninstalledEvent().log(myProject);
|
|
||||||
final String packageName = installedPackages.size() == 1 ? installedPackages.get(0).getName() : null;
|
final String packageName = installedPackages.size() == 1 ? installedPackages.get(0).getName() : null;
|
||||||
final PyPackageManagerUI ui = new PyPackageManagerUI(myProject, mySdk, new PyPackageManagerUI.Listener() {
|
final PyPackageManagerUI ui = new PyPackageManagerUI(myProject, mySdk, new PyPackageManagerUI.Listener() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user