Author: vrubezhny Date: 2010-10-01 10:47:13 -0400 (Fri, 01 Oct 2010) New Revision: 25397 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java Log: JBIDE-7169 EL proposals should not be in the beginning of proposal lists in XML editor. Issue is fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2010-10-01 14:28:05 UTC (rev 25396) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2010-10-01 14:47:13 UTC (rev 25397) @@ -155,7 +155,7 @@ if (prefix != null && prefix.isELStarted()) { addTextELProposals(contentAssistRequest, context); } else { - addELPredicateProposals(contentAssistRequest, /*TextProposal.R_TAG_INSERTION*/ XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION, true); + addELPredicateProposals(contentAssistRequest, getTagInsertionBaseRelevance(), true); } } @@ -264,4 +264,9 @@ return tagName; } + @Override + protected int getTagInsertionBaseRelevance() { + return XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION; + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java 2010-10-01 14:28:05 UTC (rev 25396) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java 2010-10-01 14:47:13 UTC (rev 25397) @@ -131,5 +131,10 @@ } } + @Override + protected int getTagInsertionBaseRelevance() { + return TextProposal.R_TAG_INSERTION; + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-10-01 14:28:05 UTC (rev 25396) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-10-01 14:47:13 UTC (rev 25397) @@ -121,7 +121,7 @@ if (prefix != null && prefix.isELStarted()) { addTextELProposals(contentAssistRequest, context); } else { - addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true); + addELPredicateProposals(contentAssistRequest, getTagInsertionBaseRelevance(), true); } } @@ -1109,4 +1109,8 @@ return region; } + protected int getTagInsertionBaseRelevance() { + return TextProposal.R_XML_TAG_INSERTION; + } + }