[jbosstools-commits] JBoss Tools SVN: r15485 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration: editors/calc and 10 other directories.

Author: DartPeng Date: 2009-05-25 06:38:53 -0400 (Mon, 25 May 2009) New Revision: 15485 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java Log: JBIDE-4232 Develop a new validator : Selectorvalidator Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -379,6 +379,20 @@ toolkit, createOnElementFeatureNS, model, false, false, false, 0, null, SmooksUIUtils.VALUE_TYPE_VALUE, null); editPart2.setAttribute(createOnElementFeatureNS.getFeature(model)); + +// gd = new GridData(GridData.FILL_HORIZONTAL); +// gd.horizontalSpan = 2; +// +// toolkit.createSeparator(parent, SWT.HORIZONTAL).setLayoutData(gd); + + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + gd.heightHint = 8; + + Composite ccc = toolkit.createComposite(parent); + ccc.setLayoutData(gd); +// ccc.setBackground(new Color(null,128,128,128)); + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); list.add(editPart1); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -91,7 +91,7 @@ public void createContents(Composite parent) { parent.setLayout(new FillLayout()); - section = formToolkit.createSection(parent, Section.TITLE_BAR); + section = formToolkit.createSection(parent, Section.TITLE_BAR|Section.DESCRIPTION); Composite client = formToolkit.createComposite(section); section.setLayout(new FillLayout()); @@ -475,7 +475,7 @@ text = ((EObject) model).eClass().getName(); } section.setText(text); - section.setDescription("Details of " + text + ". Required fields are denoted by \"*\"."); +// section.setDescription("Details of " + text + ". Required fields are denoted by \"*\"."); section.layout(); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -77,7 +77,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Count On Element", editingdomain, toolkit, parent, model, formEditor, CalcPackage.Literals.COUNTER__COUNT_ON_ELEMENT, CalcPackage.Literals.COUNTER__COUNT_ON_ELEMENT_NS); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -13,8 +13,7 @@ import java.lang.reflect.InvocationTargetException; import java.sql.Driver; import java.sql.SQLException; -import java.util.Collections; -import java.util.Iterator; +import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -24,7 +23,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.dialogs.MessageDialog; @@ -100,6 +98,13 @@ return super.ignoreProperty(feature); } + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { + return this.createElementSelectionSection("Binding On Element", editingdomain, toolkit, parent, model, + formEditor, DatasourcePackage.eINSTANCE.getDirect_BindOnElement(), DatasourcePackage.eINSTANCE + .getDirect_BindOnElementNS()); + } + /* * (non-Javadoc) * @@ -113,25 +118,7 @@ @Override public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { - IItemPropertySource itemPropertySource = (IItemPropertySource) editingdomain.getAdapterFactory().adapt(model, - IItemPropertySource.class); - List<IItemPropertyDescriptor> propertyDes = itemPropertySource.getPropertyDescriptors(model); - IItemPropertyDescriptor createOnElementFeature = null; - IItemPropertyDescriptor createOnElementFeatureNS = null; - for (Iterator<?> iterator = propertyDes.iterator(); iterator.hasNext();) { - IItemPropertyDescriptor itemPropertyDescriptor = (IItemPropertyDescriptor) iterator.next(); - if (itemPropertyDescriptor.getFeature(model) == DatasourcePackage.eINSTANCE.getDirect_BindOnElement()) { - createOnElementFeature = itemPropertyDescriptor; - } - if (itemPropertyDescriptor.getFeature(model) == DatasourcePackage.eINSTANCE.getDirect_BindOnElementNS()) { - createOnElementFeatureNS = itemPropertyDescriptor; - } - } - if (createOnElementFeature == null || createOnElementFeatureNS == null) { - return Collections.emptyList(); - } - List<AttributeFieldEditPart> editPartList = this.createElementSelectionSection("Binding On Element", - editingdomain, toolkit, parent, model, formEditor, createOnElementFeature, createOnElementFeatureNS); + List<AttributeFieldEditPart> editPartList = new ArrayList<AttributeFieldEditPart>(); Composite spaceComposite = toolkit.createComposite(parent); GridData gd = new GridData(GridData.FILL_HORIZONTAL); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/filerouting/OutputStreamUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -10,7 +10,10 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.filerouting; +import java.util.List; + import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -34,8 +37,8 @@ * org.eclipse.emf.ecore.EAttribute) */ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, - IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, - SmooksMultiFormEditor formEditor) { + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + SmooksMultiFormEditor formEditor) { if (feature == FileRoutingPackage.eINSTANCE.getOutputStream_FileNamePattern()) { } if (feature == FileRoutingPackage.eINSTANCE.getOutputStream_DestinationDirectoryPattern()) { @@ -53,8 +56,44 @@ if (feature == FileRoutingPackage.eINSTANCE.getOutputStream_ResourceName()) { } - return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, - formEditor); + return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); } + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#createExtendUI + * (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain, + * org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, java.lang.Object, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { + + return createElementSelectionSection("Open On Element", editingdomain, toolkit, parent, model, formEditor, + FileRoutingPackage.Literals.OUTPUT_STREAM__OPEN_ON_ELEMENT, + FileRoutingPackage.Literals.OUTPUT_STREAM__OPEN_ON_ELEMENT_NS); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == FileRoutingPackage.Literals.OUTPUT_STREAM__OPEN_ON_ELEMENT) { + return true; + } + if (feature == FileRoutingPackage.Literals.OUTPUT_STREAM__OPEN_ON_ELEMENT_NS) { + return true; + } + return super.ignoreProperty(feature); + } + } \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -75,7 +75,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Apply On Element", editingdomain, toolkit, parent, model, formEditor, FreemarkerPackage.Literals.FREEMARKER__APPLY_ON_ELEMENT, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -57,7 +57,7 @@ } @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Execute On Element", editingdomain, toolkit, parent, model, formEditor, GroovyPackage.eINSTANCE.getGroovy_ExecuteOnElement(), GroovyPackage.eINSTANCE Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -93,7 +93,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Create On Element", editingdomain, toolkit, parent, model, formEditor, JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.javabean; +import java.util.ArrayList; import java.util.List; import org.eclipse.emf.ecore.EAttribute; @@ -46,10 +47,7 @@ @Override public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { - List<AttributeFieldEditPart> list = createElementSelectionSection("Execute On Element", editingdomain, toolkit, - parent, model, formEditor, JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT, - JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT_NS); - + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); OpenEditorEditInnerContentsAction openCDATAEditorAction = new OpenEditorEditInnerContentsAction(editingdomain, (AnyType) model, SmooksUIUtils.VALUE_TYPE_TEXT, "txt"); @@ -64,6 +62,17 @@ return list; } + + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + Composite parent, Object model, SmooksMultiFormEditor formEditor) { + List<AttributeFieldEditPart> list = createElementSelectionSection("Execute On Element", editingdomain, toolkit, + parent, model, formEditor, JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT, + JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT_NS); + + return list; + } + + /* * (non-Javadoc) Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -73,7 +73,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Data", editingdomain, toolkit, parent, model, formEditor, JavabeanPackage.eINSTANCE.getValueType_Data(), JavabeanPackage.eINSTANCE.getValueType_DataNS()); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -71,7 +71,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Wrie On Element", editingdomain, toolkit, parent, model, formEditor, JavabeanPackage.eINSTANCE.getWiringType_WireOnElement(), Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -65,13 +65,26 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Route On Element", editingdomain, toolkit, parent, model, formEditor, JmsroutingPackage.eINSTANCE.getJmsRouter_RouteOnElement(), JmsroutingPackage.eINSTANCE .getJmsRouter_RouteOnElementNS()); } + + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.configuration.editors.PropertyUICreator#isBeanIDRefFieldFeature(org.eclipse.emf.ecore.EAttribute) + */ + @Override + protected boolean isBeanIDRefFieldFeature(EAttribute attribute) { + if(attribute == JmsroutingPackage.Literals.JMS_ROUTER__BEAN_ID){ + return true; + } + return super.isBeanIDRefFieldFeature(attribute); + } + /* * (non-Javadoc) * Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -73,7 +73,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Selector", editingdomain, toolkit, parent, model, formEditor, SmooksPackage.eINSTANCE.getResourceConfigType_Selector(), SmooksPackage.eINSTANCE Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -63,7 +63,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Default Selector", editingdomain, toolkit, parent, model, formEditor, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -41,6 +41,9 @@ */ public IContentProposal[] getProposals(String contents, int position) { List<Object> list = SelectoreSelectionDialog.generateInputData(extType); + if(list == null || list.isEmpty()){ + return null; + } List<IContentProposal> contentList = new ArrayList<IContentProposal>(); List<IXMLStructuredObject> models = new ArrayList<IXMLStructuredObject>(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -748,6 +748,8 @@ layout.marginRight = 0; layout.horizontalSpacing = 0; tcom.setLayout(layout); + + EAttribute attribute = (EAttribute) propertyDescriptor.getFeature(model); FieldMarkerComposite notificationComposite = new FieldMarkerComposite(tcom, SWT.NONE); gd = new GridData(); @@ -763,7 +765,7 @@ gd = new GridData(GridData.FILL_HORIZONTAL); searchComposite.setLayoutData(gd); Object editValue = getEditValue(propertyDescriptor, model); - if (editValue != null) { + if (editValue != null && model.eIsSet(attribute)) { searchComposite.getText().setText(editValue.toString()); } searchComposite.addModifyListener(new ModifyListener() { @@ -1251,6 +1253,7 @@ public static void loadSelectorObject(IXMLStructuredObject model, List<String> loadedModelName, List<IXMLStructuredObject> loadedModels, int level) { + loadedModels.add(model); if (level >= SELECTOR_EXPAND_MAX_LEVEL) return; level++; @@ -1258,7 +1261,6 @@ return; } else { loadedModelName.add(model.getNodeName()); - loadedModels.add(model); List<IXMLStructuredObject> children = model.getChildren(); for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) { IXMLStructuredObject structuredObject = (IXMLStructuredObject) iterator.next(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -63,7 +63,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Apply On Element", editingdomain, toolkit, parent, model, formEditor, XslPackage.Literals.XSL__APPLY_ON_ELEMENT, XslPackage.Literals.XSL__APPLY_ON_ELEMENT_NS); Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -0,0 +1,97 @@ +/******************************************************************************* + * 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.configuration.validate; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.model.javabean.JavabeanPackage; +import org.jboss.tools.smooks.model.javabean.WiringType; +import org.jboss.tools.smooks.model.jmsrouting.JmsRouter; +import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; +import org.jboss.tools.smooks.model.smooks.DocumentRoot; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class BeanIdRefValidator extends AbstractValidator { + + private List<String> idList = new ArrayList<String>(); + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.validate.AbstractValidator# + * preStartValidation() + */ + @Override + protected void preStartValidation() { + + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.validate.AbstractValidator#validate + * (java.util.Collection, org.eclipse.emf.edit.domain.EditingDomain) + */ + @Override + public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { + idList.clear(); + Resource resource = editingDomain.getResourceSet().getResources().get(0); + Object obj = resource.getContents().get(0); + if (obj instanceof DocumentRoot) { + SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList(); + List<String> ids = SmooksUIUtils.getBeanIdList(listType); + idList.addAll(ids); + } + if (idList.isEmpty()) { +// return null; + } + return super.validate(selectedObjects, editingDomain); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.validate.AbstractValidator#validateModel + * (java.lang.Object, org.eclipse.emf.edit.domain.EditingDomain) + */ + @Override + protected Diagnostic validateModel(Object model, EditingDomain editingDomain) { + if (model instanceof WiringType) { + String idRef = ((WiringType) model).getBeanIdRef(); + if (!idList.contains(idRef)) { + return newWaringDiagnostic("Reference BeanId '" + idRef + "' dosen't exist.", model, + JavabeanPackage.Literals.WIRING_TYPE__BEAN_ID_REF); + } + } + + if(model instanceof JmsRouter){ + String idRef = ((JmsRouter)model).getBeanId(); + if (!idList.contains(idRef)) { + return newWaringDiagnostic("Reference BeanId '" + idRef + "' dosen't exist.", model, + JmsroutingPackage.Literals.JMS_ROUTER__BEAN_ID); + } + } + return super.validateModel(model, editingDomain); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/BeanIdRefValidator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -0,0 +1,254 @@ +/******************************************************************************* + * 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.configuration.validate; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; +import org.jboss.tools.smooks.configuration.editors.SelectoreSelectionDialog; +import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; +import org.jboss.tools.smooks.configuration.editors.groovy.GroovyUICreator; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.model.calc.CalcPackage; +import org.jboss.tools.smooks.model.calc.Counter; +import org.jboss.tools.smooks.model.datasource.DatasourcePackage; +import org.jboss.tools.smooks.model.datasource.Direct; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; +import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage; +import org.jboss.tools.smooks.model.fileRouting.OutputStream; +import org.jboss.tools.smooks.model.freemarker.Freemarker; +import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; +import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; +import org.jboss.tools.smooks.model.groovy.Groovy; +import org.jboss.tools.smooks.model.groovy.GroovyPackage; +import org.jboss.tools.smooks.model.javabean.BindingsType; +import org.jboss.tools.smooks.model.javabean.ExpressionType; +import org.jboss.tools.smooks.model.javabean.JavabeanPackage; +import org.jboss.tools.smooks.model.javabean.ValueType; +import org.jboss.tools.smooks.model.javabean.WiringType; +import org.jboss.tools.smooks.model.jmsrouting.JmsRouter; +import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; +import org.jboss.tools.smooks.model.smooks.DocumentRoot; +import org.jboss.tools.smooks.model.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.xsl.Xsl; +import org.jboss.tools.smooks.model.xsl.XslPackage; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class SelectorValidator extends AbstractValidator { + + private SmooksGraphicsExtType extType = null; + + private List<Object> list = new ArrayList<Object>(); + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.validate.AbstractValidator#validate + * (java.util.Collection, org.eclipse.emf.edit.domain.EditingDomain) + */ + @Override + public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { + list.clear(); + Resource resource = editingDomain.getResourceSet().getResources().get(0); + Object obj = resource.getContents().get(0); + final SmooksGraphicsExtType[] extTypes = new SmooksGraphicsExtType[1]; + if (obj instanceof DocumentRoot) { + SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList(); + IResource r = SmooksUIUtils.getResource(listType); + IFile file = null; + if (r instanceof IFile) { + file = (IFile) r; + } + final IFile ff = file; + Display.getDefault().syncExec(new Runnable() { + + /* + * (non-Javadoc) + * + * @see java.lang.Runnable#run() + */ + public void run() { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + if (window == null) { + return; + } + SmooksMultiFormEditor editor = (SmooksMultiFormEditor) window.getActivePage().findEditor( + new FileEditorInput((IFile) ff)); + if (editor == null) + return; + + SmooksGraphicsExtType extType = editor.getSmooksGraphicsExt(); + extTypes[0] = extType; + } + + }); + } + extType = extTypes[0]; + if (extType != null) { + List<Object> l = SelectoreSelectionDialog.generateInputData(extType); + if (l != null) { + list.addAll(l); + } + } + return super.validate(selectedObjects, editingDomain); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.validate.AbstractValidator#validateModel + * (java.lang.Object, org.eclipse.emf.edit.domain.EditingDomain) + */ + @Override + protected Diagnostic validateModel(Object model, EditingDomain editingDomain) { + EAttribute feature = getAttribute(model); + String path = getPath(model); +// if(feature != null && path == null){ +// return newWaringDiagnostic("Selector '" +path+ "' isn't available", model, feature); +// } + if (feature != null && path != null) { + Object node = null; + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + Object obj = (Object) iterator.next(); + if (obj instanceof IXMLStructuredObject) { + if (node == null){ + node = SmooksUIUtils.localXMLNodeWithPath(path, (IXMLStructuredObject) obj,"/" , false); + } + if(node != null){ + return null; + } + } + } + if(node == null){ + return newWaringDiagnostic("Selector '" +path+ "' isn't available", model, feature); + } + } + return super.validateModel(model, editingDomain); + } + + private EAttribute getAttribute(Object model) { + if (model instanceof BindingsType) { + return JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT; + } + if (model instanceof Counter) { + return CalcPackage.Literals.COUNTER__COUNT_ON_ELEMENT; + } + if(model instanceof Direct){ + return DatasourcePackage.Literals.DIRECT__BIND_ON_ELEMENT; + } + if(model instanceof RouteBean){ + return EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT; + } + if(model instanceof OutputStream){ + return FileRoutingPackage.Literals.OUTPUT_STREAM__OPEN_ON_ELEMENT; + } + if(model instanceof Freemarker){ + return FreemarkerPackage.Literals.FREEMARKER__APPLY_ON_ELEMENT; + } + if(model instanceof Xsl){ + return XslPackage.Literals.XSL__APPLY_ON_ELEMENT; + } + if(model instanceof GroovyUICreator){ + return GroovyPackage.Literals.GROOVY__EXECUTE_ON_ELEMENT; + } + if(model instanceof JmsRouter){ + return JmsroutingPackage.Literals.JMS_ROUTER__ROUTE_ON_ELEMENT; + } + + if(model instanceof ResourceConfigType){ + return SmooksPackage.Literals.RESOURCE_CONFIG_TYPE__SELECTOR; + } + + if(model instanceof SmooksResourceListType){ + return SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR; + } + + if(model instanceof WiringType){ + return JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT; + } + if(model instanceof ExpressionType){ + return JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT; + } + if(model instanceof ValueType){ + return JavabeanPackage.Literals.VALUE_TYPE__DATA; + } + return null; + } + + private String getPath(Object model) { + if(model instanceof ExpressionType){ + return ((ExpressionType)model).getExecOnElement(); + } + if(model instanceof ValueType){ + return ((ValueType)model).getData(); + } + if(model instanceof WiringType){ + return ((WiringType)model).getWireOnElement(); + } + if(model instanceof SmooksResourceListType){ + return ((SmooksResourceListType)model).getDefaultSelector(); + } + if(model instanceof ResourceConfigType) + { + return ((ResourceConfigType)model).getSelector(); + } + if(model instanceof JmsRouter){ + return ((JmsRouter)model).getRouteOnElement(); + } + if(model instanceof GroovyUICreator){ + return ((Groovy)model).getExecuteOnElement(); + } + if(model instanceof Xsl){ + return ((Xsl)model).getApplyOnElement(); + } + if (model instanceof Counter) { + return ((Counter)model).getCountOnElement(); + } + if (model instanceof BindingsType) { + return ((BindingsType) model).getCreateOnElement(); + } + if(model instanceof Direct){ + return ((Direct)model).getBindOnElement(); + } + if(model instanceof RouteBean){ + return ((RouteBean)model).getRouteOnElement(); + } + if(model instanceof OutputStream){ + return ((OutputStream)model).getOpenOnElement(); + } + if(model instanceof Freemarker){ + return ((Freemarker)model).getApplyOnElement(); + } + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-05-25 10:22:39 UTC (rev 15484) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-05-25 10:38:53 UTC (rev 15485) @@ -96,6 +96,8 @@ public SmooksModelValidator() { validatorList.add(new ClassFieldEditorValidator()); validatorList.add(new DuplicatedBeanIDValidator()); + validatorList.add(new BeanIdRefValidator()); + validatorList.add(new SelectorValidator()); innerEditingDomain = newEditingDomain(); } @@ -244,9 +246,11 @@ private AdapterFactoryEditingDomain newEditingDomain() { BasicCommandStack commandStack = new BasicCommandStack(); - AdapterFactoryEditingDomain editingDomain = new AdapterFactoryEditingDomain(getAdapterFactory(), commandStack, - new HashMap<Resource, Boolean>()); - return editingDomain; + if(innerEditingDomain == null){ + innerEditingDomain = new AdapterFactoryEditingDomain(getAdapterFactory(), commandStack, + new HashMap<Resource, Boolean>()); + } + return innerEditingDomain; } public ComposedAdapterFactory getAdapterFactory() {