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

Remove unnecessary parameter

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-06-26 20:56:20 +04:00
parent 38f56df8d4
commit bc38292ec5
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesConverter.java
+11 -16
View File
@@ -54,7 +54,7 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
if (s == null) return null;
MavenId id = MavenArtifactCoordinatesHelper.getId(context);
MavenProjectIndicesManager manager = MavenProjectIndicesManager.getInstance(getProject(context));
MavenProjectIndicesManager manager = MavenProjectIndicesManager.getInstance(context.getProject());
return selectStrategy(context).isValid(id, manager, context) ? s : null;
}
@@ -67,7 +67,7 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
@NotNull
public Collection<String> getVariants(ConvertContext context) {
MavenProjectIndicesManager manager = MavenProjectIndicesManager.getInstance(getProject(context));
MavenProjectIndicesManager manager = MavenProjectIndicesManager.getInstance(context.getProject());
MavenId id = MavenArtifactCoordinatesHelper.getId(context);
MavenDomShortArtifactCoordinates coordinates = MavenArtifactCoordinatesHelper.getCoordinates(context);
@@ -79,17 +79,12 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
@Override
public PsiElement resolve(String o, ConvertContext context) {
Project p = getProject(context);
MavenId id = MavenArtifactCoordinatesHelper.getId(context);
PsiFile result = selectStrategy(context).resolve(p, id, context);
PsiFile result = selectStrategy(context).resolve(id, context);
return result != null ? result : super.resolve(o, context);
}
private static Project getProject(ConvertContext context) {
return context.getFile().getProject();
}
@Override
public String getErrorMessage(@Nullable String s, ConvertContext context) {
return selectStrategy(context).getContextName() + " '''" + MavenArtifactCoordinatesHelper.getId(context) + "''' not found";
@@ -181,9 +176,9 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
return doGetVariants(id, manager);
}
public PsiFile resolve(Project project, MavenId id, ConvertContext context) {
MavenProjectsManager projectsManager = MavenProjectsManager.getInstance(project);
PsiManager psiManager = PsiManager.getInstance(project);
public PsiFile resolve(MavenId id, ConvertContext context) {
PsiManager psiManager = context.getPsiManager();
MavenProjectsManager projectsManager = MavenProjectsManager.getInstance(psiManager.getProject());
PsiFile result = resolveBySpecifiedPath();
if (result != null) return result;
@@ -227,7 +222,7 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
private class ProjectStrategy extends ConverterStrategy {
@Override
public PsiFile resolve(Project project, MavenId id, ConvertContext context) {
public PsiFile resolve(MavenId id, ConvertContext context) {
return null;
}
@@ -268,8 +263,8 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
}
@Override
public PsiFile resolve(Project project, MavenId id, ConvertContext context) {
PsiFile res = super.resolve(project, id, context);
public PsiFile resolve(MavenId id, ConvertContext context) {
PsiFile res = super.resolve(id, context);
if (res != null) return res;
DomElement parent = context.getInvocationElement().getParent();
@@ -285,7 +280,7 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
if (mavenProject != null) {
for (MavenArtifact artifact : mavenProject.getDependencies()) {
if (dependencyId.equals(DependencyConflictId.create(artifact))) {
return super.resolve(project, new MavenId(id.getGroupId(), id.getArtifactId(), artifact.getVersion()), context);
return super.resolve(new MavenId(id.getGroupId(), id.getArtifactId(), artifact.getVersion()), context);
}
}
}
@@ -330,7 +325,7 @@ public abstract class MavenArtifactCoordinatesConverter extends ResolvingConvert
private class ExclusionStrategy extends ConverterStrategy {
@Override
public PsiFile resolve(Project project, MavenId id, ConvertContext context) {
public PsiFile resolve(MavenId id, ConvertContext context) {
return null;
}