MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 00:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed PyPackageManager.findInstalledPackage() into findPackage()

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-09-10 15:29:21 +04:00
parent 26373e942d
commit cc00ea1918
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
View File

@@ -324,7 +324,7 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
String warningText = frameworkName + " will be installed on selected interpreter";
try {
if (onlyWithCache && packageManager.cacheIsNotNull() || !onlyWithCache) {
final PyPackage pip = packageManager.findInstalledPackage("pip", false);
final PyPackage pip = packageManager.findPackage("pip", false);
myInstallFramework = true;
if (pip == null) {
warningText = "pip and " + warningText;

2
python/openapi/src/com/jetbrains/python/packaging/PyPackageManager.java
View File

@@ -70,7 +70,7 @@ public abstract class PyPackageManager {
@Nullable
public abstract List<PyPackage> getPackages(boolean cachedOnly) throws PyExternalProcessException;
@Nullable
public abstract PyPackage findInstalledPackage(String name, boolean cachedOnly) throws PyExternalProcessException;
public abstract PyPackage findPackage(String name, boolean cachedOnly) throws PyExternalProcessException;
@Nullable
public abstract List<PyRequirement> getRequirements(@NotNull Module module);
public abstract Set<PyPackage> getDependents(@NotNull PyPackage pkg) throws PyExternalProcessException;

4
python/openapi/src/com/jetbrains/python/templateLanguages/PyTemplatesUtil.java
View File

@@ -40,7 +40,7 @@ public class PyTemplatesUtil {
if (templateBinding != null) {
if (TemplatesService.ALL_TEMPLATE_BINDINGS.contains(templateBinding)) {
try {
final PyPackage installedPackage = packageManager.findInstalledPackage(templateBinding, false);
final PyPackage installedPackage = packageManager.findPackage(templateBinding, false);
if (installedPackage == null)
return new ValidationResult(templateBinding + " will be installed on selected interpreter");
}
@@ -50,7 +50,7 @@ public class PyTemplatesUtil {
}
if (language != null) {
try {
final PyPackage installedPackage = packageManager.findInstalledPackage(language, false);
final PyPackage installedPackage = packageManager.findPackage(language, false);
if (installedPackage == null) {
return new ValidationResult(language + " will be installed on selected interpreter");
}

2
python/python-rest/src/com/jetbrains/rest/RestPythonUtil.java
View File

@@ -49,7 +49,7 @@ public class RestPythonUtil {
if (sdk != null) {
PyPackageManager manager = PyPackageManager.getInstance(sdk);
try {
final PyPackage sphinx = manager.findInstalledPackage("Sphinx", false);
final PyPackage sphinx = manager.findPackage("Sphinx", false);
presentation.setEnabled(sphinx != null);
}
catch (PyExternalProcessException ignored) {

8
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
View File

@@ -171,12 +171,12 @@ public class PyPackageManagerImpl extends PyPackageManager {
boolean hasSetuptools = false;
boolean hasPip = false;
try {
hasSetuptools = findInstalledPackage(SETUPTOOLS, false) != null;
hasSetuptools = findPackage(SETUPTOOLS, false) != null;
}
catch (PyExternalProcessException ignored) {
}
try {
hasPip = findInstalledPackage(PIP, false) != null;
hasPip = findPackage(PIP, false) != null;
}
catch (PyExternalProcessException ignored) {
}
@@ -315,7 +315,7 @@ public class PyPackageManagerImpl extends PyPackageManager {
@Override
@Nullable
public PyPackage findInstalledPackage(String name, boolean cachedOnly) throws PyExternalProcessException {
public PyPackage findPackage(String name, boolean cachedOnly) throws PyExternalProcessException {
final List<PyPackage> packages = getPackages(cachedOnly);
if (packages != null) {
for (PyPackage pkg : packages) {
@@ -334,7 +334,7 @@ public class PyPackageManagerImpl extends PyPackageManager {
public boolean hasPip(boolean cachedOnly) {
try {
return findInstalledPackage(PACKAGE_PIP, cachedOnly) != null;
return findPackage(PACKAGE_PIP, cachedOnly) != null;
}
catch (PyExternalProcessException e) {
return false;

6
python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java
View File

@@ -86,11 +86,11 @@ public class PyInstalledPackagesPanel extends InstalledPackagesPanel {
PyExternalProcessException exc = null;
try {
PyPackageManager packageManager = PyPackageManager.getInstance(selectedSdk);
myHasSetuptools = packageManager.findInstalledPackage(PyPackageManager.PACKAGE_SETUPTOOLS, false) != null;
myHasSetuptools = packageManager.findPackage(PyPackageManager.PACKAGE_SETUPTOOLS, false) != null;
if (!myHasSetuptools) {
myHasSetuptools = packageManager.findInstalledPackage(PyPackageManager.PACKAGE_DISTRIBUTE, false) != null;
myHasSetuptools = packageManager.findPackage(PyPackageManager.PACKAGE_DISTRIBUTE, false) != null;
}
myHasPip = packageManager.findInstalledPackage(PyPackageManager.PACKAGE_PIP, false) != null;
myHasPip = packageManager.findPackage(PyPackageManager.PACKAGE_PIP, false) != null;
}
catch (PyExternalProcessException e) {
exc = e;

2
python/src/com/jetbrains/python/testing/VFSTestFrameworkListener.java
View File

@@ -132,7 +132,7 @@ public class VFSTestFrameworkListener implements ApplicationComponent {
}
final PyPackageManager packageManager = PyPackageManager.getInstance(sdk);
try {
return packageManager.findInstalledPackage(testPackageName, false) != null;
return packageManager.findPackage(testPackageName, false) != null;
}
catch (PyExternalProcessException e) {
LOG.info("Can't load package list " + e.getMessage());

2
python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationProducer.java
View File

@@ -98,7 +98,7 @@ public class PyTestConfigurationProducer extends PythonTestConfigurationProducer
if (pyClass != null) {
final PyPackageManager packageManager = PyPackageManager.getInstance(sdk);
try {
final PyPackage pytestPackage = packageManager.findInstalledPackage("pytest", false);
final PyPackage pytestPackage = packageManager.findPackage("pytest", false);
if (pytestPackage != null && PackageVersionComparator.VERSION_COMPARATOR.compare(pytestPackage.getVersion(), "2.3.3") >= 0) {
keywords = pyClass.getName() + " and " + keywords;
}