Author: akazakov Date: 2009-08-25 09:55:42 -0400 (Tue, 25 Aug 2009) New Revision: 17251 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ConverterIDProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletsJsfCProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ValidatorIDProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4823 fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2009-08-25 13:55:42 UTC (rev 17251) @@ -11,7 +11,8 @@ org.jboss.tools.jst.web, org.jboss.tools.common.el.core, org.eclipse.jface.text, - org.eclipse.wst.sse.core + org.eclipse.wst.sse.core, + org.eclipse.wst.xml.ui;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbQuery.java 2009-08-25 13:55:42 UTC (rev 17251) @@ -28,9 +28,6 @@ private Type type; private String parent; - //includes text after offset - private String text; - /** * Type of object for which we want to get info * @author Alexey Kazakov @@ -176,12 +173,4 @@ public void setPrefix(String prefix) { this.prefix = prefix; } - - public void setText(String text) { - this.text = text; - } - - public String getText() { - return text; - } } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ConverterIDProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ConverterIDProposalType.java 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ConverterIDProposalType.java 2009-08-25 13:55:42 UTC (rev 17251) @@ -16,8 +16,11 @@ import java.util.Set; import java.util.TreeSet; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.KbQuery; +import org.jboss.tools.jst.web.kb.WebKbPlugin; import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; /** @@ -27,6 +30,9 @@ */ public class ConverterIDProposalType extends ModelProposalType { + private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$ + private static Image ICON; + public ConverterIDProposalType() {} @Override @@ -46,7 +52,11 @@ proposal.setLabel(text); proposal.setReplacementString(text); proposal.setPosition(text.length()); - + if(ICON==null) { + ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage(); + } + proposal.setImage(ICON); + proposals.add(proposal); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java 2009-08-25 13:55:42 UTC (rev 17251) @@ -47,6 +47,7 @@ if(ICON==null) { ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage(); } + proposal.setImage(ICON); proposals.add(proposal); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletsJsfCProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletsJsfCProposalType.java 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/FaceletsJsfCProposalType.java 2009-08-25 13:55:42 UTC (rev 17251) @@ -15,6 +15,9 @@ import java.util.List; import java.util.Map; +import org.eclipse.swt.graphics.Image; +import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; +import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; @@ -29,6 +32,8 @@ */ public class FaceletsJsfCProposalType extends CustomProposalType { + private static Image ICON; + /* (non-Javadoc) * @see org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType#getProposals(org.jboss.tools.jst.web.kb.KbQuery) */ @@ -90,6 +95,11 @@ proposal.setReplacementString(proposal.getLabel()); int position = proposal.getReplacementString().length(); proposal.setPosition(position); + if (ICON == null) { + ICON = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC); + } + proposal.setImage(ICON); + return proposal; } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/IDProposalType.java 2009-08-25 13:55:42 UTC (rev 17251) @@ -1,3 +1,13 @@ +/******************************************************************************* + * 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.taglib; import java.util.ArrayList; @@ -5,19 +15,25 @@ import java.util.Set; import java.util.TreeSet; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.IDocument; +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.xml.core.internal.provisional.document.IDOMModel; 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.WebKbPlugin; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; public class IDProposalType extends CustomProposalType { + private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$ + private static Image ICON; + static String ID = "id"; //$NON-NLS-1$ static String QUOTE_1 = "'"; //$NON-NLS-1$ static String QUOTE_2 = "\""; //$NON-NLS-1$ @@ -36,14 +52,11 @@ collectIDs(root); } } - } - finally { + } finally { if (sModel != null) { sModel.releaseFromRead(); } } - - } private void collectIDs(Element element) { @@ -61,17 +74,14 @@ @Override public TextProposal[] getProposals(KbQuery query) { String v = query.getValue(); - String txt = query.getText(); - if(txt.startsWith(QUOTE_1) || txt.startsWith(QUOTE_2)) txt = txt.substring(1); - if(txt.endsWith(QUOTE_1) || txt.endsWith(QUOTE_2)) txt = txt.substring(0, txt.length() - 1); int offset = v.length(); int b = v.lastIndexOf(','); if(b < 0) b = 0; else b += 1; - String tail = txt.substring(offset); + String tail = v.substring(offset); int e = tail.indexOf(','); - if(e < 0) e = txt.length(); else e += offset; - String prefix = v.substring(b); - + if(e < 0) e = v.length(); else e += offset; + String prefix = v.substring(b).trim(); + List<TextProposal> proposals = new ArrayList<TextProposal>(); for (String text: idList) { if(text.startsWith(prefix)) { @@ -79,15 +89,17 @@ proposal.setLabel(text); proposal.setReplacementString(text); proposal.setPosition(b + text.length()); - proposal.setStart(b); proposal.setEnd(e); + if(ICON==null) { + ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage(); + } + proposal.setImage(ICON); proposals.add(proposal); } } - + return proposals.toArray(new TextProposal[0]); } - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ValidatorIDProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ValidatorIDProposalType.java 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ValidatorIDProposalType.java 2009-08-25 13:55:42 UTC (rev 17251) @@ -25,5 +25,4 @@ protected String getListID() { return IWebPromptingProvider.JSF_VALIDATOR_IDS; } - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml 2009-08-25 13:04:25 UTC (rev 17250) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/componentExtension.xml 2009-08-25 13:55:42 UTC (rev 17251) @@ -18,8 +18,8 @@ </attribute> <attribute name="dir"> <proposal type="enumeration"> - <param value="LTR" /> - <param value="RTL" /> + <param value="ltr" /> + <param value="rtl" /> </proposal> </attribute> <attribute name="disabled">