From 4f7c4ea8c0ed499e287920a9b60fc703bb5ac99b Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 5 Apr 2012 12:34:06 +0400 Subject: [PATCH] revert badly implementation of IDEA-53817 (Environment variable is red (not set) despite the fact it is used in profile .) --- .../references/MavenPropertyPsiReference.java | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java index 0147445d81a1..ea987636dded 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java @@ -23,7 +23,6 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.psi.*; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; @@ -63,12 +62,12 @@ public class MavenPropertyPsiReference extends MavenPsiReference { protected final MavenDomProjectModel myProjectDom; protected final MavenProject myMavenProject; - private Boolean mySoft; + private final boolean mySoft; public MavenPropertyPsiReference(MavenProject mavenProject, PsiElement element, String text, TextRange range, boolean isSoft) { super(element, text, range); myMavenProject = mavenProject; - mySoft = isSoft ? true : null; + mySoft = isSoft; myProjectDom = MavenDomUtil.getMavenDomProjectModel(myProject, mavenProject.getFile()); } @@ -431,34 +430,7 @@ public class MavenPropertyPsiReference extends MavenPsiReference { @Override public boolean isSoft() { - Boolean res = mySoft; - if (res == null) { - XmlTag xmlTag = PsiTreeUtil.getParentOfType(getElement(), XmlTag.class); - while (xmlTag != null) { - if (xmlTag.getName().equals("profile")) { - XmlTag activation = xmlTag.findFirstSubTag("activation"); - if (activation != null) { - for (XmlTag propertyTag : activation.findSubTags("property")) { - XmlTag nameTag = propertyTag.findFirstSubTag("name"); - if (nameTag != null) { - if (nameTag.getValue().getTrimmedText().equals(myText)) { - res = true; - break; - } - } - } - } - break; - } - - xmlTag = xmlTag.getParentTag(); - } - - if (res == null) res = false; - mySoft = res; - } - - return res; + return mySoft; } private interface SchemaProcessor {