[jbosstools-commits] JBoss Tools SVN: r15508 - in trunk/smooks: plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider and 10 other directories.

Author: DartPeng Date: 2009-05-26 03:44:30 -0400 (Tue, 26 May 2009) New Revision: 15508 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java 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/esbrouter/RouteBeanPropertyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.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/smooks/ConditionTypeUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BeanIdRefProposalProvider.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/TemplateUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/DBExtractTransformConfigFileTestCase.java Log: JBIDE-4232 1.Fix some bugs of the selector validator 2.Relabel the treeviewer Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-26 07:44:30 UTC (rev 15508) @@ -183,7 +183,7 @@ _UI_BindingsType_type = Bindings _UI_DecodeParamType_type = Decode Param _UI_ExpressionType_type = Expression -_UI_ValueType_type = Value +_UI_ValueType_type = Value Binding _UI_WiringType_type = Wiring _UI_BindingsType_group_feature = Group _UI_BindingsType_value_feature = Value Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -233,10 +233,10 @@ */ @Override public String getText(Object object) { - String label = ((BindingsType)object).getTargetProfile(); + String label = ((BindingsType)object).getBeanId(); return label == null || label.length() == 0 ? getString("_UI_BindingsType_type") : - getString("_UI_BindingsType_type") + " " + label; + getString("_UI_BindingsType_type") + " (" + label+")"; } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -200,10 +200,10 @@ */ @Override public String getText(Object object) { - String label = ((ExpressionType)object).getValue(); + String label = ((ExpressionType)object).getProperty(); return label == null || label.length() == 0 ? getString("_UI_ExpressionType_type") : - getString("_UI_ExpressionType_type") + " " + label; + getString("_UI_ExpressionType_type") + " (" + label+")"; } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -255,13 +255,10 @@ */ @Override public String getText(Object object) { - String label = ((ValueType)object).getData(); - if(label != null && label.length() > 12){ - label = label.substring(0, 12) + "..."; - } + String label = ((ValueType)object).getProperty(); return label == null || label.length() == 0 ? getString("_UI_ValueType_type") : - getString("_UI_ValueType_type") + " " + label; + getString("_UI_ValueType_type") + " (" + label + ")"; } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -200,10 +200,10 @@ */ @Override public String getText(Object object) { - String label = ((WiringType)object).getBeanIdRef(); + String label = ((WiringType)object).getProperty(); return label == null || label.length() == 0 ? getString("_UI_WiringType_type") : - getString("_UI_WiringType_type") + " " + label; + getString("_UI_WiringType_type") + " (" + label+")"; } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -1417,7 +1417,7 @@ source, new String[] { "name", "condition_._type", - "kind", "simple" + "kind", "mixed" }); addAnnotation (getConditionType_Value(), 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-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -30,15 +30,18 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.layout.FillLayout; 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.Group; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.forms.IFormColors; import org.eclipse.ui.forms.events.IHyperlinkListener; import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.configuration.editors.uitls.FieldAssistDisposer; import org.jboss.tools.smooks.configuration.editors.uitls.FieldMarkerWrapper; import org.jboss.tools.smooks.configuration.editors.uitls.IFieldDialog; @@ -131,8 +134,8 @@ return SmooksUIUtils.getJavaProject(model); } - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, - Composite parent, Object model, SmooksMultiFormEditor formEditor) { + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return Collections.emptyList(); } @@ -181,7 +184,7 @@ SmooksMultiFormEditor formEditor) { SmooksGraphicsExtType ext = formEditor.getSmooksGraphicsExt(); if (ext != null) { - return SmooksUIUtils.createSelectorFieldEditor(toolkit, parent, propertyDescriptor, model, ext,formEditor); + return SmooksUIUtils.createSelectorFieldEditor(toolkit, parent, propertyDescriptor, model, ext, formEditor); } return null; } @@ -253,7 +256,7 @@ final Object cmodel = model; combo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - if(combo.getText() == null || combo.getText().length() ==0){ + if (combo.getText() == null || combo.getText().length() == 0) { ip.setPropertyValue(cmodel, null); return; } @@ -264,20 +267,24 @@ ip.setPropertyValue(cmodel, combo.getText()); } }); - - final FieldAssistDisposer disposer = SmooksUIUtils.addBeanIdRefAssistToCombo(combo, (EObject)model); - - combo.addDisposeListener(new DisposeListener(){ - /* (non-Javadoc) - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) + final FieldAssistDisposer disposer = SmooksUIUtils.addBeanIdRefAssistToCombo(combo, (EObject) model); + + combo.addDisposeListener(new DisposeListener() { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.swt.events.DisposeListener#widgetDisposed + * (org.eclipse.swt.events.DisposeEvent) */ public void widgetDisposed(DisposeEvent e) { disposer.dispose(); } - + }); - + return editPart; } } @@ -295,18 +302,18 @@ return null; } - public boolean ignoreProperty(EAttribute feature) { return false; } - - public IItemPropertyDescriptor getPropertyDescriptor(AdapterFactoryEditingDomain editingDomain,EAttribute attribute , Object model){ + + public IItemPropertyDescriptor getPropertyDescriptor(AdapterFactoryEditingDomain editingDomain, + EAttribute attribute, Object model) { IItemPropertySource itemPropertySource = (IItemPropertySource) editingDomain.getAdapterFactory().adapt(model, IItemPropertySource.class); List<IItemPropertyDescriptor> list = itemPropertySource.getPropertyDescriptors(model); for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { IItemPropertyDescriptor itemPropertyDescriptor = (IItemPropertyDescriptor) iterator.next(); - if(itemPropertyDescriptor.getFeature(model) == attribute){ + if (itemPropertyDescriptor.getFeature(model) == attribute) { return itemPropertyDescriptor; } } @@ -342,24 +349,50 @@ AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor, IItemPropertyDescriptor createOnElementFeature, IItemPropertyDescriptor createOnElementFeatureNS) { - Section section = toolkit.createSection(parent, Section.TITLE_BAR); - section.setText(sectionTitle); + Group group = new Group(parent, SWT.NONE); + // Section section = toolkit.createSection(parent, Section.TITLE_BAR); + // section.setText(sectionTitle); + if (sectionTitle != null) { + sectionTitle = " " + sectionTitle + " "; + } + group.setText(sectionTitle); + // FontData fd = new FontData(); + // fd.setStyle(SWT.BOLD); + // group.setForeground(toolkit.getColors().getForeground()); FillLayout layout = new FillLayout(); layout.marginHeight = 0; layout.marginWidth = 0; - section.setLayout(layout); + // section.setLayout(layout); + group.setLayout(layout); GridData gd = new GridData(GridData.FILL_HORIZONTAL); - gd.heightHint = 100; +// gd.heightHint = 100; gd.horizontalSpan = 2; - section.setLayoutData(gd); + // section.setLayoutData(gd); + group.setLayoutData(gd); + group.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + // Composite backComposite = toolkit.createComposite(section); + // section.setClient(backComposite); + // GridLayout gl = new GridLayout(); + // gl.marginHeight = 0; + // gl.marginWidth = 0; + // gl.marginLeft = 1; + // gl.marginRight = 1; + // gl.marginBottom = 1; + // backComposite.setLayout(gl); + // backComposite.setBackground(toolkit.getColors().getColor(IFormColors.BORDER)); - Composite container = toolkit.createComposite(section); + Composite container = toolkit.createComposite(group); + group.setBackground(container.getBackground()); - section.setClient(container); - + Font f = container.getFont(); + if (f != null) { + FontData fd = f.getFontData()[0]; + if (fd != null) + group.setFont(new Font(null, new FontData(fd.getName(), fd.getHeight(), SWT.BOLD))); + } GridLayout glayout = new GridLayout(); glayout.numColumns = 2; container.setLayout(glayout); @@ -368,7 +401,7 @@ name += "*"; } AttributeFieldEditPart editPart1 = SmooksUIUtils.createSelectorFieldEditor(name, toolkit, container, - createOnElementFeature, model, formEditor.getSmooksGraphicsExt(),formEditor); + createOnElementFeature, model, formEditor.getSmooksGraphicsExt(), formEditor); editPart1.setAttribute(createOnElementFeature.getFeature(model)); String namespace = "Namespace"; @@ -379,20 +412,19 @@ 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; + // + // 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)); - + // 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/esbrouter/RouteBeanPropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/esbrouter/RouteBeanPropertyUICreator.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/esbrouter/RouteBeanPropertyUICreator.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -15,12 +15,16 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.ui.forms.IFormColors; import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; @@ -116,18 +120,30 @@ public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); - Section section = toolkit.createSection(parent, Section.TITLE_BAR); + Group group =new Group(parent,SWT.NONE); +// Section section = toolkit.createSection(parent, Section.TITLE_BAR); GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; - section.setText("Route To Serivce"); - section.setLayoutData(gd); +// section.setText("Route To Serivce"); + group.setText("Route To Serivce"); +// section.setLayoutData(gd); + group.setLayoutData(gd); FillLayout fl = new FillLayout(); fl.marginHeight = 0; fl.marginWidth = 0; - section.setLayout(fl); - Composite composite = toolkit.createComposite(section); - section.setClient(composite); +// section.setLayout(fl); + group.setLayout(fl); + + Composite composite = toolkit.createComposite(group); +// section.setClient(composite); + group.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + Font f = composite.getFont(); + if (f != null) { + FontData fd = f.getFontData()[0]; + if (fd != null) + group.setFont(new Font(null, new FontData(fd.getName(), fd.getHeight(), SWT.BOLD))); + } GridLayout gl = new GridLayout(); gl.numColumns = 2; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.freemarker; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; import org.eclipse.emf.ecore.EAttribute; @@ -40,32 +40,39 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, - EAttribute feature, SmooksMultiFormEditor formEditor) { + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + SmooksMultiFormEditor formEditor) { if (feature == FreemarkerPackage.eINSTANCE.getTemplate_Value()) { } - if (feature == FreemarkerPackage.eINSTANCE.getTemplate_Encoding()) { - } - return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); } @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, - SmooksMultiFormEditor formEditor) { - OpenEditorEditInnerContentsAction openCDATAEditorAction = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_CDATA, "flt"); -// OpenEditorEditInnerContentsAction openCommentEditorAction = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "flt"); + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); + OpenEditorEditInnerContentsAction openCDATAEditorAction = new OpenEditorEditInnerContentsAction(editingdomain, + (AnyType) model, SmooksUIUtils.VALUE_TYPE_CDATA, "flt"); + // OpenEditorEditInnerContentsAction openCommentEditorAction = new + // OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, + // SmooksUIUtils.VALUE_TYPE_COMMENT, "flt"); - AttributeFieldEditPart cdatatext = SmooksUIUtils.createCDATAFieldEditor("Inline Template", editingdomain, toolkit, parent, model, openCDATAEditorAction); -// AttributeFieldEditPart commenttext = SmooksUIUtils.createCommentFieldEditor("Template Contents(Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction); - - openCDATAEditorAction.setRelateText((Text)cdatatext.getContentControl()); -// openCommentEditorAction.setRelateText((Text)commenttext.getContentControl()); - - SmooksUIUtils.createFileSelectionTextFieldEditor("External Template File", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, - null, null); + AttributeFieldEditPart cdatatext = SmooksUIUtils.createCDATAFieldEditor("Inline Template", editingdomain, + toolkit, parent, model, openCDATAEditorAction, true); + list.add(cdatatext); + // AttributeFieldEditPart commenttext = + // SmooksUIUtils.createCommentFieldEditor("Template Contents(Comment)", + // editingdomain, toolkit, parent, model, openCommentEditorAction); - return Collections.emptyList(); + openCDATAEditorAction.setRelateText((Text) cdatatext.getContentControl()); + // openCommentEditorAction.setRelateText((Text)commenttext.getContentControl()); + + list.add(SmooksUIUtils.createFileSelectionTextFieldEditor("External Template File", parent, editingdomain, + toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, null, null)); + list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit, getPropertyDescriptor(editingdomain, + FreemarkerPackage.eINSTANCE.getTemplate_Encoding(), model), model, false, false, null)); + return list; } @Override @@ -73,6 +80,10 @@ if (feature == FreemarkerPackage.eINSTANCE.getTemplate_Value()) { return true; } + if (feature == FreemarkerPackage.eINSTANCE.getTemplate_Encoding()) { + return true; + } + return super.ignoreProperty(feature); } 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-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -19,6 +19,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.model.javabean.JavabeanPackage; /** @@ -73,10 +74,17 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - 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()); + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { + List<AttributeFieldEditPart> list = createElementSelectionSection("Data", editingdomain, toolkit, parent, + model, formEditor, JavabeanPackage.eINSTANCE.getValueType_Data(), JavabeanPackage.eINSTANCE + .getValueType_DataNS()); + list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit, getPropertyDescriptor(editingdomain, + JavabeanPackage.Literals.VALUE_TYPE__DEFAULT, model), model, false, false, null)); + + list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit, getPropertyDescriptor(editingdomain, + JavabeanPackage.Literals.VALUE_TYPE__DECODER, model), model, false, false, null)); + return list; } /* @@ -94,6 +102,12 @@ if (feature == JavabeanPackage.eINSTANCE.getValueType_DataNS()) { return true; } + if (feature == JavabeanPackage.eINSTANCE.getValueType_Decoder()) { + return true; + } + if (feature == JavabeanPackage.eINSTANCE.getValueType_Default()) { + return true; + } return super.ignoreProperty(feature); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ConditionTypeUICreator.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -10,8 +10,12 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.smooks; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; +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; @@ -36,11 +40,12 @@ * 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 == SmooksPackage.eINSTANCE.getConditionType_Value()) { } if (feature == SmooksPackage.eINSTANCE.getConditionType_Evaluator()) { - return SmooksUIUtils.createJavaTypeSearchFieldEditor(parent, toolkit, propertyDescriptor, (EObject)model); + return SmooksUIUtils.createJavaTypeSearchFieldEditor(parent, toolkit, propertyDescriptor, (EObject) model); } if (feature == SmooksPackage.eINSTANCE.getConditionType_Id()) { } @@ -50,4 +55,39 @@ return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor); } + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.PropertyUICreator# + * createExtendUIOnBottom + * (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> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); + AttributeFieldEditPart cdatatext = SmooksUIUtils.createCDATAFieldEditor("Condition Value", editingdomain, + toolkit, parent, model, null,true); + list.add(cdatatext); + return list; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == SmooksPackage.eINSTANCE.getConditionType_Value()) { + 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/uitls/BeanIdRefProposalProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BeanIdRefProposalProvider.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BeanIdRefProposalProvider.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -49,7 +49,7 @@ return proposalList.toArray(new IContentProposal[]{}); } - return null; + return new IContentProposal[]{}; } protected SmooksResourceListType getSmooksResourceList(EObject model) { 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-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -42,7 +42,7 @@ public IContentProposal[] getProposals(String contents, int position) { List<Object> list = SelectoreSelectionDialog.generateInputData(extType); if(list == null || list.isEmpty()){ - return null; + return new IContentProposal[]{}; } 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-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -148,7 +148,7 @@ 'F', 'g', 'G', 'h', 'H', 'i', 'I', 'j', 'J', 'k', 'K', 'l', 'L', 'm', 'M', 'n', 'N', 'o', 'O', 'p', 'P', 'q', 'Q', 'r', 'R', 's', 'S', 't', 'T', 'u', 'U', 'v', 'V', 'w', 'W', 'x', 'X', 'y', 'Y' }; - public static final String[] SELECTOR_SPERATORS = new String[]{" " , "/"}; + public static final String[] SELECTOR_SPERATORS = new String[] { " ", "/" }; public static List<String> getBeanIdList(SmooksResourceListType resourceList) { List<AbstractResourceConfig> rlist = resourceList.getAbstractResourceConfig(); @@ -395,6 +395,15 @@ EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor, Object model, boolean multiText, boolean linkLabel, boolean openFile, int height, IHyperlinkListener listener, int valueType, OpenEditorEditInnerContentsAction openEditorAction) { + return createStringFieldEditor(label, parent, editingdomain, toolkit, itemPropertyDescriptor, model, multiText, + linkLabel, openFile, height, listener, valueType, openEditorAction, false); + } + + public static AttributeFieldEditPart createStringFieldEditor(String label, final Composite parent, + EditingDomain editingdomain, FormToolkit toolkit, final IItemPropertyDescriptor itemPropertyDescriptor, + Object model, boolean multiText, boolean linkLabel, boolean openFile, int height, + IHyperlinkListener listener, int valueType, OpenEditorEditInnerContentsAction openEditorAction, + boolean expandEditor) { AttributeFieldEditPart fieldEditPart = new AttributeFieldEditPart(); GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING); Section section = null; @@ -416,6 +425,7 @@ space.setLayoutData(gd); section = toolkit.createSection(parent, Section.TITLE_BAR | Section.TWISTIE); + section.setExpanded(expandEditor); FillLayout layout = new FillLayout(); section.setLayout(layout); section.setText(label); @@ -554,9 +564,9 @@ } if (editValue != null && valueIsSet) { valueText.setText(editValue); - if (editValue.length() > 0 && section != null) { - section.setExpanded(true); - } +// if (editValue.length() > 0 && section != null) { +// section.setExpanded(true); +// } } if (valueType == VALUE_TYPE_TEXT && model instanceof AnyType && fEditingDomain != null) { valueText.addModifyListener(new ModifyListener() { @@ -710,6 +720,13 @@ return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, null, VALUE_TYPE_CDATA, action); } + + public static AttributeFieldEditPart createCDATAFieldEditor(String label, + AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, + OpenEditorEditInnerContentsAction action,boolean expanedEditor) { + return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, + null, VALUE_TYPE_CDATA, action,expanedEditor); + } public static AttributeFieldEditPart createCommentFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, @@ -717,6 +734,13 @@ return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, null, VALUE_TYPE_COMMENT, action); } + + public static AttributeFieldEditPart createCommentFieldEditor(String label, + AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, + OpenEditorEditInnerContentsAction action,boolean expandEditor) { + return createStringFieldEditor(label, parent, editingdomain, toolkit, null, model, true, true, false, 300, + null, VALUE_TYPE_COMMENT, action,expandEditor); + } public static AttributeFieldEditPart createJavaTypeSearchFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, final EObject model) { @@ -748,7 +772,7 @@ layout.marginRight = 0; layout.horizontalSpacing = 0; tcom.setLayout(layout); - + EAttribute attribute = (EAttribute) propertyDescriptor.getFeature(model); FieldMarkerComposite notificationComposite = new FieldMarkerComposite(tcom, SWT.NONE); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.xsl; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; import org.eclipse.emf.ecore.EAttribute; @@ -41,8 +41,9 @@ * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, * org.eclipse.emf.ecore.EAttribute) */ - public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model, - EAttribute feature, SmooksMultiFormEditor formEditor) { + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + SmooksMultiFormEditor formEditor) { if (feature == XslPackage.eINSTANCE.getTemplate_Value()) { } if (feature == XslPackage.eINSTANCE.getTemplate_Encoding()) { @@ -63,22 +64,34 @@ if (feature == XslPackage.eINSTANCE.getTemplate_Value()) { return true; } + if (feature == XslPackage.eINSTANCE.getTemplate_Encoding()) { + return true; + } return super.ignoreProperty(feature); } @Override - public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, - SmooksMultiFormEditor formEditor) { - OpenEditorEditInnerContentsAction openCdataEditorAction = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_CDATA, "xsl"); -// OpenEditorEditInnerContentsAction openCommentEditorAction = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "xsl"); - AttributeFieldEditPart text1 = SmooksUIUtils.createCDATAFieldEditor("Inline Template", editingdomain, toolkit, parent, model, openCdataEditorAction); -// AttributeFieldEditPart text2 = SmooksUIUtils.createCommentFieldEditor("Template Contents (Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction); - openCdataEditorAction.setRelateText((Text)text1.getContentControl()); -// openCommentEditorAction.setRelateText((Text)text2.getContentControl()); - SmooksUIUtils.createFileSelectionTextFieldEditor("External Template File", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, - null, null); - - return Collections.emptyList(); + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); + OpenEditorEditInnerContentsAction openCdataEditorAction = new OpenEditorEditInnerContentsAction(editingdomain, + (AnyType) model, SmooksUIUtils.VALUE_TYPE_CDATA, "xsl"); + // OpenEditorEditInnerContentsAction openCommentEditorAction = new + // OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, + // SmooksUIUtils.VALUE_TYPE_COMMENT, "xsl"); + AttributeFieldEditPart text1 = SmooksUIUtils.createCDATAFieldEditor("Inline Template", editingdomain, toolkit, + parent, model, openCdataEditorAction,true); + // AttributeFieldEditPart text2 = + // SmooksUIUtils.createCommentFieldEditor("Template Contents (Comment)", + // editingdomain, toolkit, parent, model, openCommentEditorAction); + openCdataEditorAction.setRelateText((Text) text1.getContentControl()); + // openCommentEditorAction.setRelateText((Text)text2.getContentControl()); + list.add(SmooksUIUtils.createFileSelectionTextFieldEditor("External Template File", parent, editingdomain, + toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, null, null)); + list.add(text1); + list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit, getPropertyDescriptor(editingdomain, + XslPackage.eINSTANCE.getTemplate_Encoding(), model), model, false, false, null)); + return list; } } \ No newline at end of file Modified: 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 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SelectorValidator.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.validate; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -17,17 +18,13 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Path; 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; @@ -78,8 +75,10 @@ public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) { list.clear(); Resource resource = editingDomain.getResourceSet().getResources().get(0); + if (resource.getContents().isEmpty()) { + return super.validate(selectedObjects, editingDomain); + } 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); @@ -88,30 +87,15 @@ file = (IFile) r; } final IFile ff = file; - Display.getDefault().syncExec(new Runnable() { + String extName = ff.getName() + ".ext"; - /* - * (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; - } - - }); + IFile extFile = ff.getParent().getFile(new Path(extName)); + try { + extType = SmooksUIUtils.loadSmooksGraphicsExt(extFile); + } catch (IOException e) { + // ignore + } } - extType = extTypes[0]; if (extType != null) { List<Object> l = SelectoreSelectionDialog.generateInputData(extType); if (l != null) { @@ -132,24 +116,37 @@ 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 (path == null) { + return null; + } + // if(feature != null && path == null){ + // return newWaringDiagnostic("Selector '" +path+ "' isn't available", + // model, feature); + // } + String sperator = "/"; + if (path.indexOf('/') == -1) { + sperator = " "; + } 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) { + try { + node = SmooksUIUtils + .localXMLNodeWithPath(path, (IXMLStructuredObject) obj, sperator, false); + } catch (Throwable e) { + // ignore + } } - if(node != null){ + if (node != null) { return null; } } } - if(node == null){ - return newWaringDiagnostic("Selector '" +path+ "' isn't available", model, feature); + if (node == null) { + return newWaringDiagnostic("Selector '" + path + "' isn't available", model, feature); } } return super.validateModel(model, editingDomain); @@ -162,91 +159,90 @@ if (model instanceof Counter) { return CalcPackage.Literals.COUNTER__COUNT_ON_ELEMENT; } - if(model instanceof Direct){ + if (model instanceof Direct) { return DatasourcePackage.Literals.DIRECT__BIND_ON_ELEMENT; } - if(model instanceof RouteBean){ + if (model instanceof RouteBean) { return EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT; } - if(model instanceof OutputStream){ + if (model instanceof OutputStream) { return FileRoutingPackage.Literals.OUTPUT_STREAM__OPEN_ON_ELEMENT; } - if(model instanceof Freemarker){ + if (model instanceof Freemarker) { return FreemarkerPackage.Literals.FREEMARKER__APPLY_ON_ELEMENT; } - if(model instanceof Xsl){ + if (model instanceof Xsl) { return XslPackage.Literals.XSL__APPLY_ON_ELEMENT; } - if(model instanceof GroovyUICreator){ + if (model instanceof GroovyUICreator) { return GroovyPackage.Literals.GROOVY__EXECUTE_ON_ELEMENT; } - if(model instanceof JmsRouter){ + 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 ResourceConfigType) { + return SmooksPackage.Literals.RESOURCE_CONFIG_TYPE__SELECTOR; } - - if(model instanceof SmooksResourceListType){ + + if (model instanceof SmooksResourceListType) { return SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR; } - - if(model instanceof WiringType){ + + if (model instanceof WiringType) { return JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT; } - if(model instanceof ExpressionType){ + if (model instanceof ExpressionType) { return JavabeanPackage.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT; } - if(model instanceof ValueType){ + 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 ExpressionType) { + return ((ExpressionType) model).getExecOnElement(); } - if(model instanceof ValueType){ - return ((ValueType)model).getData(); + if (model instanceof ValueType) { + return ((ValueType) model).getData(); } - if(model instanceof WiringType){ - return ((WiringType)model).getWireOnElement(); + if (model instanceof WiringType) { + return ((WiringType) model).getWireOnElement(); } - if(model instanceof SmooksResourceListType){ - return ((SmooksResourceListType)model).getDefaultSelector(); + if (model instanceof SmooksResourceListType) { + return ((SmooksResourceListType) model).getDefaultSelector(); } - if(model instanceof ResourceConfigType) - { - return ((ResourceConfigType)model).getSelector(); + if (model instanceof ResourceConfigType) { + return ((ResourceConfigType) model).getSelector(); } - if(model instanceof JmsRouter){ - return ((JmsRouter)model).getRouteOnElement(); + if (model instanceof JmsRouter) { + return ((JmsRouter) model).getRouteOnElement(); } - if(model instanceof GroovyUICreator){ - return ((Groovy)model).getExecuteOnElement(); + if (model instanceof GroovyUICreator) { + return ((Groovy) model).getExecuteOnElement(); } - if(model instanceof Xsl){ - return ((Xsl)model).getApplyOnElement(); + if (model instanceof Xsl) { + return ((Xsl) model).getApplyOnElement(); } if (model instanceof Counter) { - return ((Counter)model).getCountOnElement(); + return ((Counter) model).getCountOnElement(); } if (model instanceof BindingsType) { return ((BindingsType) model).getCreateOnElement(); } - if(model instanceof Direct){ - return ((Direct)model).getBindOnElement(); + if (model instanceof Direct) { + return ((Direct) model).getBindOnElement(); } - if(model instanceof RouteBean){ - return ((RouteBean)model).getRouteOnElement(); + if (model instanceof RouteBean) { + return ((RouteBean) model).getRouteOnElement(); } - if(model instanceof OutputStream){ - return ((OutputStream)model).getOpenOnElement(); + if (model instanceof OutputStream) { + return ((OutputStream) model).getOpenOnElement(); } - if(model instanceof Freemarker){ - return ((Freemarker)model).getApplyOnElement(); + if (model instanceof Freemarker) { + return ((Freemarker) model).getApplyOnElement(); } return null; } Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/DBExtractTransformConfigFileTestCase.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/DBExtractTransformConfigFileTestCase.java 2009-05-26 07:43:11 UTC (rev 15507) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/DBExtractTransformConfigFileTestCase.java 2009-05-26 07:44:30 UTC (rev 15508) @@ -78,14 +78,14 @@ Assert.assertEquals("DBExtractTransformLoadDS", executor.getDatasource()); Assert.assertEquals(false, executor.isExecuteBefore()); Assert.assertEquals("INSERT INTO ORDERS VALUES(${order.orderNum}, ${order.customerUname}, ${order.status}, ${order.net}, ${order.total}, ${message.date})", executor.getStatement().trim()); - Assert.assertEquals("orderExistsRS.isEmpty()", executor.getCondition().getValue()); + Assert.assertEquals("orderExistsRS.isEmpty()", executor.getCondition().getStringValue()); } if(executorCount == 2){ Assert.assertEquals("order-item", executor.getExecuteOnElement()); Assert.assertEquals("DBExtractTransformLoadDS", executor.getDatasource()); Assert.assertEquals(false, executor.isExecuteBefore()); Assert.assertEquals("INSERT INTO ORDERITEMS VALUES (${order.orderNum}, ${orderItem.quantity}, ${orderItem.productId}, ${orderItem.title}, ${orderItem.price})", executor.getStatement().trim()); - Assert.assertEquals("orderExistsRS.isEmpty()", executor.getCondition().getValue()); + Assert.assertEquals("orderExistsRS.isEmpty()", executor.getCondition().getStringValue()); } executorCount ++; }