Author: vrubezhny Date: 2011-09-02 14:00:41 -0400 (Fri, 02 Sep 2011) New Revision: 34500 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 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/messages/messages.properties Log: JBIDE-9634 Replace EL prefixed used in content assist to be #{...} instead of ${...} by default Issue is fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-09-02 17:04:01 UTC (rev 34499) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-09-02 18:00:41 UTC (rev 34500) @@ -718,7 +718,7 @@ * @return default EL prefix */ public String getDefaultELPrefix() { - return EL_DOLLAR_PREFIX; + return EL_NUMBER_PREFIX; } /** 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 2011-09-02 17:04:01 UTC (rev 34499) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-09-02 18:00:41 UTC (rev 34500) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp.contentassist.computers; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -175,8 +176,8 @@ if(!prefix.isELStarted()) { AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, getDefaultELPrefix() + "}" + (prefix.isAttributeValue() && prefix.hasOpenQuote() && !prefix.hasCloseQuote() ? String.valueOf(prefix.getQuoteChar()) : ""), //$NON-NLS-1$ //$NON-NLS-2$ - getOffset(), 0, 2, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_NewELExpression, - null, JstUIMessages.JspContentAssistProcessor_NewELExpressionAttrInfo, TextProposal.R_XML_ATTRIBUTE_VALUE_TEMPLATE); + getOffset(), 0, 2, JSF_EL_PROPOSAL_IMAGE, MessageFormat.format(JstUIMessages.JspContentAssistProcessor_NewELExpression, getDefaultELPrefix()), + null, MessageFormat.format(JstUIMessages.JspContentAssistProcessor_NewELExpressionAttrInfo, getDefaultELPrefix()), TextProposal.R_XML_ATTRIBUTE_VALUE_TEMPLATE); contentAssistRequest.addProposal(proposal); return; @@ -325,8 +326,8 @@ if (prefix == null || !prefix.isELStarted()) { AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, getDefaultELPrefix()+ "}", //$NON-NLS-1$ contentAssistRequest.getReplacementBeginPosition(), - 0, 2, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_NewELExpression, null, - JstUIMessages.FaceletPageContectAssistProcessor_NewELExpressionTextInfo, TextProposal.R_TAG_INSERTION + 1); + 0, 2, JSF_EL_PROPOSAL_IMAGE, MessageFormat.format(JstUIMessages.JspContentAssistProcessor_NewELExpression, getDefaultELPrefix()), null, + MessageFormat.format(JstUIMessages.FaceletPageContectAssistProcessor_NewELExpressionTextInfo, getDefaultELPrefix()), TextProposal.R_TAG_INSERTION + 1); contentAssistRequest.addProposal(proposal); return; @@ -1236,5 +1237,4 @@ protected int getTagInsertionBaseRelevance() { return TextProposal.R_XML_TAG_INSERTION; } - } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2011-09-02 17:04:01 UTC (rev 34499) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2011-09-02 18:00:41 UTC (rev 34500) @@ -21,7 +21,7 @@ ADD_FONT_FAMILY_TIP=Add font family REMOVE_FONT_FAMILY_TIP=Remove font family -FaceletPageContectAssistProcessor_NewELExpressionTextInfo=${} +FaceletPageContectAssistProcessor_NewELExpressionTextInfo={0}\} FONT_FAMILY_DIALOG_TITLE=Choose font family BUTTON_APPLY=Apply BUTTON_CLEAR=Clear @@ -87,8 +87,8 @@ DEFAULT_TEXT_FOR_BROWSER_PREVIEW=Double click to edit preview. JspContentAssistProcessor_CloseELExpression=Close JSF EL Expression JspContentAssistProcessor_CloseELExpressionInfo=} -JspContentAssistProcessor_NewELExpression=New JSF EL Expression - Create a new attribute value with ${} -JspContentAssistProcessor_NewELExpressionAttrInfo=${} +JspContentAssistProcessor_NewELExpression=New JSF EL Expression - Create a new attribute value with {0}\} +JspContentAssistProcessor_NewELExpressionAttrInfo={0}\} JSPDialogCellEditor_CodeAssist=code assist JSPDialogCellEditor_EditAttribute=Edit {0} JSPDialogContentProposalProvider_CloseELExpression=Close EL Expression