Author: vrubezhny Date: 2011-11-11 11:21:46 -0500 (Fri, 11 Nov 2011) New Revision: 36304 Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java Log: JBIDE-9910 Proposal info for message bundles in code completion for EL Fix CA for java element/bean proposals in Java files (Fixed issue causing JUnit Test org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1676Test to fail) Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2011-11-11 14:51:41 UTC (rev 36303) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2011-11-11 16:21:46 UTC (rev 36304) @@ -581,7 +581,7 @@ elEndPosition = limit; } limit = documentContent.indexOf('}', offset - ref.getStartPosition()); - if (limit != -1 && elEndPosition != -1 && limit < elEndPosition) { + if (limit != -1 && (elEndPosition == -1 || (elEndPosition != -1 && limit < elEndPosition))) { elEndPosition = limit+1; } String restOfEL = elEndPosition == -1 ? "" : documentContent.substring(offset - ref.getStartPosition(), elEndPosition); //$NON-NLS-1$