Author: DartPeng Date: 2008-09-11 05:28:47 -0400 (Thu, 11 Sep 2008) New Revision: 10195 Added: 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/DateTypeContentProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java Log: Add a Master/Details formpage Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-09-11 09:20:50 UTC (rev 10194) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -16,6 +16,7 @@ import org.milyn.xsd.smooks.ResourceConfigType; import org.milyn.xsd.smooks.ResourceType; import org.milyn.xsd.smooks.SmooksResourceListType; +import org.milyn.xsd.smooks.util.SmooksConstants; /** * @author Dart Peng<br> @@ -58,19 +59,35 @@ } protected boolean isSmooksTransformType(ResourceConfigType config) { + if (config == null) + return false; + String selector = config.getSelector(); + if (selector != null) { + return SmooksConstants.GLOBAL_PARAMETERS.equals(selector.trim()); + } return false; } protected boolean isDateConfig(ResourceConfigType config) { + if (config == null) + return false; + ResourceType resource = config.getResource(); + if (resource != null) { + String r = resource.getValue(); + if(r != null) + return SmooksConstants.DATE_DECODER.equals(r.trim()); + } return false; } protected boolean isBeanPopulator(ResourceConfigType config) { + if (config == null) + return false; ResourceType resource = config.getResource(); if (resource != null) { String resourceString = resource.getValue(); - return NormalSmooksModelPackage.RESOURCE_CLASS_BEAN_POPULATOR - .equals(resourceString); + if(resourceString != null) + return SmooksConstants.BEAN_POPULATOR.equals(resourceString.trim()); } return false; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java 2008-09-11 09:20:50 UTC (rev 10194) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -25,10 +25,6 @@ private List<ResourceConfigType> beanPopulatorResourceConfigList = new ArrayList<ResourceConfigType>(); private ResourceConfigType smooksTransformTypeResourceConfig; - - public static final String RESOURCE_CLASS_BEAN_POPULATOR = ""; - - public static final String RESOURCE_CLASS_DATE_POPULATOR = ""; /** * @return the dateResourceConfigList Added: 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 (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -0,0 +1,113 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.ui.editors; + +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.IDetailsPage; +import org.eclipse.ui.forms.IFormPart; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.Section; + +/** + * @author Dart Peng<br> + * Date : Sep 11, 2008 + */ +public abstract class AbstractSmooksModelDetailPage implements IDetailsPage { + IFormPart formPart; + ISelection selection; + FormToolkit formToolKit = null; + + /* (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.setText("Details Information"); + + Composite client = formToolKit.createComposite(section); + section.setLayout(new FillLayout()); + + section.setClient(client); + } + + abstract protected void createSectionContents(Composite parent); + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.IFormPart#commit(boolean) + */ + public void commit(boolean onSave) { + + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.IFormPart#dispose() + */ + public void dispose() { + + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.IFormPart#initialize(org.eclipse.ui.forms.IManagedForm) + */ + public void initialize(IManagedForm form) { + if(form != null){ + formToolKit = form.getToolkit(); + } + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.IFormPart#isDirty() + */ + public boolean isDirty() { + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.IFormPart#isStale() + */ + public boolean isStale() { + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.IFormPart#refresh() + */ + public void refresh() { + + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.IFormPart#setFocus() + */ + public void setFocus() { + + } + + /* (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) + */ + public void selectionChanged(IFormPart part, ISelection selection) { + this.selection = selection; + formPart = part; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.ui.editors; + +import org.eclipse.swt.widgets.Composite; + +/** + * @author Dart Peng<br> + * Date : Sep 11, 2008 + */ +public class BeanPopulatorDetailPage extends AbstractSmooksModelDetailPage { + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage#createSectionContents(org.eclipse.swt.widgets.Composite) + */ + @Override + protected void createSectionContents(Composite parent) { + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.ui.editors; + +import java.util.List; + +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; + +/** + * @author Dart Peng<br> + * Date : Sep 11, 2008 + */ +public class DateTypeContentProvider implements ITreeContentProvider { + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + */ + public Object[] getChildren(Object parentElement) { + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) + */ + public Object getParent(Object element) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) + */ + public boolean hasChildren(Object element) { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + */ + public Object[] getElements(Object inputElement) { + if(inputElement instanceof List){ + return ((List)inputElement).toArray(); + } + return new Object[]{}; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IContentProvider#dispose() + */ + public void dispose() { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) + */ + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + // TODO Auto-generated method stub + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-09-11 09:20:50 UTC (rev 10194) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -36,6 +36,7 @@ import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; import org.milyn.xsd.smooks.DocumentRoot; import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; +import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl; /** * @author Dart Peng @@ -70,11 +71,11 @@ @Override protected void addPages() { graphicalPage = new SmooksGraphicalFormPage(this, "graph", "Mapping"); - normalPage = new SmooksNormalContentEditFormPage(this, "normal", - "Normal Edition"); try { int index = this.addPage(this.graphicalPage); this.setPageText(index, "Graph"); + normalPage = new SmooksNormalContentEditFormPage(this, "normal", + "Normal Edition",null); index = this.addPage(normalPage); setPageText(index, "Normal"); } catch (PartInitException e) { @@ -96,8 +97,8 @@ String path = ResourcesPlugin.getWorkspace().getRoot().getLocation() .append(file.getFullPath()).toString(); if (this.getEditingDomain() != null && smooksResource == null) { - smooksResource = getEditingDomain().getResourceSet() - .createResource(URI.createFileURI(path)); + smooksResource = new SmooksResourceFactoryImpl().createResource(URI + .createFileURI(path)); if (!smooksResource.isLoaded()) { try { smooksResource.load(Collections.EMPTY_MAP); @@ -109,14 +110,22 @@ } public void refreshNormalPage() { + NormalSmooksModelPackage modelPackage = createSmooksModelPackage(); + if (this.normalPage != null) { + normalPage.setModelPackage(modelPackage); + } + } + + protected NormalSmooksModelPackage createSmooksModelPackage() { NormalSmooksModelBuilder builder = NormalSmooksModelBuilder .getInstance(); if (smooksResource.getContents().isEmpty()) - return; + return null; DocumentRoot document = (DocumentRoot) smooksResource.getContents() .get(0); NormalSmooksModelPackage modelPackage = builder .buildNormalSmooksModelPackage(document.getSmooksResourceList()); + return modelPackage; } @Override Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-11 09:20:50 UTC (rev 10194) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -103,6 +103,7 @@ import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer; import org.jboss.tools.smooks.analyzer.MappingModel; import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.ResourceConfigEraser; import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; import org.jboss.tools.smooks.analyzer.SmooksFileBuilder; import org.jboss.tools.smooks.graphical.GraphInformations; @@ -208,29 +209,28 @@ return this.getEditDomain().getCommandStack(); } - protected void pickUpNormalInformation() { + protected void cleanMappingResourceConfig() { SmooksResourceListType list = null; if (!smooksResource.getContents().isEmpty()) { DocumentRoot doc = (DocumentRoot) this.smooksResource.getContents() .get(0); list = doc.getSmooksResourceList(); - if (mappingResourceConfigList != null) { - List<ResourceConfigType> resourceConfigList = mappingResourceConfigList - .getRelationgResourceConfigList(); - for (Iterator iterator = resourceConfigList.iterator(); iterator - .hasNext();) { - ResourceConfigType resourceConfigType = (ResourceConfigType) iterator - .next(); - list.getAbstractResourceConfig().remove(resourceConfigType); - } - } + ResourceConfigEraser eraser = new ResourceConfigEraser(); + eraser.cleanMappingResourceConfig(list, mappingResourceConfigList, + this.editingDomain); } else { DocumentRoot doc = SmooksFactory.eINSTANCE.createDocumentRoot(); smooksResource.getContents().add(doc); list = SmooksFactory.eINSTANCE.createSmooksResourceListType(); doc.setSmooksResourceList(list); } + callParentRefillNormalModelInfor(); } + + private void callParentRefillNormalModelInfor(){ + SmooksFormEditor editor = (SmooksFormEditor)getEditor(); + editor.refreshNormalPage(); + } // protected void notifyParentEditorTransformNormal @@ -240,7 +240,7 @@ try { this.initTransformViewerModel((IEditorSite) getSite(), getEditorInput()); - pickUpNormalInformation(); + cleanMappingResourceConfig(); } catch (IOWrappedException ex) { MessageDialog.openWarning(getSite().getShell(), "Waring", "Exceptions occurd during parsing Smooks file, no worries"); @@ -848,6 +848,7 @@ initFormEditorWithGraphInfo(graph); } catch (Throwable t) { // ignore + t.printStackTrace(); } IFile file = ((IFileEditorInput) input).getFile(); if (sourceDataTypeID == null || targetDataTypeID == null) { @@ -880,9 +881,6 @@ */ public void init(IEditorSite site, IEditorInput input) { super.init(site, input); - // if (Registry.INSTANCE.get(GraphicalPackage.eNS_URI) == null) { - Registry.INSTANCE.put(GraphicalPackage.eNS_URI, - GraphicalPackage.eINSTANCE); FormEditor parentEditor = this.getEditor(); if (parentEditor instanceof SmooksFormEditor) { editingDomain = ((SmooksFormEditor) parentEditor) 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-11 09:20:50 UTC (rev 10194) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -10,9 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; -import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -24,7 +22,6 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; import org.jboss.tools.smooks.utils.UIUtils; /** @@ -33,136 +30,43 @@ public class SmooksNormalContentEditFormPage extends FormPage { protected NormalSmooksModelPackage modelPackage = null; - + + protected SmooksResourceConfigFormBlock resourceBlock = null; + public SmooksNormalContentEditFormPage(FormEditor editor, String id, - String title) { + String title, NormalSmooksModelPackage modelPacakge) { super(editor, id, title); + this.setModelPackage(modelPacakge); + resourceBlock = new SmooksResourceConfigFormBlock(); } - public SmooksNormalContentEditFormPage(String id, String title) { + public SmooksNormalContentEditFormPage(String id, String title, + NormalSmooksModelPackage modelPacakge) { super(id, title); + this.setModelPackage(modelPackage); + resourceBlock = new SmooksResourceConfigFormBlock(); } - + @Override protected void createFormContent(IManagedForm managedForm) { final ScrolledForm form = managedForm.getForm(); FormToolkit tool = managedForm.getToolkit(); tool.decorateFormHeading(form.getForm()); - GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(2); - form.getBody().setLayout(gridLayout); + GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(1); + resourceBlock.createContent(managedForm); Composite rootMainControl = form.getBody(); form.setText("Normal Page"); - createResourceConfigGUI(rootMainControl, tool); createSmooksTypeGUI(rootMainControl, tool); - createDataTypeGUI(rootMainControl, tool); + form.getBody().setLayout(gridLayout); + form.pack(); + + resourceBlock.initViewers(); } - protected void createDataTypeGUI(Composite rootMainControl, FormToolkit tool) { - Section section = tool.createSection(rootMainControl, Section.TITLE_BAR - | Section.DESCRIPTION); - section.setText("Data Type"); - - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - section.setLayoutData(gd); - Composite dataTypeComposite = tool.createComposite(section); - section.setClient(dataTypeComposite); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginHeight = 0; - layout.marginWidth = 0; - dataTypeComposite.setLayout(layout); - - Composite tableComposite = tool - .createComposite(dataTypeComposite); - FillLayout fillLayout = new FillLayout(); - fillLayout.marginHeight = 1; - fillLayout.marginWidth = 1; - tableComposite.setLayout(fillLayout); - TableViewer tableTreeViewer = new TableViewer(tableComposite, SWT.NONE); - gd = new GridData(GridData.FILL_BOTH); - tableComposite.setLayoutData(gd); - tableComposite.setBackground(GraphicsConstants.groupBorderColor); - tool.paintBordersFor(tableComposite); - - Composite buttonComposite = tool - .createComposite(dataTypeComposite); - gd = new GridData(GridData.FILL_VERTICAL); - buttonComposite.setLayoutData(gd); - - GridLayout buttonLayout = new GridLayout(); - buttonComposite.setLayout(buttonLayout); - - Button addButton = tool.createButton(buttonComposite, "New", SWT.NONE); - gd = new GridData(GridData.FILL_HORIZONTAL); - addButton.setLayoutData(gd); - Button removeButton = tool.createButton(buttonComposite, "Delete", - SWT.NONE); - removeButton.setLayoutData(gd); - - Button upButton = tool.createButton(buttonComposite, "Up", SWT.NONE); - upButton.setLayoutData(gd); - - Button downButton = tool - .createButton(buttonComposite, "Down", SWT.NONE); - downButton.setLayoutData(gd); - } - - protected void createResourceConfigGUI(Composite rootMainControl, - FormToolkit tool) { - Section section = tool - .createSection(rootMainControl, Section.TITLE_BAR); - section.setText("Resource Config"); - - GridData gd = new GridData(GridData.FILL_BOTH); - gd.verticalSpan = 2; - section.setLayoutData(gd); - Composite resourceConfigComposite = tool.createComposite(section); - section.setClient(resourceConfigComposite); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginHeight = 0; - layout.marginWidth = 0; - resourceConfigComposite.setLayout(layout); - - Composite tableComposite = tool - .createComposite(resourceConfigComposite); - FillLayout fillLayout = new FillLayout(); - fillLayout.marginHeight = 1; - fillLayout.marginWidth = 1; - tableComposite.setLayout(fillLayout); - TableViewer tableTreeViewer = new TableViewer(tableComposite, SWT.NONE); - gd = new GridData(GridData.FILL_BOTH); - tableComposite.setLayoutData(gd); - tableComposite.setBackground(GraphicsConstants.groupBorderColor); - tool.paintBordersFor(tableComposite); - - Composite buttonComposite = tool - .createComposite(resourceConfigComposite); - gd = new GridData(GridData.FILL_VERTICAL); - buttonComposite.setLayoutData(gd); - - GridLayout buttonLayout = new GridLayout(); - buttonComposite.setLayout(buttonLayout); - - Button addButton = tool.createButton(buttonComposite, "New", SWT.NONE); - gd = new GridData(GridData.FILL_HORIZONTAL); - addButton.setLayoutData(gd); - Button removeButton = tool.createButton(buttonComposite, "Delete", - SWT.NONE); - removeButton.setLayoutData(gd); - - Button upButton = tool.createButton(buttonComposite, "Up", SWT.NONE); - upButton.setLayoutData(gd); - - Button downButton = tool - .createButton(buttonComposite, "Down", SWT.NONE); - downButton.setLayoutData(gd); - - } - protected void createSmooksTypeGUI(Composite mainComposite, FormToolkit tool) { GridData gd = new GridData(GridData.FILL_HORIZONTAL); - Section section = tool.createSection(mainComposite, Section.TITLE_BAR); + Section section = tool.createSection(mainComposite, Section.TITLE_BAR + | Section.DESCRIPTION | Section.TWISTIE); section.setLayoutData(gd); Composite typeSelectComposite = tool.createComposite(section); section.setClient(typeSelectComposite); @@ -198,11 +102,14 @@ } /** - * @param modelPackage the modelPackage to set + * @param modelPackage + * the modelPackage to set */ public void setModelPackage(NormalSmooksModelPackage modelPackage) { - if(modelPackage == this.modelPackage) return; + if (modelPackage == this.modelPackage) + return; this.modelPackage = modelPackage; + this.resourceBlock.setModelPackage(this.modelPackage); } } Added: 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 (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-11 09:28:47 UTC (rev 10195) @@ -0,0 +1,165 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.ui.editors; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +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.ui.forms.DetailsPart; +import org.eclipse.ui.forms.IManagedForm; +import org.eclipse.ui.forms.MasterDetailsBlock; +import org.eclipse.ui.forms.SectionPart; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.Section; +import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; +import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; +import org.milyn.xsd.smooks.impl.ResourceConfigTypeImpl; + +/** + * @author Dart Peng<br> + * Date : Sep 11, 2008 + */ +public class SmooksResourceConfigFormBlock extends MasterDetailsBlock { + + TreeViewer dateTypeViewer; + + NormalSmooksModelPackage modelPackage = null; + + public NormalSmooksModelPackage getModelPackage() { + return modelPackage; + } + + public void setModelPackage(NormalSmooksModelPackage modelPackage) { + this.modelPackage = modelPackage; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.forms.MasterDetailsBlock#createMasterPart(org.eclipse.ui.forms.IManagedForm, + * org.eclipse.swt.widgets.Composite) + */ + @Override + protected void createMasterPart(IManagedForm managedForm, Composite parent) { + FormToolkit tool = managedForm.getToolkit(); + createDataTypeGUI(parent, tool, managedForm); + configDateTypeViewer(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.forms.MasterDetailsBlock#createToolBarActions(org.eclipse.ui.forms.IManagedForm) + */ + @Override + protected void createToolBarActions(IManagedForm managedForm) { + + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.forms.DetailsPart) + */ + @Override + protected void registerPages(DetailsPart detailsPart) { + detailsPart.registerPage(ResourceConfigTypeImpl.class, + new BeanPopulatorDetailPage()); + } + + protected void configDateTypeViewer() { + dateTypeViewer.setContentProvider(new DateTypeContentProvider()); + } + + public void initViewers() { + if (this.getModelPackage() != null) { + List all = new ArrayList(); + List list = modelPackage.getBeanPopulatorResourceConfigList(); + if (list != null) { + all.addAll(list); + } + List dl = modelPackage.getDateResourceConfigList(); + if (dl != null) { + all.addAll(dl); + } + + dateTypeViewer.setInput(all); + } + } + + protected void createDataTypeGUI(Composite rootMainControl, + FormToolkit tool, final IManagedForm managedForm) { + Section section = tool.createSection(rootMainControl, Section.TITLE_BAR + | Section.DESCRIPTION); + section.setText("Data Type"); + final SectionPart spart = new SectionPart(section); + managedForm.addPart(spart); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + Composite dataTypeComposite = tool.createComposite(section); + section.setClient(dataTypeComposite); + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + layout.marginHeight = 0; + layout.marginWidth = 0; + dataTypeComposite.setLayout(layout); + + Composite tableComposite = tool.createComposite(dataTypeComposite); + FillLayout fillLayout = new FillLayout(); + fillLayout.marginHeight = 1; + fillLayout.marginWidth = 1; + tableComposite.setLayout(fillLayout); + dateTypeViewer = new TreeViewer(tableComposite, SWT.NONE); + dateTypeViewer + .addSelectionChangedListener(new ISelectionChangedListener() { + + public void selectionChanged(SelectionChangedEvent event) { + managedForm.fireSelectionChanged(spart, event + .getSelection()); + } + + }); + gd = new GridData(GridData.FILL_BOTH); + tableComposite.setLayoutData(gd); + tableComposite.setBackground(GraphicsConstants.groupBorderColor); + tool.paintBordersFor(tableComposite); + + Composite buttonComposite = tool.createComposite(dataTypeComposite); + gd = new GridData(GridData.FILL_VERTICAL); + buttonComposite.setLayoutData(gd); + + GridLayout buttonLayout = new GridLayout(); + buttonComposite.setLayout(buttonLayout); + + Button addButton = tool.createButton(buttonComposite, "New", SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + addButton.setLayoutData(gd); + Button removeButton = tool.createButton(buttonComposite, "Delete", + SWT.NONE); + removeButton.setLayoutData(gd); + + Button upButton = tool.createButton(buttonComposite, "Up", SWT.NONE); + upButton.setLayoutData(gd); + + Button downButton = tool + .createButton(buttonComposite, "Down", SWT.NONE); + downButton.setLayoutData(gd); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java ___________________________________________________________________ Name: svn:mime-type + text/plain