[jbosstools-commits] JBoss Tools SVN: r15277 - in trunk/jst/plugins/org.jboss.tools.jst.web: src/org/jboss/tools/jst/web/kb and 1 other directories.

Author: akazakov Date: 2009-05-15 08:45:03 -0400 (Fri, 15 May 2009) New Revision: 15277 Removed: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IFaceletPageContext.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IPageContext.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IProposalProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IResourceBundle.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/KbQuery.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageContextFactory.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/FaceletContextImpl.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/taglib/ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/taglib/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-2808 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2009-05-15 12:45:03 UTC (rev 15277) @@ -42,8 +42,6 @@ org.jboss.tools.jst.web.browser, org.jboss.tools.jst.web.browser.wtp, org.jboss.tools.jst.web.context, - org.jboss.tools.jst.web.kb, - org.jboss.tools.jst.web.kb.taglib, org.jboss.tools.jst.web.launching.sourcelookup, org.jboss.tools.jst.web.launching.sourcelookup.xpl, org.jboss.tools.jst.web.messages.xpl, Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IFaceletPageContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IFaceletPageContext.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IFaceletPageContext.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,35 +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.web.kb; - -import java.util.Map; - -/** - * @author Alexey Kazakov - */ -public interface IFaceletPageContext extends IPageContext { - - /** - * Returns parent page context. For example if some this facelet page is used in a template then - * this method will return a page context for that template. - * May return null. - * @return - */ - IFaceletPageContext getParentContext(); - - /** - * Returns parameters which are declared in the parent context and are available within this page. - * Key - name of Parameter. - * Value - value of Parameter. - * @return - */ - Map<String, String> getParams(); -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IPageContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IPageContext.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IPageContext.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,55 +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.web.kb; - -import org.eclipse.jface.text.IDocument; -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.Var; -import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; - -/** - * Page context - * @author Alexey Kazakov - */ -public interface IPageContext extends ELContext { - - /** - * Returns libraries which should be used in this context - * @return - */ - ITagLibrary[] getLibraries(); - - /** - * Returns EL Resolvers which are declared for this page - * @return - */ - ELResolver[] getElResolvers(); - - /** - * Returns resource bundles - * @return - */ - IResourceBundle[] getResourceBundles(); - - /** - * Returns IDocument for source file - * @return - */ - IDocument getDocument(); - - /** - * Returns "var" attributes which are available in particular offset. - * @param offset - * @return - */ - Var[] getVars(int offset); -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IProposalProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IProposalProcessor.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IProposalProcessor.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,25 +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.web.kb; - -import org.jboss.tools.common.text.TextProposal; - -/** - * @author Alexey Kazakov - */ -public interface IProposalProcessor { - - /** - * @return proposals - */ - TextProposal[] getProposals(KbQuery query, IPageContext context); - -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IResourceBundle.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IResourceBundle.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/IResourceBundle.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,27 +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.web.kb; - -/** - * @author Alexey Kazakov - */ -public interface IResourceBundle { - - /** - * @return var attribute value - */ - String getVar(); - - /** - * @return basename attribute value - */ - String getBasename(); -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/KbQuery.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/KbQuery.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/KbQuery.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,175 +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.web.kb; - -/** - * Query object is used to get info from Page Processors. - * @author Alexey Kazakov - */ -public class KbQuery { - - public static final String PREFIX_SEPARATOR = ":"; - - private int offset; - private String uri; - private String[] parentTags; - private String value; - private String stringQuery; - private boolean useAsMask; - private String prefix; - private Type type; - private String parent; - - /** - * Type of object for which we want to get info - * @author Alexey Kazakov - */ - public static enum Type { - TEXT, - TAG_NAME, - ATTRIBUTE_NAME, - ATTRIBUTE_VALUE - } - - public KbQuery() { - } - - /** - * URI of tag library - * @return - */ - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - /** - * The stack of parent tags - * @return - */ - public String[] getParentTags() { - return parentTags; - } - - /** - * @param parentTags the stack of parent tags - */ - public void setParentTags(String[] parentTags) { - this.parentTags = parentTags; - } - - /** - * return the last parent tag - */ - public String getLastParentTag() { - if(parentTags.length>0) { - return parentTags[parentTags.length-1]; - } - return null; - } - - /** - * @return the name of parent tag (type==TAG_NAME) or attribute (type==ATTRIBUTE_NAME or type==ATTRIBUTE_VALE) to set - */ - public String getParent() { - if(type == Type.TAG_NAME) { - return getLastParentTag(); - } - return parent; - } - - /** - * @param name the name of parent tag or attribute to set - */ - public void setParent(String name) { - this.parent = name; - } - - /** - * Value of query. For example in case of ATTRIBUTE_NAME type it is an attribute name. - * @return - */ - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - /** - * True if the value is a mask. For example we ask all tags which start with "<h:outputT" then the value "outputT" is a mask. - * @return - */ - public boolean isMask() { - return useAsMask; - } - - public void setMask(boolean useAsMask) { - this.useAsMask = useAsMask; - } - - /** - * Returns type of value - * @return - */ - public Type getType() { - return type; - } - - public void setType(Type type) { - this.type = type; - } - - /** - * @return offset - */ - public int getOffset() { - return offset; - } - - public void setOffset(int offset) { - this.offset = offset; - } - - /** - * @return the string representation of this query. - * In case of tag name this method will return "<h:outputText" - * but getValue() will return "outputText". - */ - public String getStringQuery() { - return stringQuery; - } - - /** - * @param stringQuery the stringQuery to set - */ - public void setStringQuery(String stringQuery) { - this.stringQuery = stringQuery; - } - - /** - * @return the tag prefix. - */ - public String getPrefix() { - return prefix; - } - - /** - * @param prefix the prefix to set - */ - public void setPrefix(String prefix) { - this.prefix = prefix; - } -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageContextFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,30 +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.web.kb; - -import org.eclipse.core.resources.IFile; - -/** - * @author Alexey Kazakov - */ -public class PageContextFactory { - - /** - * Creates a page context for given resource and offset. - * @param file - * @param offset - * @return - */ - public static IPageContext createPageContext(IFile file, int offset) { - // TODO - return null; - } -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,89 +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.web.kb; - -import java.util.ArrayList; - -import org.jboss.tools.common.el.core.resolver.ELResolver; -import org.jboss.tools.common.text.TextProposal; -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.ITagLibrary; - -/** - * @author Alexey Kazakov - */ -public class PageProcessor implements IProposalProcessor { - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.ProposalProcessor#getProposals(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.PageContext) - */ - public TextProposal[] getProposals(KbQuery query, IPageContext context) { - ArrayList<TextProposal> proposals = new ArrayList<TextProposal>(); - ITagLibrary[] libs = context.getLibraries(); - for (int i = 0; i < libs.length; i++) { - TextProposal[] libProposals = libs[i].getProposals(query, context); - for (int j = 0; j < libProposals.length; j++) { - proposals.add(libProposals[i]); - } - } - if(query.getType() == KbQuery.Type.ATTRIBUTE_VALUE || query.getType() == KbQuery.Type.TEXT) { - String value = query.getValue(); - //TODO convert value to EL string. - String elString = value; - ELResolver[] resolvers = context.getElResolvers(); - for (int i = 0; i < resolvers.length; i++) { - proposals.addAll(resolvers[i].getCompletions(elString, !query.isMask(), query.getOffset(), context)); - } - } - - return proposals.toArray(new TextProposal[proposals.size()]); - } - - /** - * Returns components - * @param query - * @param context - * @return components - */ - public IComponent[] getComponents(KbQuery query, IPageContext context) { - ArrayList<IComponent> components = new ArrayList<IComponent>(); - ITagLibrary[] libs = context.getLibraries(); - for (int i = 0; i < libs.length; i++) { - IComponent[] libComponents = libs[i].getComponents(query, context); - for (int j = 0; j < libComponents.length; j++) { - components.add(libComponents[i]); - } - } - return components.toArray(new IComponent[components.size()]); - } - - /** - * Returns attributes - * @param query - * @param context - * @return attributes - */ - public IAttribute[] getAttributes(KbQuery query, IPageContext context) { - ArrayList<IAttribute> attributes = new ArrayList<IAttribute>(); - if(query.getType() == KbQuery.Type.ATTRIBUTE_NAME || query.getType() == KbQuery.Type.ATTRIBUTE_VALUE) { - IComponent[] components = getComponents(query, context); - for (int i = 0; i < components.length; i++) { - IAttribute[] libAttributess = components[i].getAttributes(query, context); - for (int j = 0; j < libAttributess.length; j++) { - attributes.add(libAttributess[i]); - } - } - } - return attributes.toArray(new IAttribute[attributes.size()]); - } -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/FaceletContextImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/FaceletContextImpl.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/FaceletContextImpl.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,49 +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.web.kb.internal; - -import java.util.Map; - -import org.jboss.tools.jst.web.kb.IFaceletPageContext; - -/** - * Facelet page context - * @author Alexey Kazakov - */ -public class FaceletContextImpl extends JspContextImpl implements IFaceletPageContext { - - private IFaceletPageContext parentContext; - private Map<String, String> params; - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.kb.text.FaceletPageContext#getParentContext() - */ - public IFaceletPageContext getParentContext() { - return parentContext; - } - - public void setParentContext(IFaceletPageContext parentContext) { - this.parentContext = parentContext; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.kb.text.FaceletPageContext#getParams() - */ - public Map<String, String> getParams() { - return params; - } - - public void setParams(Map<String, String> params) { - this.params = params; - } -} \ No newline at end of file Deleted: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-05-15 12:44:23 UTC (rev 15276) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-05-15 12:45:03 UTC (rev 15277) @@ -1,165 +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.web.kb.internal; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Region; -import org.jboss.tools.common.el.core.resolver.ELResolver; -import org.jboss.tools.common.el.core.resolver.ElVarSearcher; -import org.jboss.tools.common.el.core.resolver.Var; -import org.jboss.tools.jst.web.kb.IPageContext; -import org.jboss.tools.jst.web.kb.IResourceBundle; -import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; - -/** - * JSP page context - * @author Alexey Kazakov - */ -public class JspContextImpl implements IPageContext { - - private IFile resource; - private IDocument document; - private ElVarSearcher varSearcher; - private ITagLibrary[] libs; - private ELResolver[] elResolvers; - private Map<Region, Var[]> vars = new HashMap<Region, Var[]>(); - private Set<Var> allVars = new HashSet<Var>(); - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.kb.text.PageContext#getResource() - */ - public IFile getResource() { - return resource; - } - - public void setResource(IFile resource) { - this.resource = resource; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.kb.text.PageContext#getLibraries() - */ - public ITagLibrary[] getLibraries() { - return libs; - } - - public void setLibraries(ITagLibrary[] libs) { - this.libs = libs; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.kb.text.PageContext#getElResolvers() - */ - public ELResolver[] getElResolvers() { - return elResolvers; - } - - public void setElResolvers(ELResolver[] elResolvers) { - this.elResolvers = elResolvers; - } - - private final static Var[] EMPTY_VAR_ARRAY = new Var[0]; - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.kb.text.PageContext#getVars(int) - */ - public Var[] getVars(int offset) { - for (Region region : vars.keySet()) { - if(offset>=region.getOffset() && offset<=region.getOffset() + region.getLength()) { - return vars.get(region); - } - } - return EMPTY_VAR_ARRAY; - } - - /** - * Adds new Var to the context - * @param region - * @param vars - */ - public void addVars(Region region, Var[] vars) { - this.vars.put(region, vars); - for (int i = 0; i < vars.length; i++) { - allVars.add(vars[i]); - } - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.kb.text.PageContext#getResourceBundles() - */ - public IResourceBundle[] getResourceBundles() { - // TODO - return null; - } - - /** - * @return the libs - */ - public ITagLibrary[] getLibs() { - return libs; - } - - /** - * @param libs the libs to set - */ - public void setLibs(ITagLibrary[] libs) { - this.libs = libs; - } - - /** - * @param document the document to set - */ - public void setDocument(IDocument document) { - this.document = document; - } - - /** - * @param varSearcher the varSearcher to set - */ - public void setVarSearcher(ElVarSearcher varSearcher) { - this.varSearcher = varSearcher; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.PageContext#getDocument() - */ - public IDocument getDocument() { - return document; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELContext#getVarSearcher() - */ - public ElVarSearcher getVarSearcher() { - return varSearcher; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.common.el.core.resolver.ELContext#getVars() - */ - public Var[] getVars() { - return allVars.toArray(new Var[allVars.size()]); - } -} \ No newline at end of file