[jbosstools-commits] JBoss Tools SVN: r33305 - in trunk: jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink and 1 other directory.
Author: vrubezhny
Date: 2011-07-28 11:02:21 -0400 (Thu, 28 Jul 2011)
New Revision: 33305
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
Log:
JBIDE-9087
Support of Bundles bean in CDI projects with Seam International module.
Fixed few resolution issues that break the resolution on long-named variables
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2011-07-28
15:02:19 UTC (rev 33304)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2011-07-28
15:02:21 UTC (rev 33305)
@@ -195,7 +195,9 @@
resolvedVariables = resolvedVars;
resolution.setLastResolvedToken(left);
- ELSegmentImpl segment = new ELSegmentImpl(combineLexicalTokensForExpression(left));
+ JSF2CCAttrELSegmentImpl segment = new
JSF2CCAttrELSegmentImpl(combineLexicalTokensForExpression(left));
+ segment.setVarName(left.toString());
+ segment.setResource(this.currentFile);
segment.setResolved(true);
resolution.addSegment(segment);
@@ -420,7 +422,7 @@
ELResolutionImpl resolution,
boolean returnEqualedVariablesOnly) {
Set<TextProposal> kbProposals = new
TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER);
-
+
JSF2CCAttrELSegmentImpl segment = new JSF2CCAttrELSegmentImpl(expr.getFirstToken());
segment.setResource(this.currentFile);
segment.setVarName(expr.toString());
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-28
15:02:19 UTC (rev 33304)
+++
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-28
15:02:21 UTC (rev 33305)
@@ -13,16 +13,20 @@
import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.resolver.ELSegment;
import org.jboss.tools.common.el.core.resolver.IOpenableReference;
import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment;
+import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
import org.jboss.tools.jst.text.ext.JSTExtensionsPlugin;
public class ELHyperlink extends AbstractHyperlink{
@@ -60,6 +64,20 @@
return;
}
+ // Open by ITextSourceReference
+ ITextSourceReference ref = segment.getSourceReference();
+ if (ref != null) {
+ IResource r = ref.getResource();
+ IFile file = r instanceof IFile ? (IFile)r : null;
+ if (file == null || !file.exists() || !file.isAccessible()) {
+ openFileFailed();
+ return;
+ }
+ if (openFileInEditor(file) != null && ref.getStartPosition() >=0 &&
ref.getLength() > 0) {
+ StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(new
Region(ref.getStartPosition(), ref.getLength()));
+ return;
+ }
+ }
}
private String trimQuotes(String value) {