MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-250744 IJ-CR-3053 naming fixed

Browse Source 
GitOrigin-RevId: 1374e5fad68439785cc01f71fe18b18414e978f6
This commit is contained in:
Dmitriy.Panov
2020-09-23 16:27:10 +03:00
committed by intellij-monorepo-bot
parent 13ebaea13e
commit d0d48a52c5
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
View File

@@ -54,7 +54,7 @@ public final class ArtifactRepositoryManager {
private static final VersionScheme ourVersioning = new GenericVersionScheme();
private static final JreProxySelector ourProxySelector = new JreProxySelector();
private static final Logger LOG = LoggerFactory.getLogger(ArtifactRepositoryManager.class);
private final RepositorySystemSessionFactory sessionFactory;
private final RepositorySystemSessionFactory mySessionFactory;
private static final RemoteRepository MAVEN_CENTRAL_REPOSITORY = createRemoteRepository(
"central", "https://repo1.maven.org/maven2/"
@@ -97,7 +97,7 @@ public final class ArtifactRepositoryManager {
public ArtifactRepositoryManager(@NotNull File localRepositoryPath, List<RemoteRepository> remoteRepositories, @NotNull ProgressConsumer progressConsumer, boolean offline) {
myRemoteRepositories.addAll(remoteRepositories);
sessionFactory = new RepositorySystemSessionFactory(localRepositoryPath, progressConsumer, offline);
mySessionFactory = new RepositorySystemSessionFactory(localRepositoryPath, progressConsumer, offline);
}
private static class RepositorySystemSessionFactory {
@@ -154,11 +154,11 @@ public final class ArtifactRepositoryManager {
this.defaultSession = session;
}
RepositorySystemSession session() {
return session(Collections.emptyList());
RepositorySystemSession getDefaultSession() {
return defaultSession;
}
RepositorySystemSession session(@NotNull List<String> excludedDependencies) {
RepositorySystemSession createSession(@NotNull List<String> excludedDependencies) {
if (excludedDependencies.isEmpty()) {
return defaultSession;
}
@@ -242,7 +242,7 @@ public final class ArtifactRepositoryManager {
Set<VersionConstraint> constraints = Collections.singleton(asVersionConstraint(versionConstraint));
CollectRequest collectRequest = createCollectRequest(groupId, artifactId, constraints, EnumSet.of(ArtifactKind.ARTIFACT));
ArtifactDependencyTreeBuilder builder = new ArtifactDependencyTreeBuilder();
DependencyNode root = ourSystem.collectDependencies(sessionFactory.session(), collectRequest).getRoot();
DependencyNode root = ourSystem.collectDependencies(mySessionFactory.getDefaultSession(), collectRequest).getRoot();
if (root.getArtifact() == null && root.getChildren().size() == 1) {
root = root.getChildren().get(0);
}
@@ -269,7 +269,7 @@ public final class ArtifactRepositoryManager {
}
RepositorySystemSession session;
if (includeTransitiveDependencies) {
session = sessionFactory.session(excludedDependencies);
session = mySessionFactory.createSession(excludedDependencies);
final CollectResult collectResult = ourSystem.collectDependencies(
session, createCollectRequest(groupId, artifactId, constraints, EnumSet.of(kind))
);
@@ -282,7 +282,7 @@ public final class ArtifactRepositoryManager {
requests = builder.getRequests();
}
else {
session = sessionFactory.session();
session = mySessionFactory.getDefaultSession();
requests = new ArrayList<>();
for (Artifact artifact : toArtifacts(groupId, artifactId, constraints, Collections.singleton(kind))) {
if (ourVersioning.parseVersionConstraint(artifact.getVersion()).getRange() != null) {
@@ -389,7 +389,7 @@ public final class ArtifactRepositoryManager {
@NotNull
public List<Version> getAvailableVersions(String groupId, String artifactId, String versionConstraint, final ArtifactKind artifactKind) throws Exception {
final VersionRangeResult result = ourSystem.resolveVersionRange(
sessionFactory.session(), createVersionRangeRequest(groupId, artifactId, asVersionConstraint(versionConstraint), artifactKind)
mySessionFactory.getDefaultSession(), createVersionRangeRequest(groupId, artifactId, asVersionConstraint(versionConstraint), artifactKind)
);
return result.getVersions();
}