Author: scabanovich Date: 2009-10-14 11:54:14 -0400 (Wed, 14 Oct 2009) New Revision: 18089 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/attribute/adapter/JSFKnowledgeBaseAdapter.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-5019 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/attribute/adapter/JSFKnowledgeBaseAdapter.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/attribute/adapter/JSFKnowledgeBaseAdapter.java 2009-10-14 15:51:49 UTC (rev 18088) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/attribute/adapter/JSFKnowledgeBaseAdapter.java 2009-10-14 15:54:14 UTC (rev 18089) @@ -17,11 +17,16 @@ import org.eclipse.swt.widgets.Control; import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.jsf.ui.Messages; +import org.jboss.tools.jst.jsp.contentassist.JSPDialogContentProposalProvider; import org.jboss.tools.jst.jsp.outline.*; public class JSFKnowledgeBaseAdapter extends DefaultValueAdapter implements IActionHelper, IActionHelperExtension { Properties context = new Properties(); + public void setContext(Properties context) { + this.context = context; + } + public String getCommand() { return Messages.JSFKnowledgeBaseAdapter_Browse; } @@ -37,6 +42,11 @@ String attrName = attribute.getProperty("attrName"); //$NON-NLS-1$ context.setProperty("nodeName", nodeName); //$NON-NLS-1$ context.setProperty("attributeName", attrName); //$NON-NLS-1$ + + JSPDialogContentProposalProvider pp = new JSPDialogContentProposalProvider(); + pp.setAttrMode(); + pp.setContext(context); + String query = "/" + nodeName + "@" + attrName; //$NON-NLS-1$ //$NON-NLS-2$ context.setProperty("query", query); //$NON-NLS-1$ context.setProperty("help", query); //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java 2009-10-14 15:51:49 UTC (rev 18088) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizardPage.java 2009-10-14 15:54:14 UTC (rev 18089) @@ -23,7 +23,10 @@ import org.eclipse.compare.Splitter; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; import org.jboss.tools.common.model.ui.attribute.XAttributeSupport; +import org.jboss.tools.common.model.ui.attribute.adapter.IModelPropertyEditorAdapter; import org.jboss.tools.common.model.ui.attribute.editor.IPropertyEditor; import org.jboss.tools.common.model.ui.objecteditor.XChildrenEditor; import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizard; @@ -41,6 +44,7 @@ import org.jboss.tools.jsf.model.pv.JSFPromptingProvider; import org.jboss.tools.jsf.ui.JsfUiPlugin; import org.jboss.tools.jsf.ui.Messages; +import org.jboss.tools.jsf.ui.attribute.adapter.JSFKnowledgeBaseAdapter; import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; import org.jboss.tools.common.model.ui.editors.dnd.*; import org.jboss.tools.common.model.ui.editors.dnd.composite.*; @@ -97,6 +101,16 @@ showAttributes(maincomposite); + IModelPropertyEditorAdapter a = support.getPropertyEditorAdapterByName("value"); + if(a instanceof JSFKnowledgeBaseAdapter) { + ISelection s = getSpecificWizard().getWizardModel().getDropData().getSelectionProvider().getSelection(); + if (s instanceof TextSelection) { + int offset = ((TextSelection)s).getOffset(); + context.put("offset", new Integer(offset)); + } + ((JSFKnowledgeBaseAdapter)a).setContext(context); + } + setControl(maincomposite); getSpecificWizard().getWizardModel().addPropertyChangeListener( IDropWizardModel.TAG_PROPOSAL, this); @@ -135,7 +149,7 @@ TabItem advanced = new TabItem(tabs, SWT.NONE); advanced.setText(DropWizardMessages.Advanced_Tab_Title); TagAttributesComposite advancedTabContent = new TagAttributesComposite( - tabs, SWT.NONE, getSpecificWizard().getWizardModel()); + tabs, SWT.NONE, getSpecificWizard().getWizardModel(), context); advanced.setControl(advancedTabContent); tabs.addSelectionListener(advancedTabContent); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizardPage.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizardPage.java 2009-10-14 15:51:49 UTC (rev 18088) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizardPage.java 2009-10-14 15:54:14 UTC (rev 18089) @@ -10,7 +10,12 @@ ******************************************************************************/ package org.jboss.tools.jsf.ui.wizard.palette; +import java.util.Properties; + import org.jboss.tools.common.model.ui.attribute.XAttributeSupport; +import org.jboss.tools.common.model.ui.attribute.adapter.IModelPropertyEditorAdapter; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -22,6 +27,7 @@ import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.editors.dnd.*; +import org.jboss.tools.jsf.ui.attribute.adapter.JSFKnowledgeBaseAdapter; import org.jboss.tools.jst.jsp.jspeditor.dnd.TagProposal; /** @@ -32,7 +38,7 @@ final XEntityData data; XAttributeSupport support = new XAttributeSupport(); - + public SelectItemsWizardPage(){ data = XEntityDataImpl.create(new String[][] { { "JSFSelectItemsWizard", "yes" }, { "select items", "no" }}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ @@ -64,6 +70,16 @@ showAttributes(bottomGroup); + IModelPropertyEditorAdapter a = support.getPropertyEditorAdapterByName("select items"); + if(a instanceof JSFKnowledgeBaseAdapter) { + ISelection s = getSpecificWizard().getWizardModel().getDropData().getSelectionProvider().getSelection(); + if (s instanceof TextSelection) { + int offset = ((TextSelection)s).getOffset(); + context.put("offset", new Integer(offset)); + } + ((JSFKnowledgeBaseAdapter)a).setContext(context); + } + setControl(maincomposite); getSpecificWizard().getWizardModel().addPropertyChangeListener(IDropWizardModel.TAG_PROPOSAL,this); updateTitle();