From bc38292ec5ffdfce93bc0a3b1710f91d83ac41d8 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Wed, 26 Jun 2013 20:09:13 +0400 Subject: [PATCH] Remove unnecessary parameter --- .../MavenArtifactCoordinatesConverter.java | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesConverter.java index fa0671340367..2f328a883edf 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesConverter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesConverter.java @@ -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 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; }