Author: akazakov Date: 2011-07-14 21:01:59 -0400 (Thu, 14 Jul 2011) New Revision: 32930 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/MessagePropertyELSegment.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java Log: https://issues.jboss.org/browse/JBIDE-9307 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 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -16,6 +16,8 @@ import java.util.Set; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.JavaModelException; +import org.jboss.tools.common.el.core.ELCorePlugin; import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; @@ -71,6 +73,11 @@ */ public void setElement(IJavaElement element) { this.element = element; + try { + setResource(element.getUnderlyingResource()); + } catch (JavaModelException e) { + ELCorePlugin.getDefault().logError(e); + } } /** Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.resolver; -import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IFile; import org.jboss.tools.common.text.ITextSourceReference; /** @@ -26,20 +26,20 @@ /** * @return resource of Message Bundle. */ - IResource getMessageBundleResource(); - + IFile getMessageBundleResource(); + /** * @return true if the segment presents message bundle. In this case isProperty() always returns false; */ boolean isBundle(); - + /** * @return true if the segment presents message property. */ boolean isProperty(); - + /** * @return source reference of message property. */ ITextSourceReference getMessagePropertySourceReference(); -} +} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.resolver; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.text.ITextSourceReference; @@ -20,7 +21,7 @@ public class MessagePropertyELSegmentImpl extends ELSegmentImpl implements MessagePropertyELSegment { - private IResource messageBundleResource = null; + private IFile messageBundleResource = null; private ITextSourceReference messagePropertySourceReference = null; private int propertyStart=0, propertyLength=0; private String baseName=null; @@ -30,12 +31,13 @@ super(token); } - public IResource getMessageBundleResource() { + public IFile getMessageBundleResource() { return messageBundleResource; } - public void setMessageBundleResource(IResource resource){ + public void setMessageBundleResource(IFile resource){ messageBundleResource = resource; + setResource(resource); } public void setBundleOnlySegment(boolean set) { @@ -79,4 +81,4 @@ public void setBaseName(String name){ baseName = name; } -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -83,7 +83,7 @@ JSTExtensionsPlugin.getDefault().logError(e); } }else if(segment instanceof MessagePropertyELSegment){ - IFile file = (IFile)((MessagePropertyELSegment)segment).getMessageBundleResource(); + IFile file = ((MessagePropertyELSegment)segment).getMessageBundleResource(); if(file == null) file = (IFile)segment.getResource(); @@ -122,8 +122,9 @@ if ( error != null && error.length() > 0) { openFileFailed(); } - }else + } else { openFileFailed(); + } } private String getPageLocale(IRegion region) {