Author: DartPeng Date: 2008-09-12 06:19:01 -0400 (Fri, 12 Sep 2008) New Revision: 10217 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java Log: add some GUI for editing ResourceConfigType Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-12 10:18:41 UTC (rev 10216) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-12 10:19:01 UTC (rev 10217) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.IDetailsPage; @@ -18,96 +20,186 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; +import org.milyn.xsd.smooks.ResourceConfigType; /** * @author Dart Peng<br> - * Date : Sep 11, 2008 + * Date : Sep 11, 2008 */ public abstract class AbstractSmooksModelDetailPage implements IDetailsPage { - IFormPart formPart; + IFormPart formPart; + ISelection selection; + FormToolkit formToolKit = null; - - /* (non-Javadoc) + + protected ResourceConfigType oldResourceConfigList; + + protected ResourceConfigType resourceConfigList; + + EditingDomain domain; + SmooksFormEditor parentEditor; + + public AbstractSmooksModelDetailPage(SmooksFormEditor parentEditor, + EditingDomain domain) { + this.domain = domain; + this.parentEditor = parentEditor; + } + + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite) */ public void createContents(Composite parent) { parent.setLayout(new FillLayout()); - Section section = formToolKit.createSection(parent, Section.DESCRIPTION|Section.TITLE_BAR); + Section section = formToolKit.createSection(parent, Section.DESCRIPTION + | Section.TITLE_BAR); section.setText("Details Information"); - + Composite client = formToolKit.createComposite(section); section.setLayout(new FillLayout()); - + section.setClient(client); + + createSectionContents(client); + } - + abstract protected void createSectionContents(Composite parent); - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#commit(boolean) */ public void commit(boolean onSave) { } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#dispose() */ public void dispose() { } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#initialize(org.eclipse.ui.forms.IManagedForm) */ public void initialize(IManagedForm form) { - if(form != null){ + if (form != null) { formToolKit = form.getToolkit(); } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#isDirty() */ public boolean isDirty() { return false; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#isStale() */ public boolean isStale() { + if (oldResourceConfigList != resourceConfigList) { + oldResourceConfigList = resourceConfigList; + return true; + } return false; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#refresh() */ public void refresh() { } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#setFocus() */ public void setFocus() { } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.ui.forms.IFormPart#setFormInput(java.lang.Object) */ public boolean setFormInput(Object input) { return false; } - /* (non-Javadoc) - * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection) + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, + * org.eclipse.jface.viewers.ISelection) */ public void selectionChanged(IFormPart part, ISelection selection) { this.selection = selection; formPart = part; + if (selection != null && selection instanceof IStructuredSelection) { + resourceConfigList = (ResourceConfigType) ((IStructuredSelection) selection) + .getFirstElement(); + refresh(); + } } + protected IFormPart getFormPart() { + return formPart; + } + + protected void setFormPart(IFormPart formPart) { + this.formPart = formPart; + } + + protected ISelection getSelection() { + return selection; + } + + protected void setSelection(ISelection selection) { + this.selection = selection; + } + + protected FormToolkit getFormToolKit() { + return formToolKit; + } + + protected void setFormToolKit(FormToolkit formToolKit) { + this.formToolKit = formToolKit; + } + + protected ResourceConfigType getResourceConfigList() { + return resourceConfigList; + } + + protected void setResourceConfigList(ResourceConfigType resourceConfigList) { + this.resourceConfigList = resourceConfigList; + } + + protected EditingDomain getDomain() { + return domain; + } + + protected void setDomain(EditingDomain domain) { + this.domain = domain; + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-12 10:18:41 UTC (rev 10216) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-12 10:19:01 UTC (rev 10217) @@ -10,20 +10,184 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Text; +import org.milyn.xsd.smooks.util.SmooksModelUtils; /** * @author Dart Peng<br> - * Date : Sep 11, 2008 + * Date : Sep 11, 2008 */ public class BeanPopulatorDetailPage extends AbstractSmooksModelDetailPage { - /* (non-Javadoc) + private Text selectorText; + private Text beanClassText; + private Text beanIDText; + private Button clazzBrowseButton; + private Button idBrowseButton; + + public BeanPopulatorDetailPage(SmooksFormEditor parentEditor, + EditingDomain domain) { + super(parentEditor, domain); + } + + /* + * (non-Javadoc) + * * @see org.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage#createSectionContents(org.eclipse.swt.widgets.Composite) */ @Override protected void createSectionContents(Composite parent) { + GridLayout gridLayout = new GridLayout(); + gridLayout.numColumns = 2; + parent.setLayout(gridLayout); + + this.formToolKit.createLabel(parent, "Selector : "); + selectorText = formToolKit.createText(parent, ""); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + selectorText.setLayoutData(gd); + + this.formToolKit.createLabel(parent, "Bean Class : "); + Composite beanClassComposite = formToolKit.createComposite(parent); + GridLayout bcgl = new GridLayout(); + bcgl.numColumns = 2; + bcgl.marginHeight = 0; + bcgl.marginWidth = 1; + beanClassComposite.setLayout(bcgl); + beanClassText = formToolKit.createText(beanClassComposite, ""); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + beanClassText.setLayoutData(gd); + + clazzBrowseButton = formToolKit.createButton(beanClassComposite, + "Browse", SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + beanClassComposite.setLayoutData(gd); + formToolKit.paintBordersFor(beanClassComposite); + this.formToolKit.createLabel(parent, "Bean ID : "); + Composite beanIDComposite = formToolKit.createComposite(parent); + GridLayout bilg = new GridLayout(); + bilg.numColumns = 2; + bilg.marginHeight = 0; + bilg.marginWidth = 1; + beanIDComposite.setLayout(bilg); + + beanIDText = formToolKit.createText(beanIDComposite, ""); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + beanIDText.setLayoutData(gd); + + idBrowseButton = formToolKit.createButton(beanIDComposite, "Browse", + SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + beanIDComposite.setLayoutData(gd); + formToolKit.paintBordersFor(beanIDComposite); + formToolKit.paintBordersFor(parent); + configControls(); + hookContorls(); } + protected void idBrowseButtonSelected() { + + } + + protected void clazzBrowseButtonSelected() { + + } + + + + @Override + public boolean isStale() { + return true; + } + + @Override + public void refresh() { + configControls(); + } + + private void hookContorls() { + selectorText.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + selectorChanged(); + } + + }); + beanClassText.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + beanClassChanged(); + } + + }); + clazzBrowseButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + clazzBrowseButtonSelected(); + } + + }); + beanIDText.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + beanIDChanged(); + } + + }); + idBrowseButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + idBrowseButtonSelected(); + } + + }); + } + + private void configControls() { + + if (resourceConfigList != null) { + String selector = ""; + selector = resourceConfigList.getSelector(); + if (selector == null) + selector = ""; + selectorText.setText(selector); + + String beanClass = SmooksModelUtils.getParmaText("beanClass", resourceConfigList); + if(beanClass == null) beanClass = ""; + String beanId = SmooksModelUtils.getParmaText("beanId", resourceConfigList); + if(beanId == null) beanId = ""; + + beanClassText.setText(beanClass); + beanIDText.setText(beanId); + } + + } + + protected void beanIDChanged() { + + } + + protected void beanClassChanged() { + + } + + protected void selectorChanged() { + + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-09-12 10:18:41 UTC (rev 10216) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-09-12 10:19:01 UTC (rev 10217) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -37,15 +38,25 @@ String title, NormalSmooksModelPackage modelPacakge) { super(editor, id, title); this.setModelPackage(modelPacakge); - resourceBlock = new SmooksResourceConfigFormBlock(); + this.createResourceConfigFormBlock(); } public SmooksNormalContentEditFormPage(String id, String title, NormalSmooksModelPackage modelPacakge) { super(id, title); this.setModelPackage(modelPackage); + this.createResourceConfigFormBlock(); + } + + protected void createResourceConfigFormBlock(){ resourceBlock = new SmooksResourceConfigFormBlock(); + resourceBlock.setDomain(getEditingDomain()); + resourceBlock.setParentEditor((SmooksFormEditor)this.getEditor()); } + + protected EditingDomain getEditingDomain(){ + return ((SmooksFormEditor)getEditor()).getEditingDomain(); + } @Override protected void createFormContent(IManagedForm managedForm) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-12 10:18:41 UTC (rev 10216) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-12 10:19:01 UTC (rev 10217) @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.List; +import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TreeViewer; @@ -41,7 +42,19 @@ TreeViewer dateTypeViewer; NormalSmooksModelPackage modelPackage = null; + + SmooksFormEditor parentEditor; + + protected EditingDomain domain; + public EditingDomain getDomain() { + return domain; + } + + public void setDomain(EditingDomain domain) { + this.domain = domain; + } + public NormalSmooksModelPackage getModelPackage() { return modelPackage; } @@ -81,7 +94,7 @@ @Override protected void registerPages(DetailsPart detailsPart) { detailsPart.registerPage(ResourceConfigTypeImpl.class, - new BeanPopulatorDetailPage()); + new BeanPopulatorDetailPage(getParentEditor(),getDomain())); } protected void configDateTypeViewer() { @@ -162,4 +175,12 @@ downButton.setLayoutData(gd); } + protected SmooksFormEditor getParentEditor() { + return parentEditor; + } + + public void setParentEditor(SmooksFormEditor parentEditor) { + this.parentEditor = parentEditor; + } + }