Author: vrubezhny Date: 2011-08-05 08:25:25 -0400 (Fri, 05 Aug 2011) New Revision: 33630 Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java Log: JBIDE-9288 Open On for bundle messages doesn't work for CDI projects with International Module enabled Multiple hyperlinks enabled for ELs Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java 2011-08-05 12:22:43 UTC (rev 33629) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java 2011-08-05 12:25:25 UTC (rev 33630) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.jst.text.ext.hyperlink; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; @@ -42,7 +44,7 @@ ELContext context = PageContextFactory.createPageContext(file); if(context == null) return null; - + Set<IHyperlink> links = new HashSet<IHyperlink>(); ELReference reference = context.getELReference(region.getOffset()); if(reference != null){ ELInvocationExpression expression = findInvocationExpressionByOffset(reference, region.getOffset()); @@ -54,7 +56,8 @@ ELSegment segment = resolution.findSegmentByOffset(region.getOffset()-reference.getStartPosition()); if(segment != null && segment.isResolved()){ - return new IHyperlink[]{new ELHyperlink(textViewer.getDocument(), reference, segment)}; +// return new IHyperlink[]{new ELHyperlink(textViewer.getDocument(), reference, segment)}; + links.add(new ELHyperlink(textViewer.getDocument(), reference, segment)); } } @@ -62,7 +65,9 @@ } } - return null; + if (links.size() == 0) + return null; + return (IHyperlink[])links.toArray(new IHyperlink[links.size()]); } private ELInvocationExpression findInvocationExpressionByOffset(ELReference reference, int offset){