Author: DartPeng Date: 2010-01-06 02:18:47 -0500 (Wed, 06 Jan 2010) New Revision: 19658 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java Log: JBIDE-5564 Fixed it Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java 2010-01-06 00:53:40 UTC (rev 19657) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizard.java 2010-01-06 07:18:47 UTC (rev 19658) @@ -14,6 +14,7 @@ import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; @@ -30,7 +31,7 @@ private PrivateWizardDialog dialog; public ChildrenSelectionWizard(Shell shell, Collection<?> childrenDescriptor, - AdapterFactoryEditingDomain editingDomain) { + AdapterFactoryEditingDomain editingDomain , ILabelProvider customeLabelProvider) { super(); dialog = new PrivateWizardDialog(shell, this){ @@ -38,6 +39,7 @@ page = new ChildrenSelectionWizardPage(childrenDescriptor, editingDomain, "children selection", //$NON-NLS-1$ "Select children", null); //$NON-NLS-1$ page.setWizardDialog(dialog); + page.setCustomeLabelProvider(customeLabelProvider); } public CommandParameter getChildDescriptor(){ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java 2010-01-06 00:53:40 UTC (rev 19657) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ChildrenSelectionWizardPage.java 2010-01-06 07:18:47 UTC (rev 19658) @@ -16,9 +16,11 @@ import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; @@ -39,6 +41,8 @@ * */ public class ChildrenSelectionWizardPage extends WizardPage { + + private ILabelProvider customeLabelProvider = null; private Collection<?> childrenDescriptor = new ArrayList<CommandParameter>(); @@ -77,12 +81,12 @@ } }); tableViewer.addDoubleClickListener(new IDoubleClickListener() { - + public void doubleClick(DoubleClickEvent event) { dialog.close(); } }); - if(childrenDescriptor != null){ + if (childrenDescriptor != null) { tableViewer.setInput(childrenDescriptor); } updatePage(); @@ -92,7 +96,15 @@ public Object getChild() { return child; } + + /** + * @param customeLabelProvider the customeLabelProvider to set + */ + public void setCustomeLabelProvider(ILabelProvider customeLabelProvider) { + this.customeLabelProvider = customeLabelProvider; + } + protected void updatePage() { String error = null; if (child == null) { @@ -103,8 +115,8 @@ this.setPageComplete(error == null); } - public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor, - AdapterFactoryEditingDomain editingDomain, String pageName, String title, ImageDescriptor titleImage) { + public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor, AdapterFactoryEditingDomain editingDomain, + String pageName, String title, ImageDescriptor titleImage) { super(pageName, title, titleImage); this.childrenDescriptor = childrenDescriptor; this.editingDomain = editingDomain; @@ -112,8 +124,8 @@ this.setDescription(Messages.ChildrenSelectionWizardPage_wizardtitle); } - public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor, - AdapterFactoryEditingDomain editingDomain,String pageName) { + public ChildrenSelectionWizardPage(Collection<?> childrenDescriptor, AdapterFactoryEditingDomain editingDomain, + String pageName) { super(pageName); this.childrenDescriptor = childrenDescriptor; this.editingDomain = editingDomain; @@ -155,19 +167,31 @@ @Override public Image getImage(Object element) { + Image image = null; + if(customeLabelProvider != null){ + image = customeLabelProvider.getImage(element); + } + if(image != null){ + return image; + } element = getValue(element); IItemLabelProvider provider = (IItemLabelProvider) editingDomain.getAdapterFactory().adapt(element, IItemLabelProvider.class); Object img = provider.getImage(element); - if(img instanceof Image){ - return ((Image)img); - } - return null; + image = ExtendedImageRegistry.getInstance().getImage(img); + return image; } @Override public String getText(Object element) { + String label = null; + if(customeLabelProvider != null){ + label = customeLabelProvider.getText(element); + } + if(label != null){ + return label; + } element = getValue(element); IItemLabelProvider provider = (IItemLabelProvider) editingDomain.getAdapterFactory().adapt(element, IItemLabelProvider.class); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java 2010-01-06 00:53:40 UTC (rev 19657) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/ModelMultiChildrenTabelPanelCreator.java 2010-01-06 07:18:47 UTC (rev 19658) @@ -19,6 +19,7 @@ import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -40,20 +41,30 @@ private EObject newChild = null; + private ILabelProvider customeChildrenSelectionViewerLabelProvider = null; + public ModelMultiChildrenTabelPanelCreator(Shell shell, Collection<?> children, AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject parentModel, - FormToolkit toolkit, IEditorPart editorPart) { + FormToolkit toolkit, IEditorPart editorPart, ILabelProvider customeChildrenSelectionViewerLabelProvider) { super(smooksModelProvider, parentModel, toolkit, editorPart); this.shell = shell; this.children = children; this.editingDomain = editingDomain; + this.customeChildrenSelectionViewerLabelProvider = customeChildrenSelectionViewerLabelProvider; } + public ModelMultiChildrenTabelPanelCreator(Shell shell, Collection<?> children, + AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject parentModel, + FormToolkit toolkit, IEditorPart editorPart) { + this(shell, children, editingDomain, smooksModelProvider, parentModel, toolkit, editorPart, null); + } + @Override protected boolean performNewChild() { List<Object> cloneChildren = new ArrayList<Object>(); cloneChildren.addAll(children); - ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain); + ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain, + customeChildrenSelectionViewerLabelProvider); if (wizard.open() == Dialog.OK) { CommandParameter param = wizard.getChildDescriptor(); if (param != null) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java 2010-01-06 00:53:40 UTC (rev 19657) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/MultiContainerChildrenAddtionTablePanel.java 2010-01-06 07:18:47 UTC (rev 19658) @@ -19,6 +19,7 @@ import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -39,21 +40,30 @@ private EStructuralFeature feature; private EObject newChild = null; + + private ILabelProvider cutomeChildrenSelectionViewerLabelProvider; public MultiContainerChildrenAddtionTablePanel(Shell shell, Collection<?> children, AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject rootModel, - FormToolkit toolkit, IEditorPart editorPart) { + FormToolkit toolkit, IEditorPart editorPart , ILabelProvider cutomeChildrenSelectionViewerLabelProvider) { super(smooksModelProvider, rootModel, toolkit, editorPart); this.shell = shell; this.children = children; this.editingDomain = editingDomain; + this.cutomeChildrenSelectionViewerLabelProvider = cutomeChildrenSelectionViewerLabelProvider; } + + public MultiContainerChildrenAddtionTablePanel(Shell shell, Collection<?> children, + AdapterFactoryEditingDomain editingDomain, ISmooksModelProvider smooksModelProvider, EObject rootModel, + FormToolkit toolkit, IEditorPart editorPart){ + this(shell, children, editingDomain, smooksModelProvider, rootModel, toolkit, editorPart, null); + } @Override protected boolean performNewChild() { List<Object> cloneChildren = new ArrayList<Object>(); cloneChildren.addAll(children); - ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain); + ChildrenSelectionWizard wizard = new ChildrenSelectionWizard(shell, cloneChildren, editingDomain , cutomeChildrenSelectionViewerLabelProvider); if (wizard.open() == Dialog.OK) { CommandParameter param = wizard.getChildDescriptor(); if (param != null) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2010-01-06 00:53:40 UTC (rev 19657) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2010-01-06 07:18:47 UTC (rev 19658) @@ -442,6 +442,7 @@ createReaderPanel((EObject) list.getAbstractReader().get(0)); } else { disposeCompositeControls(readerConfigComposite, null); + createSimpleReaderPanel(reader); } } @@ -731,20 +732,7 @@ } } else { - Label formText = this.getManagedForm().getToolkit().createLabel(readerConfigComposite, ""); //$NON-NLS-1$ - GridData gd = new GridData(GridData.FILL_BOTH); - gd.heightHint = 50; - gd.horizontalSpan = 2; - formText.setLayoutData(gd); - if (reader instanceof XMLReader || reader instanceof JavaReader || reader instanceof XSDReader) { - formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Sample_Data); - } - - if (reader instanceof NullReader) { - formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Input_Type); - } - readerConfigComposite.layout(); - scrolledPageBook.reflow(false); + createSimpleReaderPanel(reader); } deactiveAllInputFile(compoundCommand); if (!compoundCommand.isEmpty() && compoundCommand.canExecute()) { @@ -771,7 +759,24 @@ } } } + + private void createSimpleReaderPanel(Object reader){ + Label formText = this.getManagedForm().getToolkit().createLabel(readerConfigComposite, ""); //$NON-NLS-1$ + GridData gd = new GridData(GridData.FILL_BOTH); + gd.heightHint = 50; + gd.horizontalSpan = 2; + formText.setLayoutData(gd); + if (reader instanceof XMLReader || reader instanceof JavaReader || reader instanceof XSDReader) { + formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Sample_Data); + } + if (reader instanceof NullReader) { + formText.setText(Messages.SmooksReaderFormPage_Warning_Specify_Input_Type); + } + readerConfigComposite.layout(); + scrolledPageBook.reflow(false); + } + private void createReaderPanel(EObject reader) { disposeCompositeControls(readerConfigComposite, null); try { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java 2010-01-06 00:53:40 UTC (rev 19657) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/csv12/Csv12ReaderUICreator.java 2010-01-06 07:18:47 UTC (rev 19658) @@ -15,10 +15,13 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -37,8 +40,10 @@ import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.graphical.wizard.freemarker.Messages; +import org.jboss.tools.smooks.model.csv12.Binding; import org.jboss.tools.smooks.model.csv12.CSV12Reader; import org.jboss.tools.smooks.model.csv12.Csv12Package; +import org.jboss.tools.smooks.model.csv12.MapBinding; /** * @author Dart Peng (dpeng(a)redhat.com) Date Apr 10, 2009 @@ -113,22 +118,8 @@ final Collection<?> children = p.getNewChildDescriptors(reader, editingDomain, null); ModelMultiChildrenTabelPanelCreator creator = new ModelMultiChildrenTabelPanelCreator(shell, children, - editingDomain, modelProvider, reader, toolkit, editorPart) { - // - // @Override - // protected EStructuralFeature getChildFeature(CommandParameter - // model) { - // return model.getEStructuralFeature(); - // } - // - // @Override - // protected EObject getNewChildInstance(CommandParameter feature2) - // { - // return feature2.getEValue(); - // } + editingDomain, modelProvider, reader, toolkit, editorPart, new ReaderBindingLabelProvider()); - }; - creator.createChildrenTablePanel(group); GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.heightHint = 180; @@ -156,7 +147,8 @@ final IItemPropertyDescriptor descriptor = propertySource.getPropertyDescriptor(model, Csv12Package.Literals.CSV12_READER__SEPARATOR); - final AttributeFieldEditPart separatorEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Separator_Char, + final AttributeFieldEditPart separatorEditPart = SmooksUIUtils.createStringFieldEditor( + org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Separator_Char, parent, editingdomain, toolkit, descriptor, model, false, false, false, null, 0, null, SmooksUIUtils.VALUE_TYPE_VALUE, null, false); Text separateText = (Text) separatorEditPart.getContentControl(); @@ -165,7 +157,8 @@ final IItemPropertyDescriptor quotedescriptor = propertySource.getPropertyDescriptor(model, Csv12Package.Literals.CSV12_READER__QUOTE); - final AttributeFieldEditPart quoteEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Quote_Char, parent, + final AttributeFieldEditPart quoteEditPart = SmooksUIUtils.createStringFieldEditor( + org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Quote_Char, parent, editingdomain, toolkit, quotedescriptor, model, false, false, false, null, 0, null, SmooksUIUtils.VALUE_TYPE_VALUE, null, false); Text quoteText = (Text) quoteEditPart.getContentControl(); @@ -176,7 +169,8 @@ String fields = (String) SmooksUIUtils.getEditValue(fieldsDescriptor, model); - final AttributeFieldEditPart fieldsEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Fields, parent, + final AttributeFieldEditPart fieldsEditPart = SmooksUIUtils.createStringFieldEditor( + org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Fields, parent, editingdomain, toolkit, fieldsDescriptor, model, false, false, false, null, 0, null, SmooksUIUtils.VALUE_TYPE_VALUE, null, false); Text text = (Text) fieldsEditPart.getContentControl(); @@ -191,14 +185,16 @@ final IItemPropertyDescriptor recorddescriptor = propertySource.getPropertyDescriptor(model, Csv12Package.Literals.CSV12_READER__RECORD_ELEMENT_NAME); - final AttributeFieldEditPart recordEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Record_Name, parent, + final AttributeFieldEditPart recordEditPart = SmooksUIUtils.createStringFieldEditor( + org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Record_Name, parent, editingdomain, toolkit, recorddescriptor, model, false, false, false, null, 0, null, SmooksUIUtils.VALUE_TYPE_VALUE, null, false); final IItemPropertyDescriptor rootdescriptor = propertySource.getPropertyDescriptor(model, Csv12Package.Literals.CSV12_READER__ROOT_ELEMENT_NAME); - final AttributeFieldEditPart rootEditPart = SmooksUIUtils.createStringFieldEditor(org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Root_Name, parent, + final AttributeFieldEditPart rootEditPart = SmooksUIUtils.createStringFieldEditor( + org.jboss.tools.smooks.configuration.editors.csv12.Messages.Csv12ReaderUICreator_Root_Name, parent, editingdomain, toolkit, rootdescriptor, model, false, false, false, null, 0, null, SmooksUIUtils.VALUE_TYPE_VALUE, null, false); @@ -247,4 +243,68 @@ editPart.getFieldMarker().setMessage(error); } } + + /** + * newChildDescriptors.add (createChildParameter + * (Csv12Package.Literals.CSV12_READER__SINGLE_BINDING, + * Csv12Factory.eINSTANCE.createBinding())); + * + * newChildDescriptors.add (createChildParameter + * (Csv12Package.Literals.CSV12_READER__SINGLE_BINDING, + * Csv12Factory.eINSTANCE.createMapBinding())); + * + * newChildDescriptors.add (createChildParameter + * (Csv12Package.Literals.CSV12_READER__LIST_BINDING, + * Csv12Factory.eINSTANCE.createBinding())); + * + * newChildDescriptors.add (createChildParameter + * (Csv12Package.Literals.CSV12_READER__LIST_BINDING, + * Csv12Factory.eINSTANCE.createMapBinding())); + * + * newChildDescriptors.add (createChildParameter + * (Csv12Package.Literals.CSV12_READER__MAP_BINDING, + * Csv12Factory.eINSTANCE.createMapBinding())); + * + * @author Dart + * + */ + + private class ReaderBindingLabelProvider extends LabelProvider { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) + */ + @Override + public String getText(Object element) { + if (element instanceof CommandParameter) { + Object v = ((CommandParameter) element).getValue(); + v = AdapterFactoryEditingDomain.unwrap(v); + EStructuralFeature feature = ((CommandParameter) element).getEStructuralFeature(); + if (v instanceof MapBinding) { + if (feature == Csv12Package.Literals.CSV12_READER__MAP_BINDING) { + return "Map MapBinding"; + } + if (feature == Csv12Package.Literals.CSV12_READER__SINGLE_BINDING) { + return "Single MapBinding"; + } + if (feature == Csv12Package.Literals.CSV12_READER__LIST_BINDING) { + return "List MapBinding"; + } + } + if (v instanceof Binding) { + if (feature == Csv12Package.Literals.CSV12_READER__SINGLE_BINDING) { + return "Single Binding"; + } + if (feature == Csv12Package.Literals.CSV12_READER__LIST_BINDING) { + return "List Binding"; + } + } + } + return super.getText(element); + } + + } } \ No newline at end of file