Author: DartPeng Date: 2008-09-16 05:33:46 -0400 (Tue, 16 Sep 2008) New Revision: 10248 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 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/SmooksGraphicalFormPage.java 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/modelparser/SmooksConfigurationFileGenerateContext.java Log: Add a new DetailPage for DateTypeDecrator Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -4,20 +4,39 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.emf.common.command.BasicCommandStack; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; import org.milyn.xsd.smooks.DocumentRoot; import org.milyn.xsd.smooks.SmooksFactory; +import org.milyn.xsd.smooks.SmooksPackage; import org.milyn.xsd.smooks.SmooksResourceListType; -import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl; +import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; public class SmooksFileBuilder { Resource smooksResource; + EditingDomain domain; + public SmooksFileBuilder(EditingDomain domain) { + this.domain = domain; + } + public Resource getSmooksResource() { return smooksResource; } @@ -41,32 +60,74 @@ + " and the targetID : " + context.getTargetDataTypeID()); } - if(smooksResource == null) { + if (smooksResource == null) { throw new SmooksAnalyzerException("SmooksResource is NULL"); } - DocumentRoot documentRoot = (DocumentRoot)smooksResource.getContents().get(0); - if(documentRoot == null){ + DocumentRoot documentRoot = (DocumentRoot) smooksResource.getContents() + .get(0); + if (documentRoot == null) { documentRoot = SmooksFactory.eINSTANCE.createDocumentRoot(); smooksResource.getContents().add(documentRoot); } - + SmooksResourceListType listType = documentRoot.getSmooksResourceList(); - if(listType == null){ + if (listType == null) { listType = SmooksFactory.eINSTANCE.createSmooksResourceListType(); documentRoot.setSmooksResourceList(listType); } // init the smooksresourcelist initSmooksParseStyle(context, listType); + context.setGeneratorResourceList(new ArrayList()); + context.setSmooksResourceListModel(listType); + context.setDomain(domain); - context.setSmooksResourceListModel(listType); analyzer.analyzeMappingGraphModel(context); + insertResoureConfig(listType, context.getGeneratorResourceList()); + + List test = listType.getAbstractResourceConfig(); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); smooksResource.save(outputStream, Collections.EMPTY_MAP); return new ByteArrayInputStream(outputStream.toByteArray()); } + private EditingDomain createEditingDomain() { + ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory( + ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + adapterFactory + .addAdapterFactory(new ResourceItemProviderAdapterFactory()); + adapterFactory + .addAdapterFactory(new SmooksItemProviderAdapterFactory()); + + AdapterFactoryEditingDomain editingDomain = new AdapterFactoryEditingDomain( + adapterFactory, createCommandStack(), + new HashMap<Resource, Boolean>()); + + return editingDomain; + } + + protected CommandStack createCommandStack() { + return new BasicCommandStack(); + } + + protected void insertResoureConfig(SmooksResourceListType list, + List resourceConfigList) { + EditingDomain domain = createEditingDomain(); + int length = resourceConfigList.size(); + List kk = list.getAbstractResourceConfig(); + for (int i = length - 1; i >= 0; i--) { + Object obj = resourceConfigList.get(i); + Command addResourceConfigCommand = AddCommand + .create( + domain, + list,SmooksPackage.eINSTANCE.getSmooksResourceListType_AbstractResourceConfig(), + obj); + addResourceConfigCommand.execute(); + } + } + /** * * <code> <resource-config selector="global-parameters"> Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,31 @@ +/******************************************************************************* + * 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; + +import org.milyn.xsd.smooks.ResourceConfigType; + +/** + * @author Dart Peng<br> + * Date : Sep 16, 2008 + */ +public class BeanPopulatorWarrper extends ResourceConfigWarrper { + + public BeanPopulatorWarrper() { + super(); + // TODO Auto-generated constructor stub + } + + public BeanPopulatorWarrper(ResourceConfigType type) { + super(type); + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,31 @@ +/******************************************************************************* + * 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; + +import org.milyn.xsd.smooks.ResourceConfigType; + +/** + * @author Dart Peng<br> + * Date : Sep 16, 2008 + */ +public class DateTypeWarrper extends ResourceConfigWarrper { + + public DateTypeWarrper() { + super(); + // TODO Auto-generated constructor stub + } + + public DateTypeWarrper(ResourceConfigType type) { + super(type); + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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; + +import org.milyn.xsd.smooks.ResourceConfigType; + +/** + * @author Dart Peng<br> + * Date : Sep 16, 2008 + */ +public class ResourceConfigWarrper { + private ResourceConfigType resourceConfig; + + public ResourceConfigWarrper(){ + + } + + public ResourceConfigWarrper(ResourceConfigType type){ + setResourceConfig(type); + } + + public ResourceConfigType getResourceConfig() { + return resourceConfig; + } + + public void setResourceConfig(ResourceConfigType resourceConfig) { + this.resourceConfig = resourceConfig; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -20,6 +20,7 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; +import org.jboss.tools.smooks.ui.ResourceConfigWarrper; import org.milyn.xsd.smooks.ResourceConfigType; /** @@ -156,8 +157,14 @@ this.selection = selection; formPart = part; if (selection != null && selection instanceof IStructuredSelection) { - resourceConfigList = (ResourceConfigType) ((IStructuredSelection) selection) - .getFirstElement(); + Object obj = ((IStructuredSelection) selection) + .getFirstElement(); + if(obj instanceof ResourceConfigType){ + resourceConfigList = (ResourceConfigType)obj; + } + if(obj instanceof ResourceConfigWarrper){ + resourceConfigList = ((ResourceConfigWarrper)obj).getResourceConfig(); + } refresh(); } } 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-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -21,6 +23,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; +import org.milyn.xsd.smooks.SmooksPackage; import org.milyn.xsd.smooks.util.SmooksModelUtils; /** @@ -75,7 +78,7 @@ gd.grabExcessHorizontalSpace = true; beanClassComposite.setLayoutData(gd); formToolKit.paintBordersFor(beanClassComposite); - + this.formToolKit.createLabel(parent, "Bean ID : "); Composite beanIDComposite = formToolKit.createComposite(parent); GridLayout bilg = new GridLayout(); @@ -107,8 +110,6 @@ protected void clazzBrowseButtonSelected() { } - - @Override public boolean isStale() { @@ -159,23 +160,27 @@ } 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 = ""; - + + 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() { @@ -187,7 +192,15 @@ } protected void selectorChanged() { - + String selector = selectorText.getText(); + if (selector != null) { + Command command = SetCommand.create(this.getDomain(), resourceConfigList, + SmooksPackage.eINSTANCE.getResourceConfigType_Selector(), + selector); + getDomain().getCommandStack().execute(command); + } + // resourceConfigList.getResource() + // this.getDomain(). } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,83 @@ +/******************************************************************************* + * 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.emf.edit.domain.EditingDomain; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; +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 16, 2008 + */ +public class DateTypeDetailPage extends AbstractSmooksModelDetailPage { + + private Text formatText; + private Combo localeLangaugeCombo; + private Combo localeContryCombo; + + public DateTypeDetailPage(SmooksFormEditor parentEditor, + EditingDomain domain) { + super(parentEditor, domain); + // TODO Auto-generated constructor stub + } + + @Override + public boolean isStale() { + return true; + } + + @Override + public void refresh() { + if(this.resourceConfigList != null){ + String formate = SmooksModelUtils.getParmaText("format", resourceConfigList); + String locallang = SmooksModelUtils.getParmaText("Locale-Language", resourceConfigList); + String localcontry = SmooksModelUtils.getParmaText("Locale-Contry", resourceConfigList); + if(formate == null) formate = ""; + if(locallang == null) locallang = ""; + if(localcontry == null) localcontry = ""; + + + formatText.setText(formate); + localeContryCombo.setText(localcontry); + localeLangaugeCombo.setText(locallang); + } + } + + @Override + protected void createSectionContents(Composite parent) { + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + parent.setLayout(layout); + this.formToolKit.createLabel(parent, "Format :"); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + formatText = this.formToolKit.createText(parent, ""); + formatText.setLayoutData(gd); + + this.formToolKit.createLabel(parent, "Locale-Language :"); + gd = new GridData(GridData.FILL_HORIZONTAL); + localeLangaugeCombo = new Combo(parent, SWT.FLAT); + localeLangaugeCombo.setLayoutData(gd); + + this.formToolKit.createLabel(parent, "Locale-Contry :"); + gd = new GridData(GridData.FILL_HORIZONTAL); + localeContryCombo = new Combo(parent, SWT.FLAT); + localeContryCombo.setLayoutData(gd); + + formToolKit.paintBordersFor(parent); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -0,0 +1,59 @@ +/******************************************************************************* + * 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.jboss.tools.smooks.ui.BeanPopulatorWarrper; +import org.jboss.tools.smooks.ui.DateTypeWarrper; +import org.jboss.tools.smooks.ui.ResourceConfigWarrper; +import org.milyn.xsd.smooks.ResourceConfigType; +import org.milyn.xsd.smooks.ResourceType; +import org.milyn.xsd.smooks.util.SmooksConstants; + +/** + * @author Dart Peng<br> + * Date : Sep 16, 2008 + */ +public class ResourceConfigWarrperFactory { + + + public static ResourceConfigWarrper createResourceConfigWarrper( + ResourceConfigType type) { + if (isBeanPopulatorResource(type)) { + BeanPopulatorWarrper p = new BeanPopulatorWarrper(type); + return p; + } + if(isDateTypeSelector(type)){ + DateTypeWarrper warrper = new DateTypeWarrper(type); + return warrper; + } + return null; + } + + public static boolean isBeanPopulatorResource(ResourceConfigType type) { + ResourceType resource = type.getResource(); + if (resource == null) + return false; + if (SmooksConstants.BEAN_POPULATOR.equals(resource.getValue())) { + return true; + } + return false; + } + + public static boolean isDateTypeSelector(ResourceConfigType type) { + ResourceType resource = type.getResource(); + if (resource == null) + return false; + if (SmooksConstants.DATE_DECODER.equals(resource.getValue())) { + return true; + } + return false; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -226,9 +226,9 @@ } callParentRefillNormalModelInfor(); } - - private void callParentRefillNormalModelInfor(){ - SmooksFormEditor editor = (SmooksFormEditor)getEditor(); + + private void callParentRefillNormalModelInfor() { + SmooksFormEditor editor = (SmooksFormEditor) getEditor(); editor.refreshNormalPage(); } @@ -451,7 +451,7 @@ } protected SmooksFileBuilder createSmooksFileBulder() { - return new SmooksFileBuilder(); + return new SmooksFileBuilder(this.getEditingDomain()); } protected void initTargetTreeViewer() { @@ -1136,6 +1136,8 @@ * @return the editingDomain */ protected AdapterFactoryEditingDomain getEditingDomain() { + FormEditor parentEditor = this.getEditor(); + editingDomain = ((SmooksFormEditor) parentEditor).getEditingDomain(); return editingDomain; } 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-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -15,7 +15,9 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -30,23 +32,32 @@ 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.BeanPopulatorWarrper; +import org.jboss.tools.smooks.ui.DateTypeWarrper; +import org.jboss.tools.smooks.ui.ResourceConfigWarrper; import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; +import org.milyn.xsd.smooks.ResourceConfigType; import org.milyn.xsd.smooks.impl.ResourceConfigTypeImpl; /** * @author Dart Peng<br> * Date : Sep 11, 2008 */ -public class SmooksResourceConfigFormBlock extends MasterDetailsBlock { +public class SmooksResourceConfigFormBlock extends MasterDetailsBlock implements + ISelectionChangedListener { TreeViewer dateTypeViewer; NormalSmooksModelPackage modelPackage = null; - + SmooksFormEditor parentEditor; - + + IManagedForm managedForm; + protected EditingDomain domain; + private SectionPart sectionPart; + public EditingDomain getDomain() { return domain; } @@ -71,6 +82,7 @@ */ @Override protected void createMasterPart(IManagedForm managedForm, Composite parent) { + this.managedForm = managedForm; FormToolkit tool = managedForm.getToolkit(); createDataTypeGUI(parent, tool, managedForm); configDateTypeViewer(); @@ -93,8 +105,10 @@ */ @Override protected void registerPages(DetailsPart detailsPart) { - detailsPart.registerPage(ResourceConfigTypeImpl.class, - new BeanPopulatorDetailPage(getParentEditor(),getDomain())); + detailsPart.registerPage(BeanPopulatorWarrper.class, + new BeanPopulatorDetailPage(getParentEditor(), getDomain())); + detailsPart.registerPage(DateTypeWarrper.class, + new DateTypeDetailPage(getParentEditor(), getDomain())); } protected void configDateTypeViewer() { @@ -122,8 +136,8 @@ Section section = tool.createSection(rootMainControl, Section.TITLE_BAR | Section.DESCRIPTION); section.setText("Data Type"); - final SectionPart spart = new SectionPart(section); - managedForm.addPart(spart); + sectionPart = new SectionPart(section); + managedForm.addPart(sectionPart); GridData gd = new GridData(GridData.FILL_HORIZONTAL); Composite dataTypeComposite = tool.createComposite(section); section.setClient(dataTypeComposite); @@ -139,15 +153,7 @@ 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()); - } - - }); + dateTypeViewer.addSelectionChangedListener(this); gd = new GridData(GridData.FILL_BOTH); tableComposite.setLayoutData(gd); tableComposite.setBackground(GraphicsConstants.groupBorderColor); @@ -183,4 +189,22 @@ this.parentEditor = parentEditor; } + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) event + .getSelection(); + if (selection.isEmpty()) + return; + Object obj = selection.getFirstElement(); + if (obj instanceof ResourceConfigType) { + ResourceConfigWarrper warrper = ResourceConfigWarrperFactory + .createResourceConfigWarrper((ResourceConfigType) obj); + if (warrper != null) { + selection = new StructuredSelection(warrper); + managedForm.fireSelectionChanged(sectionPart,selection); + return; + } + } + managedForm.fireSelectionChanged(sectionPart, event.getSelection()); + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-16 09:06:33 UTC (rev 10247) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-16 09:33:46 UTC (rev 10248) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.modelparser; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.edit.domain.EditingDomain; import org.jboss.tools.smooks.graphical.Param; import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; import org.milyn.xsd.smooks.SmooksResourceListType; @@ -25,7 +29,10 @@ protected String targetDataTypeID = null; protected GraphRootModel dataMappingRootModel; protected SmooksResourceListType smooksResourceListModel; + protected List generatorResourceList = new ArrayList(); + protected EditingDomain domain; + protected String smooksType = null; /** * @return the sourceDataTypeID @@ -90,5 +97,17 @@ public void addParam(Param param){ } + public EditingDomain getDomain() { + return domain; + } + public void setDomain(EditingDomain domain) { + this.domain = domain; + } + public List getGeneratorResourceList() { + return generatorResourceList; + } + public void setGeneratorResourceList(List generatorResourceList) { + this.generatorResourceList = generatorResourceList; + } }