Author: vrubezhny Date: 2011-08-12 18:05:46 -0400 (Fri, 12 Aug 2011) New Revision: 33870 Removed: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 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/FaceletsELCompletionProposalComputer.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/contentassist/computers/XmlTagCompletionProposalComputer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java Log: (JBIDE-9501) Some JST/VPE editos classes use deprecated content assist processors code Deprecated classes were removed Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -1,1245 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.jsp.contentassist; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.filebuffers.FileBuffers; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.jface.text.contentassist.IContextInformationValidator; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; -import org.eclipse.wst.xml.ui.internal.XMLUIMessages; -import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; -import org.jboss.tools.common.el.core.model.ELInstance; -import org.jboss.tools.common.el.core.model.ELInvocationExpression; -import org.jboss.tools.common.el.core.model.ELModel; -import org.jboss.tools.common.el.core.model.ELUtil; -import org.jboss.tools.common.el.core.parser.ELParser; -import org.jboss.tools.common.el.core.parser.ELParserUtil; -import org.jboss.tools.common.el.core.resolver.ELContext; -import org.jboss.tools.common.el.core.resolver.ELResolver; -import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager; -import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.web.kb.KbQuery; -import org.jboss.tools.jst.web.kb.KbQuery.Type; -import org.jboss.tools.jst.web.kb.internal.KbProject; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -@Deprecated -@SuppressWarnings("restriction") -abstract public class AbstractXMLContentAssistProcessor extends AbstractContentAssistProcessor { - private static final char[] PROPOSAL_AUTO_ACTIVATION_CHARS = new char[] { - '<', '=', '"', '\'', '.', '{' - }; - - private IDocument fDocument; - private int fDocumentPosition; - private ELContext fContext; - - protected final static ICompletionProposal[] EMPTY_PROPOSAL_LIST = new ICompletionProposal[0]; - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int) - */ - @Override - public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, - int offset) { - this.fDocument = (viewer == null ? null : viewer.getDocument()); - this.fDocumentPosition = offset; - this.fContext = createContext(); - - IFile resource = fContext == null ? null : fContext.getResource(); - KbProject.checkKBBuilderInstalled(resource); - return super.computeCompletionProposals(viewer, offset); - } - - /** - * The reason of overriding is that the method returns wrong region in case of incomplete tag (a tag with no '>'-closing char) - * In this case we have to return that previous incomplete tag instead of the current tag) - */ - public IStructuredDocumentRegion getStructuredDocumentRegion(int pos) { - IStructuredDocumentRegion sdRegion = null; - if (fDocument == null) - return null; - - int lastOffset = pos; - IStructuredDocument doc = (IStructuredDocument) fDocument; - - do { - sdRegion = doc.getRegionAtCharacterOffset(lastOffset); - if (sdRegion != null) { - ITextRegion region = sdRegion.getRegionAtCharacterOffset(lastOffset); - if (region != null && region.getType() == DOMRegionContext.XML_TAG_OPEN && - sdRegion.getStartOffset(region) == lastOffset) { - // The offset is at the beginning of the region - if ((sdRegion.getStartOffset(region) == sdRegion.getStartOffset()) && (sdRegion.getPrevious() != null) && (!sdRegion.getPrevious().isEnded())) { - // Is the region also the start of the node? If so, the - // previous IStructuredDocumentRegion is - // where to look for a useful region. -// sdRegion = sdRegion.getPrevious(); - sdRegion = null; - } - else { - // Is there no separating whitespace from the previous region? - // If not, - // then that region is the important one - ITextRegion previousRegion = sdRegion.getRegionAtCharacterOffset(lastOffset - 1); - if ((previousRegion != null) && (previousRegion != region) && (previousRegion.getTextLength() == previousRegion.getLength())) { -// sdRegion = sdRegion.getPrevious(); - sdRegion = null; - } - } - } - } - lastOffset--; - } while (sdRegion == null && lastOffset >= 0); - return sdRegion; - } - - /** - * The reason of overriding is that the method returns wrong region in case of incomplete tag (a tag with no '>'-closing char) - * In this case we have to return that previous incomplete tag instead of the current tag) - */ - protected ITextRegion getCompletionRegion(int documentPosition, Node domnode) { - if (domnode == null) { - return null; - } - // Get the original WTP Structured Document Region - IStructuredDocumentRegion sdNormalRegion = super.getStructuredDocumentRegion(documentPosition); - // Get Fixed Structured Document Region - IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(documentPosition); - - // If original and fixed regions are different we have to replace domnode with its parent node - if (sdFixedRegion != null && !sdFixedRegion.equals(sdNormalRegion)) { - Node prevnode = domnode.getParentNode(); - if (prevnode != null) { - domnode = prevnode; - } - } - - return super.getCompletionRegion(documentPosition, domnode); - } - - protected ITextRegion getCompletionRegion(int offset, IStructuredDocumentRegion sdRegion) { - ITextRegion region = super.getCompletionRegion(offset, sdRegion); - if (region != null && region.getType() == DOMRegionContext.UNDEFINED) { - // FIX: JBIDE-2332 CA with proposal list for comonent's atributes doesn't work before double quotes. - // Sometimes, especially if we have a broken XML node, the region returned has UNDEFINED type. - // If so, we're try to use the prevoius region, which probably will be the region of type XML_TAG_NAME. - - ITextRegion previousRegion = sdRegion.getRegionAtCharacterOffset(offset - 1); - if ((previousRegion != null) && (previousRegion != region) && (previousRegion.getTextLength() < previousRegion.getLength())) { - region = previousRegion; - } - } - return region; - } - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeTagNameProposals(int, java.lang.String, org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion, org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode, org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode) - */ - protected ContentAssistRequest computeTagNameProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) { - ContentAssistRequest contentAssistRequest = null; - IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition); - - if (sdRegion != nodeAtOffset.getFirstStructuredDocumentRegion()) { - // completing the *first* tag in "<tagname1 |<tagname2" - IDOMNode actualNode = (IDOMNode) node.getModel().getIndexedRegion(sdRegion.getStartOffset(completionRegion)); - if (actualNode != null) { - if (actualNode.getFirstStructuredDocumentRegion() == sdRegion) { - // start tag - if ((documentPosition >= sdRegion.getStartOffset(completionRegion) + completionRegion.getLength()) && - (documentPosition > sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength())){ - // it's attributes - contentAssistRequest = newContentAssistRequest(actualNode, actualNode, sdRegion, completionRegion, documentPosition - matchString.length(), matchString.length(), matchString); - if (node.getStructuredDocument().getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getType() == DOMRegionContext.XML_TAG_OPEN) { - addAttributeNameProposals(contentAssistRequest); - } - addTagCloseProposals(contentAssistRequest); - } - else { - // it's name - contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, documentPosition - matchString.length(), matchString.length(), matchString); - addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(actualNode)); - } - } - else { - if (documentPosition >= sdRegion.getStartOffset(completionRegion) + completionRegion.getLength()) { - // insert name - contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString); - } - else { - // replace name - contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString); - } - addEndTagNameProposals(contentAssistRequest); - } - } - } - else { - if (documentPosition > sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength()) { - // unclosed tag with only a name; should prompt for attributes - // and a close instead - contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, documentPosition - matchString.length(), matchString.length(), matchString); - addAttributeNameProposals(contentAssistRequest); - addTagCloseProposals(contentAssistRequest); - } - else { - if (sdRegion.getRegions().get(0).getType() != DOMRegionContext.XML_END_TAG_OPEN) { - int replaceLength = documentPosition - sdRegion.getStartOffset(completionRegion); - contentAssistRequest = newContentAssistRequest(node, node.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), replaceLength, matchString); - addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(nodeAtOffset)); - } - else { - IDOMNode actualNode = (IDOMNode) node.getModel().getIndexedRegion(documentPosition); - if (actualNode != null) { - if (documentPosition >= sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength()) { - contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString); - } - else { - contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString); - } - addEndTagNameProposals(contentAssistRequest); - } - } - } - } - return contentAssistRequest; - } - - private int getElementPositionForModelQuery(Node child) { - return getElementPosition(child); - // return -1; - } - /** - * Helper method to reuse functionality for getting context when no proposals are needed. - * @param viewer - * @param offset - */ - public void createContext(ITextViewer viewer, int offset) { - this.fDocument = (viewer == null ? null : viewer.getDocument()); - this.fDocumentPosition = offset; - this.fContext = createContext(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int) - */ - @Override - public IContextInformation[] computeContextInformation(ITextViewer viewer, - int offset) { - this.fDocument = (viewer == null ? null : viewer.getDocument()); - this.fDocumentPosition = offset; - this.fContext = createContext(); - - return super.computeContextInformation(viewer, offset); - } - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#getMatchString(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion, org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion, int) - */ - @Override - protected String getMatchString(IStructuredDocumentRegion parent, ITextRegion aRegion, int offset) { - if (aRegion == null) return ""; //$NON-NLS-1$ - String matchString = super.getMatchString(parent, aRegion, offset); - String regionType = aRegion.getType(); - if(regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchString.startsWith("\"")) { //$NON-NLS-1$ - matchString = matchString.substring(1); - } - return matchString; - } - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#getCompletionProposalAutoActivationCharacters() - */ - @Override - public char[] getCompletionProposalAutoActivationCharacters() { - return PROPOSAL_AUTO_ACTIVATION_CHARS; - } - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#getContextInformationAutoActivationCharacters() - */ - @Override - public char[] getContextInformationAutoActivationCharacters() { - return super.getContextInformationAutoActivationCharacters(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#getContextInformationValidator() - */ - @Override - public IContextInformationValidator getContextInformationValidator() { - return super.getContextInformationValidator(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#getErrorMessage() - */ - @Override - public String getErrorMessage() { - return super.getErrorMessage(); - } - - - - /* the methods to be overriden in derived classes */ - - - - /** - * Calculates and adds the attribute name proposals to the Content Assist Request object - */ - protected void addAttributeNameProposals(ContentAssistRequest contentAssistRequest) { - } - - /** - * Calculates and adds the attribute value proposals to the Content Assist Request object - */ - protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { -// System.out.println("AbstractXMLContentAssistProcessor: addAttributeValueProposals() invoked"); //$NON-NLS-1$ -/* - IDOMNode node = (IDOMNode) contentAssistRequest.getNode(); - - // Find the attribute region and name for which this position should - // have a value proposed - IStructuredDocumentRegion open = node.getFirstStructuredDocumentRegion(); - ITextRegionList openRegions = open.getRegions(); - int i = openRegions.indexOf(contentAssistRequest.getRegion()); - if (i < 0) { - return; - } - ITextRegion nameRegion = null; - while (i >= 0) { - nameRegion = openRegions.get(i--); - if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { - break; - } - } - - // the name region is REQUIRED to do anything useful - if (nameRegion != null) { - // Retrieve the declaration - CMElementDeclaration elementDecl = getCMElementDeclaration(node); - - // String attributeName = nameRegion.getText(); - String attributeName = open.getText(nameRegion); - String currentValue = node.getAttributes().getNamedItem(attributeName).getNodeValue(); - String currentValueText = ((IDOMAttr)node.getAttributes().getNamedItem(attributeName)).getValueRegionText(); - ITextRegion currentValueRegion = ((IDOMAttr)node.getAttributes().getNamedItem(attributeName)).getValueRegion(); - - - - ITextRegion invokeRegion = contentAssistRequest.getRegion(); - int pos = contentAssistRequest.getRegion().getStart(); - int replBegin = contentAssistRequest.getReplacementBeginPosition(); - int invokeRegionEnd = invokeRegion.getStart() + invokeRegion.getLength(); - IDOMAttr attrNode = (IDOMAttr)node.getAttributes().getNamedItem(attributeName); - int valueRegionStartOffset = attrNode.getValueRegionStartOffset(); - ITextRegion eqRegion = attrNode.getEqualRegion(); - int eqRegionEnd= eqRegion.getStart() + eqRegion.getLength(); - int attrValueEnd=eqRegionEnd + currentValueText.length(); - int attrTextEnd = invokeRegion.getTextEnd(); - // attrNode.getValueRegionText() - } - else { - setErrorMessage(UNKNOWN_CONTEXT); - } - */ - } - - /* - * Calculates and adds the comment proposals to the Content Assist Request object - */ - protected void addCommentProposal(ContentAssistRequest contentAssistRequest) { - } - - /* - * Calculates and adds the doc type proposals to the Content Assist Request object - */ - protected void addDocTypeProposal(ContentAssistRequest contentAssistRequest) { - } - - /* - * Calculates and adds the empty document proposals to the Content Assist Request object - */ - protected void addEmptyDocumentProposals(ContentAssistRequest contentAssistRequest) { - } - - /* - * Calculates and adds the tag name proposals to the Content Assist Request object - */ - protected void addEndTagNameProposals(ContentAssistRequest contentAssistRequest) { - } - - /* - * Calculates and adds the end tag proposals to the Content Assist Request object - */ - protected void addEndTagProposals(ContentAssistRequest contentAssistRequest) { - } - - /* - * Calculates and adds the enttity proposals to the Content Assist Request object - */ - protected void addEntityProposals(ContentAssistRequest contentAssistRequest, int documentPosition, ITextRegion completionRegion, IDOMNode treeNode) { - super.addEntityProposals(contentAssistRequest, documentPosition, completionRegion, treeNode); - } - - /* - * Calculates and adds the PCDATA proposals to the Content Assist Request object - */ - protected void addPCDATAProposal(String nodeName, ContentAssistRequest contentAssistRequest) { - } - - /* - * Calculates and adds the start document proposals to the Content Assist Request object - */ - protected void addStartDocumentProposals(ContentAssistRequest contentAssistRequest) { - } - - /* - * Calculates and adds the tag close proposals to the Content Assist Request object - * - */ - protected void addTagCloseProposals(ContentAssistRequest contentAssistRequest) { - IDOMNode node = (IDOMNode) contentAssistRequest.getParent(); - if (node.getNodeType() == Node.ELEMENT_NODE) { - int contentType = CMElementDeclaration.ANY; - // if it's XML and content doesn't HAVE to be element, add "/>" - // proposal. - boolean endWithSlashBracket = (getXML(node) && (contentType != CMElementDeclaration.ELEMENT)); - - Image image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC); - - // is the start tag ended properly? - if ((contentAssistRequest.getDocumentRegion() == node.getFirstStructuredDocumentRegion()) && !(node.getFirstStructuredDocumentRegion()).isEnded()) { - setErrorMessage(null); - // prompt with a close for the start tag - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, ">", //$NON-NLS-1$ - getOffset(), - 0, 2, image, NLS.bind(XMLUIMessages.Close_with__, (new Object[]{" '>'"})), //$NON-NLS-1$ - null, null, TextProposal.R_CLOSE_TAG); - contentAssistRequest.addProposal(proposal); - - // prompt with the closer for the start tag and an end tag - // if one is not present - if (node.getEndStructuredDocumentRegion() == null) { - // make sure tag name is actually what it thinks it - // is...(eg. <%@ vs. <jsp:directive) - IStructuredDocumentRegion sdr = contentAssistRequest.getDocumentRegion(); - String openingTagText = (sdr != null) ? sdr.getFullText() : ""; //$NON-NLS-1$ - if ((openingTagText != null) && (openingTagText.indexOf(node.getNodeName()) != -1)) { - proposal = new AutoContentAssistantProposal(true, "></" + node.getNodeName() + ">", //$NON-NLS-2$//$NON-NLS-1$ - getOffset(), - 0, 1, image, NLS.bind(XMLUIMessages.Close_with____, (new Object[]{node.getNodeName()})), null, null, TextProposal.R_CLOSE_TAG); - contentAssistRequest.addProposal(proposal); - } - } - // prompt with slash bracket "/>" incase if it's a self - // ending tag - if (endWithSlashBracket) { - proposal = new AutoContentAssistantProposal(true, "/>", //$NON-NLS-1$ - getOffset(), - 0, 1, image, NLS.bind(XMLUIMessages.Close_with__, (new Object[]{" \"/>\""})), //$NON-NLS-1$ - null, null, TextProposal.R_CLOSE_TAG + 1); // +1 to bring to top of list - contentAssistRequest.addProposal(proposal); - } - } - else if ((contentAssistRequest.getDocumentRegion() == node.getLastStructuredDocumentRegion()) && !node.getLastStructuredDocumentRegion().isEnded()) { - setErrorMessage(null); - // prompt with a closing end character for the end tag - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, ">", //$NON-NLS-1$ - getOffset(), - 0, 1, image, NLS.bind(XMLUIMessages.Close_with__, (new Object[]{" '>'"})), //$NON-NLS-1$ - null, null, TextProposal.R_CLOSE_TAG); - contentAssistRequest.addProposal(proposal); - } - } - else if (node.getNodeType() == Node.DOCUMENT_NODE) { - setErrorMessage(UNKNOWN_CONTEXT); - } - } - - /* - * Calculates and adds the tag insertion proposals to the Content Assist Request object - */ - protected void addTagInsertionProposals(ContentAssistRequest contentAssistRequest, int childPosition) { - } - - /** - * Calculates and adds the tag name proposals to the Content Assist Request object - * - * @param contentAssistRequest - * @param childPosition - */ - abstract protected void addTagNameProposals(ContentAssistRequest contentAssistRequest, int childPosition); - - - /** - * Calculates and adds the EL proposals in attribute value to the Content Assist Request object - * - * @param contentAssistRequest - */ - abstract protected void addAttributeValueELProposals(ContentAssistRequest contentAssistRequest); - - /** - * Calculates and adds the EL proposals in text to the Content Assist Request object - * - * @param contentAssistRequest - */ - abstract protected void addTextELProposals(ContentAssistRequest contentAssistRequest); - - /* - * (non-Javadoc) - * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeCompletionProposals(int, java.lang.String, org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion, org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode, org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode) - */ - protected ContentAssistRequest computeCompletionProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode) { - ContentAssistRequest contentAssistRequest = super.computeCompletionProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); - if (contentAssistRequest == null) { - IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition); - contentAssistRequest = newContentAssistRequest((Node) treeNode, treeNode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, ""); //$NON-NLS-1$ - } - - String regionType = completionRegion.getType(); - - /* - * Jeremy: Add attribute name proposals before empty tag close - */ - if ((xmlnode.getNodeType() == Node.ELEMENT_NODE) || (xmlnode.getNodeType() == Node.DOCUMENT_NODE)) { - if (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { - addAttributeNameProposals(contentAssistRequest); - } else if ((regionType == DOMRegionContext.XML_CONTENT) - || (regionType == DOMRegionContext.XML_CHAR_REFERENCE) - || (regionType == DOMRegionContext.XML_ENTITY_REFERENCE) - || (regionType == DOMRegionContext.XML_PE_REFERENCE) - || (regionType == DOMRegionContext.BLOCK_TEXT) - || (regionType == DOMRegionContext.XML_END_TAG_OPEN)) { - addTextELProposals(contentAssistRequest); - } - } - - return contentAssistRequest; - } - - - protected ContentAssistRequest computeAttributeValueProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) { - ContentAssistRequest contentAssistRequest = super.computeAttributeValueProposals(documentPosition, matchString, completionRegion, nodeAtOffset, node); - - IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition); - if ((documentPosition <= sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength()) || - (sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength() == sdRegion.getStartOffset(completionRegion) + completionRegion.getLength())) { - // setup to replace the existing value - if (nodeAtOffset.getFirstStructuredDocumentRegion().isEnded() || (documentPosition >= sdRegion.getStartOffset(completionRegion))) { - addAttributeValueELProposals(contentAssistRequest); - } - } - return contentAssistRequest; - } - - /** - * Creates and fulfills the <code>org.jboss.tools.common.el.core.resolver.ELContext</code> - * instance - * - * @return - */ - abstract protected ELContext createContext(); - - - /** - * Creates and fulfills the <code>org.jboss.tools.jst.web.kb.KbQuery</code> - * instance - * Important: the Context is to be set before any call to createKbQuery - * - * @return - */ - - /** - * Returns the <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance. The prefix and URI for the tags - * are calculated from the current node - * - * @param type One of the <code>org.jboss.tools.jst.web.kb.KbQuery.Type</code> values - * @param query The value for query - * @param stringQuery the full text of the query value - * - * @return The <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance - */ - abstract protected KbQuery createKbQuery(Type type, String query, String stringQuery); - - /** - * Returns the <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance - * - * @param type One of the <code>org.jboss.tools.jst.web.kb.KbQuery.Type</code> values - * @param query The value for query - * @param prefix the prefix for the tag - * @param uri the URI for the tag - * - * @return The <code>org.jboss.tools.jst.web.kb.KbQuery</code> instance - */ - abstract protected KbQuery createKbQuery(Type type, String query, String stringQuery, String prefix, String uri); - - /** - * Returns the <code>org.jboss.tools.common.el.core.resolver.ELContext</code> instance - * - * @return - */ - protected ELContext getContext() { - return this.fContext; - } - - /** - * Returns the document position where the CA is invoked - * @return - */ - protected int getOffset() { - return this.fDocumentPosition; - } - - /** - * Returns the document - * - * @return - */ - protected IDocument getDocument() { - return this.fDocument; - } - - /** - * Returns IFile resource of the document - * - * @return - */ - protected IFile getResource() { - IStructuredModel sModel = StructuredModelManager.getModelManager().getExistingModelForRead(getDocument()); - try { - if (sModel != null) { - String baseLocation = sModel.getBaseLocation(); - IPath location = new Path(baseLocation).makeAbsolute(); - return FileBuffers.getWorkspaceFileAtLocation(location); - } - } - finally { - if (sModel != null) { - sModel.releaseFromRead(); - } - } - return null; - } - - /** - * Returns array of the <code>org.jboss.tools.common.el.core.resolver.ELResolver</code> - * instances. - * - * @param resource - * @return - */ - protected ELResolver[] getELResolvers(IResource resource) { - if (resource == null) - return null; - - ELResolverFactoryManager elrfm = ELResolverFactoryManager.getInstance(); - return elrfm.getResolvers(resource); - } - - private static final String[] EMPTY_TAGS = new String[0]; - /** - * Returns array of the parent tags - * - * @return - */ - public String[] getParentTags(boolean includeThisTag) { - List<String> parentTags = new ArrayList<String>(); - - IStructuredModel sModel = StructuredModelManager - .getModelManager() - .getExistingModelForRead(getDocument()); - try { - if (sModel == null) - return EMPTY_TAGS; - - Document xmlDocument = (sModel instanceof IDOMModel) - ? ((IDOMModel) sModel).getDocument() - : null; - - if (xmlDocument == null) - return EMPTY_TAGS; - - - Node n = null; - if (includeThisTag) { - n = findNodeForOffset(xmlDocument, getOffset()); - } else { - // Get Fixed Structured Document Region - IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset()); - if (sdFixedRegion == null) - return EMPTY_TAGS; - - n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset()); - } - if (n == null) - return EMPTY_TAGS; - - // Find the first parent tag - if (!(n instanceof Element)) { - if (n instanceof Attr) { - n = ((Attr) n).getOwnerElement(); - } else { - n = n.getParentNode(); - } - } else if (!includeThisTag) { - n = n.getParentNode(); - } - - // Store all the parents - while (n != null && n instanceof Element) { - String tagName = getTagName(n); - parentTags.add(0, tagName); - n = n.getParentNode(); - } - - return (String[])parentTags.toArray(new String[parentTags.size()]); - } finally { - if (sModel != null) { - sModel.releaseFromRead(); - } - } - } - - protected String getTagName(Node tag) { - return tag.getNodeName(); - } - - /** - * Returns name of the parent attribute/tag name - * - * @return - */ - protected String getParent(boolean returnAttributeName, boolean returnThisElement) { - IStructuredModel sModel = StructuredModelManager - .getModelManager() - .getExistingModelForRead(getDocument()); - try { - if (sModel == null) - return null; - - Document xmlDocument = (sModel instanceof IDOMModel) - ? ((IDOMModel) sModel).getDocument() - : null; - - if (xmlDocument == null) - return null; - - Node n = null; - if (returnAttributeName) { - n = findNodeForOffset(xmlDocument, getOffset()); - } else { - // Get Fixed Structured Document Region - IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset()); - if (sdFixedRegion == null) - return null; - - n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset()); - } - - if (n == null) - return null; - - // Find the first parent tag - if (!(n instanceof Element)) { - if (n instanceof Attr) { - if (returnAttributeName) { - String parentAttrName = n.getNodeName(); - return parentAttrName; - } - n = ((Attr) n).getOwnerElement(); - } else { - n = n.getParentNode(); - } - } else { - if (!returnThisElement) - n = n.getParentNode(); - } - if (n == null) - return null; - - String parentTagName = getTagName(n); - return parentTagName; - } finally { - if (sModel != null) { - sModel.releaseFromRead(); - } - } - } - - /** - * Returns URI for the current/parent tag - * @return - */ - public String getTagPrefix() { - IStructuredModel sModel = StructuredModelManager - .getModelManager() - .getExistingModelForRead(getDocument()); - try { - if (sModel == null) - return null; - - Document xmlDocument = (sModel instanceof IDOMModel) - ? ((IDOMModel) sModel).getDocument() - : null; - - if (xmlDocument == null) - return null; - - // Get Fixed Structured Document Region - IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset()); - if (sdFixedRegion == null) - return null; - - Node n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset()); - if (n == null) - return null; - - - if (!(n instanceof Element) && !(n instanceof Attr)) - return null; - - if (n instanceof Attr) { - n = ((Attr) n).getOwnerElement(); - } - - if (n == null) - return null; - - String nodePrefix = ((Element)n).getPrefix(); - return nodePrefix; - } finally { - if (sModel != null) { - sModel.releaseFromRead(); - } - } - } - - /** - * Returns URI for the current/parent tag - * @return - */ - public String getTagUri() { - String nodePrefix = getTagPrefix(); - return getUri(nodePrefix); - } - - /** - * Returns URI string for the prefix specified - * - * @param prefix - * @return - */ - abstract protected String getUri(String prefix); - - /* Utility functions */ - Node findNodeForOffset(IDOMNode node, int offset) { - if(node == null) return null; - if (!node.contains(offset)) return null; - - if (node.hasChildNodes()) { - // Try to find the node in children - NodeList children = node.getChildNodes(); - for (int i = 0; children != null && i < children.getLength(); i++) { - IDOMNode child = (IDOMNode)children.item(i); - if (child.contains(offset)) { - return findNodeForOffset(child, offset); - } - } - } - // Not found in children or nave no children - if (node.hasAttributes()) { - // Try to find in the node attributes - NamedNodeMap attributes = node.getAttributes(); - - for (int i = 0; attributes != null && i < attributes.getLength(); i++) { - IDOMNode attr = (IDOMNode)attributes.item(i); - if (attr.contains(offset)) { - return attr; - } - } - } - // Return the node itself - return node; - } - - Node findNodeForOffset(Node node, int offset) { - return (node instanceof IDOMNode) ? findNodeForOffset((IDOMNode)node, offset) : null; - } - - /** - * this is the position the cursor should be in after the proposal is - * applied - * - * @param proposedText - * @return the position the cursor should be in after the proposal is - * applied - */ - protected int getCursorPositionForProposedText(String proposedText) { - int cursorAdjustment; - cursorAdjustment = proposedText.indexOf("\"\"") + 1; //$NON-NLS-1$ - // otherwise, after the first tag - if (cursorAdjustment == 0) { - cursorAdjustment = proposedText.indexOf('>') + 1; - } - if (cursorAdjustment == 0) { - cursorAdjustment = proposedText.length(); - } - - return cursorAdjustment; - } - - /** - * Returns EL Prefix Text Region Information Object - * - * @return - */ - protected TextRegion getELPrefix(ContentAssistRequest request) { - if (!DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(request.getRegion().getType()) && - !DOMRegionContext.XML_CONTENT.equals(request.getRegion().getType()) && - !DOMRegionContext.BLOCK_TEXT.equals(request.getRegion().getType())) - return null; - - String text = request.getDocumentRegion().getFullText(request.getRegion()); - int startOffset = request.getDocumentRegion().getStartOffset() + request.getRegion().getStart(); - - boolean isAttributeValue = false; - boolean hasOpenQuote = false; - boolean hasCloseQuote = false; - char quoteChar = (char)0; - if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(request.getRegion().getType())) { - isAttributeValue = true; - if (text.startsWith("\"") || text.startsWith("'")) {//$NON-NLS-1$ //$NON-NLS-2$ - quoteChar = text.charAt(0); - hasOpenQuote = true; - } - if (hasOpenQuote && text.trim().endsWith(String.valueOf(quoteChar))) { - hasCloseQuote = true; - } - } - - int inValueOffset = getOffset() - startOffset; - if (text != null && text.length() < inValueOffset) { // probably, the attribute value ends before the document position - return null; - } - if (inValueOffset<0) { - return null; - } - -// String matchString = text.substring(0, inValueOffset); - - ELParser p = ELParserUtil.getJbossFactory().createParser(); - ELModel model = p.parse(text); - - ELInstance is = ELUtil.findInstance(model, inValueOffset);// ELInstance - ELInvocationExpression ie = ELUtil.findExpression(model, inValueOffset);// ELExpression - - boolean isELStarted = (model != null && is != null && (model.toString().startsWith("#{") || //$NON-NLS-1$ - model.toString().startsWith("${"))); //$NON-NLS-1$ - boolean isELClosed = (model != null && is != null && model.toString().endsWith("}")); //$NON-NLS-1$ - -// boolean insideEL = startOffset + model.toString().length() - TextRegion tr = new TextRegion(startOffset, ie == null ? inValueOffset : ie.getStartPosition(), - ie == null ? 0 : inValueOffset - ie.getStartPosition(), ie == null ? "" : ie.getText(), //$NON-NLS-1$ - isELStarted, isELClosed, - isAttributeValue, hasOpenQuote, hasCloseQuote, quoteChar); - - return tr; - } - - /** - * Returns EL Predicate Text Region Information Object - * - * - * @return - */ - protected TextRegion getELPredicatePrefix(ContentAssistRequest request) { - if (request == null || request.getRegion() == null) - return null; - - IStructuredDocumentRegion documentRegion = request.getDocumentRegion(); - ITextRegion completionRegion = request.getRegion(); - String regionType = completionRegion.getType(); - - if (DOMRegionContext.XML_END_TAG_OPEN.equals(regionType) || DOMRegionContext.XML_TAG_OPEN.equals(regionType)) { - documentRegion = documentRegion.getPrevious(); - completionRegion = getCompletionRegion(request.getDocumentRegion().getStartOffset() + request.getRegion().getStart() - 1, request.getParent()); - } - if (!DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(completionRegion.getType()) && - !DOMRegionContext.XML_CONTENT.equals(completionRegion.getType()) && - !DOMRegionContext.BLOCK_TEXT.equals(completionRegion.getType())) { - return null; - } - String text = documentRegion.getFullText(completionRegion); - int startOffset = documentRegion.getStartOffset() + completionRegion.getStart(); - - boolean isAttributeValue = false; - boolean hasOpenQuote = false; - boolean hasCloseQuote = false; - char quoteChar = (char)0; - if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(request.getRegion().getType())) { - isAttributeValue = true; - if (text.startsWith("\"") || text.startsWith("'")) {//$NON-NLS-1$ //$NON-NLS-2$ - quoteChar = text.charAt(0); - hasOpenQuote = true; - } - if (hasOpenQuote && text.trim().endsWith(String.valueOf(quoteChar))) { - hasCloseQuote = true; - } - } - - int inValueOffset = getOffset() - startOffset; - if (inValueOffset<0 || // There is no a word part before cursor - (text != null && text.length() < inValueOffset)) { // probably, the attribute value ends before the document position - return null; - } - - String matchString = getELPredicateMatchString(text, inValueOffset); - if (matchString == null) - return null; - - TextRegion tr = new TextRegion(startOffset, getOffset() - matchString.length() - startOffset, - matchString.length(), matchString, false, false, - isAttributeValue, hasOpenQuote, hasCloseQuote, quoteChar); - - return tr; - } - - /** - * Returns predicate string for the EL-related query. - * The predicate string is the word/part of word right before the cursor position, including the '.' and '_' characters, - * which is to be replaced by the EL CA proposal ('#{' and '}' character sequences are to be inserted too) - * - * @param text - * @param offset - * @return - */ - protected String getELPredicateMatchString(String text, int offset) { - int beginningOffset = offset - 1; - while(beginningOffset >=0 && - (Character.isJavaIdentifierPart(text.charAt(beginningOffset)) || - '.' == text.charAt(beginningOffset) || - '_' == text.charAt(beginningOffset))) { - beginningOffset--; - } - beginningOffset++; // move it to point the first valid character - return text.substring(beginningOffset, offset); - } - - /** - * Returns EL Prefix Text Region Information Object - * - * @deprecated - * @return - */ - protected TextRegion getELPrefix() { - IStructuredModel sModel = StructuredModelManager - .getModelManager() - .getExistingModelForRead(getDocument()); - try { - if (sModel == null) - return null; - - Document xmlDocument = (sModel instanceof IDOMModel) - ? ((IDOMModel) sModel).getDocument() - : null; - - if (xmlDocument == null) - return null; - - Node n = findNodeForOffset(xmlDocument, getOffset()); - if (n == null) - return null; - - String text = null; - ITextRegion region = null; - int startOffset = -1; - int offset = getOffset(); - while (n != null && startOffset == -1) { - if (n instanceof IDOMAttr) { - text = ((IDOMAttr)n).getValueRegionText(); - region = ((IDOMAttr)n).getValueRegion(); - startOffset = ((IndexedRegion)((IDOMAttr)n).getOwnerElement()).getStartOffset(); - if(region != null) { - startOffset += region.getStart(); - } else { - region = ((IDOMAttr)n).getEqualRegion(); - if(region != null) { - startOffset += region.getStart() + region.getLength(); - } else { - startOffset = ((IDOMAttr)n).getEndOffset(); - } - } - } else if (n instanceof IDOMText) { - text = ((IDOMText)n).getNodeValue(); - region = ((IDOMText)n).getFirstStructuredDocumentRegion(); - startOffset = ((IDOMText)n).getStartOffset(); - } else { - // The EL may appear only in TEXT and ATTRIBUTE VALUE types of node - // But if the current offset is start of a tag - we should treat it as part of previous region - if (n instanceof IDOMElement) { - IDOMElement elem = (IDOMElement)n; - if ((elem.hasEndTag() && elem.getEndStartOffset() == offset) || - elem.getStartOffset() == offset) { - n = findNodeForOffset(xmlDocument, --offset); - continue; - } - } - - return null; - } - } - - int inValueOffset = getOffset() - startOffset; - if (text != null && text.length() < inValueOffset) { // probably, the attribute value ends before the document position - return null; - } - if (inValueOffset<0) { - return null; - } - -// String matchString = text.substring(0, inValueOffset); - - ELParser p = ELParserUtil.getJbossFactory().createParser(); - ELModel model = p.parse(text); - - ELInstance is = ELUtil.findInstance(model, inValueOffset);// ELInstance - ELInvocationExpression ie = ELUtil.findExpression(model, inValueOffset);// ELExpression - - boolean isELStarted = (model != null && is != null && (model.toString().startsWith("#{") || //$NON-NLS-1$ - model.toString().startsWith("${"))); //$NON-NLS-1$ - boolean isELClosed = (model != null && is != null && model.toString().endsWith("}")); //$NON-NLS-1$ - -// boolean insideEL = startOffset + model.toString().length() - TextRegion tr = new TextRegion(startOffset, ie == null ? inValueOffset : ie.getStartPosition(), ie == null ? 0 : inValueOffset - ie.getStartPosition(), ie == null ? "" : ie.getText(), isELStarted, isELClosed); //$NON-NLS-1$ - - return tr; - } finally { - if (sModel != null) { - sModel.releaseFromRead(); - } - } - } - - public static class TextRegion { - private int startOffset; - private int offset; - private int length; - private String text; - private boolean isELStarted; - private boolean isELClosed; - private boolean isAttributeValue; - private boolean hasOpenQuote; - private boolean hasCloseQuote; - private char quoteChar; - - TextRegion(int startOffset, int offset, int length, String text, boolean isELStarted, boolean isELClosed) { - this(startOffset, offset, length, text, isELStarted, isELClosed, false, false, false, (char)0); - } - - public TextRegion(int startOffset, int offset, int length, String text, boolean isELStarted, boolean isELClosed, - boolean isAttributeValue, boolean hasOpenQuote, boolean hasCloseQuote, char quoteChar) { - this.startOffset = startOffset; - this.offset = offset; - this.length = length; - this.text = text; - this.isELStarted = isELStarted; - this.isELClosed = isELClosed; - this.isAttributeValue = isAttributeValue; - this.hasOpenQuote = hasOpenQuote; - this.hasCloseQuote = hasCloseQuote; - this.quoteChar = quoteChar; - } - - public int getStartOffset() { - return startOffset; - } - - public int getOffset() { - return offset; - } - - public int getLength() { - return length; - } - - public String getText() { - StringBuffer sb = new StringBuffer(length); - sb = sb.append(text.substring(0, length)); - sb.setLength(length); - return sb.toString(); - } - - public boolean isELStarted() { - return isELStarted; - } - - public boolean isELClosed() { - return isELClosed; - } - - public boolean isAttributeValue() { - return isAttributeValue; - } - - public char getQuoteChar() { - return quoteChar; - } - - public boolean hasOpenQuote() { - return hasOpenQuote; - } - - public boolean hasCloseQuote() { - return hasCloseQuote; - } - } -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -1,223 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.jsp.contentassist; - -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; -import org.jboss.tools.common.el.core.ca.ELTextProposal; -import org.jboss.tools.common.el.core.resolver.ELContext; -import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.jsp.messages.JstUIMessages; -import org.jboss.tools.jst.web.kb.IFaceletPageContext; -import org.jboss.tools.jst.web.kb.KbQuery; -import org.jboss.tools.jst.web.kb.PageContextFactory; -import org.jboss.tools.jst.web.kb.PageProcessor; -import org.jboss.tools.jst.web.kb.KbQuery.Type; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - -/** - * - * @author Jeremy - * - */ -@Deprecated -@SuppressWarnings("restriction") -public class FaceletPageContectAssistProcessor extends JspContentAssistProcessor { - private static final String JSFC_ATTRIBUTE_NAME = "jsfc"; //$NON-NLS-1$ - private boolean replaceJsfcTags; - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor#createContext() - */ - @Override - protected ELContext createContext() { - return PageContextFactory.createPageContext(getResource(), PageContextFactory.FACELETS_PAGE_CONTEXT_TYPE); - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#getContext() - */ - @Override - public IFaceletPageContext getContext() { - return (IFaceletPageContext)super.getContext(); - } - - /** - * Calculates and adds the tag proposals to the Content Assist Request object - * The method is to be overridden here because xhtml allows to use EL-s inside a text region - * - * @param contentAssistRequest Content Assist Request object - * @param childPosition the - */ - - @Override - protected void addTagInsertionProposals( - ContentAssistRequest contentAssistRequest, int childPosition) { - - // Need to check if an EL Expression is opened here. - // If it is true we don't need to start any new tag proposals - TextRegion prefix = getELPrefix(contentAssistRequest); - if (prefix != null && prefix.isELStarted()) { - return; - } - - addTagNameProposals(contentAssistRequest, childPosition, true); - addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true); - } - - /** - * Calculates and adds the EL proposals to the Content Assist Request object - */ - @Override - protected void addTextELProposals(ContentAssistRequest contentAssistRequest) { - if (!isELCAToBeShown()) - return; - - TextRegion prefix = getELPrefix(contentAssistRequest); - if (prefix == null || !prefix.isELStarted()) { - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, "#{}", //$NON-NLS-1$ - contentAssistRequest.getReplacementBeginPosition(), - 0, 2, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_NewELExpression, null, - JstUIMessages.FaceletPageContectAssistProcessor_NewELExpressionTextInfo, TextProposal.R_TAG_INSERTION + 1); - - contentAssistRequest.addProposal(proposal); - return; - } - String matchString = "#{" + prefix.getText(); //$NON-NLS-1$ - String query = matchString; - if (query == null) - query = ""; //$NON-NLS-1$ - String stringQuery = matchString; - - int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset(); - - KbQuery kbQuery = createKbQuery(Type.TEXT, query, stringQuery); - TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); - if (proposals == null || proposals.length == 0) - return; - - for (TextProposal textProposal : proposals) { - int replacementOffset = beginChangeOffset; - int replacementLength = prefix.getLength(); - String replacementString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); - int cursorPosition = replacementString.length(); - - if (!prefix.isELClosed()) { - replacementString += "}"; //$NON-NLS-1$ - } - - Image image = textProposal.getImage(); - - // JBIDE-512, JBIDE-2541 related changes ===>>> -// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); - String displayString = textProposal.getLabel(); - if (displayString == null) - displayString = textProposal.getReplacementString() == null ? replacementString : textProposal.getReplacementString(); - - // <<<=== JBIDE-512, JBIDE-2541 related changes - int relevance = textProposal.getRelevance(); - if (relevance == TextProposal.R_NONE) { - relevance = TextProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE; - } - - AutoContentAssistantProposal proposal = null; - if (textProposal instanceof ELTextProposal) { - IJavaElement[] javaElements = ((ELTextProposal)textProposal).getAllJavaElements(); - - proposal = new AutoELContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, javaElements, relevance); - } else { - String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ - - proposal = new AutoContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, additionalProposalInfo, relevance); - } - - contentAssistRequest.addProposal(proposal); - } - - if (prefix.isELStarted() && !prefix.isELClosed()) { - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal("}", //$NON-NLS-1$ - getOffset(), 0, 1, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_CloseELExpression, - null, JstUIMessages.JspContentAssistProcessor_CloseELExpressionInfo, TextProposal.R_XML_ATTRIBUTE_VALUE_TEMPLATE); - - contentAssistRequest.addProposal(proposal); - } - } - - /* (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#addAttributeNameProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest) - */ - @Override - protected void addAttributeNameProposals( - ContentAssistRequest contentAssistRequest) { - super.addAttributeNameProposals(contentAssistRequest); - if (isExistingAttribute(JSFC_ATTRIBUTE_NAME)) { - this.replaceJsfcTags = true; - super.addAttributeNameProposals(contentAssistRequest); - this.replaceJsfcTags = false; - } - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#addAttributeValueProposals(org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest) - */ - @Override - protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { - super.addAttributeValueProposals(contentAssistRequest); - if (isExistingAttribute(JSFC_ATTRIBUTE_NAME)) { - this.replaceJsfcTags = true; - super.addAttributeValueProposals(contentAssistRequest); - this.replaceJsfcTags = false; - } - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor#getTagName(org.w3c.dom.Node) - */ - @Override - protected String getTagName(Node tag) { - String tagName = tag.getNodeName(); - if(replaceJsfcTags) { - // Only HTML tags - if(tagName.indexOf(':')>0) { - return tagName; - } - if (!(tag instanceof Element)) - return tagName; - - Element element = (Element)tag; - - NamedNodeMap attributes = element.getAttributes(); - Node jsfC = attributes.getNamedItem(JSFC_ATTRIBUTE_NAME); - if(jsfC==null || (!(jsfC instanceof Attr))) { - return tagName; - } - Attr jsfCAttribute = (Attr)jsfC; - String jsfTagName = jsfCAttribute.getValue(); - if(jsfTagName==null || jsfTagName.indexOf(':')<1) { - return tagName; - } - tagName = jsfTagName; - } - return tagName; - } -} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -35,7 +35,7 @@ import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor.TextRegion; +import org.jboss.tools.jst.jsp.contentassist.computers.AbstractXmlCompletionProposalComputer.TextRegion; import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.messages.JstUIMessages; Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -1,270 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009-2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.jsp.contentassist; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.resources.IFile; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; -import org.jboss.tools.common.el.core.model.ELExpression; -import org.jboss.tools.common.el.core.parser.ELParserFactory; -import org.jboss.tools.common.el.core.parser.ELParserUtil; -import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; -import org.jboss.tools.common.el.core.resolver.ELContext; -import org.jboss.tools.common.el.core.resolver.ELContextImpl; -import org.jboss.tools.common.el.core.resolver.ELResolution; -import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; -import org.jboss.tools.common.el.core.resolver.ElVarSearcher; -import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; -import org.jboss.tools.common.el.core.resolver.Var; -import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.web.kb.IPageContext; -import org.jboss.tools.jst.web.kb.KbQuery; -import org.jboss.tools.jst.web.kb.PageContextFactory; -import org.jboss.tools.jst.web.kb.PageProcessor; -import org.jboss.tools.jst.web.kb.KbQuery.Type; -import org.jboss.tools.jst.web.kb.taglib.INameSpace; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * - * @author Jeremy - * - */ -@Deprecated -@SuppressWarnings("restriction") -public class JspContentAssistProcessor extends XmlContentAssistProcessor { - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor#createContext() - */ - @Override - protected ELContext createContext() { - return PageContextFactory.createPageContext(getResource(), PageContextFactory.JSP_PAGE_CONTEXT_TYPE); - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#getContext() - */ - @Override - public IPageContext getContext() { - return (IPageContext)super.getContext(); - } - - /** - * Returns URI string for the prefix specified using the namespaces collected for - * the {@link IPageContext} context. - * Important: The context must be created using createContext() method before using this method. - * - * @param prefix - * @return - */ - @Override - public String getUri(String prefix) { - if (prefix == null) - return null; - - Map<String, List<INameSpace>> nameSpaces = getContext().getNameSpaces(getOffset()); - if (nameSpaces == null || nameSpaces.isEmpty()) - return null; - - for (List<INameSpace> nameSpace : nameSpaces.values()) { - for (INameSpace n : nameSpace) { - if (prefix.equals(n.getPrefix())) { - return n.getURI(); - } - } - } - return null; - } - - /* - * Checks if the specified attribute exists - * - * @param attrName Name of attribute to check - */ - protected boolean isExistingAttribute(String attrName) { - IStructuredModel sModel = StructuredModelManager.getModelManager() - .getExistingModelForRead(getDocument()); - try { - if (sModel == null) - return false; - - Document xmlDocument = (sModel instanceof IDOMModel) ? ((IDOMModel) sModel) - .getDocument() - : null; - - if (xmlDocument == null) - return false; - - // Get Fixed Structured Document Region - IStructuredDocumentRegion sdFixedRegion = this.getStructuredDocumentRegion(getOffset()); - if (sdFixedRegion == null) - return false; - - Node n = findNodeForOffset(xmlDocument, sdFixedRegion.getStartOffset()); - if (n == null) - return false; - - // Find the first parent tag - if (!(n instanceof Element)) { - if (n instanceof Attr) { - n = ((Attr) n).getOwnerElement(); - } else { - return false; - } - } - - if (n == null) - return false; - - return (((Element)n).getAttributeNode(attrName) != null); - } finally { - if (sModel != null) { - sModel.releaseFromRead(); - } - } - } - - /** - * Calculates and adds the tag proposals to the Content Assist Request object - * The method is to be overridden here because jsp disallows to use EL-s inside a text region - * - * @param contentAssistRequest Content Assist Request object - * @param childPosition the - */ - - @Override - protected void addTagInsertionProposals( - ContentAssistRequest contentAssistRequest, int childPosition) { - - // Need to check if an EL Expression is opened here. - // If it is true we don't need to start any new tag proposals - TextRegion prefix = getELPrefix(contentAssistRequest); - if (prefix != null && prefix.isELStarted()) { - return; - } - - addTagNameProposals(contentAssistRequest, childPosition, true); - } - - /** - * Calculates and adds the attribute name proposals to the Content Assist Request object - * - * @param contentAssistRequest Content Assist Request object - * @param childPosition the - */ - protected void addAttributeNameProposals(ContentAssistRequest contentAssistRequest) { - String matchString = contentAssistRequest.getMatchString(); - String query = matchString; - if (query == null) - query = ""; //$NON-NLS-1$ - String stringQuery = matchString; - - KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_NAME, query, stringQuery); - TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); - - for (int i = 0; proposals != null && i < proposals.length; i++) { - TextProposal textProposal = proposals[i]; - - if (isExistingAttribute(textProposal.getLabel())) - continue; - - String replacementString = textProposal.getReplacementString() + "=\"\""; //$NON-NLS-1$ - - int replacementOffset = contentAssistRequest.getReplacementBeginPosition(); - int replacementLength = contentAssistRequest.getReplacementLength(); - int cursorPosition = getCursorPositionForProposedText(replacementString); - Image image = textProposal.getImage(); - if (image == null) { - image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE); - } - - String displayString = textProposal.getLabel() == null ? - replacementString : - textProposal.getLabel(); - IContextInformation contextInformation = null; - String additionalProposalInfo = textProposal.getContextInfo(); - int relevance = textProposal.getRelevance(); - - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - contextInformation, additionalProposalInfo, relevance); - - contentAssistRequest.addProposal(proposal); - } - } - - /** - * Calculates and adds the EL proposals to the Content Assist Request object - */ - @Override - protected void addTextELProposals(ContentAssistRequest contentAssistRequest) { - } - - protected void setVars(ELContextImpl context, IFile file) { - ELCompletionEngine fakeEngine = new ELCompletionEngine() { - - public ELResolution resolveELOperand(IFile file, - ELExpression operand, boolean returnEqualedVariablesOnly, - List<Var> vars, ElVarSearcher varSearcher, int offset) - throws BadLocationException, StringIndexOutOfBoundsException { - return new ELResolutionImpl(operand); - } - - public ELParserFactory getParserFactory() { - return ELParserUtil.getJbossFactory(); - } - - public List<TextProposal> getProposals(ELContext context, String el, int offset) { - return Collections.emptyList(); - } - - public ELResolution resolve(ELContext context, ELExpression operand, int offset) { - return new ELResolutionImpl(operand); - } - - public List<TextProposal> getProposals(ELContext context, int offset) { - return Collections.emptyList(); - } - - public IRelevanceCheck createRelevanceCheck(IJavaElement element) { - return null; - } - }; - ElVarSearcher varSearcher = new ElVarSearcher(file, fakeEngine); - List<Var> vars = varSearcher.findAllVars(file, getOffset()); - - if (vars != null) { - for (Var var : vars) { - context.addVar(new Region(getOffset(), 0), var); - } - } - } -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -1,558 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.jsp.contentassist; - -import java.util.List; -import java.util.Map; - -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; -import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; -import org.jboss.tools.common.el.core.ca.ELTextProposal; -import org.jboss.tools.common.el.core.resolver.ELContext; -import org.jboss.tools.common.el.core.resolver.ELResolver; -import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.jsp.JspEditorPlugin; -import org.jboss.tools.jst.jsp.messages.JstUIMessages; -import org.jboss.tools.jst.web.kb.IPageContext; -import org.jboss.tools.jst.web.kb.KbQuery; -import org.jboss.tools.jst.web.kb.PageContextFactory; -import org.jboss.tools.jst.web.kb.PageProcessor; -import org.jboss.tools.jst.web.kb.KbQuery.Type; -import org.jboss.tools.jst.web.kb.taglib.INameSpace; - -/** - * - * @author Jeremy - * - */ -@Deprecated -@SuppressWarnings("restriction") -public class XmlContentAssistProcessor extends AbstractXMLContentAssistProcessor { - protected static final Image JSF_EL_PROPOSAL_IMAGE = JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH); - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor#createContext() - */ - @Override - protected ELContext createContext() { - return PageContextFactory.createPageContext(getResource(), PageContextFactory.XML_PAGE_CONTEXT_TYPE); - } - - @Override - protected KbQuery createKbQuery(Type type, String query, String stringQuery) { - return createKbQuery(type, query, stringQuery, getTagPrefix(), getTagUri()); - } - - @Override - protected KbQuery createKbQuery(Type type, String query, String stringQuery, String prefix, String uri) { - KbQuery kbQuery = new KbQuery(); - - String[] parentTags = getParentTags(type == Type.ATTRIBUTE_NAME || type == Type.ATTRIBUTE_VALUE); - String parent = getParent(type == Type.ATTRIBUTE_VALUE, type == Type.ATTRIBUTE_NAME); - String queryValue = query; - String queryStringValue = stringQuery; - - kbQuery.setPrefix(prefix); - kbQuery.setUri(uri); - kbQuery.setParentTags(parentTags); - kbQuery.setParent(parent); - kbQuery.setMask(true); - kbQuery.setType(type); - kbQuery.setOffset(getOffset()); - kbQuery.setValue(queryValue); - kbQuery.setStringQuery(queryStringValue); - - return kbQuery; - } - - /** - * Returns URI string for the prefix specified using the namespaces collected for - * the {@link IPageContext} context. - * - * @Override org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor#getUri(String) - */ - protected String getUri(String prefix) { - return null; - } - - /** - * Calculates and adds the tag proposals to the Content Assist Request object - * - * @param contentAssistRequest Content Assist Request object - * @param childPosition the - */ - - @Override - protected void addTagInsertionProposals( - ContentAssistRequest contentAssistRequest, int childPosition) { - - // Need to check if an EL Expression is opened here. - // If it is true we don't need to start any new tag proposals - TextRegion prefix = getELPrefix(contentAssistRequest); - if (prefix != null && prefix.isELStarted()) { - return; - } - - addTagNameProposals(contentAssistRequest, childPosition, true); - addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true); - } - - private void addTagNameProposalsForPrefix( - ContentAssistRequest contentAssistRequest, - int childPosition, - String query, - String prefix, - String uri, - int defaultRelevance, - boolean insertTagOpenningCharacter) { - if (query == null) - query = ""; //$NON-NLS-1$ - String stringQuery = "<" + query; //$NON-NLS-1$ - - KbQuery kbQuery = createKbQuery(Type.TAG_NAME, query, stringQuery, prefix, uri); - TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); - - for (int i = 0; proposals != null && i < proposals.length; i++) { - TextProposal textProposal = proposals[i]; - - String replacementString = textProposal.getReplacementString(); - String closingTag = textProposal.getLabel(); - if (closingTag != null && closingTag.startsWith("<")) { //$NON-NLS-1$ - closingTag = closingTag.substring(1); - } - - if (!insertTagOpenningCharacter && replacementString.startsWith("<")) { //$NON-NLS-1$ - // Because the tag starting char is already in the text - replacementString = replacementString.substring(1); - } - if (!replacementString.endsWith("/>")) { //$NON-NLS-1$ - replacementString += "</" + closingTag + ">"; //$NON-NLS-1$ //$NON-NLS-2$ - } - - - int replacementOffset = contentAssistRequest.getReplacementBeginPosition(); - int replacementLength = contentAssistRequest.getReplacementLength(); - int cursorPosition = getCursorPositionForProposedText(replacementString); - Image image = textProposal.getImage(); - if (image == null) { - image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC); - } - - String displayString = closingTag; - IContextInformation contextInformation = null; - String additionalProposalInfo = textProposal.getContextInfo(); - int relevance = textProposal.getRelevance(); - if (relevance == TextProposal.R_NONE) { - relevance = defaultRelevance == TextProposal.R_NONE? TextProposal.R_TAG_INSERTION : defaultRelevance; - } - - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - contextInformation, additionalProposalInfo, relevance); - - contentAssistRequest.addProposal(proposal); - } - } - - - /** - * Calculates and adds the tag name proposals to the Content Assist Request object - * - * @param contentAssistRequest Content Assist Request object - * @param childPosition the - */ - @Override - protected void addTagNameProposals( - ContentAssistRequest contentAssistRequest, int childPosition) { - addTagNameProposals(contentAssistRequest, childPosition, false); - } - - /** - * Calculates and adds the tag name proposals to the Content Assist Request object - * - * @param contentAssistRequest Content Assist Request object - * @param childPosition the - */ - protected void addTagNameProposals( - ContentAssistRequest contentAssistRequest, int childPosition, boolean insertTagOpenningCharacter) { - - String mainPrefix = getTagPrefix(); - String mainURI = getTagUri(); - - String query = contentAssistRequest.getMatchString(); - addTagNameProposalsForPrefix(contentAssistRequest, childPosition, query, mainPrefix, mainURI, TextProposal.R_TAG_INSERTION, insertTagOpenningCharacter); - - if (query == null || query.length() == 0 || query.contains(":")) //$NON-NLS-1$ - return; - - // Make an additional proposals to allow prefixed tags to be entered with no prefix typed - ELContext elContext = getContext(); - if (elContext instanceof IPageContext) { - IPageContext pageContext = (IPageContext)elContext; - Map<String, List<INameSpace>> nsMap = pageContext.getNameSpaces(contentAssistRequest.getReplacementBeginPosition()); - if (nsMap == null) return; - - for (List<INameSpace> namespaces : nsMap.values()) { - if (namespaces == null) continue; - - for (INameSpace namespace : namespaces) { - String possiblePrefix = namespace.getPrefix(); - if (possiblePrefix == null || possiblePrefix.length() == 0) - continue; // Don't query proposals for the default value here - - String possibleURI = namespace.getURI(); - String possibleQuery = namespace.getPrefix() + ":" + query; //$NON-NLS-1$ - addTagNameProposalsForPrefix(contentAssistRequest, childPosition, - possibleQuery, possiblePrefix, possibleURI, - TextProposal.R_TAG_INSERTION - 1, - insertTagOpenningCharacter); - } - } - } - } - - - - @Override - public String getTagPrefix() { - String prefix = super.getTagPrefix(); - if (prefix != null) - return prefix; - - String uri = getUri(""); //$NON-NLS-1$ - return uri == null ? null : ""; //$NON-NLS-1$ - } - - /** - * Calculates and adds the attribute value proposals to the Content Assist Request object - */ - protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) { - // Need to check if an EL Expression is opened here. - // If it is true we don't need to start any new tag proposals - TextRegion prefix = getELPrefix(contentAssistRequest); - if (prefix != null && prefix.isELStarted()) { - return; - } - - String matchString = contentAssistRequest.getMatchString(); - String query = matchString; - if (query == null) - query = ""; //$NON-NLS-1$ - String stringQuery = matchString; - - KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery); - TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); - - for (int i = 0; proposals != null && i < proposals.length; i++) { - TextProposal textProposal = proposals[i]; - int replacementOffset = contentAssistRequest.getReplacementBeginPosition(); - int replacementLength = contentAssistRequest.getReplacementLength(); - if(textProposal.getStart() >= 0 && textProposal.getEnd() >= 0) { - replacementOffset += textProposal.getStart() + 1; - replacementLength = textProposal.getEnd() - textProposal.getStart(); - } - String replacementString = "\"" + textProposal.getReplacementString() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ - if(textProposal.getStart() >= 0 && textProposal.getEnd() >= 0) { - replacementString = textProposal.getReplacementString(); - } - int cursorPosition = getCursorPositionForProposedText(replacementString); - Image image = textProposal.getImage(); - String displayString = textProposal.getLabel() == null ? - replacementString : - textProposal.getLabel(); - IContextInformation contextInformation = null; - String additionalProposalInfo = textProposal.getContextInfo(); - int relevance = textProposal.getRelevance(); - if (relevance == TextProposal.R_NONE) { - relevance = TextProposal.R_JSP_ATTRIBUTE_VALUE; - } - - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - contextInformation, additionalProposalInfo, relevance); - - contentAssistRequest.addProposal(proposal); - } - - addELPredicateProposals(contentAssistRequest, TextProposal.R_JSP_ATTRIBUTE_VALUE, false); - } - - /** - * Calculates and adds EL predicate proposals based on the last word typed - * To be used only outside the EL. - * - * @param contentAssistRequest - */ - protected void addELPredicateProposals(ContentAssistRequest contentAssistRequest, int baseRelevance, boolean shiftRelevanceAgainstTagNameProposals) { - if (!isELCAToBeShown()) - return; - - // Need to check if the cursor is placed right after a word part. - // If there is no word part found then just quit - TextRegion prefix = getELPredicatePrefix(contentAssistRequest); - if (prefix == null || prefix.isELStarted()) { - return; - } - String matchString = "#{" + prefix.getText(); //$NON-NLS-1$ - String query = matchString; - if (query == null) - query = ""; //$NON-NLS-1$ - String stringQuery = matchString; - int relevanceShift = -2; // Fix for JBIDE-5987: Relevance for predicate proposals is shifted down by default to show EL proposals lower than attr-value proposals - if (shiftRelevanceAgainstTagNameProposals) { - relevanceShift += prefix.getText() != null && prefix.getText().trim().length() > 0 ? (XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION - baseRelevance + 2): -2; - } - - int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset(); - - KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery); - TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); - - if (proposals == null || proposals.length == 0) - return; - - for (TextProposal textProposal : proposals) { - int replacementOffset = beginChangeOffset; - int replacementLength = prefix.getLength(); - String replacementString = "#{" + prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); //$NON-NLS-1$ - - char quoteChar = prefix.isAttributeValue() && prefix.hasOpenQuote() ? prefix.getQuoteChar() : '"'; - int cursorPosition = replacementString.length(); - - if (!prefix.isELClosed()) { - replacementString += "}"; //$NON-NLS-1$ - } - - if (prefix.isAttributeValue() && prefix.hasOpenQuote() && !prefix.hasCloseQuote()) { - replacementString += String.valueOf(quoteChar); - } - - Image image = textProposal.getImage(); - - // JBIDE-512, JBIDE-2541 related changes ===>>> -// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); - String displayString = textProposal.getLabel(); - if (displayString == null) - displayString = textProposal.getReplacementString() == null ? replacementString : textProposal.getReplacementString(); - // <<<=== JBIDE-512, JBIDE-2541 related changes - - int relevance = textProposal.getRelevance(); - if (relevance == TextProposal.R_NONE) { - relevance = baseRelevance; - } - relevance += relevanceShift; - - AutoContentAssistantProposal proposal = null; - if (textProposal instanceof ELTextProposal) { - IJavaElement[] javaElements = ((ELTextProposal)textProposal).getAllJavaElements(); - - proposal = new AutoELContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, javaElements, relevance); - } else { - String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ - - proposal = new AutoContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, additionalProposalInfo, relevance); - } - contentAssistRequest.addProposal(proposal); - } - } - - @Override - protected void addAttributeValueELProposals(ContentAssistRequest contentAssistRequest) { - if (!isELCAToBeShown()) - return; - - TextRegion prefix = getELPrefix(contentAssistRequest); - if (prefix == null) { - return; - } - - if(!prefix.isELStarted()) { - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, - "#{}" + (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); - - contentAssistRequest.addProposal(proposal); - return; - } - String matchString = "#{" + prefix.getText(); //$NON-NLS-1$ - String query = matchString; - if (query == null) - query = ""; //$NON-NLS-1$ - String stringQuery = matchString; - - int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset(); - - KbQuery kbQuery = createKbQuery(Type.ATTRIBUTE_VALUE, query, stringQuery); - TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); - - if (proposals == null || proposals.length == 0) - return; - - for (TextProposal textProposal : proposals) { - int replacementOffset = beginChangeOffset; - int replacementLength = prefix.getLength(); - String replacementString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); - - char quoteChar = prefix.isAttributeValue() && prefix.hasOpenQuote() ? prefix.getQuoteChar() : '"'; -// if (prefix.isAttributeValue() && !prefix.hasOpenQuote()) { -// replacementString = String.valueOf(quoteChar) + replacementString; -// } - int cursorPosition = replacementString.length(); - - if (!prefix.isELClosed()) { - replacementString += "}"; //$NON-NLS-1$ - } - - if (prefix.isAttributeValue() && prefix.hasOpenQuote() && !prefix.hasCloseQuote()) { - replacementString += String.valueOf(quoteChar); - } - - Image image = textProposal.getImage(); - - // JBIDE-512, JBIDE-2541 related changes ===>>> -// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); - String displayString = textProposal.getLabel(); - if (displayString == null) - displayString = textProposal.getReplacementString() == null ? replacementString : textProposal.getReplacementString(); - // <<<=== JBIDE-512, JBIDE-2541 related changes - - int relevance = textProposal.getRelevance(); - if (relevance == TextProposal.R_NONE) { - relevance = TextProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE; - } - - AutoContentAssistantProposal proposal = null; - if (textProposal instanceof ELTextProposal) { - IJavaElement[] javaElements = ((ELTextProposal)textProposal).getAllJavaElements(); - - proposal = new AutoELContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, javaElements, relevance); - } else { - String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ - - proposal = new AutoContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, additionalProposalInfo, relevance); - } - contentAssistRequest.addProposal(proposal); - } - - if (prefix.isELStarted() && !prefix.isELClosed()) { - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal( - "}" + (prefix.isAttributeValue() && prefix.hasOpenQuote() && !prefix.hasCloseQuote() ? String.valueOf(prefix.getQuoteChar()) : ""), //$NON-NLS-1$ //$NON-NLS-2$ - getOffset(), 0, 0, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_CloseELExpression, - null, JstUIMessages.JspContentAssistProcessor_CloseELExpressionInfo, TextProposal.R_XML_ATTRIBUTE_VALUE + 1); // - - contentAssistRequest.addProposal(proposal); - } - } - - @Override - protected void addTextELProposals(ContentAssistRequest contentAssistRequest) { - if (!isELCAToBeShown()) - return; - - TextRegion prefix = getELPrefix(contentAssistRequest); - if (prefix == null || !prefix.isELStarted()) { - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, "#{}", //$NON-NLS-1$ - contentAssistRequest.getReplacementBeginPosition(), - 0, 2, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_NewELExpression, null, - JstUIMessages.FaceletPageContectAssistProcessor_NewELExpressionTextInfo, TextProposal.R_TAG_INSERTION + 1); - - contentAssistRequest.addProposal(proposal); - return; - } - String matchString = "#{" + prefix.getText(); //$NON-NLS-1$ - String query = matchString; - if (query == null) - query = ""; //$NON-NLS-1$ - String stringQuery = matchString; - - int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset(); - - KbQuery kbQuery = createKbQuery(Type.TEXT, query, stringQuery); - TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, getContext()); - - if (proposals == null || proposals.length == 0) - return; - - for (TextProposal textProposal : proposals) { - int replacementOffset = beginChangeOffset; - int replacementLength = prefix.getLength(); - String replacementString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); - int cursorPosition = replacementString.length(); - - if (!prefix.isELClosed()) { - replacementString += "}"; //$NON-NLS-1$ - } - - Image image = textProposal.getImage(); - - // JBIDE-512, JBIDE-2541 related changes ===>>> -// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString(); - String displayString = textProposal.getLabel(); - if (displayString == null) - displayString = textProposal.getReplacementString() == null ? replacementString : textProposal.getReplacementString(); - - // <<<=== JBIDE-512, JBIDE-2541 related changes - int relevance = textProposal.getRelevance(); - if (relevance == TextProposal.R_NONE) { - relevance = TextProposal.R_JSP_JSF_EL_VARIABLE_ATTRIBUTE_VALUE; - } - - AutoContentAssistantProposal proposal = null; - if (textProposal instanceof ELTextProposal) { - IJavaElement[] javaElements = ((ELTextProposal)textProposal).getAllJavaElements(); - - proposal = new AutoELContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, javaElements, relevance); - } else { - String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ - - proposal = new AutoContentAssistantProposal(replacementString, - replacementOffset, replacementLength, cursorPosition, image, displayString, - null, additionalProposalInfo, relevance); - } - contentAssistRequest.addProposal(proposal); - } - - if (prefix.isELStarted() && !prefix.isELClosed()) { - AutoContentAssistantProposal proposal = new AutoContentAssistantProposal("}", //$NON-NLS-1$ - getOffset(), 0, 1, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_CloseELExpression, - null, JstUIMessages.JspContentAssistProcessor_CloseELExpressionInfo, TextProposal.R_XML_ATTRIBUTE_VALUE_TEMPLATE); - - contentAssistRequest.addProposal(proposal); - } - } - - /** - * Checks is we need to show EL proposals - * - * @return - */ - protected boolean isELCAToBeShown() { - ELResolver[] resolvers = getContext().getElResolvers(); - return (resolvers != null && resolvers.length > 0); - } -} \ No newline at end of file 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-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -733,4 +733,79 @@ protected boolean endsWithELBeginning(String text) { return (text != null && text.endsWith(EL_SUFFIX)); } + + public static class TextRegion { + private int startOffset; + private int offset; + private int length; + private String text; + private boolean isELStarted; + private boolean isELClosed; + private boolean isAttributeValue; + private boolean hasOpenQuote; + private boolean hasCloseQuote; + private char quoteChar; + + public TextRegion(int startOffset, int offset, int length, String text, boolean isELStarted, boolean isELClosed) { + this(startOffset, offset, length, text, isELStarted, isELClosed, false, false, false, (char)0); + } + + public TextRegion(int startOffset, int offset, int length, String text, boolean isELStarted, boolean isELClosed, + boolean isAttributeValue, boolean hasOpenQuote, boolean hasCloseQuote, char quoteChar) { + this.startOffset = startOffset; + this.offset = offset; + this.length = length; + this.text = text; + this.isELStarted = isELStarted; + this.isELClosed = isELClosed; + this.isAttributeValue = isAttributeValue; + this.hasOpenQuote = hasOpenQuote; + this.hasCloseQuote = hasCloseQuote; + this.quoteChar = quoteChar; + } + + public int getStartOffset() { + return startOffset; + } + + public int getOffset() { + return offset; + } + + public int getLength() { + return length; + } + + public String getText() { + StringBuffer sb = new StringBuffer(length); + sb = sb.append(text.substring(0, length)); + sb.setLength(length); + return sb.toString(); + } + + public boolean isELStarted() { + return isELStarted; + } + + public boolean isELClosed() { + return isELClosed; + } + + public boolean isAttributeValue() { + return isAttributeValue; + } + + public char getQuoteChar() { + return quoteChar; + } + + public boolean hasOpenQuote() { + return hasOpenQuote; + } + + public boolean hasCloseQuote() { + return hasCloseQuote; + } + } + } 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 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -13,10 +13,6 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.swt.graphics.Image; import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument; import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; @@ -29,18 +25,9 @@ import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter; import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; -import org.jboss.tools.common.el.core.ca.ELTextProposal; import org.jboss.tools.common.el.core.resolver.ELContext; -import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor.TextRegion; -import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; -import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal; -import org.jboss.tools.jst.jsp.messages.JstUIMessages; import org.jboss.tools.jst.web.kb.IFaceletPageContext; -import org.jboss.tools.jst.web.kb.KbQuery; -import org.jboss.tools.jst.web.kb.KbQuery.Type; import org.jboss.tools.jst.web.kb.PageContextFactory; -import org.jboss.tools.jst.web.kb.PageProcessor; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; 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-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -40,7 +40,6 @@ import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentModelGenerator; -import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; import org.jboss.tools.common.el.core.ca.ELTextProposal; import org.jboss.tools.common.el.core.model.ELInstance; import org.jboss.tools.common.el.core.model.ELInvocationExpression; @@ -53,7 +52,6 @@ import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.jsp.JspEditorPlugin; -import org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor.TextRegion; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal; import org.jboss.tools.jst.jsp.messages.JstUIMessages; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -666,80 +666,6 @@ public static class ELXMLContentModelGenerator extends XMLContentModelGenerator { } - - public static class TextRegion { - private int startOffset; - private int offset; - private int length; - private String text; - private boolean isELStarted; - private boolean isELClosed; - private boolean isAttributeValue; - private boolean hasOpenQuote; - private boolean hasCloseQuote; - private char quoteChar; - - TextRegion(int startOffset, int offset, int length, String text, boolean isELStarted, boolean isELClosed) { - this(startOffset, offset, length, text, isELStarted, isELClosed, false, false, false, (char)0); - } - public TextRegion(int startOffset, int offset, int length, String text, boolean isELStarted, boolean isELClosed, - boolean isAttributeValue, boolean hasOpenQuote, boolean hasCloseQuote, char quoteChar) { - this.startOffset = startOffset; - this.offset = offset; - this.length = length; - this.text = text; - this.isELStarted = isELStarted; - this.isELClosed = isELClosed; - this.isAttributeValue = isAttributeValue; - this.hasOpenQuote = hasOpenQuote; - this.hasCloseQuote = hasCloseQuote; - this.quoteChar = quoteChar; - } - - public int getStartOffset() { - return startOffset; - } - - public int getOffset() { - return offset; - } - - public int getLength() { - return length; - } - - public String getText() { - StringBuffer sb = new StringBuffer(length); - sb = sb.append(text.substring(0, length)); - sb.setLength(length); - return sb.toString(); - } - - public boolean isELStarted() { - return isELStarted; - } - - public boolean isELClosed() { - return isELClosed; - } - - public boolean isAttributeValue() { - return isAttributeValue; - } - - public char getQuoteChar() { - return quoteChar; - } - - public boolean hasOpenQuote() { - return hasOpenQuote; - } - - public boolean hasCloseQuote() { - return hasCloseQuote; - } - } - } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -54,8 +54,8 @@ import org.jboss.tools.common.el.core.resolver.ELSegment; import org.jboss.tools.common.el.core.resolver.JavaMemberELSegmentImpl; import org.jboss.tools.common.text.TextProposal; -import org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor.TextRegion; import org.jboss.tools.jst.jsp.contentassist.Utils; +import org.jboss.tools.jst.jsp.contentassist.computers.AbstractXmlCompletionProposalComputer.TextRegion; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; import org.jboss.tools.jst.web.kb.KbQuery.Type; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPContentOutlineConfiguration.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -44,15 +44,13 @@ import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; import org.jboss.tools.jst.jsp.JspEditorPlugin; -import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IViewerDropAdapterFactory; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; -import org.jboss.tools.jst.web.kb.PageProcessor; import org.jboss.tools.jst.web.kb.KbQuery.Type; -import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibComponent; +import org.jboss.tools.jst.web.kb.PageProcessor; import org.jboss.tools.jst.web.kb.taglib.IAttribute; import org.jboss.tools.jst.web.kb.taglib.IComponent; import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibComponent; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -43,16 +43,14 @@ import org.eclipse.wst.xml.ui.internal.properties.EnumeratedStringPropertyDescriptor; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.jst.jsp.JspEditorPlugin; -import org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor; -import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; import org.jboss.tools.jst.jsp.contentassist.computers.FaceletsELCompletionProposalComputer; import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.editor.IVisualController; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; -import org.jboss.tools.jst.web.kb.PageProcessor; import org.jboss.tools.jst.web.kb.KbQuery.Type; +import org.jboss.tools.jst.web.kb.PageProcessor; import org.jboss.tools.jst.web.kb.taglib.IAttribute; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2011-08-12 22:04:57 UTC (rev 33869) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2011-08-12 22:05:46 UTC (rev 33870) @@ -33,7 +33,6 @@ import org.jboss.tools.common.model.project.IPromptingProvider; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.util.ModelFeatureFactory; -import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor; import org.jboss.tools.jst.jsp.contentassist.computers.FaceletsELCompletionProposalComputer; import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer; import org.jboss.tools.jst.jsp.drop.treeviewer.model.AttributeValueResource;