Author: scabanovich Date: 2012-04-27 16:04:47 -0400 (Fri, 27 Apr 2012) New Revision: 40578 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java Log: JBIDE-11682 https://issues.jboss.org/browse/JBIDE-11682 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-04-27 20:04:09 UTC (rev 40577) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-04-27 20:04:47 UTC (rev 40578) @@ -81,8 +81,6 @@ this.allVars = allVars; } - private static final ELReference[] EMPTY_ARRAY = new ELReference[0]; - /* * (non-Javadoc) * @see org.jboss.tools.jst.web.kb.IXmlContext#getELReferences() @@ -111,10 +109,11 @@ */ @Override public ELReference getELReference(int offset) { - ELReference[] refs = getELReferences(); - for (int i = 0; i < refs.length; i++) { - if(refs[i].getStartPosition()<=offset && (refs[i].getStartPosition() + refs[i].getLength()>offset)) { - return refs[i]; + if(elReferenceSet != null) { + for (ELReference ref: elReferenceSet) { + if(ref.getStartPosition()<=offset && (ref.getStartPosition() + ref.getLength()>offset)) { + return ref; + } } } return null; @@ -123,10 +122,11 @@ @Override public Set<ELReference> getELReferences(IRegion region) { Set<ELReference> references = new HashSet<ELReference>(); - ELReference[] refs = getELReferences(); - for (int i = 0; i < refs.length; i++) { - if(refs[i].getStartPosition()>=region.getOffset() && (refs[i].getStartPosition() + refs[i].getLength()<=region.getOffset() + region.getLength())) { - references.add(refs[i]); + if(elReferenceSet != null) { + for (ELReference ref: elReferenceSet) { + if(ref.getStartPosition()>=region.getOffset() && (ref.getStartPosition() + ref.getLength()<=region.getOffset() + region.getLength())) { + references.add(ref); + } } } return references; Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java 2012-04-27 20:04:09 UTC (rev 40577) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java 2012-04-27 20:04:47 UTC (rev 40578) @@ -23,6 +23,7 @@ * @author Alexey Kazakov */ public class SimpleELContext implements ELContext { + static final ELReference[] EMPTY_ARRAY = new ELReference[0]; protected IFile resource; protected ELResolver[] elResolvers; @@ -89,7 +90,7 @@ * @see org.jboss.tools.common.el.core.resolver.ELContext#getELReferences() */ public ELReference[] getELReferences() { - return null; + return EMPTY_ARRAY; } /*