[jbosstools-commits] JBoss Tools SVN: r17643 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el and 1 other directory.
Author: vrubezhny
Date: 2009-09-17 18:40:05 -0400 (Thu, 17 Sep 2009)
New Revision: 17643
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java
Log:
JBIDE-4897: OpenOn's don't work for EL in xhtml pages.
The open-ons operability is restored
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2009-09-17
21:47:15 UTC (rev 17642)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2009-09-17
22:40:05 UTC (rev 17643)
@@ -105,6 +105,7 @@
*/
public void setMemberInfo(MemberInfo memberInfo) {
this.memberInfo = memberInfo;
+ this.setElement(memberInfo != null ? memberInfo.getJavaElement() : null);
}
/**
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-09-17
21:47:15 UTC (rev 17642)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-09-17
22:40:05 UTC (rev 17643)
@@ -481,7 +481,6 @@
proposals.add(proposal);
}
segment.setMemberInfo(bijectedAttribute!=null?bijectedAttribute:member);
- segment.setElement(bijectedAttribute!=null?bijectedAttribute.getJavaElement():member!=null?member.getJavaElement():null);
segment.getVariables().add(var);
}
// <<<=== JBIDE-512, JBIDE-2541 related changes
@@ -500,7 +499,6 @@
if (member != null && !members.contains(member)) {
members.add(member);
segment.setMemberInfo(member);
- segment.setElement(member.getJavaElement());
segment.getVariables().add(var);
segment.setResolved(true);
}
@@ -527,7 +525,6 @@
}
if(!members.isEmpty()) {
segment.setMemberInfo(members.get(0)); // TODO: This is a buggy way to select a
member to setup in a segment
- segment.setElement(members.get(0).getJavaElement());
}
resolution.addSegment(segment);
} else { // Last segment
@@ -756,7 +753,6 @@
proposalsToFilter.addAll(infos.getMethodPresentations());
proposalsToFilter.addAll(infos.getPropertyPresentations(segment.getUnpairedGettersOrSetters()));
segment.setMemberInfo(mbr);
- segment.setElement(mbr!=null?mbr.getJavaElement():null);
}
for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter) {
// We do expect nothing but name for method tokens (No round brackets)
@@ -773,7 +769,6 @@
kbProposals.add(kbProposal);
segment.setMemberInfo(proposal.getMember());
- segment.setElement(proposal.getMember()!=null?proposal.getMember().getJavaElement():null);
if(segment.getUnpairedGettersOrSetters()!=null) {
TypeInfoCollector.MethodInfo unpirMethod =
segment.getUnpairedGettersOrSetters().get(filter);
segment.clearUnpairedGettersOrSetters();
@@ -829,7 +824,6 @@
WebKbPlugin.getDefault().logError(jme);
}
segment.setMemberInfo(mbr);
- segment.setElement(mbr!=null?mbr.getJavaElement():null);
}
String filter = expr.getMemberName();
@@ -862,7 +856,6 @@
kbProposals.add(kbProposal);
segment.setMemberInfo(proposal.getMember());
- segment.setElement(proposal.getMember()!=null?proposal.getMember().getJavaElement():null);
if(segment.getUnpairedGettersOrSetters()!=null) {
TypeInfoCollector.MethodInfo unpirMethod =
segment.getUnpairedGettersOrSetters().get(filter);
segment.clearUnpairedGettersOrSetters();