jbosstools-commits May 2009

jbosstools-commits@lists.jboss.org

1 participants
625 discussions

JBoss Tools SVN: r15487 - in trunk/jsf/docs/userguide/en/images: context_menu_preferences and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-25 08:12:41 -0400 (Mon, 25 May 2009) New Revision: 15487 Added: trunk/jsf/docs/userguide/en/images/context_menu_preferences/ trunk/jsf/docs/userguide/en/images/context_menu_preferences/addCustomCapabilities.png trunk/jsf/docs/userguide/en/images/context_menu_preferences/addCustomCapabilities2.png Log: https://jira.jboss.org/jira/browse/JBDS-621 - adding the images for the 'Context Menu Preferences and Options' chapter; Added: trunk/jsf/docs/userguide/en/images/context_menu_preferences/addCustomCapabilities.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/context_menu_preferences/addCustomCapabilities.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/context_menu_preferences/addCustomCapabilities2.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/context_menu_preferences/addCustomCapabilities2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15486 - trunk/jsf/docs/userguide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-25 08:11:58 -0400 (Mon, 25 May 2009) New Revision: 15486 Added: trunk/jsf/docs/userguide/en/modules/conclusion.xml trunk/jsf/docs/userguide/en/modules/context_menu_preferences.xml Log: https://jira.jboss.org/jira/browse/JBDS-621 - adding new chapters; Added: trunk/jsf/docs/userguide/en/modules/conclusion.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/conclusion.xml (rev 0) +++ trunk/jsf/docs/userguide/en/modules/conclusion.xml 2009-05-25 12:11:58 UTC (rev 15486) @@ -0,0 +1,18 @@ +<?xml version='1.0' encoding='UTF-8'?> +<chapter id="conclusion" xreflabel="conclusion"> + <?dbhtml filename="conclusion.html"?> + <title>Conclusion</title> + + <para>On the whole, this document should guide you to those parts of <property>JBoss + Tools</property> which you specifically need to develop Web Applications. It covers + different aspects of visual components such as editors, views, etc. for browsing, + representing and editing web resources you are working with.</para> + + <para>If there's anything we didn't cover or you can't figure + out, please feel free to visit our <ulink + url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=258" + >JBoss Developer Studio Users Forum</ulink> or <ulink + url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201" + >JBoss Tools Users Forum</ulink> to ask questions. There we are also looking for + your suggestions and comments.</para> +</chapter> \ No newline at end of file Added: trunk/jsf/docs/userguide/en/modules/context_menu_preferences.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/context_menu_preferences.xml (rev 0) +++ trunk/jsf/docs/userguide/en/modules/context_menu_preferences.xml 2009-05-25 12:11:58 UTC (rev 15486) @@ -0,0 +1,88 @@ +<?xml version='1.0' encoding='UTF-8'?> +<chapter id="context_menu_preferences" xreflabel="context_menu_preferences"> + <?dbhtml filename="context_menu_preferences.html"?> + <title>Context Menu Preferences and Options</title> + + <para>To adjust the project specific preferences, you should bring the context menu for your + project and select the <emphasis> + <property>Preferences</property> + </emphasis> option. More details on what adjustments you can perform in the + <property>Preferences screen</property>, see in the <link linkend="preferences" + >"JBoss Tools Preferences"</link> chapter.</para> + + <para>Under the <emphasis> + <property>JBoss Tools</property> + </emphasis> option in the context menu there are also several actions provided by + <property>JBDS</property>:</para> + + <itemizedlist> + <listitem> + <para>Add/Remove Struts Capabilities</para> + </listitem> + <listitem> + <para>Add/Remove JSF Capabilities</para> + </listitem> + <listitem> + <para>Add Custom Capabilities</para> + </listitem> + </itemizedlist> + + <section id="add_remove_struts_cap"> + <title>Add/Remove Struts Capabilities</title> + + <para>Please, for details refer to the <ulink + url="&strutsreflink;#AddingStrutsCapabilityToAnExistingWebApplication532">Struts + Tools Reference Guide</ulink>.</para> + </section> + + <section id="add_remove_jsf_cap"> + <title>Add/Remove JSF Capabilities</title> + + <para>Please, for details refer to the <ulink url="&jsfreflink;#add_jsf_capability">JSF + Tools Reference Guide</ulink>.</para> + </section> + + <section id="add_custom_cap"> + <title>Add Custom Capabilities</title> + + <para>You can add custom capabilities to any JSF, Struts or Seam project made within + <property>JBDS</property>, i.e. add a support of additional frameworks built on top + of JSF, such as </para> + + <itemizedlist> + <listitem> + <para>ADF</para> + </listitem> + <listitem> + <para>Facelets</para> + </listitem> + <listitem> + <para>JBoss Rich Faces (versions 3.1, 3.2, 3.3)</para> + </listitem> + </itemizedlist> + + <para>When the option is selected, the <property>Add Custom Capabilities dialog</property> + appears. You should check the needed modules and press <emphasis> + <property>Finish</property>.</emphasis></para> + + <figure> + <title>Adding Custom Capabilities</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/context_menu_preferences/addCustomCapabilities.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>The next page displays all the updates that have been made to the project.</para> + + <figure> + <title>Updates Displayed</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/context_menu_preferences/addCustomCapabilities2.png"/> + </imageobject> + </mediaobject> + </figure> + </section> +</chapter>

15 years, 4 months

1
0
0 / 0

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.

by jbosstools-commits＠lists.jboss.org

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() {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15484 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal: context and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2009-05-25 06:22:39 -0400 (Mon, 25 May 2009) New Revision: 15484 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-3507 Added duplication generator check for Entity's Id Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-05-25 08:06:27 UTC (rev 15483) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-05-25 10:22:39 UTC (rev 15484) @@ -11,7 +11,9 @@ package org.jboss.tools.hibernate.jpt.core.internal; import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaIdMapping; import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.persistence.Persistence; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; @@ -19,6 +21,7 @@ import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGenerator; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGeneratorImpl; @@ -40,6 +43,14 @@ return new HibernateJavaEntity(parent); } + /* (non-Javadoc) + * @see org.eclipse.jpt.core.internal.platform.GenericJpaFactory#buildJavaIdMapping(org.eclipse.jpt.core.context.java.JavaPersistentAttribute) + */ + @Override + public JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent) { + return new HibernateJavaIdMapping(parent); + } + public JavaGenericGenerator buildJavaGenericGenerator(JavaJpaContextNode parent) { return new JavaGenericGeneratorImpl(parent); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-05-25 08:06:27 UTC (rev 15483) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-05-25 10:22:39 UTC (rev 15484) @@ -12,30 +12,19 @@ import java.io.File; import java.util.List; -import java.util.ListIterator; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.context.java.JavaPersistentType; -import org.eclipse.jpt.core.context.persistence.ClassRef; import org.eclipse.jpt.core.context.persistence.Persistence; import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit; -import org.eclipse.jpt.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorAnnotation; /** * @author Dmitry Geraskov @@ -54,7 +43,6 @@ public HibernatePersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit) { super(parent, persistenceUnit); - updateGenericGenerators(); this.hibernateProperties = new HibernateJpaProperties(this); } @@ -96,53 +84,7 @@ } } } - - /* (non-Javadoc) - * @see org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit#update(org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit) - */ - @Override - public void update(XmlPersistenceUnit persistenceUnit) { - super.update(persistenceUnit); - updateGenericGenerators(); - this.fireListChanged(GENERATORS_LIST); - } - - - protected void updateGenericGenerators(){ - JpaProject project = getJpaProject(); - - for (ClassRef classRef : CollectionTools.iterable(classRefs())) { - String annotClass = classRef.getClassName(); - JavaPersistentType type = classRef.getJavaPersistentType(); - JavaResourcePersistentType jrpt = project.getJavaResourcePersistentType(annotClass); - if (jrpt != null){ - GenericGeneratorAnnotation annotation = null; - JavaResourceNode jrn = jrpt.getSupportingAnnotation(GENERIC_GENERATOR); - if (jrn instanceof GenericGeneratorAnnotation) { - annotation = (GenericGeneratorAnnotation)jrn; - } - if (annotation != null) { - addGenerator(((HibernateJpaFactory)getJpaFactory()).buildJavaGenericGenerator(type)); - } - ListIterator<JavaPersistentAttribute> typeAttrs = type.attributes(); - for (JavaPersistentAttribute persAttr : CollectionTools.iterable(typeAttrs)) { - if (persAttr.getSpecifiedMapping() == null) { - continue; - } - JavaResourcePersistentAttribute jrpa = persAttr.getResourcePersistentAttribute(); - jrn = jrpa.getSupportingAnnotation(GENERIC_GENERATOR); - if (jrn instanceof GenericGeneratorAnnotation) { - annotation = (GenericGeneratorAnnotation)jrn; - } - if (annotation != null) { - addGenerator(((HibernateJpaFactory)getJpaFactory()).buildJavaGenericGenerator(type)); - } - } - } - } - } - /** * Hack class needed to make JPA/Validation API pick up our classloader instead of its own. * Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java 2009-05-25 08:06:27 UTC (rev 15483) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java 2009-05-25 10:22:39 UTC (rev 15484) @@ -16,7 +16,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaGenerator; import org.eclipse.jpt.core.context.java.JavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.AbstractJavaEntity; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEntity; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.utility.Filter; import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; @@ -28,7 +28,7 @@ * */ @SuppressWarnings("restriction") -public class HibernateJavaEntity extends AbstractJavaEntity implements GenericGeneratorHolder { +public class HibernateJavaEntity extends GenericJavaEntity implements GenericGeneratorHolder { protected JavaGenericGenerator genericGenerator; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-05-25 08:06:27 UTC (rev 15483) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-05-25 10:22:39 UTC (rev 15484) @@ -62,7 +62,7 @@ this.setSpecifiedInitialValue_(generator.getInitialValue()); this.setSpecifiedAllocationSize_(generator.getAllocationSize()); this.setSpecifiedStrategy_(generator.getStrategy()); - //getPersistenceUnit().addGenerator(this); + this.getPersistenceUnit().addGenerator(this); } public void setName(String name) {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15483 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2009-05-25 04:06:27 -0400 (Mon, 25 May 2009) New Revision: 15483 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-3507 added copyright Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 2009-05-25 08:04:49 UTC (rev 15482) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 2009-05-25 08:06:27 UTC (rev 15483) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.hibernate.jpt.ui.internal.platform; import java.util.ArrayList; @@ -18,6 +28,10 @@ import org.jboss.tools.hibernate.jpt.ui.internal.persistence.details.HibernatePropertiesComposite; import org.jboss.tools.hibernate.jpt.ui.xpl.PersistenceUnitGeneralComposite; +/** + * @author Dmitry Geraskov + * + */ @SuppressWarnings("restriction") public class HibernateJpaUiFactory extends GenericJpaUiFactory {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15482 - trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2009-05-25 04:04:49 -0400 (Mon, 25 May 2009) New Revision: 15482 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java Log: https://jira.jboss.org/jira/browse/JBIDE-3507 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2009-05-25 08:02:20 UTC (rev 15481) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2009-05-25 08:04:49 UTC (rev 15482) @@ -23,7 +23,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.sql.Connection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -40,7 +39,6 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; -import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; import org.hibernate.cfg.Environment; import org.hibernate.cfg.reveng.TableIdentifier;

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15481 - in trunk/smooks: plugins/org.jboss.tools.smooks.core/META-INF and 27 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-05-25 04:02:20 -0400 (Mon, 25 May 2009) New Revision: 15481 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateESBRoutingDocumentRoot_routeBean_RouteBean.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_condition_ConditionType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_conditions_ConditionsType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_features_FeaturesType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_handler_HandlerType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_handlers_HandlersType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_import_ImportType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_param_ParamType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_params_ParamsType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_profile_ProfileType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_profiles_ProfilesType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_reader_ReaderType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_resourceConfig_ResourceConfigType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_resource_ResourceType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_setOff_SetOffType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_setOn_SetOnType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_smooksResourceList_SmooksResourceListType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_abstractResourceConfig_RouteBean.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ESBRoutingDocumentRoot.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/RouteBean.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/Smooks11DocumentRoot.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.ecore trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.genmodel trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.ecore trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.genmodel trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/ESBRoutingDocumentRoot.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingPackage.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/RouteBean.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/ESBRoutingDocumentRootImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingFactoryImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingPackageImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/RouteBeanImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/ESBRoutingDocumentRootItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/Esbrouting1EditPlugin.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/EsbroutingItemProviderAdapterFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/RouteBeanItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingAdapterFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceFactoryImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingSwitch.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingXMLProcessor.java trunk/smooks/plugins/org.jboss.tools.smooks.core/xsd/routing-1.0.xsd trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/esbrouter/ 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/uitls/BeanIdRefProposalProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldAssistDisposer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorConentProposalListener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposal.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/Test.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/route-to-02_Low_Price_Service.xml Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/XslImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.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/PropertyUICreatorManager.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.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/freemarker/FreemarkerUICreator.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/groovy/GroovyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.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/ParamTypeUICreator.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/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/editors/xsl/XslUICreator.java trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java Log: JBIDE-4372 1. Add JBoss ESB Router Model 2. Add "SelectorContentAssist" and "BeanIdRefContentAssist" Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/META-INF/MANIFEST.MF 2009-05-25 08:02:20 UTC (rev 15481) @@ -37,6 +37,10 @@ org.jboss.tools.smooks.model.edi.impl, org.jboss.tools.smooks.model.edi.provider, org.jboss.tools.smooks.model.edi.util, + org.jboss.tools.smooks.model.esbrouting, + org.jboss.tools.smooks.model.esbrouting.impl, + org.jboss.tools.smooks.model.esbrouting.provider, + org.jboss.tools.smooks.model.esbrouting.util, org.jboss.tools.smooks.model.fileRouting, org.jboss.tools.smooks.model.fileRouting.impl, org.jboss.tools.smooks.model.fileRouting.provider, Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateESBRoutingDocumentRoot_routeBean_RouteBean.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateESBRoutingDocumentRoot_routeBean_RouteBean.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_condition_ConditionType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_condition_ConditionType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_conditions_ConditionsType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_conditions_ConditionsType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_features_FeaturesType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_features_FeaturesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_handler_HandlerType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_handler_HandlerType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_handlers_HandlersType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_handlers_HandlersType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_import_ImportType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_import_ImportType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_param_ParamType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_param_ParamType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_params_ParamsType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_params_ParamsType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_profile_ProfileType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_profile_ProfileType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_profiles_ProfilesType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_profiles_ProfilesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_reader_ReaderType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_reader_ReaderType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_resourceConfig_ResourceConfigType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_resourceConfig_ResourceConfigType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_resource_ResourceType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_resource_ResourceType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_setOff_SetOffType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_setOff_SetOffType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_setOn_SetOnType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_setOn_SetOnType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_smooksResourceList_SmooksResourceListType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooks11DocumentRoot_smooksResourceList_SmooksResourceListType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_abstractResourceConfig_RouteBean.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_abstractResourceConfig_RouteBean.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ESBRoutingDocumentRoot.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ESBRoutingDocumentRoot.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/RouteBean.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/RouteBean.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/Smooks11DocumentRoot.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/Smooks11DocumentRoot.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.ecore =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.ecore (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.ecore 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="esbrouting" + nsURI="http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd" nsPrefix="esb"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="JBoss ESB Smooks Routing Components"/> + </eAnnotations> + <eClassifiers xsi:type="ecore:EClass" name="ESBRoutingDocumentRoot"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value=""/> + <details key="kind" value="mixed"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="elementWildcard"/> + <details key="name" value=":mixed"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1" + eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry" + transient="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="xmlns:prefix"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1" + eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry" + transient="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="xsi:schemaLocation"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="routeBean" upperBound="-2" + eType="#//RouteBean" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="JBoss ESB Async Router."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="routeBean"/> + <details key="namespace" value="##targetNamespace"/> + <details key="affiliation" value="http://www.milyn.org/xsd/smooks-1.1.xsd#abstract-resource-config"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="RouteBean" eSuperTypes="smooks-1.1.ecore#//ElementVisitor"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="JBoss ESB Async Router."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="routeBean"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanIdRef" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Bean ID reference of the bean to be routed to the target Service.
 "/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="beanIdRef"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="messagePayloadLocation" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" defaultValueLiteral="" + unsettable="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="ESB Message.Body location on which the routed bean will be set."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="messagePayloadLocation"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="routeBefore" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean" + defaultValueLiteral="false" unsettable="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Route on visitBefore of the routeOnElement."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="routeBefore"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="routeOnElement" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Route on Element."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="routeOnElement"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="routeOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Route on Element Namespace."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="routeOnElementNS"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="toServiceCategory" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Target Service Category."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="toServiceCategory"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="toServiceName" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Target Service Name."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="toServiceName"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.ecore ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.genmodel =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.genmodel (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.genmodel 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> +<genmodel:GenModel xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/esb-routing/src" + modelPluginID="esb_routing" modelName="Esbrouting-1" importerID="org.eclipse.emf.importer.ecore" + complianceLevel="5.0" copyrightFields="false"> + <foreignModel>esbrouting-1.0.ecore</foreignModel> + <genPackages prefix="Esbrouting" resource="XML" disposableProviderFactory="true" + ecorePackage="esbrouting-1.0.ecore#/"> + <genClasses ecoreClass="esbrouting-1.0.ecore#//ESBRoutingDocumentRoot"> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/mixed"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/xMLNSPrefixMap"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/xSISchemaLocation"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/routeBean"/> + </genClasses> + <genClasses ecoreClass="esbrouting-1.0.ecore#//RouteBean"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/beanIdRef"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/messagePayloadLocation"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/routeBefore"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/routeOnElement"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/routeOnElementNS"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/toServiceCategory"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/toServiceName"/> + </genClasses> + </genPackages> + <genPackages prefix="Smooks" resource="XML" disposableProviderFactory="true" ecorePackage="smooks-1.1.ecore#/"> + <genClasses image="false" ecoreClass="smooks-1.1.ecore#//AbstractReader"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//AbstractReader/targetProfile"/> + </genClasses> + <genClasses image="false" ecoreClass="smooks-1.1.ecore#//AbstractResourceConfig"/> + <genClasses ecoreClass="smooks-1.1.ecore#//ConditionsType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ConditionsType/condition"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ConditionType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/evaluator"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/id"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/idRef"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//Smooks11DocumentRoot"> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//Smooks11DocumentRoot/mixed"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/xMLNSPrefixMap"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/xSISchemaLocation"/> + <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/abstractReader"/> + <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/abstractResourceConfig"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/condition"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/conditions"/> + <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/elementVisitor"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/features"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/handler"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/handlers"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/import"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/param"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/params"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/profile"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/profiles"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/reader"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/resource"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/resourceConfig"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/setOff"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/setOn"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/smooksResourceList"/> + </genClasses> + <genClasses image="false" ecoreClass="smooks-1.1.ecore#//ElementVisitor"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ElementVisitor/condition"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ElementVisitor/targetProfile"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//FeaturesType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//FeaturesType/setOn"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//FeaturesType/setOff"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//HandlersType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//HandlersType/handler"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//HandlerType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//HandlerType/class"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ImportType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ImportType/param"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ImportType/file"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ParamsType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ParamsType/param"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ParamType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ParamType/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ParamType/type"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ProfilesType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ProfilesType/profile"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ProfileType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ProfileType/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ProfileType/baseProfile"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ProfileType/subProfiles"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ReaderType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ReaderType/handlers"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ReaderType/features"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ReaderType/params"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ReaderType/class"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ResourceConfigType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ResourceConfigType/resource"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ResourceConfigType/condition"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ResourceConfigType/param"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceConfigType/selector"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceConfigType/selectorNamespace"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceConfigType/targetProfile"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ResourceType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceType/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceType/type"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//SetOffType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SetOffType/feature"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//SetOnType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SetOnType/feature"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//SmooksResourceListType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/params"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/conditions"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/profiles"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/abstractReaderGroup"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/abstractReader"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/abstractResourceConfigGroup"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/abstractResourceConfig"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultConditionRef"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultSelector"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultSelectorNamespace"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultTargetProfile"/> + </genClasses> + </genPackages> + <genPackages prefix="Common" resource="XML" disposableProviderFactory="true" ecorePackage="common.ecore#/"> + <genClasses image="false" ecoreClass="common.ecore#//AbstractAnyType"> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/getCDATA"/> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/setCDATA"> + <genParameters ecoreParameter="common.ecore#//AbstractAnyType/setCDATA/cdata"/> + </genOperations> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/getStringValue"/> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/setStringValue"> + <genParameters ecoreParameter="common.ecore#//AbstractAnyType/setStringValue/stringValue"/> + </genOperations> + </genClasses> + </genPackages> +</genmodel:GenModel> Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/all_model/esbrouting-1.0.genmodel ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.ecore =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.ecore (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.ecore 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="esbrouting" + nsURI="http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd" nsPrefix="esb"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="JBoss ESB Smooks Routing Components"/> + </eAnnotations> + <eClassifiers xsi:type="ecore:EClass" name="ESBRoutingDocumentRoot"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value=""/> + <details key="kind" value="mixed"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="elementWildcard"/> + <details key="name" value=":mixed"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1" + eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry" + transient="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="xmlns:prefix"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1" + eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry" + transient="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="xsi:schemaLocation"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="routeBean" upperBound="-2" + eType="#//RouteBean" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="JBoss ESB Async Router."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="routeBean"/> + <details key="namespace" value="##targetNamespace"/> + <details key="affiliation" value="http://www.milyn.org/xsd/smooks-1.1.xsd#abstract-resource-config"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="RouteBean" eSuperTypes="smooks-1.1.ecore#//ElementVisitor"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="JBoss ESB Async Router."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="routeBean"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanIdRef" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Bean ID reference of the bean to be routed to the target Service.
 "/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="beanIdRef"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="messagePayloadLocation" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" defaultValueLiteral="" + unsettable="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="ESB Message.Body location on which the routed bean will be set."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="messagePayloadLocation"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="routeBefore" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean" + defaultValueLiteral="false" unsettable="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Route on visitBefore of the routeOnElement."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="routeBefore"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="routeOnElement" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Route on Element."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="routeOnElement"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="routeOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Route on Element Namespace."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="routeOnElementNS"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="toServiceCategory" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Target Service Category."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="toServiceCategory"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="toServiceName" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Target Service Name."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="toServiceName"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.ecore ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.genmodel =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.genmodel (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.genmodel 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> +<genmodel:GenModel xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/esb-routing/src" + modelPluginID="esb_routing" modelName="Esbrouting-1" importerID="org.eclipse.emf.importer.ecore" + complianceLevel="5.0" copyrightFields="false"> + <foreignModel>esbrouting-1.0.ecore</foreignModel> + <genPackages prefix="Esbrouting" resource="XML" disposableProviderFactory="true" + ecorePackage="esbrouting-1.0.ecore#/"> + <genClasses ecoreClass="esbrouting-1.0.ecore#//ESBRoutingDocumentRoot"> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/mixed"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/xMLNSPrefixMap"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/xSISchemaLocation"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference esbrouting-1.0.ecore#//ESBRoutingDocumentRoot/routeBean"/> + </genClasses> + <genClasses ecoreClass="esbrouting-1.0.ecore#//RouteBean"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/beanIdRef"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/messagePayloadLocation"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/routeBefore"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/routeOnElement"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/routeOnElementNS"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/toServiceCategory"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esbrouting-1.0.ecore#//RouteBean/toServiceName"/> + </genClasses> + </genPackages> + <genPackages prefix="Smooks" resource="XML" disposableProviderFactory="true" ecorePackage="smooks-1.1.ecore#/"> + <genClasses image="false" ecoreClass="smooks-1.1.ecore#//AbstractReader"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//AbstractReader/targetProfile"/> + </genClasses> + <genClasses image="false" ecoreClass="smooks-1.1.ecore#//AbstractResourceConfig"/> + <genClasses ecoreClass="smooks-1.1.ecore#//ConditionsType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ConditionsType/condition"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ConditionType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/evaluator"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/id"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ConditionType/idRef"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//Smooks11DocumentRoot"> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//Smooks11DocumentRoot/mixed"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/xMLNSPrefixMap"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/xSISchemaLocation"/> + <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/abstractReader"/> + <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/abstractResourceConfig"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/condition"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/conditions"/> + <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/elementVisitor"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/features"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/handler"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/handlers"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/import"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/param"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/params"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/profile"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/profiles"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/reader"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/resource"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/resourceConfig"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/setOff"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/setOn"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//Smooks11DocumentRoot/smooksResourceList"/> + </genClasses> + <genClasses image="false" ecoreClass="smooks-1.1.ecore#//ElementVisitor"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ElementVisitor/condition"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ElementVisitor/targetProfile"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//FeaturesType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//FeaturesType/setOn"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//FeaturesType/setOff"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//HandlersType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//HandlersType/handler"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//HandlerType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//HandlerType/class"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ImportType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ImportType/param"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ImportType/file"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ParamsType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ParamsType/param"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ParamType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ParamType/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ParamType/type"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ProfilesType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ProfilesType/profile"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ProfileType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ProfileType/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ProfileType/baseProfile"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ProfileType/subProfiles"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ReaderType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ReaderType/handlers"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ReaderType/features"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ReaderType/params"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ReaderType/class"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ResourceConfigType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ResourceConfigType/resource"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ResourceConfigType/condition"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//ResourceConfigType/param"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceConfigType/selector"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceConfigType/selectorNamespace"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceConfigType/targetProfile"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//ResourceType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceType/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//ResourceType/type"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//SetOffType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SetOffType/feature"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//SetOnType"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SetOnType/feature"/> + </genClasses> + <genClasses ecoreClass="smooks-1.1.ecore#//SmooksResourceListType"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/params"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/conditions"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/profiles"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/abstractReaderGroup"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/abstractReader"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/abstractResourceConfigGroup"/> + <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference smooks-1.1.ecore#//SmooksResourceListType/abstractResourceConfig"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultConditionRef"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultSelector"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultSelectorNamespace"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-1.1.ecore#//SmooksResourceListType/defaultTargetProfile"/> + </genClasses> + </genPackages> + <genPackages prefix="Common" resource="XML" disposableProviderFactory="true" ecorePackage="common.ecore#/"> + <genClasses image="false" ecoreClass="common.ecore#//AbstractAnyType"> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/getCDATA"/> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/setCDATA"> + <genParameters ecoreParameter="common.ecore#//AbstractAnyType/setCDATA/cdata"/> + </genOperations> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/getStringValue"/> + <genOperations ecoreOperation="common.ecore#//AbstractAnyType/setStringValue"> + <genParameters ecoreParameter="common.ecore#//AbstractAnyType/setStringValue/stringValue"/> + </genOperations> + </genClasses> + </genPackages> +</genmodel:GenModel> Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/esbrouting-1.0.genmodel ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-25 08:02:20 UTC (rev 15481) @@ -428,4 +428,19 @@ _UI_CountDirection_INCREMENT_literal = INCREMENT -_UI_CountDirection_DECREMENT_literal = DECREMENT \ No newline at end of file +_UI_CountDirection_DECREMENT_literal = DECREMENT + +# ESB Rout +_UI_ESBRoutingDocumentRoot_mixed_feature = Mixed +_UI_ESBRoutingDocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map +_UI_ESBRoutingDocumentRoot_xSISchemaLocation_feature = XSI Schema Location +_UI_ESBRoutingDocumentRoot_routeBean_feature = JBoss ESB Router +_UI_RouteBean_beanIdRef_feature = Bean Id Ref +_UI_RouteBean_messagePayloadLocation_feature = Message Payload Location +_UI_RouteBean_routeBefore_feature = Route Before +_UI_RouteBean_routeOnElement_feature = Route On Element +_UI_RouteBean_routeOnElementNS_feature = Route On Element NS +_UI_RouteBean_toServiceCategory_feature = To Service Category +_UI_RouteBean_toServiceName_feature = To Service Name +_UI_ESBRoutingDocumentRoot_type = ESB Routing Document Root +_UI_RouteBean_type = JBoss ESB Router \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.xml 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.xml 2009-05-25 08:02:20 UTC (rev 15481) @@ -213,6 +213,14 @@ type="calc" class="org.jboss.tools.smooks.model.calc.util.CalcResourceFactoryImpl"/> </extension> + <extension + point="org.eclipse.emf.ecore.generated_package"> + <package + class="org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage" + genModel="model/esbrouting-1.0.genmodel" + uri="http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd"> + </package> + </extension> Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/ESBRoutingDocumentRoot.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/ESBRoutingDocumentRoot.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/ESBRoutingDocumentRoot.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,114 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting; + +import org.eclipse.emf.common.util.EMap; + +import org.eclipse.emf.ecore.EObject; + +import org.eclipse.emf.ecore.util.FeatureMap; + +/** + *  + * A representation of the model object 'ESB Routing Document Root'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getMixed Mixed}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getXMLNSPrefixMap XMLNS Prefix Map}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getXSISchemaLocation XSI Schema Location}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getRouteBean Route Bean}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getESBRoutingDocumentRoot() + * @model extendedMetaData="name='' kind='mixed'" + * @generated + */ +public interface ESBRoutingDocumentRoot extends EObject { + /** + * Returns the value of the 'Mixed' attribute list. + * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. + *  + * + * If the meaning of the 'Mixed' attribute list isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Mixed' attribute list. + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getESBRoutingDocumentRoot_Mixed() + * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" + * extendedMetaData="kind='elementWildcard' name=':mixed'" + * @generated + */ + FeatureMap getMixed(); + + /** + * Returns the value of the 'XMLNS Prefix Map' map. + * The key is of type {@link java.lang.String}, + * and the value is of type {@link java.lang.String}, + *  + * + * If the meaning of the 'XMLNS Prefix Map' map isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'XMLNS Prefix Map' map. + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getESBRoutingDocumentRoot_XMLNSPrefixMap() + * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true" + * extendedMetaData="kind='attribute' name='xmlns:prefix'" + * @generated + */ + EMap<String, String> getXMLNSPrefixMap(); + + /** + * Returns the value of the 'XSI Schema Location' map. + * The key is of type {@link java.lang.String}, + * and the value is of type {@link java.lang.String}, + *  + * + * If the meaning of the 'XSI Schema Location' map isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'XSI Schema Location' map. + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getESBRoutingDocumentRoot_XSISchemaLocation() + * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true" + * extendedMetaData="kind='attribute' name='xsi:schemaLocation'" + * @generated + */ + EMap<String, String> getXSISchemaLocation(); + + /** + * Returns the value of the 'Route Bean' containment reference. + *  + *  + *  + * JBoss ESB Async Router. + *  + * @return the value of the 'Route Bean' containment reference. + * @see #setRouteBean(RouteBean) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getESBRoutingDocumentRoot_RouteBean() + * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='routeBean' namespace='##targetNamespace' affiliation='http://www.milyn.org/xsd/smooks-1.1.xsd#abstract-resource-config'" + * @generated + */ + RouteBean getRouteBean(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getRouteBean Route Bean}' containment reference. + *  + *  + * @param value the new value of the 'Route Bean' containment reference. + * @see #getRouteBean() + * @generated + */ + void setRouteBean(RouteBean value); + +} // ESBRoutingDocumentRoot Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/ESBRoutingDocumentRoot.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingFactory.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,55 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting; + +import org.eclipse.emf.ecore.EFactory; + +/** + *  + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + *  + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage + * @generated + */ +public interface EsbroutingFactory extends EFactory { + /** + * The singleton instance of the factory. + *  + *  + * @generated + */ + EsbroutingFactory eINSTANCE = org.jboss.tools.smooks.model.esbrouting.impl.EsbroutingFactoryImpl.init(); + + /** + * Returns a new object of class 'ESB Routing Document Root'. + *  + *  + * @return a new object of class 'ESB Routing Document Root'. + * @generated + */ + ESBRoutingDocumentRoot createESBRoutingDocumentRoot(); + + /** + * Returns a new object of class 'Route Bean'. + *  + *  + * @return a new object of class 'Route Bean'. + * @generated + */ + RouteBean createRouteBean(); + + /** + * Returns the package supported by this factory. + *  + *  + * @return the package supported by this factory. + * @generated + */ + EsbroutingPackage getEsbroutingPackage(); + +} //EsbroutingFactory Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingPackage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingPackage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingPackage.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,522 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.jboss.tools.smooks.model.smooks.SmooksPackage; + +/** + *  + * The Package for the model. + * It contains accessors for the meta objects to represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + *  + *  + * JBoss ESB Smooks Routing Components + *  + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingFactory + * @model kind="package" + * @generated + */ +public interface EsbroutingPackage extends EPackage { + /** + * The package name. + *  + *  + * @generated + */ + String eNAME = "esbrouting"; + + /** + * The package namespace URI. + *  + *  + * @generated + */ + String eNS_URI = "http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd"; + + /** + * The package namespace name. + *  + *  + * @generated + */ + String eNS_PREFIX = "esb"; + + /** + * The singleton instance of the package. + *  + *  + * @generated + */ + EsbroutingPackage eINSTANCE = org.jboss.tools.smooks.model.esbrouting.impl.EsbroutingPackageImpl.init(); + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl ESB Routing Document Root}' class. + *  + *  + * @see org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl + * @see org.jboss.tools.smooks.model.esbrouting.impl.EsbroutingPackageImpl#getESBRoutingDocumentRoot() + * @generated + */ + int ESB_ROUTING_DOCUMENT_ROOT = 0; + + /** + * The feature id for the 'Mixed' attribute list. + *  + *  + * @generated + * @ordered + */ + int ESB_ROUTING_DOCUMENT_ROOT__MIXED = 0; + + /** + * The feature id for the 'XMLNS Prefix Map' map. + *  + *  + * @generated + * @ordered + */ + int ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1; + + /** + * The feature id for the 'XSI Schema Location' map. + *  + *  + * @generated + * @ordered + */ + int ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2; + + /** + * The feature id for the 'Route Bean' containment reference. + *  + *  + * @generated + * @ordered + */ + int ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN = 3; + + /** + * The number of structural features of the 'ESB Routing Document Root' class. + *  + *  + * @generated + * @ordered + */ + int ESB_ROUTING_DOCUMENT_ROOT_FEATURE_COUNT = 4; + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl Route Bean}' class. + *  + *  + * @see org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl + * @see org.jboss.tools.smooks.model.esbrouting.impl.EsbroutingPackageImpl#getRouteBean() + * @generated + */ + int ROUTE_BEAN = 1; + + /** + * The feature id for the 'Mixed' attribute list. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__MIXED = SmooksPackage.ELEMENT_VISITOR__MIXED; + + /** + * The feature id for the 'Any' attribute list. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__ANY = SmooksPackage.ELEMENT_VISITOR__ANY; + + /** + * The feature id for the 'Any Attribute' attribute list. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__ANY_ATTRIBUTE = SmooksPackage.ELEMENT_VISITOR__ANY_ATTRIBUTE; + + /** + * The feature id for the 'Condition' containment reference. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__CONDITION = SmooksPackage.ELEMENT_VISITOR__CONDITION; + + /** + * The feature id for the 'Target Profile' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__TARGET_PROFILE = SmooksPackage.ELEMENT_VISITOR__TARGET_PROFILE; + + /** + * The feature id for the 'Bean Id Ref' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__BEAN_ID_REF = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Message Payload Location' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 1; + + /** + * The feature id for the 'Route Before' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__ROUTE_BEFORE = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 2; + + /** + * The feature id for the 'Route On Element' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__ROUTE_ON_ELEMENT = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 3; + + /** + * The feature id for the 'Route On Element NS' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__ROUTE_ON_ELEMENT_NS = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 4; + + /** + * The feature id for the 'To Service Category' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__TO_SERVICE_CATEGORY = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 5; + + /** + * The feature id for the 'To Service Name' attribute. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN__TO_SERVICE_NAME = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 6; + + /** + * The number of structural features of the 'Route Bean' class. + *  + *  + * @generated + * @ordered + */ + int ROUTE_BEAN_FEATURE_COUNT = SmooksPackage.ELEMENT_VISITOR_FEATURE_COUNT + 7; + + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot ESB Routing Document Root}'. + *  + *  + * @return the meta object for class 'ESB Routing Document Root'. + * @see org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot + * @generated + */ + EClass getESBRoutingDocumentRoot(); + + /** + * Returns the meta object for the attribute list '{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getMixed Mixed}'. + *  + *  + * @return the meta object for the attribute list 'Mixed'. + * @see org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getMixed() + * @see #getESBRoutingDocumentRoot() + * @generated + */ + EAttribute getESBRoutingDocumentRoot_Mixed(); + + /** + * Returns the meta object for the map '{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getXMLNSPrefixMap XMLNS Prefix Map}'. + *  + *  + * @return the meta object for the map 'XMLNS Prefix Map'. + * @see org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getXMLNSPrefixMap() + * @see #getESBRoutingDocumentRoot() + * @generated + */ + EReference getESBRoutingDocumentRoot_XMLNSPrefixMap(); + + /** + * Returns the meta object for the map '{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getXSISchemaLocation XSI Schema Location}'. + *  + *  + * @return the meta object for the map 'XSI Schema Location'. + * @see org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getXSISchemaLocation() + * @see #getESBRoutingDocumentRoot() + * @generated + */ + EReference getESBRoutingDocumentRoot_XSISchemaLocation(); + + /** + * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getRouteBean Route Bean}'. + *  + *  + * @return the meta object for the containment reference 'Route Bean'. + * @see org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot#getRouteBean() + * @see #getESBRoutingDocumentRoot() + * @generated + */ + EReference getESBRoutingDocumentRoot_RouteBean(); + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean Route Bean}'. + *  + *  + * @return the meta object for class 'Route Bean'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean + * @generated + */ + EClass getRouteBean(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getBeanIdRef Bean Id Ref}'. + *  + *  + * @return the meta object for the attribute 'Bean Id Ref'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean#getBeanIdRef() + * @see #getRouteBean() + * @generated + */ + EAttribute getRouteBean_BeanIdRef(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getMessagePayloadLocation Message Payload Location}'. + *  + *  + * @return the meta object for the attribute 'Message Payload Location'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean#getMessagePayloadLocation() + * @see #getRouteBean() + * @generated + */ + EAttribute getRouteBean_MessagePayloadLocation(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#isRouteBefore Route Before}'. + *  + *  + * @return the meta object for the attribute 'Route Before'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean#isRouteBefore() + * @see #getRouteBean() + * @generated + */ + EAttribute getRouteBean_RouteBefore(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElement Route On Element}'. + *  + *  + * @return the meta object for the attribute 'Route On Element'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElement() + * @see #getRouteBean() + * @generated + */ + EAttribute getRouteBean_RouteOnElement(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElementNS Route On Element NS}'. + *  + *  + * @return the meta object for the attribute 'Route On Element NS'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElementNS() + * @see #getRouteBean() + * @generated + */ + EAttribute getRouteBean_RouteOnElementNS(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceCategory To Service Category}'. + *  + *  + * @return the meta object for the attribute 'To Service Category'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceCategory() + * @see #getRouteBean() + * @generated + */ + EAttribute getRouteBean_ToServiceCategory(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceName To Service Name}'. + *  + *  + * @return the meta object for the attribute 'To Service Name'. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceName() + * @see #getRouteBean() + * @generated + */ + EAttribute getRouteBean_ToServiceName(); + + /** + * Returns the factory that creates the instances of the model. + *  + *  + * @return the factory that creates the instances of the model. + * @generated + */ + EsbroutingFactory getEsbroutingFactory(); + + /** + *  + * Defines literals for the meta objects that represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + *  + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl ESB Routing Document Root}' class. + *  + *  + * @see org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl + * @see org.jboss.tools.smooks.model.esbrouting.impl.EsbroutingPackageImpl#getESBRoutingDocumentRoot() + * @generated + */ + EClass ESB_ROUTING_DOCUMENT_ROOT = eINSTANCE.getESBRoutingDocumentRoot(); + + /** + * The meta object literal for the 'Mixed' attribute list feature. + *  + *  + * @generated + */ + EAttribute ESB_ROUTING_DOCUMENT_ROOT__MIXED = eINSTANCE.getESBRoutingDocumentRoot_Mixed(); + + /** + * The meta object literal for the 'XMLNS Prefix Map' map feature. + *  + *  + * @generated + */ + EReference ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP = eINSTANCE.getESBRoutingDocumentRoot_XMLNSPrefixMap(); + + /** + * The meta object literal for the 'XSI Schema Location' map feature. + *  + *  + * @generated + */ + EReference ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getESBRoutingDocumentRoot_XSISchemaLocation(); + + /** + * The meta object literal for the 'Route Bean' containment reference feature. + *  + *  + * @generated + */ + EReference ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN = eINSTANCE.getESBRoutingDocumentRoot_RouteBean(); + + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl Route Bean}' class. + *  + *  + * @see org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl + * @see org.jboss.tools.smooks.model.esbrouting.impl.EsbroutingPackageImpl#getRouteBean() + * @generated + */ + EClass ROUTE_BEAN = eINSTANCE.getRouteBean(); + + /** + * The meta object literal for the 'Bean Id Ref' attribute feature. + *  + *  + * @generated + */ + EAttribute ROUTE_BEAN__BEAN_ID_REF = eINSTANCE.getRouteBean_BeanIdRef(); + + /** + * The meta object literal for the 'Message Payload Location' attribute feature. + *  + *  + * @generated + */ + EAttribute ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION = eINSTANCE.getRouteBean_MessagePayloadLocation(); + + /** + * The meta object literal for the 'Route Before' attribute feature. + *  + *  + * @generated + */ + EAttribute ROUTE_BEAN__ROUTE_BEFORE = eINSTANCE.getRouteBean_RouteBefore(); + + /** + * The meta object literal for the 'Route On Element' attribute feature. + *  + *  + * @generated + */ + EAttribute ROUTE_BEAN__ROUTE_ON_ELEMENT = eINSTANCE.getRouteBean_RouteOnElement(); + + /** + * The meta object literal for the 'Route On Element NS' attribute feature. + *  + *  + * @generated + */ + EAttribute ROUTE_BEAN__ROUTE_ON_ELEMENT_NS = eINSTANCE.getRouteBean_RouteOnElementNS(); + + /** + * The meta object literal for the 'To Service Category' attribute feature. + *  + *  + * @generated + */ + EAttribute ROUTE_BEAN__TO_SERVICE_CATEGORY = eINSTANCE.getRouteBean_ToServiceCategory(); + + /** + * The meta object literal for the 'To Service Name' attribute feature. + *  + *  + * @generated + */ + EAttribute ROUTE_BEAN__TO_SERVICE_NAME = eINSTANCE.getRouteBean_ToServiceName(); + + } + +} //EsbroutingPackage Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/EsbroutingPackage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/RouteBean.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/RouteBean.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/RouteBean.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,277 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting; + +import org.jboss.tools.smooks.model.smooks.ElementVisitor; + +/** + *  + * A representation of the model object 'Route Bean'. + *  + * + *  + * JBoss ESB Async Router. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getBeanIdRef Bean Id Ref}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getMessagePayloadLocation Message Payload Location}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#isRouteBefore Route Before}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElement Route On Element}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElementNS Route On Element NS}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceCategory To Service Category}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceName To Service Name}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean() + * @model extendedMetaData="name='routeBean' kind='elementOnly'" + * @generated + */ +public interface RouteBean extends ElementVisitor { + /** + * Returns the value of the 'Bean Id Ref' attribute. + *  + *  + *  + * Bean ID reference of the bean to be routed to the target Service. + * + *  + * @return the value of the 'Bean Id Ref' attribute. + * @see #setBeanIdRef(String) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean_BeanIdRef() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='beanIdRef'" + * @generated + */ + String getBeanIdRef(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getBeanIdRef Bean Id Ref}' attribute. + *  + *  + * @param value the new value of the 'Bean Id Ref' attribute. + * @see #getBeanIdRef() + * @generated + */ + void setBeanIdRef(String value); + + /** + * Returns the value of the 'Message Payload Location' attribute. + * The default value is <code>""</code>. + *  + *  + *  + * ESB Message.Body location on which the routed bean will be set. + *  + * @return the value of the 'Message Payload Location' attribute. + * @see #isSetMessagePayloadLocation() + * @see #unsetMessagePayloadLocation() + * @see #setMessagePayloadLocation(String) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean_MessagePayloadLocation() + * @model default="" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='messagePayloadLocation'" + * @generated + */ + String getMessagePayloadLocation(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getMessagePayloadLocation Message Payload Location}' attribute. + *  + *  + * @param value the new value of the 'Message Payload Location' attribute. + * @see #isSetMessagePayloadLocation() + * @see #unsetMessagePayloadLocation() + * @see #getMessagePayloadLocation() + * @generated + */ + void setMessagePayloadLocation(String value); + + /** + * Unsets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getMessagePayloadLocation Message Payload Location}' attribute. + *  + *  + * @see #isSetMessagePayloadLocation() + * @see #getMessagePayloadLocation() + * @see #setMessagePayloadLocation(String) + * @generated + */ + void unsetMessagePayloadLocation(); + + /** + * Returns whether the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getMessagePayloadLocation Message Payload Location}' attribute is set. + *  + *  + * @return whether the value of the 'Message Payload Location' attribute is set. + * @see #unsetMessagePayloadLocation() + * @see #getMessagePayloadLocation() + * @see #setMessagePayloadLocation(String) + * @generated + */ + boolean isSetMessagePayloadLocation(); + + /** + * Returns the value of the 'Route Before' attribute. + * The default value is <code>"false"</code>. + *  + *  + *  + * Route on visitBefore of the routeOnElement. + *  + * @return the value of the 'Route Before' attribute. + * @see #isSetRouteBefore() + * @see #unsetRouteBefore() + * @see #setRouteBefore(boolean) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean_RouteBefore() + * @model default="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean" + * extendedMetaData="kind='attribute' name='routeBefore'" + * @generated + */ + boolean isRouteBefore(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#isRouteBefore Route Before}' attribute. + *  + *  + * @param value the new value of the 'Route Before' attribute. + * @see #isSetRouteBefore() + * @see #unsetRouteBefore() + * @see #isRouteBefore() + * @generated + */ + void setRouteBefore(boolean value); + + /** + * Unsets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#isRouteBefore Route Before}' attribute. + *  + *  + * @see #isSetRouteBefore() + * @see #isRouteBefore() + * @see #setRouteBefore(boolean) + * @generated + */ + void unsetRouteBefore(); + + /** + * Returns whether the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#isRouteBefore Route Before}' attribute is set. + *  + *  + * @return whether the value of the 'Route Before' attribute is set. + * @see #unsetRouteBefore() + * @see #isRouteBefore() + * @see #setRouteBefore(boolean) + * @generated + */ + boolean isSetRouteBefore(); + + /** + * Returns the value of the 'Route On Element' attribute. + *  + *  + *  + * Route on Element. + *  + * @return the value of the 'Route On Element' attribute. + * @see #setRouteOnElement(String) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean_RouteOnElement() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='routeOnElement'" + * @generated + */ + String getRouteOnElement(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElement Route On Element}' attribute. + *  + *  + * @param value the new value of the 'Route On Element' attribute. + * @see #getRouteOnElement() + * @generated + */ + void setRouteOnElement(String value); + + /** + * Returns the value of the 'Route On Element NS' attribute. + *  + *  + *  + * Route on Element Namespace. + *  + * @return the value of the 'Route On Element NS' attribute. + * @see #setRouteOnElementNS(String) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean_RouteOnElementNS() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='routeOnElementNS'" + * @generated + */ + String getRouteOnElementNS(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getRouteOnElementNS Route On Element NS}' attribute. + *  + *  + * @param value the new value of the 'Route On Element NS' attribute. + * @see #getRouteOnElementNS() + * @generated + */ + void setRouteOnElementNS(String value); + + /** + * Returns the value of the 'To Service Category' attribute. + *  + *  + *  + * Target Service Category. + *  + * @return the value of the 'To Service Category' attribute. + * @see #setToServiceCategory(String) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean_ToServiceCategory() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='toServiceCategory'" + * @generated + */ + String getToServiceCategory(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceCategory To Service Category}' attribute. + *  + *  + * @param value the new value of the 'To Service Category' attribute. + * @see #getToServiceCategory() + * @generated + */ + void setToServiceCategory(String value); + + /** + * Returns the value of the 'To Service Name' attribute. + *  + *  + *  + * Target Service Name. + *  + * @return the value of the 'To Service Name' attribute. + * @see #setToServiceName(String) + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#getRouteBean_ToServiceName() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='toServiceName'" + * @generated + */ + String getToServiceName(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean#getToServiceName To Service Name}' attribute. + *  + *  + * @param value the new value of the 'To Service Name' attribute. + * @see #getToServiceName() + * @generated + */ + void setToServiceName(String value); + +} // RouteBean Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/RouteBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/ESBRoutingDocumentRootImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/ESBRoutingDocumentRootImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/ESBRoutingDocumentRootImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,286 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.impl; + + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EMap; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.EObjectImpl; +import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl; + +import org.eclipse.emf.ecore.util.BasicFeatureMap; +import org.eclipse.emf.ecore.util.EcoreEMap; +import org.eclipse.emf.ecore.util.FeatureMap; +import org.eclipse.emf.ecore.util.InternalEList; +import org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; + +/** + *  + * An implementation of the model object 'ESB Routing Document Root'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl#getMixed Mixed}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl#getXMLNSPrefixMap XMLNS Prefix Map}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl#getXSISchemaLocation XSI Schema Location}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.ESBRoutingDocumentRootImpl#getRouteBean Route Bean}</li> + * </ul> + * + * + * @generated + */ +public class ESBRoutingDocumentRootImpl extends EObjectImpl implements ESBRoutingDocumentRoot { + /** + * The cached value of the '{@link #getMixed() Mixed}' attribute list. + *  + *  + * @see #getMixed() + * @generated + * @ordered + */ + protected FeatureMap mixed; + + /** + * The cached value of the '{@link #getXMLNSPrefixMap() XMLNS Prefix Map}' map. + *  + *  + * @see #getXMLNSPrefixMap() + * @generated + * @ordered + */ + protected EMap<String, String> xMLNSPrefixMap; + + /** + * The cached value of the '{@link #getXSISchemaLocation() XSI Schema Location}' map. + *  + *  + * @see #getXSISchemaLocation() + * @generated + * @ordered + */ + protected EMap<String, String> xSISchemaLocation; + + /** + *  + *  + * @generated + */ + protected ESBRoutingDocumentRootImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return EsbroutingPackage.Literals.ESB_ROUTING_DOCUMENT_ROOT; + } + + /** + *  + *  + * @generated + */ + public FeatureMap getMixed() { + if (mixed == null) { + mixed = new BasicFeatureMap(this, EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__MIXED); + } + return mixed; + } + + /** + *  + *  + * @generated + */ + public EMap<String, String> getXMLNSPrefixMap() { + if (xMLNSPrefixMap == null) { + xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP); + } + return xMLNSPrefixMap; + } + + /** + *  + *  + * @generated + */ + public EMap<String, String> getXSISchemaLocation() { + if (xSISchemaLocation == null) { + xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION); + } + return xSISchemaLocation; + } + + /** + *  + *  + * @generated + */ + public RouteBean getRouteBean() { + return (RouteBean)getMixed().get(EsbroutingPackage.Literals.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN, true); + } + + /** + *  + *  + * @generated + */ + public NotificationChain basicSetRouteBean(RouteBean newRouteBean, NotificationChain msgs) { + return ((FeatureMap.Internal)getMixed()).basicAdd(EsbroutingPackage.Literals.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN, newRouteBean, msgs); + } + + /** + *  + *  + * @generated + */ + public void setRouteBean(RouteBean newRouteBean) { + ((FeatureMap.Internal)getMixed()).set(EsbroutingPackage.Literals.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN, newRouteBean); + } + + /** + *  + *  + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__MIXED: + return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP: + return ((InternalEList<?>)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: + return ((InternalEList<?>)getXSISchemaLocation()).basicRemove(otherEnd, msgs); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN: + return basicSetRouteBean(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__MIXED: + if (coreType) return getMixed(); + return ((FeatureMap.Internal)getMixed()).getWrapper(); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP: + if (coreType) return getXMLNSPrefixMap(); + else return getXMLNSPrefixMap().map(); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: + if (coreType) return getXSISchemaLocation(); + else return getXSISchemaLocation().map(); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN: + return getRouteBean(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__MIXED: + ((FeatureMap.Internal)getMixed()).set(newValue); + return; + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP: + ((EStructuralFeature.Setting)getXMLNSPrefixMap()).set(newValue); + return; + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: + ((EStructuralFeature.Setting)getXSISchemaLocation()).set(newValue); + return; + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN: + setRouteBean((RouteBean)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__MIXED: + getMixed().clear(); + return; + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP: + getXMLNSPrefixMap().clear(); + return; + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: + getXSISchemaLocation().clear(); + return; + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN: + setRouteBean((RouteBean)null); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__MIXED: + return mixed != null && !mixed.isEmpty(); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP: + return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty(); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: + return xSISchemaLocation != null && !xSISchemaLocation.isEmpty(); + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN: + return getRouteBean() != null; + } + return super.eIsSet(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (mixed: "); + result.append(mixed); + result.append(')'); + return result.toString(); + } + +} //ESBRoutingDocumentRootImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/ESBRoutingDocumentRootImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingFactoryImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingFactoryImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,110 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.impl; + + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; +import org.jboss.tools.smooks.model.esbrouting.*; + +/** + *  + * An implementation of the model Factory. + *  + * @generated + */ +public class EsbroutingFactoryImpl extends EFactoryImpl implements EsbroutingFactory { + /** + * Creates the default factory implementation. + *  + *  + * @generated + */ + public static EsbroutingFactory init() { + try { + EsbroutingFactory theEsbroutingFactory = (EsbroutingFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd"); + if (theEsbroutingFactory != null) { + return theEsbroutingFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new EsbroutingFactoryImpl(); + } + + /** + * Creates an instance of the factory. + *  + *  + * @generated + */ + public EsbroutingFactoryImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT: return createESBRoutingDocumentRoot(); + case EsbroutingPackage.ROUTE_BEAN: return createRouteBean(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + *  + *  + * @generated + */ + public ESBRoutingDocumentRoot createESBRoutingDocumentRoot() { + ESBRoutingDocumentRootImpl esbRoutingDocumentRoot = new ESBRoutingDocumentRootImpl(); + return esbRoutingDocumentRoot; + } + + /** + *  + *  + * @generated + */ + public RouteBean createRouteBean() { + RouteBeanImpl routeBean = new RouteBeanImpl(); + return routeBean; + } + + /** + *  + *  + * @generated + */ + public EsbroutingPackage getEsbroutingPackage() { + return (EsbroutingPackage)getEPackage(); + } + + /** + *  + *  + * @deprecated + * @generated + */ + @Deprecated + public static EsbroutingPackage getPackage() { + return EsbroutingPackage.eINSTANCE; + } + +} //EsbroutingFactoryImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingFactoryImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingPackageImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingPackageImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingPackageImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,446 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.impl; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.impl.EPackageImpl; +import org.eclipse.emf.ecore.xml.type.XMLTypePackage; +import org.jboss.tools.smooks.model.common.CommonPackage; +import org.jboss.tools.smooks.model.common.impl.CommonPackageImpl; +import org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingFactory; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; +import org.jboss.tools.smooks.model.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.smooks.impl.SmooksPackageImpl; + +/** + *  + * An implementation of the model Package. + *  + * @generated + */ +public class EsbroutingPackageImpl extends EPackageImpl implements EsbroutingPackage { + /** + *  + *  + * @generated + */ + private EClass esbRoutingDocumentRootEClass = null; + + /** + *  + *  + * @generated + */ + private EClass routeBeanEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + * Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + *  + *  + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage#eNS_URI + * @see #init() + * @generated + */ + private EsbroutingPackageImpl() { + super(eNS_URI, EsbroutingFactory.eINSTANCE); + } + + /** + *  + *  + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * Invocation of this method will not affect any packages that have + * already been initialized. + *  + *  + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static EsbroutingPackage init() { + if (isInited) return (EsbroutingPackage)EPackage.Registry.INSTANCE.getEPackage(EsbroutingPackage.eNS_URI); + + // Obtain or create and register package + EsbroutingPackageImpl theEsbroutingPackage = (EsbroutingPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EsbroutingPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EsbroutingPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + XMLTypePackage.eINSTANCE.eClass(); + + // Obtain or create and register interdependencies + SmooksPackageImpl theSmooksPackage = (SmooksPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SmooksPackage.eNS_URI) instanceof SmooksPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SmooksPackage.eNS_URI) : SmooksPackage.eINSTANCE); + CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE); + + // Create package meta-data objects + theEsbroutingPackage.createPackageContents(); + theSmooksPackage.createPackageContents(); + theCommonPackage.createPackageContents(); + + // Initialize created meta-data + theEsbroutingPackage.initializePackageContents(); + theSmooksPackage.initializePackageContents(); + theCommonPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theEsbroutingPackage.freeze(); + + return theEsbroutingPackage; + } + + /** + *  + *  + * @generated + */ + public EClass getESBRoutingDocumentRoot() { + return esbRoutingDocumentRootEClass; + } + + /** + *  + *  + * @generated + */ + public EAttribute getESBRoutingDocumentRoot_Mixed() { + return (EAttribute)esbRoutingDocumentRootEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EReference getESBRoutingDocumentRoot_XMLNSPrefixMap() { + return (EReference)esbRoutingDocumentRootEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public EReference getESBRoutingDocumentRoot_XSISchemaLocation() { + return (EReference)esbRoutingDocumentRootEClass.getEStructuralFeatures().get(2); + } + + /** + *  + *  + * @generated + */ + public EReference getESBRoutingDocumentRoot_RouteBean() { + return (EReference)esbRoutingDocumentRootEClass.getEStructuralFeatures().get(3); + } + + /** + *  + *  + * @generated + */ + public EClass getRouteBean() { + return routeBeanEClass; + } + + /** + *  + *  + * @generated + */ + public EAttribute getRouteBean_BeanIdRef() { + return (EAttribute)routeBeanEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EAttribute getRouteBean_MessagePayloadLocation() { + return (EAttribute)routeBeanEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public EAttribute getRouteBean_RouteBefore() { + return (EAttribute)routeBeanEClass.getEStructuralFeatures().get(2); + } + + /** + *  + *  + * @generated + */ + public EAttribute getRouteBean_RouteOnElement() { + return (EAttribute)routeBeanEClass.getEStructuralFeatures().get(3); + } + + /** + *  + *  + * @generated + */ + public EAttribute getRouteBean_RouteOnElementNS() { + return (EAttribute)routeBeanEClass.getEStructuralFeatures().get(4); + } + + /** + *  + *  + * @generated + */ + public EAttribute getRouteBean_ToServiceCategory() { + return (EAttribute)routeBeanEClass.getEStructuralFeatures().get(5); + } + + /** + *  + *  + * @generated + */ + public EAttribute getRouteBean_ToServiceName() { + return (EAttribute)routeBeanEClass.getEStructuralFeatures().get(6); + } + + /** + *  + *  + * @generated + */ + public EsbroutingFactory getEsbroutingFactory() { + return (EsbroutingFactory)getEFactoryInstance(); + } + + /** + *  + *  + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + *  + *  + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + esbRoutingDocumentRootEClass = createEClass(ESB_ROUTING_DOCUMENT_ROOT); + createEAttribute(esbRoutingDocumentRootEClass, ESB_ROUTING_DOCUMENT_ROOT__MIXED); + createEReference(esbRoutingDocumentRootEClass, ESB_ROUTING_DOCUMENT_ROOT__XMLNS_PREFIX_MAP); + createEReference(esbRoutingDocumentRootEClass, ESB_ROUTING_DOCUMENT_ROOT__XSI_SCHEMA_LOCATION); + createEReference(esbRoutingDocumentRootEClass, ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN); + + routeBeanEClass = createEClass(ROUTE_BEAN); + createEAttribute(routeBeanEClass, ROUTE_BEAN__BEAN_ID_REF); + createEAttribute(routeBeanEClass, ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION); + createEAttribute(routeBeanEClass, ROUTE_BEAN__ROUTE_BEFORE); + createEAttribute(routeBeanEClass, ROUTE_BEAN__ROUTE_ON_ELEMENT); + createEAttribute(routeBeanEClass, ROUTE_BEAN__ROUTE_ON_ELEMENT_NS); + createEAttribute(routeBeanEClass, ROUTE_BEAN__TO_SERVICE_CATEGORY); + createEAttribute(routeBeanEClass, ROUTE_BEAN__TO_SERVICE_NAME); + } + + /** + *  + *  + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + *  + *  + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Obtain other dependent packages + SmooksPackage theSmooksPackage = (SmooksPackage)EPackage.Registry.INSTANCE.getEPackage(SmooksPackage.eNS_URI); + XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + routeBeanEClass.getESuperTypes().add(theSmooksPackage.getElementVisitor()); + + // Initialize classes and features; add operations and parameters + initEClass(esbRoutingDocumentRootEClass, ESBRoutingDocumentRoot.class, "ESBRoutingDocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getESBRoutingDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getESBRoutingDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getESBRoutingDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getESBRoutingDocumentRoot_RouteBean(), this.getRouteBean(), null, "routeBean", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + + initEClass(routeBeanEClass, RouteBean.class, "RouteBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getRouteBean_BeanIdRef(), theXMLTypePackage.getString(), "beanIdRef", null, 1, 1, RouteBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRouteBean_MessagePayloadLocation(), theXMLTypePackage.getString(), "messagePayloadLocation", "", 0, 1, RouteBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRouteBean_RouteBefore(), theXMLTypePackage.getBoolean(), "routeBefore", "false", 0, 1, RouteBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRouteBean_RouteOnElement(), theXMLTypePackage.getString(), "routeOnElement", null, 1, 1, RouteBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRouteBean_RouteOnElementNS(), theXMLTypePackage.getString(), "routeOnElementNS", null, 0, 1, RouteBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRouteBean_ToServiceCategory(), theXMLTypePackage.getString(), "toServiceCategory", null, 1, 1, RouteBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRouteBean_ToServiceName(), theXMLTypePackage.getString(), "toServiceName", null, 1, 1, RouteBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + + // Create annotations + // http:///org/eclipse/emf/ecore/util/ExtendedMetaData + createExtendedMetaDataAnnotations(); + } + + /** + * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData. + *  + *  + * @generated + */ + protected void createExtendedMetaDataAnnotations() { + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + addAnnotation + (esbRoutingDocumentRootEClass, + source, + new String[] { + "name", "", + "kind", "mixed" + }); + addAnnotation + (getESBRoutingDocumentRoot_Mixed(), + source, + new String[] { + "kind", "elementWildcard", + "name", ":mixed" + }); + addAnnotation + (getESBRoutingDocumentRoot_XMLNSPrefixMap(), + source, + new String[] { + "kind", "attribute", + "name", "xmlns:prefix" + }); + addAnnotation + (getESBRoutingDocumentRoot_XSISchemaLocation(), + source, + new String[] { + "kind", "attribute", + "name", "xsi:schemaLocation" + }); + addAnnotation + (getESBRoutingDocumentRoot_RouteBean(), + source, + new String[] { + "kind", "element", + "name", "routeBean", + "namespace", "##targetNamespace", + "affiliation", "http://www.milyn.org/xsd/smooks-1.1.xsd#abstract-resource-config" + }); + addAnnotation + (routeBeanEClass, + source, + new String[] { + "name", "routeBean", + "kind", "elementOnly" + }); + addAnnotation + (getRouteBean_BeanIdRef(), + source, + new String[] { + "kind", "attribute", + "name", "beanIdRef" + }); + addAnnotation + (getRouteBean_MessagePayloadLocation(), + source, + new String[] { + "kind", "attribute", + "name", "messagePayloadLocation" + }); + addAnnotation + (getRouteBean_RouteBefore(), + source, + new String[] { + "kind", "attribute", + "name", "routeBefore" + }); + addAnnotation + (getRouteBean_RouteOnElement(), + source, + new String[] { + "kind", "attribute", + "name", "routeOnElement" + }); + addAnnotation + (getRouteBean_RouteOnElementNS(), + source, + new String[] { + "kind", "attribute", + "name", "routeOnElementNS" + }); + addAnnotation + (getRouteBean_ToServiceCategory(), + source, + new String[] { + "kind", "attribute", + "name", "toServiceCategory" + }); + addAnnotation + (getRouteBean_ToServiceName(), + source, + new String[] { + "kind", "attribute", + "name", "toServiceName" + }); + } + +} //EsbroutingPackageImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/EsbroutingPackageImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/RouteBeanImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/RouteBeanImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/RouteBeanImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,557 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.impl; + + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; +import org.jboss.tools.smooks.model.smooks.impl.ElementVisitorImpl; + +/** + *  + * An implementation of the model object 'Route Bean'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl#getBeanIdRef Bean Id Ref}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl#getMessagePayloadLocation Message Payload Location}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl#isRouteBefore Route Before}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl#getRouteOnElement Route On Element}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl#getRouteOnElementNS Route On Element NS}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl#getToServiceCategory To Service Category}</li> + * <li>{@link org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl#getToServiceName To Service Name}</li> + * </ul> + * + * + * @generated + */ +public class RouteBeanImpl extends ElementVisitorImpl implements RouteBean { + /** + * The default value of the '{@link #getBeanIdRef() Bean Id Ref}' attribute. + *  + *  + * @see #getBeanIdRef() + * @generated + * @ordered + */ + protected static final String BEAN_ID_REF_EDEFAULT = null; + + /** + * The cached value of the '{@link #getBeanIdRef() Bean Id Ref}' attribute. + *  + *  + * @see #getBeanIdRef() + * @generated + * @ordered + */ + protected String beanIdRef = BEAN_ID_REF_EDEFAULT; + + /** + * The default value of the '{@link #getMessagePayloadLocation() Message Payload Location}' attribute. + *  + *  + * @see #getMessagePayloadLocation() + * @generated + * @ordered + */ + protected static final String MESSAGE_PAYLOAD_LOCATION_EDEFAULT = ""; + + /** + * The cached value of the '{@link #getMessagePayloadLocation() Message Payload Location}' attribute. + *  + *  + * @see #getMessagePayloadLocation() + * @generated + * @ordered + */ + protected String messagePayloadLocation = MESSAGE_PAYLOAD_LOCATION_EDEFAULT; + + /** + * This is true if the Message Payload Location attribute has been set. + *  + *  + * @generated + * @ordered + */ + protected boolean messagePayloadLocationESet; + + /** + * The default value of the '{@link #isRouteBefore() Route Before}' attribute. + *  + *  + * @see #isRouteBefore() + * @generated + * @ordered + */ + protected static final boolean ROUTE_BEFORE_EDEFAULT = false; + + /** + * The cached value of the '{@link #isRouteBefore() Route Before}' attribute. + *  + *  + * @see #isRouteBefore() + * @generated + * @ordered + */ + protected boolean routeBefore = ROUTE_BEFORE_EDEFAULT; + + /** + * This is true if the Route Before attribute has been set. + *  + *  + * @generated + * @ordered + */ + protected boolean routeBeforeESet; + + /** + * The default value of the '{@link #getRouteOnElement() Route On Element}' attribute. + *  + *  + * @see #getRouteOnElement() + * @generated + * @ordered + */ + protected static final String ROUTE_ON_ELEMENT_EDEFAULT = null; + + /** + * The cached value of the '{@link #getRouteOnElement() Route On Element}' attribute. + *  + *  + * @see #getRouteOnElement() + * @generated + * @ordered + */ + protected String routeOnElement = ROUTE_ON_ELEMENT_EDEFAULT; + + /** + * The default value of the '{@link #getRouteOnElementNS() Route On Element NS}' attribute. + *  + *  + * @see #getRouteOnElementNS() + * @generated + * @ordered + */ + protected static final String ROUTE_ON_ELEMENT_NS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getRouteOnElementNS() Route On Element NS}' attribute. + *  + *  + * @see #getRouteOnElementNS() + * @generated + * @ordered + */ + protected String routeOnElementNS = ROUTE_ON_ELEMENT_NS_EDEFAULT; + + /** + * The default value of the '{@link #getToServiceCategory() To Service Category}' attribute. + *  + *  + * @see #getToServiceCategory() + * @generated + * @ordered + */ + protected static final String TO_SERVICE_CATEGORY_EDEFAULT = null; + + /** + * The cached value of the '{@link #getToServiceCategory() To Service Category}' attribute. + *  + *  + * @see #getToServiceCategory() + * @generated + * @ordered + */ + protected String toServiceCategory = TO_SERVICE_CATEGORY_EDEFAULT; + + /** + * The default value of the '{@link #getToServiceName() To Service Name}' attribute. + *  + *  + * @see #getToServiceName() + * @generated + * @ordered + */ + protected static final String TO_SERVICE_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getToServiceName() To Service Name}' attribute. + *  + *  + * @see #getToServiceName() + * @generated + * @ordered + */ + protected String toServiceName = TO_SERVICE_NAME_EDEFAULT; + + /** + *  + *  + * @generated + */ + protected RouteBeanImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return EsbroutingPackage.Literals.ROUTE_BEAN; + } + + /** + *  + *  + * @generated + */ + public String getBeanIdRef() { + return beanIdRef; + } + + /** + *  + *  + * @generated + */ + public void setBeanIdRef(String newBeanIdRef) { + String oldBeanIdRef = beanIdRef; + beanIdRef = newBeanIdRef; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EsbroutingPackage.ROUTE_BEAN__BEAN_ID_REF, oldBeanIdRef, beanIdRef)); + } + + /** + *  + *  + * @generated + */ + public String getMessagePayloadLocation() { + return messagePayloadLocation; + } + + /** + *  + *  + * @generated + */ + public void setMessagePayloadLocation(String newMessagePayloadLocation) { + String oldMessagePayloadLocation = messagePayloadLocation; + messagePayloadLocation = newMessagePayloadLocation; + boolean oldMessagePayloadLocationESet = messagePayloadLocationESet; + messagePayloadLocationESet = true; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EsbroutingPackage.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION, oldMessagePayloadLocation, messagePayloadLocation, !oldMessagePayloadLocationESet)); + } + + /** + *  + *  + * @generated + */ + public void unsetMessagePayloadLocation() { + String oldMessagePayloadLocation = messagePayloadLocation; + boolean oldMessagePayloadLocationESet = messagePayloadLocationESet; + messagePayloadLocation = MESSAGE_PAYLOAD_LOCATION_EDEFAULT; + messagePayloadLocationESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, EsbroutingPackage.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION, oldMessagePayloadLocation, MESSAGE_PAYLOAD_LOCATION_EDEFAULT, oldMessagePayloadLocationESet)); + } + + /** + *  + *  + * @generated + */ + public boolean isSetMessagePayloadLocation() { + return messagePayloadLocationESet; + } + + /** + *  + *  + * @generated + */ + public boolean isRouteBefore() { + return routeBefore; + } + + /** + *  + *  + * @generated + */ + public void setRouteBefore(boolean newRouteBefore) { + boolean oldRouteBefore = routeBefore; + routeBefore = newRouteBefore; + boolean oldRouteBeforeESet = routeBeforeESet; + routeBeforeESet = true; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EsbroutingPackage.ROUTE_BEAN__ROUTE_BEFORE, oldRouteBefore, routeBefore, !oldRouteBeforeESet)); + } + + /** + *  + *  + * @generated + */ + public void unsetRouteBefore() { + boolean oldRouteBefore = routeBefore; + boolean oldRouteBeforeESet = routeBeforeESet; + routeBefore = ROUTE_BEFORE_EDEFAULT; + routeBeforeESet = false; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.UNSET, EsbroutingPackage.ROUTE_BEAN__ROUTE_BEFORE, oldRouteBefore, ROUTE_BEFORE_EDEFAULT, oldRouteBeforeESet)); + } + + /** + *  + *  + * @generated + */ + public boolean isSetRouteBefore() { + return routeBeforeESet; + } + + /** + *  + *  + * @generated + */ + public String getRouteOnElement() { + return routeOnElement; + } + + /** + *  + *  + * @generated + */ + public void setRouteOnElement(String newRouteOnElement) { + String oldRouteOnElement = routeOnElement; + routeOnElement = newRouteOnElement; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT, oldRouteOnElement, routeOnElement)); + } + + /** + *  + *  + * @generated + */ + public String getRouteOnElementNS() { + return routeOnElementNS; + } + + /** + *  + *  + * @generated + */ + public void setRouteOnElementNS(String newRouteOnElementNS) { + String oldRouteOnElementNS = routeOnElementNS; + routeOnElementNS = newRouteOnElementNS; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS, oldRouteOnElementNS, routeOnElementNS)); + } + + /** + *  + *  + * @generated + */ + public String getToServiceCategory() { + return toServiceCategory; + } + + /** + *  + *  + * @generated + */ + public void setToServiceCategory(String newToServiceCategory) { + String oldToServiceCategory = toServiceCategory; + toServiceCategory = newToServiceCategory; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_CATEGORY, oldToServiceCategory, toServiceCategory)); + } + + /** + *  + *  + * @generated + */ + public String getToServiceName() { + return toServiceName; + } + + /** + *  + *  + * @generated + */ + public void setToServiceName(String newToServiceName) { + String oldToServiceName = toServiceName; + toServiceName = newToServiceName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_NAME, oldToServiceName, toServiceName)); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EsbroutingPackage.ROUTE_BEAN__BEAN_ID_REF: + return getBeanIdRef(); + case EsbroutingPackage.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION: + return getMessagePayloadLocation(); + case EsbroutingPackage.ROUTE_BEAN__ROUTE_BEFORE: + return isRouteBefore() ? Boolean.TRUE : Boolean.FALSE; + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT: + return getRouteOnElement(); + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS: + return getRouteOnElementNS(); + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_CATEGORY: + return getToServiceCategory(); + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_NAME: + return getToServiceName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EsbroutingPackage.ROUTE_BEAN__BEAN_ID_REF: + setBeanIdRef((String)newValue); + return; + case EsbroutingPackage.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION: + setMessagePayloadLocation((String)newValue); + return; + case EsbroutingPackage.ROUTE_BEAN__ROUTE_BEFORE: + setRouteBefore(((Boolean)newValue).booleanValue()); + return; + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT: + setRouteOnElement((String)newValue); + return; + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS: + setRouteOnElementNS((String)newValue); + return; + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_CATEGORY: + setToServiceCategory((String)newValue); + return; + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_NAME: + setToServiceName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EsbroutingPackage.ROUTE_BEAN__BEAN_ID_REF: + setBeanIdRef(BEAN_ID_REF_EDEFAULT); + return; + case EsbroutingPackage.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION: + unsetMessagePayloadLocation(); + return; + case EsbroutingPackage.ROUTE_BEAN__ROUTE_BEFORE: + unsetRouteBefore(); + return; + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT: + setRouteOnElement(ROUTE_ON_ELEMENT_EDEFAULT); + return; + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS: + setRouteOnElementNS(ROUTE_ON_ELEMENT_NS_EDEFAULT); + return; + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_CATEGORY: + setToServiceCategory(TO_SERVICE_CATEGORY_EDEFAULT); + return; + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_NAME: + setToServiceName(TO_SERVICE_NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EsbroutingPackage.ROUTE_BEAN__BEAN_ID_REF: + return BEAN_ID_REF_EDEFAULT == null ? beanIdRef != null : !BEAN_ID_REF_EDEFAULT.equals(beanIdRef); + case EsbroutingPackage.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION: + return isSetMessagePayloadLocation(); + case EsbroutingPackage.ROUTE_BEAN__ROUTE_BEFORE: + return isSetRouteBefore(); + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT: + return ROUTE_ON_ELEMENT_EDEFAULT == null ? routeOnElement != null : !ROUTE_ON_ELEMENT_EDEFAULT.equals(routeOnElement); + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS: + return ROUTE_ON_ELEMENT_NS_EDEFAULT == null ? routeOnElementNS != null : !ROUTE_ON_ELEMENT_NS_EDEFAULT.equals(routeOnElementNS); + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_CATEGORY: + return TO_SERVICE_CATEGORY_EDEFAULT == null ? toServiceCategory != null : !TO_SERVICE_CATEGORY_EDEFAULT.equals(toServiceCategory); + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_NAME: + return TO_SERVICE_NAME_EDEFAULT == null ? toServiceName != null : !TO_SERVICE_NAME_EDEFAULT.equals(toServiceName); + } + return super.eIsSet(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (beanIdRef: "); + result.append(beanIdRef); + result.append(", messagePayloadLocation: "); + if (messagePayloadLocationESet) result.append(messagePayloadLocation); else result.append("<unset>"); + result.append(", routeBefore: "); + if (routeBeforeESet) result.append(routeBefore); else result.append("<unset>"); + result.append(", routeOnElement: "); + result.append(routeOnElement); + result.append(", routeOnElementNS: "); + result.append(routeOnElementNS); + result.append(", toServiceCategory: "); + result.append(toServiceCategory); + result.append(", toServiceName: "); + result.append(toServiceName); + result.append(')'); + return result.toString(); + } + +} //RouteBeanImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/impl/RouteBeanImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/ESBRoutingDocumentRootItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/ESBRoutingDocumentRootItemProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/ESBRoutingDocumentRootItemProvider.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,171 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.provider; + + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.common.util.ResourceLocator; + +import org.eclipse.emf.ecore.EStructuralFeature; + +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; +import org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingFactory; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; + +/** + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot} object. + *  + *  + * @generated + */ +public class ESBRoutingDocumentRootItemProvider + extends ItemProviderAdapter + implements + IEditingDomainItemProvider, + IStructuredItemContentProvider, + ITreeItemContentProvider, + IItemLabelProvider, + IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + *  + *  + * @generated + */ + public ESBRoutingDocumentRootItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + *  + *  + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + } + return itemPropertyDescriptors; + } + + /** + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. + *  + *  + * @generated + */ + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { + if (childrenFeatures == null) { + super.getChildrenFeatures(object); + childrenFeatures.add(EsbroutingPackage.Literals.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN); + } + return childrenFeatures; + } + + /** + *  + *  + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** + * This returns ESBRoutingDocumentRoot.gif. + *  + *  + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/ESBRoutingDocumentRoot")); + } + + /** + * This returns the label text for the adapted class. + *  + *  + * @generated + */ + @Override + public String getText(Object object) { + return getString("_UI_ESBRoutingDocumentRoot_type"); + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + *  + *  + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(ESBRoutingDocumentRoot.class)) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + *  + *  + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add + (createChildParameter + (EsbroutingPackage.Literals.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN, + EsbroutingFactory.eINSTANCE.createRouteBean())); + } + + /** + * Return the resource locator for this item provider's resources. + *  + *  + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return Esbrouting1EditPlugin.INSTANCE; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/ESBRoutingDocumentRootItemProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/Esbrouting1EditPlugin.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/Esbrouting1EditPlugin.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/Esbrouting1EditPlugin.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,93 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.provider; + +import org.eclipse.emf.common.EMFPlugin; + +import org.eclipse.emf.common.util.ResourceLocator; + +/** + * This is the central singleton for the Esbrouting-1 edit plugin. + *  + *  + * @generated + */ +public final class Esbrouting1EditPlugin extends EMFPlugin { + /** + * Keep track of the singleton. + *  + *  + * @generated + */ + public static final Esbrouting1EditPlugin INSTANCE = new Esbrouting1EditPlugin(); + + /** + * Keep track of the singleton. + *  + *  + * @generated + */ + private static Implementation plugin; + + /** + * Create the instance. + *  + *  + * @generated + */ + public Esbrouting1EditPlugin() { + super + (new ResourceLocator [] { + }); + } + + /** + * Returns the singleton instance of the Eclipse plugin. + *  + *  + * @return the singleton instance. + * @generated + */ + @Override + public ResourceLocator getPluginResourceLocator() { + return plugin; + } + + /** + * Returns the singleton instance of the Eclipse plugin. + *  + *  + * @return the singleton instance. + * @generated + */ + public static Implementation getPlugin() { + return plugin; + } + + /** + * The actual implementation of the Eclipse Plugin. + *  + *  + * @generated + */ + public static class Implementation extends EclipsePlugin { + /** + * Creates an instance. + *  + *  + * @generated + */ + public Implementation() { + super(); + + // Remember the static instance. + // + plugin = this; + } + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/Esbrouting1EditPlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/EsbroutingItemProviderAdapterFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/EsbroutingItemProviderAdapterFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/EsbroutingItemProviderAdapterFactory.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,226 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.provider; + + +import java.util.ArrayList; +import java.util.Collection; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.edit.provider.ChangeNotifier; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.IChangeNotifier; +import org.eclipse.emf.edit.provider.IDisposable; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.INotifyChangedListener; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.jboss.tools.smooks.model.esbrouting.util.EsbroutingAdapterFactory; + +/** + * This is the factory that is used to provide the interfaces needed to support Viewers. + * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. + * The adapters also support Eclipse property sheets. + * Note that most of the adapters are shared among multiple instances. + *  + *  + * @generated + */ +public class EsbroutingItemProviderAdapterFactory extends EsbroutingAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { + /** + * This keeps track of the root adapter factory that delegates to this adapter factory. + *  + *  + * @generated + */ + protected ComposedAdapterFactory parentAdapterFactory; + + /** + * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. + *  + *  + * @generated + */ + protected IChangeNotifier changeNotifier = new ChangeNotifier(); + + /** + * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. + *  + *  + * @generated + */ + protected Collection<Object> supportedTypes = new ArrayList<Object>(); + + /** + * This constructs an instance. + *  + *  + * @generated + */ + public EsbroutingItemProviderAdapterFactory() { + supportedTypes.add(IEditingDomainItemProvider.class); + supportedTypes.add(IStructuredItemContentProvider.class); + supportedTypes.add(ITreeItemContentProvider.class); + supportedTypes.add(IItemLabelProvider.class); + supportedTypes.add(IItemPropertySource.class); + } + + /** + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot} instances. + *  + *  + * @generated + */ + protected ESBRoutingDocumentRootItemProvider esbRoutingDocumentRootItemProvider; + + /** + * This creates an adapter for a {@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot}. + *  + *  + * @generated + */ + @Override + public Adapter createESBRoutingDocumentRootAdapter() { + if (esbRoutingDocumentRootItemProvider == null) { + esbRoutingDocumentRootItemProvider = new ESBRoutingDocumentRootItemProvider(this); + } + + return esbRoutingDocumentRootItemProvider; + } + + /** + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.esbrouting.RouteBean} instances. + *  + *  + * @generated + */ + protected RouteBeanItemProvider routeBeanItemProvider; + + /** + * This creates an adapter for a {@link org.jboss.tools.smooks.model.esbrouting.RouteBean}. + *  + *  + * @generated + */ + @Override + public Adapter createRouteBeanAdapter() { + if (routeBeanItemProvider == null) { + routeBeanItemProvider = new RouteBeanItemProvider(this); + } + + return routeBeanItemProvider; + } + + /** + * This returns the root adapter factory that contains this factory. + *  + *  + * @generated + */ + public ComposeableAdapterFactory getRootAdapterFactory() { + return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); + } + + /** + * This sets the composed adapter factory that contains this factory. + *  + *  + * @generated + */ + public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) { + this.parentAdapterFactory = parentAdapterFactory; + } + + /** + *  + *  + * @generated + */ + @Override + public boolean isFactoryForType(Object type) { + return supportedTypes.contains(type) || super.isFactoryForType(type); + } + + /** + * This implementation substitutes the factory itself as the key for the adapter. + *  + *  + * @generated + */ + @Override + public Adapter adapt(Notifier notifier, Object type) { + return super.adapt(notifier, this); + } + + /** + *  + *  + * @generated + */ + @Override + public Object adapt(Object object, Object type) { + if (isFactoryForType(type)) { + Object adapter = super.adapt(object, type); + if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter))) { + return adapter; + } + } + + return null; + } + + /** + * This adds a listener. + *  + *  + * @generated + */ + public void addListener(INotifyChangedListener notifyChangedListener) { + changeNotifier.addListener(notifyChangedListener); + } + + /** + * This removes a listener. + *  + *  + * @generated + */ + public void removeListener(INotifyChangedListener notifyChangedListener) { + changeNotifier.removeListener(notifyChangedListener); + } + + /** + * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. + *  + *  + * @generated + */ + public void fireNotifyChanged(Notification notification) { + changeNotifier.fireNotifyChanged(notification); + + if (parentAdapterFactory != null) { + parentAdapterFactory.fireNotifyChanged(notification); + } + } + + /** + * This disposes all of the item providers created by this factory. + *  + *  + * @generated + */ + public void dispose() { + if (esbRoutingDocumentRootItemProvider != null) esbRoutingDocumentRootItemProvider.dispose(); + if (routeBeanItemProvider != null) routeBeanItemProvider.dispose(); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/EsbroutingItemProviderAdapterFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/RouteBeanItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/RouteBeanItemProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/RouteBeanItemProvider.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,303 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.provider; + + + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ViewerNotification; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; +import org.jboss.tools.smooks.model.smooks.provider.ElementVisitorItemProvider; + +/** + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.esbrouting.RouteBean} object. + *  + *  + * @generated + */ +public class RouteBeanItemProvider + extends ElementVisitorItemProvider + implements + IEditingDomainItemProvider, + IStructuredItemContentProvider, + ITreeItemContentProvider, + IItemLabelProvider, + IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + *  + *  + * @generated + */ + public RouteBeanItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + *  + *  + * @generated + */ + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addBeanIdRefPropertyDescriptor(object); + addMessagePayloadLocationPropertyDescriptor(object); + addRouteBeforePropertyDescriptor(object); + addRouteOnElementPropertyDescriptor(object); + addRouteOnElementNSPropertyDescriptor(object); + addToServiceCategoryPropertyDescriptor(object); + addToServiceNamePropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Bean Id Ref feature. + *  + *  + * @generated + */ + protected void addBeanIdRefPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RouteBean_beanIdRef_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RouteBean_beanIdRef_feature", "_UI_RouteBean_type"), + EsbroutingPackage.Literals.ROUTE_BEAN__BEAN_ID_REF, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Message Payload Location feature. + *  + *  + * @generated + */ + protected void addMessagePayloadLocationPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RouteBean_messagePayloadLocation_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RouteBean_messagePayloadLocation_feature", "_UI_RouteBean_type"), + EsbroutingPackage.Literals.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Route Before feature. + *  + *  + * @generated + */ + protected void addRouteBeforePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RouteBean_routeBefore_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RouteBean_routeBefore_feature", "_UI_RouteBean_type"), + EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_BEFORE, + true, + false, + false, + ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Route On Element feature. + *  + *  + * @generated + */ + protected void addRouteOnElementPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RouteBean_routeOnElement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RouteBean_routeOnElement_feature", "_UI_RouteBean_type"), + EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the Route On Element NS feature. + *  + *  + * @generated + */ + protected void addRouteOnElementNSPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RouteBean_routeOnElementNS_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RouteBean_routeOnElementNS_feature", "_UI_RouteBean_type"), + EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the To Service Category feature. + *  + *  + * @generated + */ + protected void addToServiceCategoryPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RouteBean_toServiceCategory_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RouteBean_toServiceCategory_feature", "_UI_RouteBean_type"), + EsbroutingPackage.Literals.ROUTE_BEAN__TO_SERVICE_CATEGORY, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This adds a property descriptor for the To Service Name feature. + *  + *  + * @generated + */ + protected void addToServiceNamePropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_RouteBean_toServiceName_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_RouteBean_toServiceName_feature", "_UI_RouteBean_type"), + EsbroutingPackage.Literals.ROUTE_BEAN__TO_SERVICE_NAME, + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** + * This returns RouteBean.gif. + *  + *  + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/RouteBean")); + } + + /** + * This returns the label text for the adapted class. + *  + *  + * @generated + */ + @Override + public String getText(Object object) { + String label = ((RouteBean)object).getToServiceName(); + return label == null || label.length() == 0 ? + getString("_UI_RouteBean_type") : + getString("_UI_RouteBean_type") + " " + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + *  + *  + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + updateChildren(notification); + + switch (notification.getFeatureID(RouteBean.class)) { + case EsbroutingPackage.ROUTE_BEAN__BEAN_ID_REF: + case EsbroutingPackage.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION: + case EsbroutingPackage.ROUTE_BEAN__ROUTE_BEFORE: + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT: + case EsbroutingPackage.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS: + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_CATEGORY: + case EsbroutingPackage.ROUTE_BEAN__TO_SERVICE_NAME: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + *  + *  + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. + *  + *  + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return Esbrouting1EditPlugin.INSTANCE; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/provider/RouteBeanItemProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingAdapterFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingAdapterFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingAdapterFactory.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,217 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.util; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.jboss.tools.smooks.model.common.AbstractAnyType; +import org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; +import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; +import org.jboss.tools.smooks.model.smooks.ElementVisitor; + +/** + *  + * The Adapter Factory for the model. + * It provides an adapter <code>createXXX</code> method for each class of the model. + *  + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage + * @generated + */ +public class EsbroutingAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + *  + *  + * @generated + */ + protected static EsbroutingPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + *  + *  + * @generated + */ + public EsbroutingAdapterFactory() { + if (modelPackage == null) { + modelPackage = EsbroutingPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + *  + * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. + *  + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the <code>createXXX</code> methods. + *  + *  + * @generated + */ + protected EsbroutingSwitch<Adapter> modelSwitch = + new EsbroutingSwitch<Adapter>() { + @Override + public Adapter caseESBRoutingDocumentRoot(ESBRoutingDocumentRoot object) { + return createESBRoutingDocumentRootAdapter(); + } + @Override + public Adapter caseRouteBean(RouteBean object) { + return createRouteBeanAdapter(); + } + @Override + public Adapter caseAnyType(AnyType object) { + return createAnyTypeAdapter(); + } + @Override + public Adapter caseAbstractAnyType(AbstractAnyType object) { + return createAbstractAnyTypeAdapter(); + } + @Override + public Adapter caseAbstractResourceConfig(AbstractResourceConfig object) { + return createAbstractResourceConfigAdapter(); + } + @Override + public Adapter caseElementVisitor(ElementVisitor object) { + return createElementVisitorAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the <code>target</code>. + *  + *  + * @param target the object to adapt. + * @return the adapter for the <code>target</code>. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot ESB Routing Document Root}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot + * @generated + */ + public Adapter createESBRoutingDocumentRootAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.esbrouting.RouteBean Route Bean}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.model.esbrouting.RouteBean + * @generated + */ + public Adapter createRouteBeanAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.xml.type.AnyType Any Type}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.eclipse.emf.ecore.xml.type.AnyType + * @generated + */ + public Adapter createAnyTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link common.AbstractAnyType Abstract Any Type}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see common.AbstractAnyType + * @generated + */ + public Adapter createAbstractAnyTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link smooks.AbstractResourceConfig Abstract Resource Config}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see smooks.AbstractResourceConfig + * @generated + */ + public Adapter createAbstractResourceConfigAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link smooks.ElementVisitor Element Visitor}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see smooks.ElementVisitor + * @generated + */ + public Adapter createElementVisitorAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + *  + * This default implementation returns null. + *  + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //EsbroutingAdapterFactory Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingAdapterFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceFactoryImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceFactoryImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,56 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.util; + +import org.eclipse.emf.common.util.URI; + +import org.eclipse.emf.ecore.resource.Resource; + +import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; + +import org.eclipse.emf.ecore.xmi.XMLResource; + +/** + *  + * The Resource Factory associated with the package. + *  + * @see org.jboss.tools.smooks.model.esbrouting.util.EsbroutingResourceImpl + * @generated + */ +public class EsbroutingResourceFactoryImpl extends ResourceFactoryImpl { + /** + * Creates an instance of the resource factory. + *  + *  + * @generated + */ + public EsbroutingResourceFactoryImpl() { + super(); + } + + /** + * Creates an instance of the resource. + *  + *  + * @generated + */ + @Override + public Resource createResource(URI uri) { + XMLResource result = new EsbroutingResourceImpl(uri); + result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE); + + result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE); + + result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE); + return result; + } + +} //EsbroutingResourceFactoryImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceFactoryImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,32 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.util; + +import org.eclipse.emf.common.util.URI; + +import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; + +/** + *  + * The Resource associated with the package. + *  + * @see org.jboss.tools.smooks.model.esbrouting.util.EsbroutingResourceFactoryImpl + * @generated + */ +public class EsbroutingResourceImpl extends XMLResourceImpl { + /** + * Creates an instance of the resource. + *  + *  + * @param uri the URI of the new resource. + * @generated + */ + public EsbroutingResourceImpl(URI uri) { + super(uri); + } + +} //EsbroutingResourceImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingResourceImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingSwitch.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingSwitch.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingSwitch.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,220 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.util; + +import java.util.List; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.jboss.tools.smooks.model.common.AbstractAnyType; +import org.jboss.tools.smooks.model.esbrouting.ESBRoutingDocumentRoot; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; +import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; +import org.jboss.tools.smooks.model.smooks.ElementVisitor; + +/** + *  + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the <code>caseXXX</code> method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + *  + * @see org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage + * @generated + */ +public class EsbroutingSwitch<T> { + /** + * The cached model package + *  + *  + * @generated + */ + protected static EsbroutingPackage modelPackage; + + /** + * Creates an instance of the switch. + *  + *  + * @generated + */ + public EsbroutingSwitch() { + if (modelPackage == null) { + modelPackage = EsbroutingPackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + public T doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List<EClass> eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch(eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case EsbroutingPackage.ESB_ROUTING_DOCUMENT_ROOT: { + ESBRoutingDocumentRoot esbRoutingDocumentRoot = (ESBRoutingDocumentRoot)theEObject; + T result = caseESBRoutingDocumentRoot(esbRoutingDocumentRoot); + if (result == null) result = defaultCase(theEObject); + return result; + } + case EsbroutingPackage.ROUTE_BEAN: { + RouteBean routeBean = (RouteBean)theEObject; + T result = caseRouteBean(routeBean); + if (result == null) result = caseElementVisitor(routeBean); + if (result == null) result = caseAbstractResourceConfig(routeBean); + if (result == null) result = caseAbstractAnyType(routeBean); + if (result == null) result = caseAnyType(routeBean); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'ESB Routing Document Root'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'ESB Routing Document Root'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseESBRoutingDocumentRoot(ESBRoutingDocumentRoot object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Route Bean'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Route Bean'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseRouteBean(RouteBean object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Any Type'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Any Type'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAnyType(AnyType object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Abstract Any Type'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Abstract Any Type'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbstractAnyType(AbstractAnyType object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Abstract Resource Config'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Abstract Resource Config'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAbstractResourceConfig(AbstractResourceConfig object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Element Visitor'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Element Visitor'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseElementVisitor(ElementVisitor object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + public T defaultCase(EObject object) { + return null; + } + +} //EsbroutingSwitch Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingSwitch.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingXMLProcessor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingXMLProcessor.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingXMLProcessor.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,54 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.model.esbrouting.util; + + +import java.util.Map; + +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.resource.Resource; + +import org.eclipse.emf.ecore.xmi.util.XMLProcessor; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; + +/** + * This class contains helper methods to serialize and deserialize XML documents + *  + *  + * @generated + */ +public class EsbroutingXMLProcessor extends XMLProcessor { + + /** + * Public constructor to instantiate the helper. + *  + *  + * @generated + */ + public EsbroutingXMLProcessor() { + super((EPackage.Registry.INSTANCE)); + EsbroutingPackage.eINSTANCE.eClass(); + } + + /** + * Register for "*" and "xml" file extensions the EsbroutingResourceFactoryImpl factory. + *  + *  + * @generated + */ + @Override + protected Map<String, Resource.Factory> getRegistrations() { + if (registrations == null) { + super.getRegistrations(); + registrations.put(XML_EXTENSION, new EsbroutingResourceFactoryImpl()); + registrations.put(STAR_EXTENSION, new EsbroutingResourceFactoryImpl()); + } + return registrations; + } + +} //EsbroutingXMLProcessor Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/esbrouting/util/EsbroutingXMLProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerImpl.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.jboss.tools.smooks.model.freemarker.Freemarker; +import org.jboss.tools.smooks.model.freemarker.FreemarkerFactory; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; import org.jboss.tools.smooks.model.freemarker.Template; import org.jboss.tools.smooks.model.freemarker.Use; @@ -155,6 +156,7 @@ */ protected FreemarkerImpl() { super(); + setTemplate(FreemarkerFactory.eINSTANCE.createTemplate()); } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -34,6 +34,8 @@ import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage; import org.jboss.tools.smooks.model.edi.EdiFactory; import org.jboss.tools.smooks.model.edi.EdiPackage; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingFactory; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; import org.jboss.tools.smooks.model.fileRouting.FileRoutingFactory; import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage; import org.jboss.tools.smooks.model.freemarker.FreemarkerFactory; @@ -324,7 +326,12 @@ // for File routing newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil .createEntry(FileRoutingPackage.Literals.DOCUMENT_ROOT__OUTPUT_STREAM, FileRoutingFactory.eINSTANCE.createOutputStream()))); + + // for ESB routing + newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(EsbroutingPackage.Literals.ESB_ROUTING_DOCUMENT_ROOT__ROUTE_BEAN, EsbroutingFactory.eINSTANCE.createRouteBean()))); + /***********************************************/ } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/XslImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/XslImpl.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/impl/XslImpl.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -25,6 +25,7 @@ import org.jboss.tools.smooks.model.xsl.Template; import org.jboss.tools.smooks.model.xsl.Use; import org.jboss.tools.smooks.model.xsl.Xsl; +import org.jboss.tools.smooks.model.xsl.XslFactory; import org.jboss.tools.smooks.model.xsl.XslPackage; @@ -155,6 +156,7 @@ */ protected XslImpl() { super(); + setTemplate(XslFactory.eINSTANCE.createTemplate()); } /** Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/xsd/routing-1.0.xsd =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/xsd/routing-1.0.xsd (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/xsd/routing-1.0.xsd 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema targetNamespace="http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd" + elementFormDefault="qualified" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:smooks="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:routing="http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd"> + + <xs:import namespace="http://www.milyn.org/xsd/smooks-1.1.xsd"/> + + <xs:annotation> + <xs:documentation xml:lang="en">JBoss ESB Smooks Routing Components</xs:documentation> + </xs:annotation> + + <xs:element name="routeBean" type="routing:routeBean" substitutionGroup="smooks:abstract-resource-config"> + <xs:annotation> + <xs:documentation xml:lang="en">JBoss ESB Async Router.</xs:documentation> + </xs:annotation> + </xs:element> + + <xs:complexType name="routeBean"> + <xs:annotation> + <xs:documentation xml:lang="en">JBoss ESB Async Router.</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="smooks:element-visitor"> + <xs:attribute name="beanIdRef" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation xml:lang="en">Bean ID reference of the bean to be routed to the target Service. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="toServiceCategory" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation xml:lang="en">Target Service Category.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="toServiceName" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation xml:lang="en">Target Service Name.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="routeOnElement" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation xml:lang="en">Route on Element.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="routeOnElementNS" type="xs:string"> + <xs:annotation> + <xs:documentation xml:lang="en">Route on Element Namespace.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="messagePayloadLocation" type="xs:string" default=""> + <xs:annotation> + <xs:documentation xml:lang="en">ESB Message.Body location on which the routed bean will be set.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="routeBefore" type="xs:boolean" default="false"> + <xs:annotation> + <xs:documentation xml:lang="en">Route on visitBefore of the routeOnElement.</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + +</xs:schema> Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/xsd/routing-1.0.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2009-05-25 08:02:20 UTC (rev 15481) @@ -19,7 +19,8 @@ org.eclipse.emf.edit.ui, org.eclipse.jdt.core, org.eclipse.jdt.ui, - org.eclipse.wst.validation + org.eclipse.wst.validation, + org.eclipse.pde.ui Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/IPropertyUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -28,8 +28,11 @@ IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, SmooksMultiFormEditor formEditor); - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor); public boolean ignoreProperty(EAttribute feature); + + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingDomain, + FormToolkit formToolkit, Composite detailsComposite, Object model, SmooksMultiFormEditor formEditor); } 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -26,6 +26,8 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.FillLayout; @@ -37,13 +39,12 @@ 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; import org.jboss.tools.smooks.configuration.editors.uitls.IModelProcsser; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; -import org.jboss.tools.smooks.model.javabean.BindingsType; -import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; @@ -130,7 +131,7 @@ return SmooksUIUtils.getJavaProject(model); } - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return Collections.emptyList(); } @@ -239,7 +240,7 @@ if (editValue != null) { combo.setText(editValue.toString()); } - List<String> list = getBeanIdList(smooksResourceList); + List<String> list = SmooksUIUtils.getBeanIdList(smooksResourceList); for (Iterator<String> iterator = list.iterator(); iterator.hasNext();) { String beanId = (String) iterator.next(); combo.add(beanId); @@ -263,6 +264,20 @@ 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) + */ + public void widgetDisposed(DisposeEvent e) { + disposer.dispose(); + } + + }); + return editPart; } } @@ -280,24 +295,23 @@ return null; } - protected List<String> getBeanIdList(SmooksResourceListType resourceList) { - List<AbstractResourceConfig> rlist = resourceList.getAbstractResourceConfig(); - List<String> beanIdList = new ArrayList<String>(); - for (Iterator<?> iterator = rlist.iterator(); iterator.hasNext();) { - AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); - if (abstractResourceConfig instanceof BindingsType) { - String beanId = ((BindingsType) abstractResourceConfig).getBeanId(); - if (beanId == null) - continue; - beanIdList.add(beanId); - } - } - return beanIdList; - } public boolean ignoreProperty(EAttribute feature) { return false; } + + 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){ + return itemPropertyDescriptor; + } + } + return null; + } protected List<AttributeFieldEditPart> createElementSelectionSection(String sectionTitle, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, @@ -372,4 +386,9 @@ return list; } + + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingDomain, + FormToolkit formToolkit, Composite detailsComposite, Object model, SmooksMultiFormEditor formEditor) { + return null; + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreatorManager.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreatorManager.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreatorManager.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -30,6 +30,7 @@ import org.jboss.tools.smooks.configuration.editors.edi.SegmentsUICreator; import org.jboss.tools.smooks.configuration.editors.edi.SubComponentUICreator; import org.jboss.tools.smooks.configuration.editors.edireader.EDIReaderUICreator; +import org.jboss.tools.smooks.configuration.editors.esbrouter.RouteBeanPropertyUICreator; import org.jboss.tools.smooks.configuration.editors.filerouting.HighWaterMarkUICreator; import org.jboss.tools.smooks.configuration.editors.filerouting.OutputStreamUICreator; import org.jboss.tools.smooks.configuration.editors.freemarker.FreemarkerUICreator; @@ -78,6 +79,7 @@ import org.jboss.tools.smooks.model.dbrouting.impl.ResultSetImpl; import org.jboss.tools.smooks.model.dbrouting.impl.ResultSetRowSelectorImpl; import org.jboss.tools.smooks.model.edi.impl.EDIReaderImpl; +import org.jboss.tools.smooks.model.esbrouting.impl.RouteBeanImpl; import org.jboss.tools.smooks.model.fileRouting.impl.HighWaterMarkImpl; import org.jboss.tools.smooks.model.fileRouting.impl.OutputStreamImpl; import org.jboss.tools.smooks.model.freemarker.impl.FreemarkerImpl; @@ -242,6 +244,8 @@ map.put(DirectImpl.class, new DirectUICreator()); map.put(DataSourceJndiImpl.class, new DataSourceJndiUICreator()); + // for ESB router + map.put(RouteBeanImpl.class, new RouteBeanPropertyUICreator()); /* * up is for smooks1.1 */ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -234,14 +234,14 @@ } }); } - - protected List<Object> generateInputData() { + + public static List<Object> generateInputData(SmooksGraphicsExtType extType){ List<Object> list = new ArrayList<Object>(); - if (this.graphicsExt != null) { - IJavaProject project = SmooksUIUtils.getJavaProject(graphicsExt); + if (extType != null) { + IJavaProject project = SmooksUIUtils.getJavaProject(extType); try { ProjectClassLoader classLoader = new ProjectClassLoader(project); - List<InputType> inputLists = graphicsExt.getInput(); + List<InputType> inputLists = extType.getInput(); for (Iterator<?> iterator = inputLists.iterator(); iterator.hasNext();) { InputType inputType = (InputType) iterator.next(); String type = inputType.getType(); @@ -288,6 +288,10 @@ return list; } + protected List<Object> generateInputData() { + return generateInputData(graphicsExt); + } + protected void showInputDataWizard() { StructuredDataSelectionWizard wizard = new StructuredDataSelectionWizard(); if (this.editorPart != null) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -61,6 +61,7 @@ import org.jboss.tools.smooks.model.datasource.Direct; import org.jboss.tools.smooks.model.dbrouting.Executor; import org.jboss.tools.smooks.model.dbrouting.ResultSetRowSelector; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; import org.jboss.tools.smooks.model.fileRouting.OutputStream; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.groovy.Groovy; @@ -844,6 +845,9 @@ if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Executor) { return true; } + if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof RouteBean) { + return true; + } } } return false; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -72,6 +72,7 @@ import org.jboss.tools.smooks.model.datasource.provider.DatasourceItemProviderAdapterFactory; import org.jboss.tools.smooks.model.dbrouting.provider.DbroutingItemProviderAdapterFactory; import org.jboss.tools.smooks.model.edi.provider.EdiItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.esbrouting.provider.EsbroutingItemProviderAdapterFactory; import org.jboss.tools.smooks.model.fileRouting.provider.FileRoutingItemProviderAdapterFactory; import org.jboss.tools.smooks.model.freemarker.provider.FreemarkerItemProviderAdapterFactory; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; @@ -226,6 +227,7 @@ adapterFactory.addAdapterFactory(new GroovyItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new FileRoutingItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new EsbroutingItemProviderAdapterFactory()); BasicCommandStack commandStack = new BasicCommandStack(); handleCommandStack(commandStack); editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>()); 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksStuffPropertyDetailPage.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -118,6 +118,20 @@ detailsComposite.setLayout(layout); IPropertyUICreator creator = PropertyUICreatorManager.getInstance().getPropertyUICreator(getModel()); List<IItemPropertyDescriptor> propertyDes = itemPropertySource.getPropertyDescriptors(getModel()); + if (creator != null) { + List<AttributeFieldEditPart> list = creator.createExtendUIOnTop((AdapterFactoryEditingDomain) formEditor + .getEditingDomain(), formToolkit, detailsComposite, getModel(), getFormEditor()); + if (list != null) { + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + AttributeFieldEditPart attributeFieldEditPart = (AttributeFieldEditPart) iterator.next(); + Object attribute = attributeFieldEditPart.getAttribute(); + if (attribute != null) { + currentPropertyUIMap.put(attribute, attributeFieldEditPart); + } + } + } + } + for (int i = 0; i < propertyDes.size(); i++) { IItemPropertyDescriptor pd = propertyDes.get(i); EAttribute attribute = (EAttribute) pd.getFeature(getModel()); @@ -139,13 +153,13 @@ } } if (creator != null) { - List<AttributeFieldEditPart> list = creator.createExtendUI((AdapterFactoryEditingDomain) formEditor.getEditingDomain(), formToolkit, - detailsComposite, getModel(), getFormEditor()); - if(list != null){ + List<AttributeFieldEditPart> list = creator.createExtendUIOnBottom((AdapterFactoryEditingDomain) formEditor + .getEditingDomain(), formToolkit, detailsComposite, getModel(), getFormEditor()); + if (list != null) { for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { AttributeFieldEditPart attributeFieldEditPart = (AttributeFieldEditPart) iterator.next(); Object attribute = attributeFieldEditPart.getAttribute(); - if(attribute != null){ + if (attribute != null) { currentPropertyUIMap.put(attribute, attributeFieldEditPart); } } 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/calc/CounterUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -77,7 +77,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/datasource/DirectUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -10,20 +10,45 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors.datasource; +import java.lang.reflect.InvocationTargetException; +import java.sql.Driver; +import java.sql.SQLException; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Properties; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IProgressMonitor; 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.emf.edit.provider.IItemPropertySource; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.forms.events.HyperlinkEvent; +import org.eclipse.ui.forms.events.IHyperlinkListener; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.Hyperlink; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; +import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor; +import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.model.datasource.DatasourcePackage; +import org.jboss.tools.smooks.model.datasource.Direct; /** * @author Dart Peng (dpeng(a)redhat.com) Date Apr 10, 2009 @@ -86,7 +111,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { IItemPropertySource itemPropertySource = (IItemPropertySource) editingdomain.getAdapterFactory().adapt(model, IItemPropertySource.class); @@ -102,11 +127,134 @@ createOnElementFeatureNS = itemPropertyDescriptor; } } - if(createOnElementFeature == null || createOnElementFeatureNS == null){ + if (createOnElementFeature == null || createOnElementFeatureNS == null) { return Collections.emptyList(); } - return this.createElementSelectionSection("Binding On Element", editingdomain, toolkit, parent, model, formEditor, - createOnElementFeature, createOnElementFeatureNS); + List<AttributeFieldEditPart> editPartList = this.createElementSelectionSection("Binding On Element", + editingdomain, toolkit, parent, model, formEditor, createOnElementFeature, createOnElementFeatureNS); + + Composite spaceComposite = toolkit.createComposite(parent); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + gd.heightHint = 20; + spaceComposite.setLayoutData(gd); + + Composite linkComposite = toolkit.createComposite(parent); + gd.horizontalSpan = 2; + linkComposite.setLayoutData(gd); + GridLayout gl = new GridLayout(); + gl.numColumns = 2; + gl.marginHeight = 0; + gl.marginWidth = 0; + gl.horizontalSpacing = 2; + linkComposite.setLayout(gl); + + gd = new GridData(); + gd.verticalAlignment = GridData.CENTER; + Label imageLabel = toolkit.createLabel(linkComposite, ""); + imageLabel.setLayoutData(gd); + imageLabel.setImage(SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_JAVA_ARRAY)); + + gd = new GridData(); + gd.verticalAlignment = GridData.CENTER; + gd.horizontalAlignment = GridData.BEGINNING; + Hyperlink testConnectLink = toolkit.createHyperlink(linkComposite, "DB Connection Test", SWT.NONE); + testConnectLink.setLayoutData(gd); + final Object fm = model; + final Shell shell = parent.getShell(); + testConnectLink.addHyperlinkListener(new IHyperlinkListener(){ + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent) + */ + public void linkActivated(HyperlinkEvent e) { + if(fm instanceof Direct){ + + ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell); + try { + dialog.run(true, true, new IRunnableWithProgress(){ + + /* (non-Javadoc) + * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) + */ + public void run(IProgressMonitor monitor) throws InvocationTargetException, + InterruptedException { + monitor.beginTask("Test Connection", 2); + String driver = ((Direct)fm).getDriver(); + String url = ((Direct)fm).getUrl(); + String userName = ((Direct)fm).getUsername(); + String password = ((Direct)fm).getPassword(); + IResource resource = SmooksUIUtils.getResource((EObject)fm); + try { + if(monitor.isCanceled()){ + throw new InterruptedException(); + } + monitor.setTaskName("Load driver class and database connection properties..."); + ProjectClassLoader classLoader = new ProjectClassLoader(JavaCore.create(resource.getProject())); + if(monitor.isCanceled()){ + throw new InterruptedException(); + } + Driver dri = (Driver) classLoader.loadClass(driver).newInstance(); + monitor.worked(1); + if(monitor.isCanceled()){ + throw new InterruptedException(); + } + Properties pros = new Properties(); + pros.setProperty("name", userName); + pros.setProperty("password", password); + if(monitor.isCanceled()){ + throw new InterruptedException(); + } + monitor.setTaskName("Try to connect database..."); + dri.connect(url, pros); + monitor.worked(1); + } catch (JavaModelException e1) { + throw new InvocationTargetException(e1); + } catch (InstantiationException e1) { + throw new InvocationTargetException(e1); + } catch (IllegalAccessException e1) { + throw new InvocationTargetException(e1); + } catch (ClassNotFoundException e1) { + throw new InvocationTargetException(e1); + } catch (SQLException e1) { + throw new InvocationTargetException(e1); + }finally{ + monitor.done(); + } + } + + }); + } catch (InvocationTargetException e2) { + SmooksUIUtils.showErrorDialog(shell, SmooksUIUtils.createErrorStatus(e2)); + return; + } catch (InterruptedException e2) { + MessageDialog.openConfirm(shell, "User Cancle", "Connection test was cancled by users"); + return; + } + MessageDialog.openConfirm(shell, "Test success", "Connection test success"); + } + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent) + */ + public void linkEntered(HyperlinkEvent e) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent) + */ + public void linkExited(HyperlinkEvent e) { + // TODO Auto-generated method stub + + } + + }); + // testConnectLink.set + return editPartList; } @Override Added: 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 (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/esbrouter/RouteBeanPropertyUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,184 @@ +/******************************************************************************* + * 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.editors.esbrouter; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +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.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; +import org.jboss.tools.smooks.configuration.editors.uitls.IModelProcsser; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; +import org.jboss.tools.smooks.model.smooks.SmooksPackage; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class RouteBeanPropertyUICreator extends PropertyUICreator { + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.PropertyUICreator# + * createExtendUIOnTop + * (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 formToolkit, Composite detailsComposite, Object model, SmooksMultiFormEditor formEditor) { + List<AttributeFieldEditPart> attributeEditPartList = createElementSelectionSection("Route On Element", + editingDomain, formToolkit, detailsComposite, model, formEditor, + EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT, + EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS); + return attributeEditPartList; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT) { + return true; + } + if (feature == EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_ON_ELEMENT_NS) { + return true; + } + if (feature == EsbroutingPackage.Literals.ROUTE_BEAN__TO_SERVICE_NAME) { + return true; + } + if (feature == EsbroutingPackage.Literals.ROUTE_BEAN__TO_SERVICE_CATEGORY) { + return true; + } + if (feature == EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_BEFORE) { + return true; + } + if (feature == EsbroutingPackage.Literals.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION) { + return true; + } + if (feature == SmooksPackage.Literals.ELEMENT_VISITOR__TARGET_PROFILE) { + return true; + } + return super.ignoreProperty(feature); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.PropertyUICreator# + * isBeanIDRefFieldFeature(org.eclipse.emf.ecore.EAttribute) + */ + @Override + protected boolean isBeanIDRefFieldFeature(EAttribute attribute) { + if (attribute == EsbroutingPackage.Literals.ROUTE_BEAN__BEAN_ID_REF) { + return true; + } + return super.isBeanIDRefFieldFeature(attribute); + } + + /* + * (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>(); + 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); + FillLayout fl = new FillLayout(); + fl.marginHeight = 0; + fl.marginWidth = 0; + + section.setLayout(fl); + Composite composite = toolkit.createComposite(section); + section.setClient(composite); + + GridLayout gl = new GridLayout(); + gl.numColumns = 2; + + composite.setLayout(gl); + + AttributeFieldEditPart serviceCategoryEditPart = SmooksUIUtils.createStringFieldEditor("Category", composite, + editingdomain, toolkit, getPropertyDescriptor(editingdomain, + EsbroutingPackage.Literals.ROUTE_BEAN__TO_SERVICE_CATEGORY, model), model, false, false, false, + 0, null, SmooksUIUtils.VALUE_TYPE_VALUE, null); + list.add(serviceCategoryEditPart); + + AttributeFieldEditPart serviceNameEditPart = SmooksUIUtils.createStringFieldEditor("Name", composite, + editingdomain, toolkit, getPropertyDescriptor(editingdomain, + EsbroutingPackage.Literals.ROUTE_BEAN__TO_SERVICE_NAME, model), model, false, false, false, 0, + null, SmooksUIUtils.VALUE_TYPE_VALUE, null); + list.add(serviceNameEditPart); + + IModelProcsser processer = new IModelProcsser() { + + public Object unwrapValue(Object model) { + if (model instanceof Boolean) { + if ((Boolean) model) { + return "TRUE"; + } else { + return "FALSE"; + } + } + return "FALSE"; + } + + public Object wrapValue(Object model) { + try { + return Boolean.parseBoolean(model.toString()); + } catch (Throwable t) { + } + return Boolean.FALSE; + } + + }; + AttributeFieldEditPart routeBeforeEP = SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, + getPropertyDescriptor(editingdomain, EsbroutingPackage.Literals.ROUTE_BEAN__ROUTE_BEFORE, model), + model, new String[] { "TRUE", "FALSE" }, processer, true); + list.add(routeBeforeEP); + + list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit, getPropertyDescriptor(editingdomain, + EsbroutingPackage.Literals.ROUTE_BEAN__MESSAGE_PAYLOAD_LOCATION, model), model, false, false, null)); + list.add(SmooksUIUtils.createStringFieldEditor(parent, toolkit, getPropertyDescriptor(editingdomain, + SmooksPackage.Literals.ELEMENT_VISITOR__TARGET_PROFILE, model), model, false, false, null)); + + return list; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/esbrouter/RouteBeanPropertyUICreator.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/FreemarkerUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -75,7 +75,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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/freemarker/TemplateUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/TemplateUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -51,19 +51,20 @@ } @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, + 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"); +// OpenEditorEditInnerContentsAction openCommentEditorAction = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "flt"); - SmooksUIUtils.createFileSelectionTextFieldEditor("Text Value", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, - null, null); - AttributeFieldEditPart cdatatext = SmooksUIUtils.createCDATAFieldEditor("Template Contents(CDATA)", editingdomain, toolkit, parent, model, openCDATAEditorAction); - AttributeFieldEditPart commenttext = SmooksUIUtils.createCommentFieldEditor("Template Contents(Comment)", editingdomain, toolkit, parent, model, openCommentEditorAction); + 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()); +// openCommentEditorAction.setRelateText((Text)commenttext.getContentControl()); + SmooksUIUtils.createFileSelectionTextFieldEditor("External Template File", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, + null, null); + return Collections.emptyList(); } 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/GroovyUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -57,7 +57,7 @@ } @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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/groovy/ScriptUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/groovy/ScriptUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -45,7 +45,7 @@ } @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { OpenEditorEditInnerContentsAction action2 = new OpenEditorEditInnerContentsAction(editingdomain,(AnyType) model, SmooksUIUtils.VALUE_TYPE_COMMENT, "groovy"); AttributeFieldEditPart editPart = SmooksUIUtils.createCommentFieldEditor("Script Contents", editingdomain, toolkit, parent, model, action2); 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/BindingsPropertyUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -93,7 +93,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -44,7 +44,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + 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, 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -73,7 +73,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -71,7 +71,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms/JmsRouterUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -65,7 +65,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ParamTypeUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -48,7 +48,7 @@ } @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { SmooksUIUtils.createMixedTextFieldEditor("Text Value", editingdomain, toolkit, parent, model , false , 500,false,false,null,null); SmooksUIUtils.createCDATAFieldEditor("CDATA Value", editingdomain, toolkit, parent, model,null); 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/ResourceConfigTypeUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -73,7 +73,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/smooks/SmooksResourceListTypeUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -63,7 +63,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, SmooksMultiFormEditor formEditor) { return createElementSelectionSection("Default Selector", editingdomain, toolkit, parent, model, formEditor, Added: 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 (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BeanIdRefProposalProvider.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,107 @@ +/******************************************************************************* + * 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.editors.uitls; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.jface.fieldassist.IContentProposal; +import org.eclipse.jface.fieldassist.IContentProposalProvider; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class BeanIdRefProposalProvider implements IContentProposalProvider { + + private EObject model; + + public BeanIdRefProposalProvider(EObject model){ + this.model = model; + } + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String, int) + */ + public IContentProposal[] getProposals(String contents, int position) { + List<IContentProposal> proposalList = new ArrayList<IContentProposal>(); + SmooksResourceListType listType = getSmooksResourceList(model); + if(listType != null){ + List<String> idList = SmooksUIUtils.getBeanIdList(listType); + + for (Iterator<String> iterator = idList.iterator(); iterator.hasNext();) { + String id = (String) iterator.next(); + if(id.toLowerCase().startsWith(contents.toLowerCase())){ + proposalList.add(new BeanIDRefContentProposal(id)); + } + } + + return proposalList.toArray(new IContentProposal[]{}); + } + + return null; + } + + protected SmooksResourceListType getSmooksResourceList(EObject model) { + EObject parent = model.eContainer(); + while (parent != null && !(parent instanceof SmooksResourceListType)) { + parent = parent.eContainer(); + } + if (parent instanceof SmooksResourceListType) { + return (SmooksResourceListType) parent; + } + return null; + } + + private class BeanIDRefContentProposal implements IContentProposal{ + + private String id; + + public BeanIDRefContentProposal(String id){ + this.id = id; + } + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getContent() + */ + public String getContent() { + // TODO Auto-generated method stub + return id; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getCursorPosition() + */ + public int getCursorPosition() { + if(id != null){ + return id.length(); + } + return 0; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getDescription() + */ + public String getDescription() { + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getLabel() + */ + public String getLabel() { + return id; + } + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BeanIdRefProposalProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldAssistDisposer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldAssistDisposer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldAssistDisposer.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors.uitls; + +import org.eclipse.jface.fieldassist.IContentProposalListener; +import org.eclipse.jface.fieldassist.IContentProposalListener2; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class FieldAssistDisposer { + private ContentAssistCommandAdapter fAdapter; + + private IContentProposalListener fListener; + + private IContentProposalListener2 fListener2; + + /** + * + */ + public FieldAssistDisposer(ContentAssistCommandAdapter adapter, IContentProposalListener listener, + IContentProposalListener2 listener2) { + fAdapter = adapter; + fListener = listener; + fListener2 = listener2; + } + + /** + * + */ + public void dispose() { + if (fAdapter == null) { + return; + } + // Dispose of the label provider + ILabelProvider labelProvider = fAdapter.getLabelProvider(); + if ((labelProvider != null)) { + fAdapter.setLabelProvider(null); + labelProvider.dispose(); + } + // Remove the listeners + if (fListener != null) { + fAdapter.removeContentProposalListener((IContentProposalListener) fListener); + fAdapter.removeContentProposalListener((IContentProposalListener2) fListener2); + } + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/FieldAssistDisposer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorConentProposalListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorConentProposalListener.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorConentProposalListener.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,46 @@ +/******************************************************************************* + * 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.editors.uitls; + +import org.eclipse.jface.fieldassist.ContentProposalAdapter; +import org.eclipse.jface.fieldassist.IContentProposal; +import org.eclipse.jface.fieldassist.IContentProposalListener; +import org.eclipse.jface.fieldassist.IContentProposalListener2; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class SelectorConentProposalListener implements IContentProposalListener, IContentProposalListener2 { + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalListener#proposalAccepted(org.eclipse.jface.fieldassist.IContentProposal) + */ + public void proposalAccepted(IContentProposal proposal) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalListener2#proposalPopupClosed(org.eclipse.jface.fieldassist.ContentProposalAdapter) + */ + public void proposalPopupClosed(ContentProposalAdapter adapter) { + + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposalListener2#proposalPopupOpened(org.eclipse.jface.fieldassist.ContentProposalAdapter) + */ + public void proposalPopupOpened(ContentProposalAdapter adapter) { + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorConentProposalListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposal.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposal.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposal.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,93 @@ +/******************************************************************************* + * 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.editors.uitls; + +import org.eclipse.jface.fieldassist.IContentProposal; +import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class SelectorContentProposal implements IContentProposal { + + private String content = null; + private IXMLStructuredObject node; + + + + public SelectorContentProposal(IXMLStructuredObject node){ + this.node = node; + this.content = SmooksUIUtils.generateFullPath(node, "/"); + } + + + /** + * @return the node + */ + public IXMLStructuredObject getNode() { + return node; + } + + + /** + * @param node the node to set + */ + public void setNode(IXMLStructuredObject node) { + this.node = node; + } + + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getContent() + */ + public String getContent() { + return content; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getCursorPosition() + */ + public int getCursorPosition() { + if(content != null){ + return content.length(); + } + return 0; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getDescription() + */ + public String getDescription() { + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.fieldassist.IContentProposal#getLabel() + */ + public String getLabel() { + String content = this.getContent(); +// if(content != null){ +// String[] s = content.split("/"); +// if(s != null && s.length > 4){ +// String newContent = ""; +// for(int i = s.length - 1; i > 4 ; i --){ +// newContent = newContent + "/" + s[i]; +// } +// newContent = "..." + newContent; +// +// return newContent; +// } +// } + return content; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,125 @@ +/******************************************************************************* + * 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.editors.uitls; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.jface.fieldassist.IContentProposal; +import org.eclipse.jface.fieldassist.IContentProposalProvider; +import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; +import org.jboss.tools.smooks.configuration.editors.SelectoreSelectionDialog; +import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class SelectorContentProposalProvider implements IContentProposalProvider { + + private SmooksGraphicsExtType extType; + + public SelectorContentProposalProvider(SmooksGraphicsExtType extType) { + this.extType = extType; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java + * .lang.String, int) + */ + public IContentProposal[] getProposals(String contents, int position) { + List<Object> list = SelectoreSelectionDialog.generateInputData(extType); + List<IContentProposal> contentList = new ArrayList<IContentProposal>(); + List<IXMLStructuredObject> models = new ArrayList<IXMLStructuredObject>(); + + IXMLStructuredObject currentNode = null; + int index = contents.lastIndexOf('/'); + String path = contents; + + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof IXMLStructuredObject) { + try { + IXMLStructuredObject result = SmooksUIUtils.localXMLNodeWithPath(path, + (IXMLStructuredObject) object); + if (result != null) { + currentNode = result; + break; + } + } catch (Throwable t) { + continue; + } + } + } + if (currentNode == null && index != -1) { + if (index != -1) { + path = contents.substring(0, index); + } + + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof IXMLStructuredObject) { + try { + IXMLStructuredObject result = SmooksUIUtils.localXMLNodeWithPath(path, + (IXMLStructuredObject) object); + if (result != null) { + currentNode = result; + break; + } + } catch (Throwable t) { + continue; + } + } + } + } + + if (currentNode == null) { + // SmooksUIUtils.g + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof IXMLStructuredObject) { + models.add((IXMLStructuredObject) object); + } + } + } else { + models.add(currentNode); + } + + List<IXMLStructuredObject> loadedModels = SmooksUIUtils.loadSelectorObject(models); + for (Iterator<?> iterator = loadedModels.iterator(); iterator.hasNext();) { + IXMLStructuredObject structuredObject = (IXMLStructuredObject) iterator.next(); + String fp = SmooksUIUtils.generateFullPath(structuredObject, "/"); + if (fp == null) + continue; + fp = fp.trim(); + if (fp.length() == 0) + continue; + if (currentNode != null) { + String p = SmooksUIUtils.generatePath(structuredObject, currentNode, "/", true); + if (p.startsWith(contents) || p.startsWith("/" + contents) || fp.startsWith(contents) + || fp.startsWith("/" + contents)) { + SelectorContentProposal p1 = new SelectorContentProposal(structuredObject); + contentList.add(p1); + } + } else { + if (fp.startsWith(contents) || fp.startsWith("/" + contents)) { + SelectorContentProposal p1 = new SelectorContentProposal(structuredObject); + contentList.add(p1); + } + } + } + return contentList.toArray(new IContentProposal[] {}); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SelectorContentProposalProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -14,6 +14,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -40,14 +41,29 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.fieldassist.ComboContentAdapter; +import org.eclipse.jface.fieldassist.ContentProposalAdapter; +import org.eclipse.jface.fieldassist.ControlDecoration; +import org.eclipse.jface.fieldassist.FieldDecoration; +import org.eclipse.jface.fieldassist.FieldDecorationRegistry; +import org.eclipse.jface.fieldassist.IContentProposalListener; +import org.eclipse.jface.fieldassist.IContentProposalListener2; +import org.eclipse.jface.fieldassist.IContentProposalProvider; +import org.eclipse.jface.fieldassist.TextContentAdapter; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposalListener; +import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposalProvider; +import org.eclipse.pde.internal.ui.editor.contentassist.TypeProposalLabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -56,6 +72,7 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Cursor; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -71,6 +88,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; import org.eclipse.ui.forms.IFormColors; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.events.IHyperlinkListener; @@ -97,6 +115,7 @@ import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; import org.jboss.tools.smooks.model.graphics.ext.util.SmooksGraphicsExtResourceFactoryImpl; import org.jboss.tools.smooks.model.javabean.BindingsType; +import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; import org.jboss.tools.smooks.model.smooks.ConditionType; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; @@ -125,6 +144,27 @@ public static final int SELECTOR_EXPAND_MAX_LEVEL = 5; + public static final char[] allEnglishCharas = new char[] { 'a', 'A', 'b', 'B', 'c', 'C', 'd', 'D', 'e', 'E', 'f', + '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 List<String> getBeanIdList(SmooksResourceListType resourceList) { + List<AbstractResourceConfig> rlist = resourceList.getAbstractResourceConfig(); + List<String> beanIdList = new ArrayList<String>(); + for (Iterator<?> iterator = rlist.iterator(); iterator.hasNext();) { + AbstractResourceConfig abstractResourceConfig = (AbstractResourceConfig) iterator.next(); + if (abstractResourceConfig instanceof BindingsType) { + String beanId = ((BindingsType) abstractResourceConfig).getBeanId(); + if (beanId == null) + continue; + beanIdList.add(beanId); + } + } + return beanIdList; + } + public static void createMixedTextFieldEditor(String label, AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, boolean linkLabel, IHyperlinkListener listener) { createMixedTextFieldEditor(label, editingdomain, toolkit, parent, model, false, 0, linkLabel, false, listener, @@ -605,29 +645,50 @@ public static AttributeFieldEditPart createSelectorFieldEditor(String labelText, FormToolkit toolkit, Composite parent, final IItemPropertyDescriptor propertyDescriptor, Object model, final SmooksGraphicsExtType extType, final IEditorPart currentEditorPart) { - return createDialogFieldEditor(labelText, parent, toolkit, propertyDescriptor, "Browse", new IFieldDialog() { - public Object open(Shell shell) { - SelectoreSelectionDialog dialog = new SelectoreSelectionDialog(shell, extType, currentEditorPart); - if (dialog.open() == Dialog.OK) { - Object currentSelection = dialog.getCurrentSelection(); - SelectorAttributes sa = dialog.getSelectorAttributes(); - if (currentSelection instanceof IXMLStructuredObject) { - String s = SmooksUIUtils.generatePath((IXMLStructuredObject) currentSelection, sa); - return s; + AttributeFieldEditPart fieldEditPart = createDialogFieldEditor(labelText, parent, toolkit, propertyDescriptor, + "Browse", new IFieldDialog() { + public Object open(Shell shell) { + SelectoreSelectionDialog dialog = new SelectoreSelectionDialog(shell, extType, + currentEditorPart); + if (dialog.open() == Dialog.OK) { + Object currentSelection = dialog.getCurrentSelection(); + SelectorAttributes sa = dialog.getSelectorAttributes(); + if (currentSelection instanceof IXMLStructuredObject) { + String s = SmooksUIUtils.generatePath((IXMLStructuredObject) currentSelection, sa); + return s; + } + } + return null; } - } - return null; - } - public IModelProcsser getModelProcesser() { - return null; - } + public IModelProcsser getModelProcesser() { + return null; + } - public void setModelProcesser(IModelProcsser processer) { + public void setModelProcesser(IModelProcsser processer) { + } + + }, (EObject) model); + + SearchComposite sc = (SearchComposite) fieldEditPart.getContentControl(); + + final FieldAssistDisposer disposer = addSelectorFieldAssistToText(sc.getText(), extType); + sc.addDisposeListener(new DisposeListener() { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse + * .swt.events.DisposeEvent) + */ + public void widgetDisposed(DisposeEvent e) { + disposer.dispose(); } - }, (EObject) model); + }); + return fieldEditPart; } public static SmooksGraphicsExtType loadSmooksGraphicsExt(IFile file) throws IOException { @@ -660,6 +721,7 @@ public static AttributeFieldEditPart createJavaTypeSearchFieldEditor(Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, final EObject model) { if (model instanceof EObject) { + IContentProposalProvider provider; AttributeFieldEditPart editpart = new AttributeFieldEditPart(); final Resource resource = ((EObject) model).eResource(); URI uri = resource.getURI(); @@ -763,7 +825,20 @@ } }); - + final TypeFieldAssistDisposer disposer = SmooksUIUtils.addTypeFieldAssistToText(searchComposite + .getText(), workspaceResource.getProject(), IJavaSearchConstants.CLASS_AND_INTERFACE); + classTextComposite.addDisposeListener(new DisposeListener() { + /* + * (non-Javadoc) + * + * @see + * org.eclipse.swt.events.DisposeListener#widgetDisposed + * (org.eclipse.swt.events.DisposeEvent) + */ + public void widgetDisposed(DisposeEvent e) { + disposer.dispose(); + } + }); toolkit.paintBordersFor(classTextComposite); editpart.setContentControl(classTextComposite); return editpart; @@ -1098,7 +1173,7 @@ }); toolkit.paintBordersFor(classTextComposite); - editpart.setContentControl(classTextComposite); + editpart.setContentControl(searchComposite); return editpart; } @@ -1174,6 +1249,212 @@ } } + public static void loadSelectorObject(IXMLStructuredObject model, List<String> loadedModelName, + List<IXMLStructuredObject> loadedModels, int level) { + if (level >= SELECTOR_EXPAND_MAX_LEVEL) + return; + level++; + if (loadedModelName.contains(model.getNodeName())) { + 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(); + loadSelectorObject(structuredObject, loadedModelName, loadedModels, level); + } + } + } + + public static List<IXMLStructuredObject> loadSelectorObject(List<IXMLStructuredObject> firstNodes) { + List<IXMLStructuredObject> loadedNodes = new ArrayList<IXMLStructuredObject>(); + for (Iterator<?> iterator = firstNodes.iterator(); iterator.hasNext();) { + IXMLStructuredObject firstNode = (IXMLStructuredObject) iterator.next(); + loadSelectorObject(firstNode, new ArrayList<String>(), loadedNodes, 0); + } + return loadedNodes; + } + + public static FieldAssistDisposer addSelectorFieldAssistToText(Text text, SmooksGraphicsExtType extType) { + // Decorate the text widget with the light-bulb image denoting content + // assist + int bits = SWT.DOWN | SWT.LEFT; + ControlDecoration controlDecoration = new ControlDecoration(text, bits); + // Configure text widget decoration + // No margin + controlDecoration.setMarginWidth(0); + // Custom hover tip text + if (isLinuxOS()) { + controlDecoration.setDescriptionText("Content Assist Available (Ctrl + space)"); + } else { + controlDecoration.setDescriptionText("Content Assist Available (Alt + /)"); + } + // Custom hover properties + controlDecoration.setShowHover(true); + controlDecoration.setShowOnlyOnFocus(true); + // Hover image to use + FieldDecoration contentProposalImage = FieldDecorationRegistry.getDefault().getFieldDecoration( + FieldDecorationRegistry.DEC_CONTENT_PROPOSAL); + controlDecoration.setImage(contentProposalImage.getImage()); + + // Default text widget adapter for field assist + TextContentAdapter textContentAdapter = new TextContentAdapter(); + // Content assist command + String command = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$ + // Set auto activation character to be a '.' + char[] autoActivationChars = new char[] { '/' }; + + // Create the proposal provider + SelectorContentProposalProvider proposalProvider = new SelectorContentProposalProvider(extType); + // Create the adapter + ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter, + proposalProvider, command, autoActivationChars); + // Configure the adapter + // Add label provider + ILabelProvider labelProvider = new LabelProvider() { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) + */ + @Override + public String getText(Object element) { + if (element instanceof SelectorContentProposal) { + return ((SelectorContentProposal) element).getLabel(); + } + return super.getText(element); + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object + * ) + */ + @Override + public Image getImage(Object element) { + return super.getImage(element); + } + + }; + adapter.setLabelProvider(labelProvider); + // Replace text field contents with accepted proposals + adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); + // Disable default filtering - custom filtering done + adapter.setFilterStyle(ContentProposalAdapter.FILTER_NONE); + // Add listeners required to reset state for custom filtering + SelectorConentProposalListener proposalListener = new SelectorConentProposalListener(); + adapter.addContentProposalListener((IContentProposalListener) proposalListener); + adapter.addContentProposalListener((IContentProposalListener2) proposalListener); + + return new FieldAssistDisposer(adapter, (IContentProposalListener) proposalListener, + (IContentProposalListener2) proposalListener); + + } + + public static FieldAssistDisposer addBeanIdRefAssistToCombo(Combo combo, EObject model) { + // Decorate the text widget with the light-bulb image denoting content + // assist + int bits = SWT.DOWN | SWT.LEFT; + ControlDecoration controlDecoration = new ControlDecoration(combo, bits); + // Configure text widget decoration + // No margin + controlDecoration.setMarginWidth(0); + // Custom hover tip text + if (isLinuxOS()) { + controlDecoration.setDescriptionText("Content Assist Available (Ctrl + space)"); + } else { + controlDecoration.setDescriptionText("Content Assist Available (Alt + /)"); + } + // Custom hover properties + controlDecoration.setShowHover(true); + controlDecoration.setShowOnlyOnFocus(true); + // Hover image to use + FieldDecoration contentProposalImage = FieldDecorationRegistry.getDefault().getFieldDecoration( + FieldDecorationRegistry.DEC_CONTENT_PROPOSAL); + controlDecoration.setImage(contentProposalImage.getImage()); + + // Default text widget adapter for field assist + ComboContentAdapter textContentAdapter = new ComboContentAdapter(); + // Content assist command + String command = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$ + // Set auto activation character to be a '.' + + // Create the proposal provider + BeanIdRefProposalProvider proposalProvider = new BeanIdRefProposalProvider(model); + // Create the adapter + ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(combo, textContentAdapter, + proposalProvider, command, allEnglishCharas); + // Configure the adapter + // Add label provider + // ILabelProvider labelProvider = new LabelProvider(); + // adapter.setLabelProvider(labelProvider); + // Replace text field contents with accepted proposals + adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); + // Disable default filtering - custom filtering done + adapter.setFilterStyle(ContentProposalAdapter.FILTER_NONE); + // Add listeners required to reset state for custom filtering + SelectorConentProposalListener proposalListener = new SelectorConentProposalListener(); + adapter.addContentProposalListener((IContentProposalListener) proposalListener); + adapter.addContentProposalListener((IContentProposalListener2) proposalListener); + + return new FieldAssistDisposer(adapter, (IContentProposalListener) proposalListener, + (IContentProposalListener2) proposalListener); + } + + public static TypeFieldAssistDisposer addTypeFieldAssistToText(Text text, IProject project, int searchScope) { + // Decorate the text widget with the light-bulb image denoting content + // assist + int bits = SWT.DOWN | SWT.LEFT; + ControlDecoration controlDecoration = new ControlDecoration(text, bits); + // Configure text widget decoration + // No margin + controlDecoration.setMarginWidth(0); + // Custom hover tip text + if (isLinuxOS()) { + controlDecoration.setDescriptionText("Content Assist Available (Ctrl + space)"); + } else { + controlDecoration.setDescriptionText("Content Assist Available (Alt + /)"); + } + // Custom hover properties + controlDecoration.setShowHover(true); + controlDecoration.setShowOnlyOnFocus(true); + // Hover image to use + FieldDecoration contentProposalImage = FieldDecorationRegistry.getDefault().getFieldDecoration( + FieldDecorationRegistry.DEC_CONTENT_PROPOSAL); + controlDecoration.setImage(contentProposalImage.getImage()); + + // Create the proposal provider + TypeContentProposalProvider proposalProvider = new TypeContentProposalProvider(project, searchScope); + // Default text widget adapter for field assist + TextContentAdapter textContentAdapter = new TextContentAdapter(); + // Content assist command + String command = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$ + // Set auto activation character to be a '.' + char[] autoActivationChars = new char[] { '.' }; + // Create the adapter + ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter, + proposalProvider, command, autoActivationChars); + // Configure the adapter + // Add label provider + ILabelProvider labelProvider = new TypeProposalLabelProvider(); + adapter.setLabelProvider(labelProvider); + // Replace text field contents with accepted proposals + adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); + // Disable default filtering - custom filtering done + adapter.setFilterStyle(ContentProposalAdapter.FILTER_NONE); + // Add listeners required to reset state for custom filtering + TypeContentProposalListener proposalListener = new TypeContentProposalListener(); + adapter.addContentProposalListener((IContentProposalListener) proposalListener); + adapter.addContentProposalListener((IContentProposalListener2) proposalListener); + + return new TypeFieldAssistDisposer(adapter, proposalListener); + } + public static void showErrorDialog(Shell shell, Status status) { ErrorDialog.openError(shell, "Error", "error", status); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -1189,4 +1470,163 @@ return createErrorStatus(throwable, "Error"); //$NON-NLS-1$ } + private static boolean isAttributeName(String name) { + if (name == null) + return false; + return name.trim().startsWith("@"); + } + + private static String getRawAttributeName(String name) { + if (isAttributeName(name)) { + return name.trim().substring(1); + } + return name; + } + + private static IXMLStructuredObject localXMLNodeWithNodeName(String name, IXMLStructuredObject contextNode, + HashMap usedNodeMap) { + if (name == null || contextNode == null) + return null; + String nodeName = contextNode.getNodeName(); + boolean isAttributeName = false; + String tempName = name; + if (isAttributeName(tempName)) { + isAttributeName = true; + tempName = getRawAttributeName(tempName); + } + boolean canCompare = true; + if (isAttributeName) { + if (!contextNode.isAttribute()) { + canCompare = false; + } + } + + if (canCompare && tempName.equalsIgnoreCase(nodeName)) { + return contextNode; + } + usedNodeMap.put(contextNode.getID(), new Object()); + List children = contextNode.getChildren(); + IXMLStructuredObject result = null; + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + IXMLStructuredObject child = (IXMLStructuredObject) iterator.next(); + if (isAttributeName) { + if (!child.isAttribute()) + continue; + } + if (tempName.equalsIgnoreCase(child.getNodeName())) { + result = child; + break; + } + } + if (result == null) { + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + IXMLStructuredObject child = (IXMLStructuredObject) iterator.next(); + // to avoid the "died loop" + if (usedNodeMap.get(child.getID()) != null) { + continue; + } + result = localXMLNodeWithNodeName(name, child, usedNodeMap); + if (result != null) { + return result; + } + } + } + return result; + } + + public static IXMLStructuredObject localXMLNodeWithNodeName(String name, IXMLStructuredObject contextNode) { + HashMap map = new HashMap(); + IXMLStructuredObject node = localXMLNodeWithNodeName(name, contextNode, map); + map.clear(); + map = null; + return node; + } + + public static IXMLStructuredObject localXMLNodeWithPath(String path, IXMLStructuredObject contextNode) { + if (path == null) + return null; + path = path.trim(); + String[] sperators = SELECTOR_SPERATORS; + String sperator = null; + boolean hasSperator = false; + for (int i = 0; i < sperators.length; i++) { + sperator = sperators[i]; + if (path.indexOf(sperator) != -1) { + hasSperator = true; + break; + } + } + if (!hasSperator) + sperator = null; + return localXMLNodeWithPath(path, contextNode, sperator, true); + } + + public static IXMLStructuredObject localXMLNodeWithPath(String path, IXMLStructuredObject contextNode, + String sperator, boolean throwException) { + if (contextNode == null || path == null) + return null; + if (sperator == null) { + sperator = " "; + } + if (path != null) + path = path.trim(); + String[] pathes = path.split(sperator); + if (pathes != null && pathes.length > 0 && path.length() != 0) { + // to find the first node + // first time , we search the node via context + String firstNodeName = pathes[0]; + int index = 0; + while (firstNodeName.length() == 0) { + index++; + firstNodeName = pathes[index]; + } + IXMLStructuredObject firstModel = localXMLNodeWithNodeName(firstNodeName, contextNode); + + // if we can't find the node , to find it from the Root Parent node + if (firstModel == null) { + firstModel = localXMLNodeWithNodeName(firstNodeName, getRootParent(contextNode)); + } + + if (firstModel == null) { + if (throwException) + throw new RuntimeException("Can't find the node : " + firstNodeName); + else { + return null; + } + } + for (int i = index + 1; i < pathes.length; i++) { + firstModel = getChildNodeWithName(pathes[i], firstModel); + if (firstModel == null && throwException) { + throw new RuntimeException("Can't find the node : " + pathes[i] + " from parent node " + + pathes[i - 1]); + } + } + + return firstModel; + } + return null; + } + + public static IXMLStructuredObject getChildNodeWithName(String name, IXMLStructuredObject parent) { + String tempName = name; + boolean isAttribute = false; + if (isAttributeName(tempName)) { + isAttribute = true; + tempName = getRawAttributeName(tempName); + } + List<IXMLStructuredObject> children = parent.getChildren(); + if (children == null) + return null; + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + IXMLStructuredObject structuredObject = (IXMLStructuredObject) iterator.next(); + if (isAttribute) { + if (!structuredObject.isAttribute()) + continue; + } + if (tempName.equalsIgnoreCase(structuredObject.getNodeName())) { + return structuredObject; + } + } + return null; + } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Test.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Test.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Test.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.editors.uitls; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class Test { + public static void main(String[] args) { + int i = 97; + for (i = 97; i < 122; i++) { + char c = (char) i; + String s = new String(new char[]{c}); + System.out.print("'"+s+"'," + "'" + s.toUpperCase() +"',"); + } + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/Test.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,36 @@ +/******************************************************************************* + * 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.editors.uitls; + +import org.eclipse.jface.fieldassist.IContentProposalListener; +import org.eclipse.jface.fieldassist.IContentProposalListener2; +import org.eclipse.pde.internal.ui.editor.contentassist.TypeContentProposalListener; +import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class TypeFieldAssistDisposer extends FieldAssistDisposer{ + + + public TypeFieldAssistDisposer(ContentAssistCommandAdapter adapter, IContentProposalListener listener, + IContentProposalListener2 listener2) { + super(adapter, listener, listener2); + } + + /** + * + */ + public TypeFieldAssistDisposer(ContentAssistCommandAdapter adapter, TypeContentProposalListener listener) { + super(adapter,listener,listener); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/TypeFieldAssistDisposer.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/TemplateUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -67,16 +67,16 @@ } @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, Composite parent, Object model, + 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"); - SmooksUIUtils.createFileSelectionTextFieldEditor("Text Value", parent, editingdomain, toolkit, null, model, SmooksUIUtils.VALUE_TYPE_TEXT, +// 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); - AttributeFieldEditPart text1 = SmooksUIUtils.createCDATAFieldEditor("Template Contents (CDATA)", 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()); return Collections.emptyList(); } 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 07:57:24 UTC (rev 15480) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/XslUICreator.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -63,7 +63,7 @@ * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) */ @Override - public List<AttributeFieldEditPart> createExtendUI(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + public List<AttributeFieldEditPart> createExtendUIOnBottom(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/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/route-to-02_Low_Price_Service.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/route-to-02_Low_Price_Service.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/route-to-02_Low_Price_Service.xml 2009-05-25 08:02:20 UTC (rev 15481) @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd" + xmlns:esbr="http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd"> + +  + <esbr:routeBean beanIdRef="02_XML_OrderItem" toServiceCategory="HugeQS" toServiceName="02_Low_Price" routeOnElement="order-item"> + <condition></condition> + </esbr:routeBean> + +  + <ftl:freemarker applyOnElement="order-item"> + <ftl:template></ftl:template> + <ftl:use> + <ftl:bindTo id="02_XML_OrderItem" /> + </ftl:use> + </ftl:freemarker> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/route-to-02_Low_Price_Service.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java 2009-05-25 07:57:24 UTC (rev 15480) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java 2009-05-25 08:02:20 UTC (rev 15481) @@ -37,6 +37,7 @@ import org.jboss.tools.smooks.model.dbrouting.provider.DbroutingItemProviderAdapterFactory; import org.jboss.tools.smooks.model.edi.EdiPackage; import org.jboss.tools.smooks.model.edi.provider.EdiItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage; import org.jboss.tools.smooks.model.fileRouting.provider.FileRoutingItemProviderAdapterFactory; import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; @@ -92,7 +93,7 @@ Registry.INSTANCE.put(JsonPackage.eNS_URI, JsonPackage.eINSTANCE); Registry.INSTANCE.put(MEdiPackage.eNS_URI, MEdiPackage.eINSTANCE); Registry.INSTANCE.put(XslPackage.eNS_URI, XslPackage.eINSTANCE); - + Registry.INSTANCE.put(EsbroutingPackage.eNS_URI, EsbroutingPackage.eINSTANCE); Registry.INSTANCE.put(org.jboss.tools.smooks10.model.smooks.SmooksPackage.eNS_URI, org.jboss.tools.smooks10.model.smooks.SmooksPackage.eINSTANCE); }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15480 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2009-05-25 03:57:24 -0400 (Mon, 25 May 2009) New Revision: 15480 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-3507 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -65,6 +65,7 @@ import org.hibernate.eclipse.console.utils.EclipseImages; import org.hibernate.eclipse.console.wizards.NewReverseEngineeringFileWizard; +@SuppressWarnings("restriction") public class CodeGenerationSettingsTab extends AbstractLaunchConfigurationTab { private ComboDialogField consoleConfigurationName; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -7,6 +7,7 @@ import org.eclipse.jpt.core.resource.java.AnnotationDefinition; import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorAnnotationImpl.GenericGeneratorAnnotationDefinition; +@SuppressWarnings("restriction") public class HibernateJpaAnnotationDefinitionProvider extends AbstractJpaAnnotationDefintionProvider { // singleton Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007-2008 Red Hat, Inc. + * Copyright (c) 2007-2009 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, @@ -27,6 +27,7 @@ * @author Dmitry Geraskov * */ +@SuppressWarnings("restriction") public class HibernateJpaFactory extends GenericJpaFactory { @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -20,7 +20,7 @@ * @author Dmitry Geraskov * */ - +@SuppressWarnings("restriction") public class HibernateJpaPlatform extends GenericJpaPlatform { public static final String ID = "hibernate"; //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -5,13 +5,11 @@ import org.eclipse.jpt.core.JpaPlatform; import org.eclipse.jpt.core.JpaPlatformFactory; import org.eclipse.jpt.core.JpaValidation; -import org.eclipse.jpt.core.JpaValidation.Supported; import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationDefinitionProvider; import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.platform.GenericJpaFactory; -import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform; import org.eclipse.jpt.core.internal.platform.GenericJpaPlatformProvider; +@SuppressWarnings("restriction") public class HibernateJpaPlatformFactory implements JpaPlatformFactory { /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -29,6 +29,7 @@ * @author Dmitry Geraskov * */ +@SuppressWarnings("restriction") public class HibernateJpaProperties extends AbstractModel implements HibernateProperties { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -41,6 +41,7 @@ * @author Dmitry Geraskov * */ +@SuppressWarnings("restriction") public class HibernatePersistenceUnit extends GenericPersistenceUnit implements Messages, Hibernate { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -24,6 +24,7 @@ * @author Dmitry Geraskov * */ +@SuppressWarnings("restriction") public abstract class HibernatePersistenceUnitProperties extends AbstractModel implements PersistenceUnitProperties { private PersistenceUnit persistenceUnit; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal.context.java; import java.util.ArrayList; @@ -6,15 +16,18 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaGenerator; import org.eclipse.jpt.core.context.java.JavaPersistentType; -import org.eclipse.jpt.core.context.java.JavaSequenceGenerator; import org.eclipse.jpt.core.internal.context.java.AbstractJavaEntity; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; import org.eclipse.jpt.utility.Filter; import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; +/** + * @author Dmitry Geraskov + * + */ +@SuppressWarnings("restriction") public class HibernateJavaEntity extends AbstractJavaEntity implements GenericGeneratorHolder { protected JavaGenericGenerator genericGenerator; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -21,6 +21,7 @@ * @author Dmitry Geraskov * */ +@SuppressWarnings("restriction") public class JavaGenericGeneratorImpl extends AbstractJavaGenerator implements JavaGenericGenerator { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -35,6 +35,7 @@ * @author Dmitry Geraskov * */ +@SuppressWarnings("restriction") public class HibernateJpaPlatformUi extends GenericJpaPlatformUi { public static final String LaunchConfigurationType_ID = "org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"; //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiFactory.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiFactory.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.hibernate.jpt.ui.internal.platform; import org.eclipse.jpt.ui.JpaPlatformUi; @@ -3,11 +13,13 @@ import org.eclipse.jpt.ui.JpaPlatformUiFactory; import org.eclipse.jpt.ui.internal.GenericJpaPlatformUiProvider; -import org.eclipse.jpt.ui.internal.GenericJpaUiFactory; -import org.eclipse.jpt.ui.internal.platform.generic.GenericJpaPlatformUi; -import org.eclipse.jpt.ui.internal.platform.generic.GenericJpaPlatformUiFactory; import org.eclipse.jpt.ui.internal.platform.generic.GenericNavigatorProvider; import org.eclipse.jpt.ui.internal.structure.JavaResourceModelStructureProvider; import org.eclipse.jpt.ui.internal.structure.PersistenceResourceModelStructureProvider; +/** + * @author Dmitry Geraskov + * + */ +@SuppressWarnings("restriction") public class HibernateJpaPlatformUiFactory implements JpaPlatformUiFactory { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -1,6 +1,7 @@ package org.jboss.tools.hibernate.jpt.ui.internal.platform; import java.util.ArrayList; +import java.util.List; import java.util.ListIterator; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; @@ -17,12 +18,14 @@ import org.jboss.tools.hibernate.jpt.ui.internal.persistence.details.HibernatePropertiesComposite; import org.jboss.tools.hibernate.jpt.ui.xpl.PersistenceUnitGeneralComposite; +@SuppressWarnings("restriction") public class HibernateJpaUiFactory extends GenericJpaUiFactory { + @SuppressWarnings("unchecked") public ListIterator createPersistenceUnitComposites( PropertyValueModel<PersistenceUnit> subjectHolder, Composite parent, WidgetFactory widgetFactory) { - ArrayList<JpaPageComposite> pages = new ArrayList<JpaPageComposite>(1); + List<JpaPageComposite> pages = new ArrayList<JpaPageComposite>(1); //replaced from Dali 2.0 pages.add(new PersistenceUnitGeneralComposite(subjectHolder, parent, widgetFactory)); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-05-25 06:57:08 UTC (rev 15479) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-05-25 07:57:24 UTC (rev 15480) @@ -29,7 +29,6 @@ import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -49,13 +48,13 @@ import org.hibernate.eclipse.console.utils.DriverClassHelpers; import org.hibernate.tool.hbm2x.StringUtils; import org.hibernate.util.StringHelper; -import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties; import org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin; /** * @author Dmitry Geraskov * */ +@SuppressWarnings("restriction") public abstract class GenerateInitWizardPage extends WizardPage { private static final String AUTODETECT = Messages.GenerateInitWizardPage_autodetect;

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15479 - in trunk: birt/plugins/org.jboss.tools.birt.oda and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: sflanigan Date: 2009-05-25 02:57:08 -0400 (Mon, 25 May 2009) New Revision: 15479 Added: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/.settings/ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/.settings/org.eclipse.jdt.core.prefs trunk/birt/plugins/org.jboss.tools.birt.oda/.settings/ trunk/birt/plugins/org.jboss.tools.birt.oda/.settings/org.eclipse.jdt.core.prefs trunk/seam/plugins/org.jboss.ide.seam.gen/.settings/ trunk/seam/plugins/org.jboss.ide.seam.gen/.settings/org.eclipse.jdt.core.prefs trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/Messages.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/messages.properties Modified: trunk/birt/plugins/org.jboss.tools.birt.core/.settings/org.eclipse.jdt.core.prefs trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SampleAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SeamGenAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English Strings Modified: trunk/birt/plugins/org.jboss.tools.birt.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/.settings/org.eclipse.jdt.core.prefs 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/birt/plugins/org.jboss.tools.birt.core/.settings/org.eclipse.jdt.core.prefs 2009-05-25 06:57:08 UTC (rev 15479) @@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/birt/plugins/org.jboss.tools.birt.oda/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/.settings/org.eclipse.jdt.core.prefs 2009-05-25 06:57:08 UTC (rev 15479) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Added: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25 06:57:08 UTC (rev 15479) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Added: trunk/seam/plugins/org.jboss.ide.seam.gen/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/.settings/org.eclipse.jdt.core.prefs 2009-05-25 06:57:08 UTC (rev 15479) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Added: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/Messages.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/Messages.java (rev 0) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/Messages.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -0,0 +1,74 @@ +package org.jboss.ide.seam.gen; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.ide.seam.gen.messages"; //$NON-NLS-1$ + public static String CouldNotCreateDatabaseConnectionDetails; + public static String CouldNotCreateDatabaseConnectionTitle; + public static String CouldNotReadDatabaseSettingsDetails; + public static String CouldNotReadDatabaseSettingsTitle; + public static String CreateConnectionQuestion; + public static String CreateConnectionTitle; + public static String CreateProjectQuestion; + public static String CreateProjectTitle; + public static String LaunchErrorTitle; + public static String NewActionAction_BeanName; + public static String NewActionAction_Description; + public static String NewActionAction_LocalInterfaceName; + public static String NewActionAction_MethodName; + public static String NewActionAction_PageName; + public static String NewActionAction_SeamComponentName; + public static String NewActionAction_Title; + public static String NewConversationAction_Description; + public static String NewConversationAction_Title; + public static String NewEntityAction_Description; + public static String NewEntityAction_EntityClassName; + public static String NewEntityAction_MasterPageName; + public static String NewEntityAction_PageName; + public static String NewEntityAction_Title; + public static String NewFormAction_Description; + public static String NewFormAction_Title; + public static String NoBuildXMLSelectedDetails; + public static String NoBuildXMLSelectedTitle; + public static String QuestionDialog_BrowseButton; + public static String QuestionDialog_ErrorPreloading; + public static String QuestionDialog_SeamGenPropertyRequiresAValue; + public static String QuestionDialog_SelectDirectoryDialogText; + public static String QuestionDialog_SelectFileDialogText; + public static String SeamGenAction_ProfileDescription; + public static String SeamGenAction_SeamGenActionName; + public static String SeamGenPlugin_CannotCreateConfig; + public static String SeamGenPlugin_ExceptionDuringSearch; + public static String SeamGenProperty_GeneralGroup; + public static String SelectBuildXML; + public static String SetupDeluxeAction_ActionPackageDesc; + public static String SetupDeluxeAction_BadDirectory; + public static String SetupDeluxeAction_BadFile; + public static String SetupDeluxeAction_CodeGenerationGroup; + public static String SetupDeluxeAction_DatabaseDropDesc; + public static String SetupDeluxeAction_DatabaseExistsDesc; + public static String SetupDeluxeAction_DatabaseGroup; + public static String SetupDeluxeAction_DatabasePasswordDesc; + public static String SetupDeluxeAction_DatabaseTypeDesc; + public static String SetupDeluxeAction_DriverJarDesc; + public static String SetupDeluxeAction_HibernateConnectionDriverClassDesc; + public static String SetupDeluxeAction_HibernateConnectionUrlDesc; + public static String SetupDeluxeAction_HibernateConnectionUsernameDesc; + public static String SetupDeluxeAction_HibernateDefaultCatalogDesc; + public static String SetupDeluxeAction_HibernateDefaultSchemaDesc; + public static String SetupDeluxeAction_HibernateDialectDesc; + public static String SetupDeluxeAction_JBossHomeDesc; + public static String SetupDeluxeAction_ModelPackageDesc; + public static String SetupDeluxeAction_ProjectNameDesc; + public static String SetupDeluxeAction_ProjectTypeDesc; + public static String SetupDeluxeAction_TestPackageDesc; + public static String SetupDeluxeAction_WorkspaceHomeDesc; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -3,6 +3,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.text.MessageFormat; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -116,7 +117,7 @@ } catch (CoreException e1) { - SeamGenPlugin.logError( "Error while preloading build.properties", e1 ); + SeamGenPlugin.logError( Messages.QuestionDialog_ErrorPreloading, e1 ); } @@ -160,7 +161,7 @@ text.setLayoutData(data); Button button = new Button(composite, SWT.PUSH); - button.setText("Browse..."); + button.setText(Messages.QuestionDialog_BrowseButton); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { String paths = null; @@ -190,7 +191,7 @@ } label = new Label(composite, SWT.NONE); label.setVisible(false); - label.setText( " " ); + label.setText( " " ); //$NON-NLS-1$ propertyToDefaultLabel.put( name, label ); @@ -211,8 +212,8 @@ protected String chooseExternalFile(Shell shell) { FileDialog dialog= new FileDialog(shell, SWT.SINGLE); - dialog.setText("Select file"); - dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); + dialog.setText(Messages.QuestionDialog_SelectFileDialogText); + dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$ //dialog.setFilterPath(lastUsedPath); String res= dialog.open(); @@ -222,7 +223,7 @@ protected String chooseExternalDirectory(Shell shell) { DirectoryDialog dialog= new DirectoryDialog(shell, SWT.SINGLE); - dialog.setText("Select directory"); + dialog.setText(Messages.QuestionDialog_SelectDirectoryDialogText); String res= dialog.open(); return res; @@ -246,9 +247,9 @@ } else { Button t = (Button) element.getValue(); if(t.getSelection()) { - text = "y"; + text = "y"; //$NON-NLS-1$ } else { - text = "n"; + text = "n"; //$NON-NLS-1$ } } SeamGenProperty sgp = (SeamGenProperty) questions.get( element.getKey() ); @@ -305,7 +306,7 @@ Label defaultLabel = (Label) propertyToDefaultLabel.get( element.getKey() ); String defaultValue = gp.getDefaultValue( properties ); - defaultLabel.setText( defaultValue==null?"":defaultValue ); + defaultLabel.setText( defaultValue==null?"":defaultValue ); //$NON-NLS-1$ String text2 = getText( element, defaultLabel ); @@ -316,7 +317,8 @@ haveNoWarning = false; button.setEnabled( false ); } else if(gp.isRequired() && text2.trim().length()==0 && defaultLabel.getText().trim().length()==0 ) { - setMessage( "'" + gp.getDescription() + "' requires a value", IMessageProvider.ERROR ); + setMessage( MessageFormat.format(Messages.QuestionDialog_SeamGenPropertyRequiresAValue, + gp.getDescription()), IMessageProvider.ERROR ); haveNoWarning = false; button.setEnabled( false ); } @@ -354,9 +356,9 @@ Button b = (Button) object; b.setToolTipText( defaultText.getText() ); if(b.getSelection()) { - return "y"; + return "y"; //$NON-NLS-1$ } else { - return "n"; + return "n"; //$NON-NLS-1$ } } else { Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -2,6 +2,7 @@ import java.io.File; import java.io.IOException; +import java.text.MessageFormat; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -53,19 +54,22 @@ try { config = findLaunchConfig("seamgen"); //$NON-NLS-1$ } catch (CoreException e1) { - logError("Exception occured during search in Launch Configuration list.", e1); + logError(Messages.SeamGenPlugin_ExceptionDuringSearch, e1); } File buildXmlPath = null; if(config==null) { try { - Bundle plugin = Platform.getBundle("org.jboss.tools.seam.core"); + Bundle plugin = Platform.getBundle("org.jboss.tools.seam.core"); //$NON-NLS-1$ if(plugin==null) return; - String seamHome = new ScopedPreferenceStore(new InstanceScope(),plugin.getSymbolicName()).getString("org.jboss.tools.seam.core.project.facet.seamhome"); - buildXmlPath = new File(seamHome+File.separator+"seam-gen"+File.separator+"build.xml"); + String seamHome = new ScopedPreferenceStore(new InstanceScope(),plugin.getSymbolicName()).getString("org.jboss.tools.seam.core.project.facet.seamhome"); //$NON-NLS-1$ + buildXmlPath = new File(seamHome+File.separator+"seam-gen"+File.separator+"build.xml"); //$NON-NLS-1$ //$NON-NLS-2$ if(buildXmlPath.exists()) SeamGenAction.createSeamgenLaunchConfig(buildXmlPath.getAbsolutePath()); } catch (CoreException e) { - logError("Cannot create configuration for Seam-Gen tool. Seamgen build.xml file: " + buildXmlPath, e); + logError(MessageFormat + .format( + Messages.SeamGenPlugin_CannotCreateConfig, + buildXmlPath), e); return; } } @@ -76,7 +80,7 @@ static public String assumeJBossASHome() { String pluginLocation=null; try { - pluginLocation = FileLocator.resolve(SeamGenPlugin.getDefault().getBundle().getEntry("/")).getFile(); + pluginLocation = FileLocator.resolve(SeamGenPlugin.getDefault().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$ } catch (IOException e) { SeamGenPlugin.log(new Status(IStatus.ERROR,SeamGenPlugin.PLUGIN_ID,e.getMessage(),e)); }; @@ -96,7 +100,7 @@ static public ILaunchConfiguration findLaunchConfig(String name) throws CoreException { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); - ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); + ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); //$NON-NLS-1$ ILaunchConfiguration[] launchConfigurations = launchManager.getLaunchConfigurations( launchConfigurationType ); for (int i = 0; i < launchConfigurations.length; i++) { // can't believe there is no look up by name API Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -12,7 +12,7 @@ private String defaultPropertyName; - public static final String GENERAL = "General"; + public static final String GENERAL = Messages.SeamGenProperty_GeneralGroup; public final static int TEXT = 0; public final static int JAR = 1; public final static int DIR = 2; @@ -36,18 +36,18 @@ } public String getDefaultValue(Properties others) { - return ""; + return ""; //$NON-NLS-1$ } protected String upper(String name) { - if(name==null || name.length()==0) return ""; + if(name==null || name.length()==0) return ""; //$NON-NLS-1$ return name.substring(0, 1).toUpperCase() + name.substring(1); } protected String lower(String name) { if ( name == null || name.length() == 0 ) - return ""; + return ""; //$NON-NLS-1$ return name.substring( 0, 1 ).toLowerCase() + name.substring( 1 ); } @@ -66,9 +66,9 @@ public void applyValue(Properties existing, Control control) { if(getDefaultPropertyName()==null) return; - String property = ""; + String property = ""; //$NON-NLS-1$ if(existing == null || existing.get(getDefaultPropertyName())==null) { - property = getDefaultValue(existing)==null?"":getDefaultValue(existing); + property = getDefaultValue(existing)==null?"":getDefaultValue(existing); //$NON-NLS-1$ } else { property = existing.getProperty( getDefaultPropertyName() ); } @@ -76,13 +76,13 @@ if(control instanceof Text) { ((Text)control).setText( property ); } else if (control instanceof Button) { - if("y".equalsIgnoreCase( property )) { + if("y".equalsIgnoreCase( property )) { //$NON-NLS-1$ ((Button)control).setSelection( true ); } else { ((Button)control).setSelection( false ); } } else { - System.out.println(getDefaultPropertyName() + " " + property); + System.out.println(getDefaultPropertyName() + " " + property); //$NON-NLS-1$ } } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -4,6 +4,7 @@ import java.util.Map; import java.util.Properties; +import org.jboss.ide.seam.gen.Messages; import org.jboss.ide.seam.gen.SeamGenProperty; public class NewActionAction extends SeamGenAction { @@ -13,36 +14,36 @@ } public String getTitle() { - return "Create new Action"; + return Messages.NewActionAction_Title; } public String getDescription() { - return "Create a new Java interface and SLSB\n with key Seam/EJB3 annotations."; + return Messages.NewActionAction_Description; } protected Map getQuestions() { Map properties = new LinkedHashMap(); - properties.put( "component.name", new SeamGenProperty("Seam component name") ); //$NON-NLS-1$ - properties.put( "interface.name", new SeamGenProperty("Local interface name") { //$NON-NLS-1$ + properties.put( "component.name", new SeamGenProperty(Messages.NewActionAction_SeamComponentName) ); //$NON-NLS-1$ + properties.put( "interface.name", new SeamGenProperty(Messages.NewActionAction_LocalInterfaceName) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return upper(property); } }); - properties.put( "bean.name", new SeamGenProperty("Bean name") { //$NON-NLS-1$ + properties.put( "bean.name", new SeamGenProperty(Messages.NewActionAction_BeanName) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ - return upper(property + "Bean"); + return upper(property + "Bean"); //$NON-NLS-1$ } }); - properties.put( "method.name", new SeamGenProperty("Method name") { //$NON-NLS-1$ + properties.put( "method.name", new SeamGenProperty(Messages.NewActionAction_MethodName) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return lower(property); } }); - properties.put( "page.name", new SeamGenProperty("Page name") { //$NON-NLS-1$ + properties.put( "page.name", new SeamGenProperty(Messages.NewActionAction_PageName) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return lower(property); Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -1,5 +1,7 @@ package org.jboss.ide.seam.gen.actions; +import org.jboss.ide.seam.gen.Messages; + public class NewConversationAction extends NewActionAction { protected String getTarget() { @@ -8,13 +10,11 @@ public String getTitle() { - return "Create new conversation"; + return Messages.NewConversationAction_Title; } public String getDescription() { - return "Create a set of classes managing a conversation.\n"; - + return Messages.NewConversationAction_Description; } - } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -4,6 +4,7 @@ import java.util.Map; import java.util.Properties; +import org.jboss.ide.seam.gen.Messages; import org.jboss.ide.seam.gen.SeamGenProperty; public class NewEntityAction extends SeamGenAction { @@ -13,24 +14,24 @@ } public String getTitle() { - return "New entity"; + return Messages.NewEntityAction_Title; } public String getDescription() { - return "Create a new entity bean\nwith key Seam/EJB3 annotations and example attributes."; + return Messages.NewEntityAction_Description; } protected Map getQuestions() { Map properties = new LinkedHashMap(); - properties.put( "entity.name", new SeamGenProperty("Entity class name") ); //$NON-NLS-1$ - properties.put( "masterPage.name", new SeamGenProperty("Master page name") { //$NON-NLS-1$ + properties.put( "entity.name", new SeamGenProperty(Messages.NewEntityAction_EntityClassName) ); //$NON-NLS-1$ + properties.put( "masterPage.name", new SeamGenProperty(Messages.NewEntityAction_MasterPageName) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( "entity.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ - return lower(property) + "List"; + return lower(property) + "List"; //$NON-NLS-1$ } }); - properties.put( "page.name", new SeamGenProperty("Page name") { //$NON-NLS-1$ + properties.put( "page.name", new SeamGenProperty(Messages.NewEntityAction_PageName) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( "entity.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return lower(property); Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -1,5 +1,7 @@ package org.jboss.ide.seam.gen.actions; +import org.jboss.ide.seam.gen.Messages; + public class NewFormAction extends NewActionAction { /** * The constructor. @@ -12,12 +14,11 @@ } public String getTitle() { - return "Create new form"; + return Messages.NewFormAction_Title; } public String getDescription() { - return "Create a form with a single input field and related\n" + - "Java interface, SLSB with key Seam/EJB3 annotations."; + return Messages.NewFormAction_Description; } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SampleAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SampleAction.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SampleAction.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -31,8 +31,8 @@ public void run(IAction action) { MessageDialog.openInformation( window.getShell(), - "JBoss Seam-gen Plug-in", - "Hello, Eclipse world"); + "JBoss Seam-gen Plug-in", //$NON-NLS-1$ + "Hello, Eclipse world"); //$NON-NLS-1$ } /** Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SeamGenAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SeamGenAction.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SeamGenAction.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -6,6 +6,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.URI; +import java.text.MessageFormat; import java.util.Collections; import java.util.Iterator; import java.util.Map; @@ -52,6 +53,7 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil; import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants; +import org.jboss.ide.seam.gen.Messages; import org.jboss.ide.seam.gen.QuestionDialog; import org.jboss.ide.seam.gen.SeamGenPlugin; @@ -74,19 +76,19 @@ public void launchesTerminated(ILaunch[] launches) { for (int i = 0; i < launches.length; i++) { final ILaunch launch2 = launches[i]; - if("seamgen".equals( launch2.getLaunchConfiguration().getName() )) { + if("seamgen".equals( launch2.getLaunchConfiguration().getName() )) { //$NON-NLS-1$ try { String target = launch2.getLaunchConfiguration().getAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_TARGETS,(String)null); - if("setup".equals(target) && launch2.getAttribute( "terminated-done" )==null) { - launch2.setAttribute( "terminated-done", "true" ); + if("setup".equals(target) && launch2.getAttribute( "terminated-done" )==null) { //$NON-NLS-1$ //$NON-NLS-2$ + launch2.setAttribute( "terminated-done", "true" ); //$NON-NLS-1$ //$NON-NLS-2$ SeamGenPlugin.getDefault().getWorkbench().getDisplay().syncExec( new Runnable() { public void run(){ - if(MessageDialog.openQuestion( getShell(), "Create new Seam project", "Create new seam project ?" )) { + if(MessageDialog.openQuestion( getShell(), Messages.CreateProjectTitle, Messages.CreateProjectQuestion )) { new NewProjectAction().run( null ); } - if(MessageDialog.openQuestion( getShell(), "Create DB Connection", "Create DB Connection ?" )) { + if(MessageDialog.openQuestion( getShell(), Messages.CreateConnectionTitle, Messages.CreateConnectionQuestion )) { createDatabaseConnection(launch2); } } @@ -103,7 +105,7 @@ while(existing!=null ) { number++; name = origName+number; - existing = DriverManager.getInstance().getDriverInstanceByName("DriverDefn."+name); + existing = DriverManager.getInstance().getDriverInstanceByName("DriverDefn."+name); //$NON-NLS-1$ } IPropertySet pset = DriverManager.getInstance().createDefaultInstance(templateID); @@ -124,23 +126,23 @@ final ILaunch launch2) { Properties seamGenProperties = getSeamGenProperties( launch2.getLaunchConfiguration() ); - String projectName = seamGenProperties.getProperty( "project.name" ); + String projectName = seamGenProperties.getProperty( "project.name" ); //$NON-NLS-1$ Properties dbProperties = new Properties(); if(seamGenProperties!=null) { - DriverInstance driverInstance = createNewDriverInstance("org.eclipse.datatools.connectivity.db.generic.genericDriverTemplate", - projectName + " seamgen-driver", - seamGenProperties.getProperty("driver.jar", ""), - seamGenProperties.getProperty( "hibernate.connection.driver_class", "" )); + DriverInstance driverInstance = createNewDriverInstance("org.eclipse.datatools.connectivity.db.generic.genericDriverTemplate", //$NON-NLS-1$ + projectName + " seamgen-driver", //$NON-NLS-1$ + seamGenProperties.getProperty("driver.jar", ""), //$NON-NLS-1$ //$NON-NLS-2$ + seamGenProperties.getProperty( "hibernate.connection.driver_class", "" )); //$NON-NLS-1$ //$NON-NLS-2$ dbProperties.setProperty(ConnectionProfileConstants.PROP_DRIVER_DEFINITION_ID, driverInstance.getId()); - dbProperties.setProperty(IDBConnectionProfileConstants.DRIVER_CLASS_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.driver_class", "" )); - dbProperties.setProperty(IDBConnectionProfileConstants.DATABASE_VENDOR_PROP_ID, "Generic JDBC"); - dbProperties.setProperty(IDBConnectionProfileConstants.DATABASE_VERSION_PROP_ID, "1.0"); - dbProperties.setProperty(IDBConnectionProfileConstants.DATABASE_NAME_PROP_ID, "SeamGen database"); - dbProperties.setProperty(IDBConnectionProfileConstants.PASSWORD_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.password", "" )); - dbProperties.setProperty(IDBConnectionProfileConstants.USERNAME_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.username", "" )); - dbProperties.setProperty(IDBConnectionProfileConstants.URL_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.url", "" )); + dbProperties.setProperty(IDBConnectionProfileConstants.DRIVER_CLASS_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.driver_class", "" )); //$NON-NLS-1$ //$NON-NLS-2$ + dbProperties.setProperty(IDBConnectionProfileConstants.DATABASE_VENDOR_PROP_ID, "Generic JDBC"); //$NON-NLS-1$ + dbProperties.setProperty(IDBConnectionProfileConstants.DATABASE_VERSION_PROP_ID, "1.0"); //$NON-NLS-1$ + dbProperties.setProperty(IDBConnectionProfileConstants.DATABASE_NAME_PROP_ID, "SeamGen database"); //$NON-NLS-1$ + dbProperties.setProperty(IDBConnectionProfileConstants.PASSWORD_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.password", "" )); //$NON-NLS-1$ //$NON-NLS-2$ + dbProperties.setProperty(IDBConnectionProfileConstants.USERNAME_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.username", "" )); //$NON-NLS-1$ //$NON-NLS-2$ + dbProperties.setProperty(IDBConnectionProfileConstants.URL_PROP_ID, seamGenProperties.getProperty( "hibernate.connection.url", "" )); //$NON-NLS-1$ //$NON-NLS-2$ //connection.setLoadingPath(seamGenProperties.getProperty( "driver.jar", "" )); @@ -148,7 +150,7 @@ //connection.setCustomProperty( "JDBC_DRIVER","Other"); try { - String name = projectName + " seamgen-connection"; + String name = projectName + " seamgen-connection"; //$NON-NLS-1$ IConnectionProfile existing = ProfileManager.getInstance().getProfileByName(name); int number = 0; String origName = name; @@ -159,18 +161,18 @@ } ProfileManager.getInstance().createProfile(name, - "Database created for seam-gen project", + Messages.SeamGenAction_ProfileDescription, IDBConnectionProfileConstants.CONNECTION_PROFILE_ID, dbProperties ); // TODO unique name ? NewCWJDBCPage.createUniqueConnectionName( NewCWJDBCPage.getExistingConnectionNamesList(), "seamgen-connection")); } catch (ConnectionProfileException e) { - SeamGenPlugin.logError("Could not create database connection", e); - MessageDialog.openError( getShell(), "Could not create database connection", "Could not create database connection. See Error log for details" ); + SeamGenPlugin.logError("Could not create database connection", e); //$NON-NLS-1$ + MessageDialog.openError( getShell(), Messages.CouldNotCreateDatabaseConnectionTitle, Messages.CouldNotCreateDatabaseConnectionDetails ); } } else { - MessageDialog.openError( getShell(), "Could not read database settings", "Could not read database settings. See Error log for details" ); + MessageDialog.openError( getShell(), Messages.CouldNotReadDatabaseSettingsTitle, Messages.CouldNotReadDatabaseSettingsDetails ); } } }); @@ -181,12 +183,12 @@ // org.eclipse.ui.externaltools.internal.launchConfigurations Properties p = getSeamGenProperties( launch2.getLaunchConfiguration() ); if(p!=null) { - String seamWorkspace = p.getProperty( "workspace.home" ); - String projectName = p.getProperty( "project.name" ); + String seamWorkspace = p.getProperty( "workspace.home" ); //$NON-NLS-1$ + String projectName = p.getProperty( "project.name" ); //$NON-NLS-1$ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - if(!"new-project".equals(target)) { + if(!"new-project".equals(target)) { //$NON-NLS-1$ if(project.exists()) { project.refreshLocal( IResource.DEPTH_INFINITE, null ); } @@ -194,7 +196,7 @@ } if(!project.exists()) { - SeamGenPlugin.logInfo( "project " + projectName + " does not exist"); + SeamGenPlugin.logInfo( "project " + projectName + " does not exist"); //$NON-NLS-1$ //$NON-NLS-2$ IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projectName); URI uri = new File(seamWorkspace, projectName).toURI(); @@ -202,26 +204,26 @@ IPath defaultDefaultLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation(); IPath parentPath = locationPath.removeLastSegments(1); if (FileUtil.isPrefixOf(parentPath, defaultDefaultLocation) && FileUtil.isPrefixOf(defaultDefaultLocation, parentPath)) { - SeamGenPlugin.logInfo( "seam workspace overlaps with eclipse. Opening project directly." ); + SeamGenPlugin.logInfo( "seam workspace overlaps with eclipse. Opening project directly." ); //$NON-NLS-1$ } else { description.setLocationURI(uri); - SeamGenPlugin.logInfo( "project location should be " + uri); + SeamGenPlugin.logInfo( "project location should be " + uri); //$NON-NLS-1$ } project.create(description, null); project.open( null ); - SeamGenPlugin.logInfo( "project " + projectName + " created "); + SeamGenPlugin.logInfo( "project " + projectName + " created "); //$NON-NLS-1$ //$NON-NLS-2$ } else { - SeamGenPlugin.logInfo( "project " + projectName + " already exists"); + SeamGenPlugin.logInfo( "project " + projectName + " already exists"); //$NON-NLS-1$ //$NON-NLS-2$ } //project.refreshLocal( IResource.DEPTH_INFINITE, null ); } else { - SeamGenPlugin.logInfo( "build.properties not found"); + SeamGenPlugin.logInfo( "build.properties not found"); //$NON-NLS-1$ } } catch (CoreException e) { - SeamGenPlugin.logError( "Error when seam-gen terminated", e ); + SeamGenPlugin.logError( "Error when seam-gen terminated", e ); //$NON-NLS-1$ } finally { } @@ -240,25 +242,25 @@ } public static ILaunchConfigurationWorkingCopy createSeamgenLaunchConfig(String pathToSeamgenBuildXml) throws CoreException { - SeamGenPlugin.logInfo( "User selected: " + pathToSeamgenBuildXml + " as build.xml" ); + SeamGenPlugin.logInfo( "User selected: " + pathToSeamgenBuildXml + " as build.xml" ); //$NON-NLS-1$ //$NON-NLS-2$ ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); - ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); - ILaunchConfigurationWorkingCopy wc = launchConfigurationType.newInstance( null, "seamgen" ); - wc.setAttribute( "process_factory_id", "org.eclipse.ant.ui.remoteAntProcessFactory" ); + ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); //$NON-NLS-1$ + ILaunchConfigurationWorkingCopy wc = launchConfigurationType.newInstance( null, "seamgen" ); //$NON-NLS-1$ + wc.setAttribute( "process_factory_id", "org.eclipse.ant.ui.remoteAntProcessFactory" ); //$NON-NLS-1$ //$NON-NLS-2$ wc.setAttribute(IAntLaunchConfigurationConstants.ATTR_DEFAULT_VM_INSTALL, true); - wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"); + wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"); //$NON-NLS-1$ - wc.setAttribute("org.eclipse.debug.core.appendEnvironmentVariables", true); + wc.setAttribute("org.eclipse.debug.core.appendEnvironmentVariables", true); //$NON-NLS-1$ - wc.setAttribute( "org.eclipse.jdt.launching.CLASSPATH_PROVIDER", "org.eclipse.ant.ui.AntClasspathProvider" ); - wc.setAttribute( "org.eclipse.jdt.launching.SOURCEPATH_PROVIDER", "org.eclipse.ant.ui.AntClasspathProvider" ); + wc.setAttribute( "org.eclipse.jdt.launching.CLASSPATH_PROVIDER", "org.eclipse.ant.ui.AntClasspathProvider" ); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute( "org.eclipse.jdt.launching.SOURCEPATH_PROVIDER", "org.eclipse.ant.ui.AntClasspathProvider" ); //$NON-NLS-1$ //$NON-NLS-2$ - wc.setAttribute( "org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID", "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"); + wc.setAttribute( "org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID", "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"); //$NON-NLS-1$ //$NON-NLS-2$ wc.setAttribute( IExternalToolConstants.ATTR_LOCATION, pathToSeamgenBuildXml ); wc.doSave(); - SeamGenPlugin.logInfo( "seamgen launch config saved" ); + SeamGenPlugin.logInfo( "seamgen launch config saved" ); //$NON-NLS-1$ return wc; } @@ -266,19 +268,19 @@ try { - ILaunchConfiguration launchConfiguration = findLaunchConfig( "seamgen" ); + ILaunchConfiguration launchConfiguration = findLaunchConfig( "seamgen" ); //$NON-NLS-1$ ILaunchConfigurationWorkingCopy wc = null; if(launchConfiguration==null) { - SeamGenPlugin.logInfo( "seamgen launch config not found. Creating one automatically." ); + SeamGenPlugin.logInfo( "seamgen launch config not found. Creating one automatically." ); //$NON-NLS-1$ FileDialog fileDialog = new FileDialog(window.getShell(), SWT.NONE); - fileDialog.setText( "Select Seam Gen build.xml..." ); - fileDialog.setFileName("build.xml"); + fileDialog.setText( Messages.SelectBuildXML ); + fileDialog.setFileName("build.xml"); //$NON-NLS-1$ String text=fileDialog.open(); if (text != null) { wc = createSeamgenLaunchConfig(text); } else { - MessageDialog.openError( window.getShell(), "No build.xml selected", "You have to select the build.xml to be used by Seam Gen." ); + MessageDialog.openError( window.getShell(), Messages.NoBuildXMLSelectedTitle, Messages.NoBuildXMLSelectedDetails ); return; } } else { @@ -291,7 +293,7 @@ if(!questions.isEmpty()) { QuestionDialog questionDialog = new QuestionDialog(window.getShell(), getTitle(), getDescription(), questions,getGroups()); if(questionDialog.open()!= QuestionDialog.OK) { - SeamGenPlugin.logInfo( "User cancelled dialog" ); + SeamGenPlugin.logInfo( "User cancelled dialog" ); //$NON-NLS-1$ return; } else { userProperties = questionDialog.getPropertiesResult(); @@ -313,15 +315,15 @@ File createTempFile = null; FileOutputStream fos = null; try { - createTempFile = File.createTempFile( "seamgenempty", "properties" ); + createTempFile = File.createTempFile( "seamgenempty", "properties" ); //$NON-NLS-1$ //$NON-NLS-2$ fos = new FileOutputStream(createTempFile); - empties.store( fos, "File used to send intentionally empty valued properties" ); + empties.store( fos, "File used to send intentionally empty valued properties" ); //$NON-NLS-1$ } catch (FileNotFoundException e) { - SeamGenPlugin.logError( "Error while running " + getTarget(), e ); + SeamGenPlugin.logError( "Error while running " + getTarget(), e ); //$NON-NLS-1$ } catch (IOException e) { - SeamGenPlugin.logError( "Error while running " + getTarget(), e ); + SeamGenPlugin.logError( "Error while running " + getTarget(), e ); //$NON-NLS-1$ } finally { if (fos != null) { @@ -349,12 +351,12 @@ launchManager.addLaunchListener( launchListener ); // launchConfiguration = wc.doSave(); - SeamGenPlugin.logInfo( "launching seamgen " + getTarget() ); + SeamGenPlugin.logInfo( "launching seamgen " + getTarget() ); //$NON-NLS-1$ ILaunch launch = wc.launch( ILaunchManager.RUN_MODE, null ); } catch (CoreException e) { - SeamGenPlugin.logError( "Exception when trying to launch seamgen", e ); - MessageDialog.openError(getShell(), "Seam-gen could not start", e.getMessage()); + SeamGenPlugin.logError( "Exception when trying to launch seamgen", e ); //$NON-NLS-1$ + MessageDialog.openError(getShell(), Messages.LaunchErrorTitle, e.getMessage()); } } @@ -364,7 +366,7 @@ } public String getDescription() { - return "Seam Gen " + getTarget(); + return MessageFormat.format(Messages.SeamGenAction_SeamGenActionName, getTarget()); } public String getTitle() { @@ -379,7 +381,7 @@ static public ILaunchConfiguration findLaunchConfig(String name) throws CoreException { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); - ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); + ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); //$NON-NLS-1$ ILaunchConfiguration[] launchConfigurations = launchManager.getLaunchConfigurations( launchConfigurationType ); for (int i = 0; i < launchConfigurations.length; i++) { // can't believe there is no look up by name API @@ -419,19 +421,19 @@ } public static Properties getSeamGenProperties(ILaunchConfiguration lc) { - SeamGenPlugin.logInfo( "launch completed...auto detecting project" ); + SeamGenPlugin.logInfo( "launch completed...auto detecting project" ); //$NON-NLS-1$ IPath location; try { location = ExternalToolsUtil.getLocation( lc ); } catch (CoreException e2) { - SeamGenPlugin.logError( "Error while loading seamgen properties", e2 ); + SeamGenPlugin.logError( "Error while loading seamgen properties", e2 ); //$NON-NLS-1$ return null; } - SeamGenPlugin.logInfo( "location: " + location ); - File file = new File(location.toFile().getParentFile(), "build.properties"); - SeamGenPlugin.logInfo( "build.properties: " + location ); + SeamGenPlugin.logInfo( "location: " + location ); //$NON-NLS-1$ + File file = new File(location.toFile().getParentFile(), "build.properties"); //$NON-NLS-1$ + SeamGenPlugin.logInfo( "build.properties: " + location ); //$NON-NLS-1$ if(file.exists()) { Properties p = new Properties(); @@ -441,7 +443,7 @@ p.load( fileInputStream ); } catch (Exception e) { - SeamGenPlugin.logError( "Error while loading seamgen properties", e ); + SeamGenPlugin.logError( "Error while loading seamgen properties", e ); //$NON-NLS-1$ } finally { if(fileInputStream!=null) @@ -449,7 +451,7 @@ fileInputStream.close(); } catch (IOException e1) { - SeamGenPlugin.logError( "Error while closing seamgen properties", e1 ); + SeamGenPlugin.logError( "Error while closing seamgen properties", e1 ); //$NON-NLS-1$ } } return p; Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2009-05-25 06:54:13 UTC (rev 15478) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2009-05-25 06:57:08 UTC (rev 15479) @@ -1,6 +1,7 @@ package org.jboss.ide.seam.gen.actions; import java.io.File; +import java.text.MessageFormat; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -8,6 +9,7 @@ import java.util.Set; import org.eclipse.ui.IWorkbenchWindowActionDelegate; +import org.jboss.ide.seam.gen.Messages; import org.jboss.ide.seam.gen.SeamGenPlugin; import org.jboss.ide.seam.gen.SeamGenProperty; @@ -15,8 +17,8 @@ IWorkbenchWindowActionDelegate { - protected static final String DB = "Database"; - protected static final String CODEGEN = "Code generation"; + protected static final String DB = Messages.SetupDeluxeAction_DatabaseGroup; + protected static final String CODEGEN = Messages.SetupDeluxeAction_CodeGenerationGroup; protected String getTarget() { return "setup"; //$NON-NLS-1$ @@ -32,11 +34,11 @@ protected Map getQuestions() { Map properties = new LinkedHashMap(); - properties.put( "project.name.new", - new SeamGenProperty( "Project name", "project.name" ) { + properties.put( "project.name.new", //$NON-NLS-1$ + new SeamGenProperty( Messages.SetupDeluxeAction_ProjectNameDesc, "project.name" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( - "project.name.new", "" ); + "project.name.new", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; } @@ -46,10 +48,10 @@ } ); - properties.put( "workspace.home.new", new SeamGenProperty( - "Seam project workspace", "workspace.home" ) { + properties.put( "workspace.home.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_WorkspaceHomeDesc, "workspace.home" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "workspace.home", + String property = others.getProperty( "workspace.home", //$NON-NLS-1$ SeamGenPlugin.assumeWorkspacePath() ); return property; } @@ -58,13 +60,15 @@ return DIR; }; - public String valid(String string) { - if(string==null) return null; - File file = new File(string); + public String valid(String filename) { + if(filename==null) return null; + File file = new File(filename); if (file.exists() && file.isDirectory()) { return null; } else { - return string + " does not exist or is not a directory"; + return MessageFormat + .format(Messages.SetupDeluxeAction_BadDirectory, + filename); } } @@ -72,10 +76,10 @@ } ); - properties.put( "jboss.home.new", new SeamGenProperty( - "JBoss AS home directory", "jboss.home" ) { + properties.put( "jboss.home.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_JBossHomeDesc, "jboss.home" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "jboss.home.new", + String property = others.getProperty( "jboss.home.new", //$NON-NLS-1$ SeamGenPlugin.assumeJBossASHome() ); return property; } @@ -84,21 +88,23 @@ return DIR; }; - public String valid(String string) { - if(string==null) return null; - File file = new File(string); + public String valid(String filename) { + if(filename==null) return null; + File file = new File(filename); if (file.exists() && file.isDirectory()) { return null; } else { - return string + " does not exist or is not a directory"; + return MessageFormat + .format(Messages.SetupDeluxeAction_BadDirectory, + filename); } } } ); - properties.put( "project.type.new", new SeamGenProperty( - "Deploy as an EAR or a WAR", "project.type" ) { + properties.put( "project.type.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_ProjectTypeDesc, "project.type" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "project.type", "ear" ); + String property = others.getProperty( "project.type", "ear" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; // ear,war } @@ -107,11 +113,11 @@ } } ); - properties.put( "action.package.new", new SeamGenProperty( - "Session beans package name", "action.package" ) { + properties.put( "action.package.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_ActionPackageDesc, "action.package" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "project.name.new", "" ); - return "com.mydomain." + property; + String property = others.getProperty( "project.name.new", "" ); //$NON-NLS-1$ //$NON-NLS-2$ + return "com.mydomain." + property; //$NON-NLS-1$ } public String getGroup() { @@ -119,10 +125,10 @@ } } ); - properties.put( "model.package.new", new SeamGenProperty( - "Entity beans package name", "model.package" ) { + properties.put( "model.package.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_ModelPackageDesc, "model.package" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "action.package.new", "" ); + String property = others.getProperty( "action.package.new", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; } @@ -131,11 +137,11 @@ } } ); - properties.put( "test.package.new", new SeamGenProperty( - "Test cases package name", "test.package" ) { + properties.put( "test.package.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_TestPackageDesc, "test.package" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "action.package.new", "" ); - return property + ".test"; + String property = others.getProperty( "action.package.new", "" ); //$NON-NLS-1$ //$NON-NLS-2$ + return property + ".test"; //$NON-NLS-1$ } public String getGroup() { @@ -143,11 +149,11 @@ } } ); - properties.put( "database.type.new", new SeamGenProperty( - "Database type", "database.type" ) { + properties.put( "database.type.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_DatabaseTypeDesc, "database.type" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "database.type.new", - "hql" ); + String property = others.getProperty( "database.type.new", //$NON-NLS-1$ + "hql" ); //$NON-NLS-1$ return property; // hsql,mysql,oracle,postgres,mssql,db2,sybase,enterprisedb } @@ -157,11 +163,11 @@ } ); - properties.put( "hibernate.dialect.new", new SeamGenProperty( - "Hibernate dialect", "hibernate.dialect" ) { + properties.put( "hibernate.dialect.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_HibernateDialectDesc, "hibernate.dialect" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "hibernate.dialect.new", - "org.hibernate.dialect.HSQLDialect" ); + String property = others.getProperty( "hibernate.dialect.new", //$NON-NLS-1$ + "org.hibernate.dialect.HSQLDialect" ); //$NON-NLS-1$ return property; } public String getGroup() { @@ -169,11 +175,11 @@ } } ); - properties.put( "driver.jar.new", new SeamGenProperty( - "Filesystem path to the JDBC driver jar", "driver.jar" ) { + properties.put( "driver.jar.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_DriverJarDesc, "driver.jar" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "driver.jar.new", - "lib/hsqldb.jar" ); + String property = others.getProperty( "driver.jar.new", //$NON-NLS-1$ + "lib/hsqldb.jar" ); //$NON-NLS-1$ return property; } @@ -181,23 +187,24 @@ return JAR; }; - public String valid(String string) { - if(string==null) return null; - File file = new File(string); + public String valid(String filename) { + if(filename==null) return null; + File file = new File(filename); if (file.exists() && file.isFile()) { return null; } else { - return string + " does not exist or is not a file"; + return MessageFormat.format(Messages.SetupDeluxeAction_BadFile, + filename); } } } ); - properties.put( "hibernate.connection.driver_class.new", - new SeamGenProperty( "JDBC driver class for your database", "hibernate.connection.driver_class" ) { + properties.put( "hibernate.connection.driver_class.new", //$NON-NLS-1$ + new SeamGenProperty( Messages.SetupDeluxeAction_HibernateConnectionDriverClassDesc, "hibernate.connection.driver_class" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( - "hibernate.connection.driver_class", - "org.hsqldb.jdbcDriver" ); + "hibernate.connection.driver_class", //$NON-NLS-1$ + "org.hsqldb.jdbcDriver" ); //$NON-NLS-1$ return property; } public String getGroup() { @@ -205,12 +212,12 @@ } } ); - properties.put( "hibernate.connection.url.new", new SeamGenProperty( - "JDBC URL for your database", "hibernate.connection.url" ) { + properties.put( "hibernate.connection.url.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_HibernateConnectionUrlDesc, "hibernate.connection.url" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( - "hibernate.connection.url", - "jdbc:hsqldb:hsql://localhost:1701" ); + "hibernate.connection.url", //$NON-NLS-1$ + "jdbc:hsqldb:hsql://localhost:1701" ); //$NON-NLS-1$ return property; } public String getGroup() { @@ -218,11 +225,11 @@ } } ); - properties.put( "hibernate.connection.username.new", - new SeamGenProperty( "Database username", "hibernate.connection.username" ) { + properties.put( "hibernate.connection.username.new", //$NON-NLS-1$ + new SeamGenProperty( Messages.SetupDeluxeAction_HibernateConnectionUsernameDesc, "hibernate.connection.username" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( - "hibernate.connection.username", "sa" ); + "hibernate.connection.username", "sa" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; } public String getGroup() { @@ -230,11 +237,11 @@ } } ); - properties.put( "hibernate.connection.password.new", - new SeamGenProperty( "Database password", "hibernate.connection.password" ) { + properties.put( "hibernate.connection.password.new", //$NON-NLS-1$ + new SeamGenProperty( Messages.SetupDeluxeAction_DatabasePasswordDesc, "hibernate.connection.password" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( - "hibernate.connection.password", "" ); + "hibernate.connection.password", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; } @@ -246,11 +253,11 @@ } } ); - properties.put( "hibernate.default_schema.new", new SeamGenProperty( - "Database schema name", "hibernate.default_schema" ) { + properties.put( "hibernate.default_schema.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_HibernateDefaultSchemaDesc, "hibernate.default_schema" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( - "hibernate.default_schema", "" ); + "hibernate.default_schema", "" ); //$NON-NLS-1$//$NON-NLS-2$ return property; } @@ -263,11 +270,11 @@ } } ); - properties.put( "hibernate.default_catalog.new", new SeamGenProperty( - "Database catalog name", "hibernate.default_catalog" ) { + properties.put( "hibernate.default_catalog.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_HibernateDefaultCatalogDesc, "hibernate.default_catalog" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { String property = others.getProperty( - "hibernate.default_catalog", "" ); + "hibernate.default_catalog", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; } @@ -282,10 +289,10 @@ ); - properties.put( "database.exists.new", new SeamGenProperty( - "Does tables already exist in the database?", "database.exists" ) { + properties.put( "database.exists.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_DatabaseExistsDesc, "database.exists" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "database.exists", "y" ); + String property = others.getProperty( "database.exists", "y" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; // yn } @@ -300,10 +307,10 @@ } ); - properties.put( "database.drop.new", new SeamGenProperty( - "Recreate database tables + data on deploy?", "database.drop" ) { + properties.put( "database.drop.new", new SeamGenProperty( //$NON-NLS-1$ + Messages.SetupDeluxeAction_DatabaseDropDesc, "database.drop" ) { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "database.drop", "n" ); + String property = others.getProperty( "database.drop", "n" ); //$NON-NLS-1$ //$NON-NLS-2$ return property; // yn } Added: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/messages.properties (rev 0) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/messages.properties 2009-05-25 06:57:08 UTC (rev 15479) @@ -0,0 +1,60 @@ +NewActionAction_BeanName=Bean name +NewActionAction_Description=Create a new Java interface and SLSB\n with key Seam/EJB3 annotations. +NewActionAction_LocalInterfaceName=Local interface name +NewActionAction_MethodName=Method name +NewActionAction_PageName=Page name +NewActionAction_SeamComponentName=Seam component name +NewActionAction_Title=Create new Action +NewConversationAction_Description=Create a set of classes managing a conversation.\n +NewConversationAction_Title=Create new conversation +NewEntityAction_Description=Create a new entity bean\nwith key Seam/EJB3 annotations and example attributes. +NewEntityAction_EntityClassName=Entity class name +NewEntityAction_MasterPageName=Master page name +NewEntityAction_PageName=Page name +NewEntityAction_Title=New entity +NewFormAction_Description=Create a form with a single input field and related\nJava interface, SLSB with key Seam/EJB3 annotations. +NewFormAction_Title=Create new form +CouldNotCreateDatabaseConnectionTitle=Could not create database connection +CouldNotCreateDatabaseConnectionDetails=Could not create database connection. See Error log for details +CouldNotReadDatabaseSettingsTitle=Could not read database settings +CouldNotReadDatabaseSettingsDetails=Could not read database settings. See Error log for details +CreateProjectTitle=Create new Seam project +CreateProjectQuestion=Create new seam project ? +SelectBuildXML=Select Seam Gen build.xml... +NoBuildXMLSelectedTitle=No build.xml selected +NoBuildXMLSelectedDetails=You have to select the build.xml to be used by Seam Gen. +CreateConnectionTitle=Create DB Connection +LaunchErrorTitle=Seam-gen could not start +CreateConnectionQuestion=Create DB Connection ? +QuestionDialog_BrowseButton=Browse... +QuestionDialog_ErrorPreloading=Error while preloading build.properties +QuestionDialog_SeamGenPropertyRequiresAValue=''{0}'' requires a value +QuestionDialog_SelectDirectoryDialogText=Select directory +QuestionDialog_SelectFileDialogText=Select file +SeamGenAction_ProfileDescription=Database created for seam-gen project +SeamGenAction_SeamGenActionName=Seam Gen {0} +SeamGenPlugin_CannotCreateConfig=Cannot create configuration for Seam-Gen tool. Seamgen build.xml file: {0} +SeamGenPlugin_ExceptionDuringSearch=Exception occured during search in Launch Configuration list. +SeamGenProperty_GeneralGroup=General +SetupDeluxeAction_ActionPackageDesc=Session beans package name +SetupDeluxeAction_BadDirectory={0} does not exist or is not a directory +SetupDeluxeAction_BadFile={0} does not exist or is not a file +SetupDeluxeAction_CodeGenerationGroup=Code generation +SetupDeluxeAction_DatabaseDropDesc=Recreate database tables + data on deploy? +SetupDeluxeAction_DatabaseExistsDesc=Does tables already exist in the database? +SetupDeluxeAction_DatabaseGroup=Database +SetupDeluxeAction_DatabasePasswordDesc=Database password +SetupDeluxeAction_DatabaseTypeDesc=Database type +SetupDeluxeAction_DriverJarDesc=Filesystem path to the JDBC driver jar +SetupDeluxeAction_HibernateConnectionDriverClassDesc=JDBC driver class for your database +SetupDeluxeAction_HibernateConnectionUrlDesc=JDBC URL for your database +SetupDeluxeAction_HibernateConnectionUsernameDesc=Database username +SetupDeluxeAction_HibernateDefaultCatalogDesc=Database catalog name +SetupDeluxeAction_HibernateDefaultSchemaDesc=Database schema name +SetupDeluxeAction_HibernateDialectDesc=Hibernate dialect +SetupDeluxeAction_JBossHomeDesc=JBoss AS home directory +SetupDeluxeAction_ModelPackageDesc=Entity beans package name +SetupDeluxeAction_ProjectNameDesc=Project name +SetupDeluxeAction_ProjectTypeDesc=Deploy as an EAR or a WAR +SetupDeluxeAction_TestPackageDesc=Test cases package name +SetupDeluxeAction_WorkspaceHomeDesc=Seam project workspace

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15478 - in trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker: .settings and 9 other directories.

by jbosstools-commits＠lists.jboss.org

Author: sflanigan Date: 2009-05-25 02:54:13 -0400 (Mon, 25 May 2009) New Revision: 15478 Added: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.settings/ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.settings/org.eclipse.jdt.core.prefs Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Messages.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/DirectiveScanner.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/actions/AddMacroLibrary.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/DirectiveRule.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/GenericDirectiveRule.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/InterpolationRule.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRule.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRuleEnd.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/StringRule.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/XmlRule.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/linetracker/ConsoleLineTracker.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/messages.properties trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractItem.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AssignmentDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDefaultDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionInterpolation.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ElseIfDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FtlDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FunctionDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/GenericNestableDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfElseDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/Interpolation.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ItemFactory.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/LibraryMacroDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ListDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroDirective.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroInstance.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NameFragment.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NullFragment.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlinePage.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/ContextProperties.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English Strings Added: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.settings/org.eclipse.jdt.core.prefs 2009-05-25 06:54:13 UTC (rev 15478) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Messages.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Messages.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Messages.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -4,8 +4,20 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.freemarker.messages"; //$NON-NLS-1$ + public static String AddMacroLibrary_Error; + public static String AddMacroLibrary_ErrorDesc; + public static String AddMacroLibrary_Message; + public static String AddMacroLibrary_Title; public static String ConfigurationManager_CHOOSE_NAMESPACE_FOR; public static String ConfigurationManager_TITLE_CHOOSE_NAMESPACE; + public static String ContextProperties_ConfirmationTitle; + public static String ContextProperties_DeleteButton; + public static String ContextProperties_DeleteValueConfirmation; + public static String ContextProperties_Description; + public static String ContextProperties_EditButton; + public static String ContextProperties_KeyColumn; + public static String ContextProperties_NewButton; + public static String ContextProperties_ValueColumn; public static String ContextValueDialog_BUTTON_BROWSE; public static String ContextValueDialog_ERROR; public static String ContextValueDialog_JAVA_PROJECT_ERROR; @@ -27,6 +39,7 @@ public static String FreemarkerMultiPageEditor_PAGE_TEXT_CONTEXT; public static String FreemarkerMultiPageEditor_PAGE_TEXT_SOURCE; public static String MacroHyperlink_TYPELABEL_MACRO_DEFINITION; + public static String OutlinePage_SetContextClassEntryAction; public static String PreferencePage_DESCRIPTION_FREEMARKER_SETTINGS; public static String PreferencePage_FIELD_COMMENT; public static String PreferencePage_FIELD_DIRECTIVE; Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/Plugin.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -157,7 +157,7 @@ private URL getImageURL(String key) { Bundle bundle = getBundle(); - IPath path = new Path("icons").append(key); + IPath path = new Path("icons").append(key); //$NON-NLS-1$ if (FileLocator.find(bundle,path,null) == null) return null; try { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/DirectiveScanner.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/DirectiveScanner.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/DirectiveScanner.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -45,9 +45,9 @@ Vector rules = new Vector(); // Add rule for double quotes - rules.add(new SingleLineRule("\"", "\"", string,'\\')); + rules.add(new SingleLineRule("\"", "\"", string,'\\')); //$NON-NLS-1$ //$NON-NLS-2$ // Add rule for single quotes - rules.add(new SingleLineRule("'", "'", string,'\\')); + rules.add(new SingleLineRule("'", "'", string,'\\')); //$NON-NLS-1$ //$NON-NLS-2$ // Add generic whitespace rule. rules.add(new WhitespaceRule(new WhitespaceDetector())); Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/actions/AddMacroLibrary.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/actions/AddMacroLibrary.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/actions/AddMacroLibrary.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -44,6 +44,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; +import org.jboss.ide.eclipse.freemarker.Messages; import org.jboss.ide.eclipse.freemarker.Plugin; import org.jboss.ide.eclipse.freemarker.configuration.ConfigurationManager; @@ -91,15 +92,15 @@ projects.add(p[i]); } ProjectSelectionDialog dialog = new ProjectSelectionDialog(Display.getCurrent().getActiveShell(), projects); - dialog.setTitle("Please choose the associated Java project"); - dialog.setMessage("Please choose the Java project that will use the FreeMarker libraries"); + dialog.setTitle(Messages.AddMacroLibrary_Title); + dialog.setMessage(Messages.AddMacroLibrary_Message); int rtn = dialog.open(); if (rtn == IDialogConstants.OK_ID) { if (dialog.getFirstResult() instanceof IJavaProject) { project = ((IJavaProject) dialog.getFirstResult()).getProject(); } else { - MessageDialog.openError(Display.getCurrent().getActiveShell(), "Java Project Required", "You must choose a Java project"); + MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.AddMacroLibrary_Error, Messages.AddMacroLibrary_ErrorDesc); } } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/DirectiveRule.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/DirectiveRule.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/DirectiveRule.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -50,7 +50,7 @@ } public DirectiveRule(String name, IToken token, boolean nameOnly) { - super("!", "!", token); + super("!", "!", token); //$NON-NLS-1$ //$NON-NLS-2$ this.sequence = name.toCharArray(); this.nameOnly = nameOnly; } @@ -110,26 +110,26 @@ } } else if (c == '\"') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ keyStack.pop(); } else { - keyStack.push("\""); + keyStack.push("\""); //$NON-NLS-1$ } } else if (c == '(') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ // string... don't add to stack } else { - keyStack.push("("); + keyStack.push("("); //$NON-NLS-1$ } } else if (c == ')') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ // string... don't add to stack } - else if (keyStack.size() > 0 && keyStack.peek().equals("(")) { + else if (keyStack.size() > 0 && keyStack.peek().equals("(")) { //$NON-NLS-1$ keyStack.pop(); } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/GenericDirectiveRule.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/GenericDirectiveRule.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/GenericDirectiveRule.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -44,7 +44,7 @@ } public GenericDirectiveRule(IToken token) { - super("!", "!", token); + super("!", "!", token); //$NON-NLS-1$ //$NON-NLS-2$ } protected boolean sequenceDetected( @@ -70,26 +70,26 @@ } } else if (c == '\"') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ keyStack.pop(); } else { - keyStack.push("\""); + keyStack.push("\""); //$NON-NLS-1$ } } else if (c == '(') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ // string... don't add to stack } else { - keyStack.push("("); + keyStack.push("("); //$NON-NLS-1$ } } else if (c == ')') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ // string... don't add to stack } - else if (keyStack.size() > 0 && keyStack.peek().equals("(")) { + else if (keyStack.size() > 0 && keyStack.peek().equals("(")) { //$NON-NLS-1$ keyStack.pop(); } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/InterpolationRule.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/InterpolationRule.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/InterpolationRule.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -33,7 +33,7 @@ public class InterpolationRule extends SingleLineRule { public InterpolationRule(char startChar, IToken token) { - super(startChar + "{", "}", token); + super(startChar + "{", "}", token); //$NON-NLS-1$ //$NON-NLS-2$ } protected boolean endSequenceDetected(ICharacterScanner scanner) { @@ -51,26 +51,26 @@ } } else if (c == '\"') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ keyStack.pop(); } else { - keyStack.push("\""); + keyStack.push("\""); //$NON-NLS-1$ } } else if (c == '(') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ // string... don't add to stack } else { - keyStack.push("("); + keyStack.push("("); //$NON-NLS-1$ } } else if (c == ')') { - if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { + if (keyStack.size() > 0 && keyStack.peek().equals("\"")) { //$NON-NLS-1$ // string... don't add to stack } - else if (keyStack.size() > 0 && keyStack.peek().equals("(")) { + else if (keyStack.size() > 0 && keyStack.peek().equals("(")) { //$NON-NLS-1$ keyStack.pop(); } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRule.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRule.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRule.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -29,7 +29,7 @@ public class MacroInstanceRule extends DirectiveRule { public MacroInstanceRule(IToken token) { - super("", token, false); + super("", token, false); //$NON-NLS-1$ } protected char getIdentifierChar() { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRuleEnd.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRuleEnd.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/MacroInstanceRuleEnd.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -29,7 +29,7 @@ public class MacroInstanceRuleEnd extends DirectiveRuleEnd { public MacroInstanceRuleEnd(IToken token) { - super("", token, false); + super("", token, false); //$NON-NLS-1$ } protected char getIdentifierChar() { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/StringRule.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/StringRule.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/StringRule.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -33,7 +33,7 @@ private String rule; public StringRule(String rule, IToken token) { - super(rule, "", token); + super(rule, "", token); //$NON-NLS-1$ this.rule = rule; } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/XmlRule.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/XmlRule.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/editor/rules/XmlRule.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -33,7 +33,7 @@ public class XmlRule extends MultiLineRule { public XmlRule(IToken token) { - super("<", ">", token); + super("<", ">", token); //$NON-NLS-1$ //$NON-NLS-2$ } protected boolean sequenceDetected( ICharacterScanner scanner, @@ -88,7 +88,7 @@ } } else if (c == '\"') { - if (stack.size() > 0 && stack.peek().equals("\"")) + if (stack.size() > 0 && stack.peek().equals("\"")) //$NON-NLS-1$ stack.pop(); } else if (c == LT || c == LB) { @@ -104,7 +104,7 @@ if (stack.size() == 0) break; } else if (c == '}') { - if (stack.size() > 0 && stack.peek().equals("{")) + if (stack.size() > 0 && stack.peek().equals("{")) //$NON-NLS-1$ stack.pop(); } previousWasEscapeCharacter = (c == fEscapeCharacter); Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/linetracker/ConsoleLineTracker.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/linetracker/ConsoleLineTracker.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/linetracker/ConsoleLineTracker.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -46,11 +46,12 @@ public class ConsoleLineTracker implements IConsoleLineTracker { private IConsole console; - private static final String CHECK = "freemarker"; - private static final String CHECK_LINE = "line:"; - private static final String CHECK_LINE2 = "on line "; - private static final String CHECK_TEMPLATE = "template:"; - private static final String CHECK_TEMPLATE2 = " in "; + // This assumes console parsing in English only + private static final String CHECK = "freemarker"; //$NON-NLS-1$ + private static final String CHECK_LINE = "line:"; //$NON-NLS-1$ + private static final String CHECK_LINE2 = "on line "; //$NON-NLS-1$ + private static final String CHECK_TEMPLATE = "template:"; //$NON-NLS-1$ + private static final String CHECK_TEMPLATE2 = " in "; //$NON-NLS-1$ public void init(IConsole console) { this.console = console; @@ -74,13 +75,13 @@ int linkOffset = i1 + 10; int linkLength = text.length() - linkOffset; String fileName = text.substring(linkOffset, text.length()).trim(); - if (fileName.endsWith(".")) fileName = fileName.substring(0, fileName.length()-1); + if (fileName.endsWith(".")) fileName = fileName.substring(0, fileName.length()-1); //$NON-NLS-1$ int lineNumber = -1; try { int i2 = text.lastIndexOf(CHECK_LINE); if (i2 > 0) { i2 += CHECK_LINE.length(); - int i3 = text.indexOf(",", i2); + int i3 = text.indexOf(",", i2); //$NON-NLS-1$ if (i3 > 0) { lineNumber = Integer.parseInt(text.substring(i2, i3).trim()); } @@ -89,7 +90,7 @@ i2 = text.lastIndexOf(CHECK_LINE2); if (i2 > 0) { i2 += CHECK_LINE2.length(); - int i3 = text.indexOf(",", i2); + int i3 = text.indexOf(",", i2); //$NON-NLS-1$ if (i3 > 0) { lineNumber = Integer.parseInt(text.substring(i2, i3).trim()); } @@ -109,7 +110,7 @@ IJavaProject javaProject = JavaCore.create(project); fileName = fileName.replace('\\', '/'); try { - populateMatchingFiles(project, files, fileName.split("/")); + populateMatchingFiles(project, files, fileName.split("/")); //$NON-NLS-1$ } catch (CoreException e) { // TODO log this exception Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/messages.properties =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/messages.properties 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/messages.properties 2009-05-25 06:54:13 UTC (rev 15478) @@ -1,5 +1,17 @@ +AddMacroLibrary_Error=Java Project Required +AddMacroLibrary_ErrorDesc=You must choose a Java project +AddMacroLibrary_Message=Please choose the Java project that will use the FreeMarker libraries +AddMacroLibrary_Title=Please choose the associated Java project ConfigurationManager_CHOOSE_NAMESPACE_FOR=Please choose the namespace for ''{0}'' ConfigurationManager_TITLE_CHOOSE_NAMESPACE=Choose Macro Library Namespace +ContextProperties_ConfirmationTitle=Confirmation +ContextProperties_DeleteButton=Delete +ContextProperties_DeleteValueConfirmation=Are you sure you want to delete this context value? +ContextProperties_Description=Create pre-determined Velocity context variables for all files under this resource +ContextProperties_EditButton=Edit +ContextProperties_KeyColumn=Name +ContextProperties_NewButton=New +ContextProperties_ValueColumn=Type ContextValueDialog_BUTTON_BROWSE=Browse ContextValueDialog_ERROR=Error ContextValueDialog_JAVA_PROJECT_ERROR=Java Project Error @@ -21,6 +33,7 @@ FreemarkerMultiPageEditor_PAGE_TEXT_CONTEXT=Context FreemarkerMultiPageEditor_PAGE_TEXT_SOURCE=Source MacroHyperlink_TYPELABEL_MACRO_DEFINITION=Macro Definition +OutlinePage_SetContextClassEntryAction=Set context class entry PreferencePage_DESCRIPTION_FREEMARKER_SETTINGS=FreeMarker Settings PreferencePage_FIELD_COMMENT=Comment: PreferencePage_FIELD_DIRECTIVE=Directive: Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -50,11 +50,11 @@ } public static String[] directives = new String[] { - "if", "else", "elseif", "switch", "case", "default", "break", "list", - "break", "include", "import", "noparse", "compress", "escape", "noescape", - "assign", "global", "local", "setting", "macro", "nested", "return", "flush", "function", - "stop", "ftl", "t", "lt", "rt", "nt", "attempt", "recover", "visit", "recurse", - "fallback" + "if", "else", "elseif", "switch", "case", "default", "break", "list", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ + "break", "include", "import", "noparse", "compress", "escape", "noescape", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ + "assign", "global", "local", "setting", "macro", "nested", "return", "flush", "function", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ + "stop", "ftl", "t", "lt", "rt", "nt", "attempt", "recover", "visit", "recurse", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ + "fallback" //$NON-NLS-1$ }; public ICompletionProposal[] getCompletionProposals(int offset, Map context) { if (offset < 2) return null; @@ -69,7 +69,7 @@ if (contents.length == 1) { // first param CompletionInterpolation completionInterpolation = new CompletionInterpolation( - "${" , offset - contentWithOffset.getOffsetInIndex() - 2, getItemSet(), getResource()); + "${" , offset - contentWithOffset.getOffsetInIndex() - 2, getItemSet(), getResource()); //$NON-NLS-1$ return completionInterpolation.getCompletionProposals(offset, context); } else { @@ -88,13 +88,13 @@ return completionProposals(l); } else if (index == 1 && !contentWithOffset.wasLastCharSpace()) { - String value = ""; + String value = ""; //$NON-NLS-1$ try { value = contentWithOffset.getContents()[index].substring(0, contentWithOffset.getOffsetInIndex()); } catch (Exception e) {} CompletionInterpolation completionInterpolation = new CompletionInterpolation( - "${" + value , offset - contentWithOffset.getOffsetInIndex() - 2, getItemSet(), getResource()); + "${" + value , offset - contentWithOffset.getOffsetInIndex() - 2, getItemSet(), getResource()); //$NON-NLS-1$ return completionInterpolation.getCompletionProposals(offset, context); } return null; Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractItem.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractItem.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AbstractItem.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -76,7 +76,7 @@ } public boolean isNestable() { - return (null != getContents() && !getContents().endsWith("/")); + return (null != getContents() && !getContents().endsWith("/")); //$NON-NLS-1$ } public ITypedRegion getRegion() { @@ -172,7 +172,7 @@ current = new StringBuffer(); offsetCount = 0; if (c == '=') { - arr.add("="); + arr.add("="); //$NON-NLS-1$ current = new StringBuffer(); } else { @@ -190,27 +190,27 @@ if (!escape) { if (c == '\"') { if (currentStack.size() > 0) { - if (currentStack.peek() == "\"") + if (currentStack.peek() == "\"") //$NON-NLS-1$ currentStack.pop(); else - currentStack.push("\""); + currentStack.push("\""); //$NON-NLS-1$ } else - currentStack.push("\""); + currentStack.push("\""); //$NON-NLS-1$ } else if (c == '(') { - currentStack.push("("); + currentStack.push("("); //$NON-NLS-1$ } else if (c == ')') { - if (currentStack.size() > 0 && currentStack.peek().equals(")")) + if (currentStack.size() > 0 && currentStack.peek().equals(")")) //$NON-NLS-1$ currentStack.pop(); } else if (c == '{') { - currentStack.push("{"); + currentStack.push("{"); //$NON-NLS-1$ } else if (c == '}') { - if (currentStack.size() > 0 && currentStack.peek().equals("}")) + if (currentStack.size() > 0 && currentStack.peek().equals("}")) //$NON-NLS-1$ currentStack.pop(); } else if (c == '\\') { @@ -242,7 +242,7 @@ } } else if (arr.size() == 0) { - arr.add(""); + arr.add(""); //$NON-NLS-1$ } if (totalOffsetCount == cursorPos) { actualIndex = arr.size()-1; @@ -363,7 +363,7 @@ public String getTreeDisplay() { if (null == treeDisplay) { treeDisplay = getContents(); - if (null != treeDisplay && treeDisplay.endsWith("/")) + if (null != treeDisplay && treeDisplay.endsWith("/")) //$NON-NLS-1$ treeDisplay = treeDisplay.substring(0, treeDisplay.length()-1); } return treeDisplay; Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AssignmentDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AssignmentDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/AssignmentDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -54,7 +54,7 @@ } public boolean isNestable() { - return (null != getContents() && !getContents().endsWith("/")); + return (null != getContents() && !getContents().endsWith("/")); //$NON-NLS-1$ } public AssignmentEndDirective getEndDirective() { @@ -73,7 +73,7 @@ private Item[] relatedItems; public String getTreeImage() { - return "assign.png"; + return "assign.png"; //$NON-NLS-1$ } Map contextValues; @@ -90,7 +90,7 @@ else if (Character.isDigit(value.charAt(0))) valueClass = Number.class; else { CompletionInterpolation completionInterpolation = - new CompletionInterpolation("${" + value, 2, getItemSet(), getResource()); + new CompletionInterpolation("${" + value, 2, getItemSet(), getResource()); //$NON-NLS-1$ valueClass = completionInterpolation.getReturnClass(context); } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDefaultDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDefaultDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDefaultDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -47,7 +47,7 @@ } public String getTreeImage() { - return "default.png"; + return "default.png"; //$NON-NLS-1$ } public void relateItem(Item directive) { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CaseDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -47,7 +47,7 @@ } public String getTreeImage() { - return "case.png"; + return "case.png"; //$NON-NLS-1$ } public void relateItem(Item directive) { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -41,21 +41,21 @@ public CompletionDirective (int offset, int length, ItemSet itemSet, ISourceViewer viewer, IResource resource) throws BadLocationException { this.contents = viewer.getDocument().get(offset, length); - ITypedRegion region = new TypedRegion(offset, this.contents.length(), "default"); + ITypedRegion region = new TypedRegion(offset, this.contents.length(), "default"); //$NON-NLS-1$ this.offset = offset; this.length = length; String[] arr = splitContents(); if (null != arr || arr.length > 0) { String s = arr[0]; try { - if (s.equals("list")) { + if (s.equals("list")) { //$NON-NLS-1$ directive = new ListDirective(); - directive.load(new TypedRegion(offset, this.contents.length(), "list"), viewer, resource); + directive.load(new TypedRegion(offset, this.contents.length(), "list"), viewer, resource); //$NON-NLS-1$ directive.setItemSet(itemSet); } - else if (s.equals("if")) { + else if (s.equals("if")) { //$NON-NLS-1$ directive = new IfDirective(); - directive.load(new TypedRegion(offset, this.contents.length(), "if"), viewer, resource); + directive.load(new TypedRegion(offset, this.contents.length(), "if"), viewer, resource); //$NON-NLS-1$ directive.setItemSet(itemSet); } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionInterpolation.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionInterpolation.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/CompletionInterpolation.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -29,7 +29,7 @@ private int offset; public CompletionInterpolation (String contents, int offset, ItemSet itemSet, IResource resource) { - this.contents = contents + "}"; + this.contents = contents + "}"; //$NON-NLS-1$ this.offset = offset; setItemSet(itemSet); setResource(resource); Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ElseIfDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ElseIfDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ElseIfDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -66,7 +66,7 @@ } public String getTreeImage() { - return "elseif.png"; + return "elseif.png"; //$NON-NLS-1$ } public boolean isStartAndEndItem() { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FtlDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FtlDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FtlDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -40,6 +40,6 @@ private Item[] relatedItems = new Item[0]; public String getTreeImage() { - return "element.png"; + return "element.png"; //$NON-NLS-1$ } } \ No newline at end of file Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FunctionDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FunctionDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/FunctionDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -57,7 +57,7 @@ } public String getTreeImage() { - return "element.png"; + return "element.png"; //$NON-NLS-1$ } public void addToContext(Map context) { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/GenericNestableDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/GenericNestableDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/GenericNestableDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -48,7 +48,7 @@ } public boolean isNestable() { - return !getContents().trim().endsWith("/"); + return !getContents().trim().endsWith("/"); //$NON-NLS-1$ } public boolean isStartItem() { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -89,7 +89,7 @@ private Item[] relatedItems; public String getTreeImage() { - return "if.png"; + return "if.png"; //$NON-NLS-1$ } public Item getEndItem() { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfElseDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfElseDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/IfElseDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -69,7 +69,7 @@ } public String getTreeImage() { - return "else.png"; + return "else.png"; //$NON-NLS-1$ } public boolean isStartAndEndItem() { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/Interpolation.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/Interpolation.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/Interpolation.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -48,7 +48,7 @@ } public String getTreeImage() { - return "interpolation.png"; + return "interpolation.png"; //$NON-NLS-1$ } public synchronized ICompletionProposal[] getCompletionProposals(int offset, Map context) { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ItemFactory.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ItemFactory.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ItemFactory.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -60,9 +60,9 @@ else if (region.getType().equals(PartitionScanner.FTL_MACRO_INSTANCE_END)) directive = new MacroEndInstance(); else if (region.getType().equals(PartitionScanner.FTL_INCLUDE)) - directive = new GenericDirective("include.png"); + directive = new GenericDirective("include.png"); //$NON-NLS-1$ else if (region.getType().equals(PartitionScanner.FTL_IMPORT)) - directive = new GenericDirective("import.png"); + directive = new GenericDirective("import.png"); //$NON-NLS-1$ else if (region.getType().equals(PartitionScanner.FTL_ASSIGN) || region.getType().equals(PartitionScanner.FTL_LOCAL) || region.getType().equals(PartitionScanner.FTL_GLOBAL)) @@ -72,15 +72,15 @@ || region.getType().equals(PartitionScanner.FTL_GLOBAL_END)) directive = new AssignmentEndDirective(region.getType()); else if (region.getType().equals(PartitionScanner.FTL_BREAK)) - directive = new GenericDirective("break.png"); + directive = new GenericDirective("break.png"); //$NON-NLS-1$ else if (region.getType().equals(PartitionScanner.FTL_STOP)) - directive = new GenericDirective("stop.png"); + directive = new GenericDirective("stop.png"); //$NON-NLS-1$ else if (region.getType().equals(PartitionScanner.FTL_RETURN)) - directive = new GenericDirective("return.png"); + directive = new GenericDirective("return.png"); //$NON-NLS-1$ else if (region.getType().equals(PartitionScanner.FTL_SWITCH_DIRECTIVE_START)) - directive = new GenericNestableDirective("switch", "switch.png"); + directive = new GenericNestableDirective("switch", "switch.png"); //$NON-NLS-1$ //$NON-NLS-2$ else if (region.getType().equals(PartitionScanner.FTL_SWITCH_DIRECTIVE_END)) - directive = new GenericNestableEndDirective("switch"); + directive = new GenericNestableEndDirective("switch"); //$NON-NLS-1$ else if (region.getType().equals(PartitionScanner.FTL_CASE_DIRECTIVE_START)) directive = new CaseDirective(); else if (region.getType().equals(PartitionScanner.FTL_CASE_DEFAULT_START)) @@ -91,7 +91,7 @@ directive = new FtlDirective(); else if (region.getType().equals(PartitionScanner.FTL_DIRECTIVE)) { String name = getDirectiveName(region, viewer); - directive = new GenericNestableDirective(name, "element.png"); + directive = new GenericNestableDirective(name, "element.png"); //$NON-NLS-1$ } else if (region.getType().equals(PartitionScanner.FTL_DIRECTIVE_END)) { String name = getDirectiveName(region, viewer); Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/LibraryMacroDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/LibraryMacroDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/LibraryMacroDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -31,10 +31,10 @@ public static void main (String[] args) { try { - String content = "#macro entries startIndex=1\r\n" + - "data=\"data\" headerUrls=[] sortIndex=-1"; + String content = "#macro entries startIndex=1\r\n" + //$NON-NLS-1$ + "data=\"data\" headerUrls=[] sortIndex=-1"; //$NON-NLS-1$ - LibraryMacroDirective lmd = new LibraryMacroDirective("lib", content, 0, content.length()); + LibraryMacroDirective lmd = new LibraryMacroDirective("lib", content, 0, content.length()); //$NON-NLS-1$ String[] attributes = lmd.getAttributes(); for (int i=0; i<attributes.length; i++) { System.out.println(attributes[i]); @@ -55,7 +55,7 @@ private String name; public String getName() { if (null == name) - name = namespace + "." + super.getName(); + name = namespace + "." + super.getName(); //$NON-NLS-1$ return name; } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ListDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ListDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/ListDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -62,7 +62,7 @@ } public String getTreeImage() { - return "list.png"; + return "list.png"; //$NON-NLS-1$ } public ICompletionProposal[] getCompletionProposals(int offset, Map context) { @@ -71,11 +71,11 @@ ContentWithOffset contentWithOffset = splitContents(offset); int index = contentWithOffset.getIndex(); if (index == 1 || (index == 0 && contentWithOffset.wasLastCharSpace())) { - String value = ""; + String value = ""; //$NON-NLS-1$ if (contentWithOffset.getContents().length >= 2) value = contentWithOffset.getContents()[1]; CompletionInterpolation completionInterpolation = new CompletionInterpolation( - "${" + value, offset - contentWithOffset.getOffsetInIndex() - 2, getItemSet(), getResource()); + "${" + value, offset - contentWithOffset.getOffsetInIndex() - 2, getItemSet(), getResource()); //$NON-NLS-1$ proposals = completionInterpolation.getCompletionProposals(offset, context); } } @@ -86,7 +86,7 @@ String[] contents = splitContents(); if (contents.length == 4) { String key = contents[3]; - CompletionInterpolation completionInterpolation = new CompletionInterpolation("${" + contents[1], 0, getItemSet(), getResource()); + CompletionInterpolation completionInterpolation = new CompletionInterpolation("${" + contents[1], 0, getItemSet(), getResource()); //$NON-NLS-1$ context.put(key, completionInterpolation.getSingularReturnClass(context)); } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroDirective.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroDirective.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroDirective.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -76,7 +76,7 @@ private Item[] relatedItems; public String getTreeImage() { - return "macro.png"; + return "macro.png"; //$NON-NLS-1$ } public String getTreeDisplay() { @@ -91,10 +91,10 @@ int i = 2; while (i<contents.length) { String att = contents[i]; - int index = att.indexOf("="); + int index = att.indexOf("="); //$NON-NLS-1$ if (index < 0) { att = att.trim(); - if (att.endsWith("]") || att.endsWith(">")) att = att.substring(0, att.length()-1); + if (att.endsWith("]") || att.endsWith(">")) att = att.substring(0, att.length()-1); //$NON-NLS-1$ //$NON-NLS-2$ l.add(att); i++; } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroInstance.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroInstance.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/MacroInstance.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -79,7 +79,7 @@ private Item[] relatedItems; public String getTreeImage() { - return "macro_instance.png"; + return "macro_instance.png"; //$NON-NLS-1$ } public String getName() { @@ -116,7 +116,7 @@ return completionProposals(l); } else if ((contentWithOffset.wasLastCharSpace()) - || !contents[index-1].equals("=")) { + || !contents[index-1].equals("=")) { //$NON-NLS-1$ String name = contents[0]; // see if we can find a macro match MacroDirective match = null; @@ -143,14 +143,14 @@ if (null != match) { String prefix = null; if (contentWithOffset.wasLastCharSpace() || contents.length < index+1) - prefix = ""; + prefix = ""; //$NON-NLS-1$ else prefix = contents[index].substring(0, subOffset); List l = new ArrayList(); for (int i=0; i<match.getAttributes().length; i++) { if (match.getAttributes()[i].startsWith(prefix)) { l.add(getCompletionProposal(offset, subOffset, - match.getAttributes()[i], (contentWithOffset.isNextCharSpace() || contents.length < index+1) ? "" : contents[index])); + match.getAttributes()[i], (contentWithOffset.isNextCharSpace() || contents.length < index+1) ? "" : contents[index])); //$NON-NLS-1$ } } return completionProposals(l); Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/BuiltInFragment.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -49,99 +49,99 @@ static { addToMap (OBJECT_BUILT_INS, new Object[]{ - "is_collection", Boolean.class, null, - "is_macro", Boolean.class, null, - "is_transform", Boolean.class, null, - "string", String.class, null, - "namespace", String.class, null, - "default", String.class, new String[]{"value "}, - "is_number", Boolean.class, null, - "is_directive", String.class, null, - "is_boolean", Boolean.class, null, - "is_hash_ex", Boolean.class, null, - "is_enumerable", Boolean.class, null, - "is_date", Boolean.class, null, - "is_node", Boolean.class, null, - "exists", Boolean.class, null, - "is_indexable", Boolean.class, null, - "is_string", Boolean.class, null, - "is_hash", Boolean.class, null, - "is_sequence", Boolean.class, null, - "if_exists", Boolean.class, null, - "has_content", Boolean.class, null, - "is_method", Boolean.class, null, + "is_collection", Boolean.class, null, //$NON-NLS-1$ + "is_macro", Boolean.class, null, //$NON-NLS-1$ + "is_transform", Boolean.class, null, //$NON-NLS-1$ + "string", String.class, null, //$NON-NLS-1$ + "namespace", String.class, null, //$NON-NLS-1$ + "default", String.class, new String[]{"value "}, //$NON-NLS-1$ //$NON-NLS-2$ + "is_number", Boolean.class, null, //$NON-NLS-1$ + "is_directive", String.class, null, //$NON-NLS-1$ + "is_boolean", Boolean.class, null, //$NON-NLS-1$ + "is_hash_ex", Boolean.class, null, //$NON-NLS-1$ + "is_enumerable", Boolean.class, null, //$NON-NLS-1$ + "is_date", Boolean.class, null, //$NON-NLS-1$ + "is_node", Boolean.class, null, //$NON-NLS-1$ + "exists", Boolean.class, null, //$NON-NLS-1$ + "is_indexable", Boolean.class, null, //$NON-NLS-1$ + "is_string", Boolean.class, null, //$NON-NLS-1$ + "is_hash", Boolean.class, null, //$NON-NLS-1$ + "is_sequence", Boolean.class, null, //$NON-NLS-1$ + "if_exists", Boolean.class, null, //$NON-NLS-1$ + "has_content", Boolean.class, null, //$NON-NLS-1$ + "is_method", Boolean.class, null, //$NON-NLS-1$ }); addToMap (STRING_BUILT_INS, new Object[]{ - "interpret", String.class, null, - "matches", Boolean.class, new String[]{"expression"}, - "html", String.class, null, - "index_of", Number.class, new String[]{"substr"}, - "right_pad", String.class, new String[]{"padAmount"}, - "xml", String.class, null, - "web_safe", String.class, null, - "eval", null, null, - "size", Number.class, null, - "cap_first", String.class, null, - "j_string", String.class, null, - "first", String.class, null, - "split", Collection.class, null, - "upper_case", String.class, null, - "last_index_of", String.class, null, - "long", Number.class, null, - "last", String.class, null, - "starts_with", Boolean.class, null, - "capitalize", String.class, null, - "short", String.class, null, - "ends_with", String.class, null, - "chunk", Collection.class, null, - "byte", String.class, null, - "trim", String.class, null, - "c", String.class, null, - "chop_linebreak", String.class, null, - "double", Number.class, null, - "url", String.class, null, - "replace", String.class, null, - "uncap_first", String.class, null, - "contains", Boolean.class, null, - "left_pad", String.class, new String[]{"param"}, - "length", Number.class, null, - "rtf", String.class, null, - "lower_case", String.class, null, - "js_string", String.class, null, - "word_list", String.class, null, + "interpret", String.class, null, //$NON-NLS-1$ + "matches", Boolean.class, new String[]{"expression"}, //$NON-NLS-1$ //$NON-NLS-2$ + "html", String.class, null, //$NON-NLS-1$ + "index_of", Number.class, new String[]{"substr"}, //$NON-NLS-1$ //$NON-NLS-2$ + "right_pad", String.class, new String[]{"padAmount"}, //$NON-NLS-1$ //$NON-NLS-2$ + "xml", String.class, null, //$NON-NLS-1$ + "web_safe", String.class, null, //$NON-NLS-1$ + "eval", null, null, //$NON-NLS-1$ + "size", Number.class, null, //$NON-NLS-1$ + "cap_first", String.class, null, //$NON-NLS-1$ + "j_string", String.class, null, //$NON-NLS-1$ + "first", String.class, null, //$NON-NLS-1$ + "split", Collection.class, null, //$NON-NLS-1$ + "upper_case", String.class, null, //$NON-NLS-1$ + "last_index_of", String.class, null, //$NON-NLS-1$ + "long", Number.class, null, //$NON-NLS-1$ + "last", String.class, null, //$NON-NLS-1$ + "starts_with", Boolean.class, null, //$NON-NLS-1$ + "capitalize", String.class, null, //$NON-NLS-1$ + "short", String.class, null, //$NON-NLS-1$ + "ends_with", String.class, null, //$NON-NLS-1$ + "chunk", Collection.class, null, //$NON-NLS-1$ + "byte", String.class, null, //$NON-NLS-1$ + "trim", String.class, null, //$NON-NLS-1$ + "c", String.class, null, //$NON-NLS-1$ + "chop_linebreak", String.class, null, //$NON-NLS-1$ + "double", Number.class, null, //$NON-NLS-1$ + "url", String.class, null, //$NON-NLS-1$ + "replace", String.class, null, //$NON-NLS-1$ + "uncap_first", String.class, null, //$NON-NLS-1$ + "contains", Boolean.class, null, //$NON-NLS-1$ + "left_pad", String.class, new String[]{"param"}, //$NON-NLS-1$ //$NON-NLS-2$ + "length", Number.class, null, //$NON-NLS-1$ + "rtf", String.class, null, //$NON-NLS-1$ + "lower_case", String.class, null, //$NON-NLS-1$ + "js_string", String.class, null, //$NON-NLS-1$ + "word_list", String.class, null, //$NON-NLS-1$ }); addToMap (NUMBER_BUILT_INS, new Object[]{ - "string.currency", Boolean.class, new String[]{"format"}, - "string", String.class, null, - "number", Number.class, null, - "new", String.class, null, - "long", Number.class, null, - "short", String.class, null, - "double", Number.class, null, - "int", Number.class, null, + "string.currency", Boolean.class, new String[]{"format"}, //$NON-NLS-1$ //$NON-NLS-2$ + "string", String.class, null, //$NON-NLS-1$ + "number", Number.class, null, //$NON-NLS-1$ + "new", String.class, null, //$NON-NLS-1$ + "long", Number.class, null, //$NON-NLS-1$ + "short", String.class, null, //$NON-NLS-1$ + "double", Number.class, null, //$NON-NLS-1$ + "int", Number.class, null, //$NON-NLS-1$ }); addToMap (DATE_BUILT_INS, new Object[]{ - "date", Date.class, null, - "time", Date.class, null, - "datetime", Date.class, null, - "string", String.class, new String[]{"format"}, - "string.short", String.class, null, - "string.medium", String.class, null, - "string.long", String.class, null, + "date", Date.class, null, //$NON-NLS-1$ + "time", Date.class, null, //$NON-NLS-1$ + "datetime", Date.class, null, //$NON-NLS-1$ + "string", String.class, new String[]{"format"}, //$NON-NLS-1$ //$NON-NLS-2$ + "string.short", String.class, null, //$NON-NLS-1$ + "string.medium", String.class, null, //$NON-NLS-1$ + "string.long", String.class, null, //$NON-NLS-1$ }); addToMap (LIST_BUILT_INS, new Object[]{ - "seq_contains", Boolean.class, new String[]{"value"}, - "reverse", Collection.class, null, - "size", Number.class, null, - "last", Object.class, null, + "seq_contains", Boolean.class, new String[]{"value"}, //$NON-NLS-1$ //$NON-NLS-2$ + "reverse", Collection.class, null, //$NON-NLS-1$ + "size", Number.class, null, //$NON-NLS-1$ + "last", Object.class, null, //$NON-NLS-1$ }); addToMap (MAP_BUILT_INS, new Object[]{ - "keys", Collection.class, null, + "keys", Collection.class, null, //$NON-NLS-1$ }); } @@ -164,7 +164,7 @@ public Class getReturnClass (Class parentClass, List fragments, Map context, IResource resource, IProject project) { if (null == subContent) { subContent = getContent(); - int index = subContent.indexOf("("); + int index = subContent.indexOf("("); //$NON-NLS-1$ if (index > 0) subContent = subContent.substring(0, index); } ParameterSet parameterSet = (ParameterSet) STRING_BUILT_INS.get(subContent); @@ -231,7 +231,7 @@ key, getContent()); } else { - String replacementString = key + "()"; + String replacementString = key + "()"; //$NON-NLS-1$ return new CompletionProposal ( replacementString, offset-subOffset+1, getContent().length(), replacementString.length()-1); @@ -245,12 +245,12 @@ else { StringBuffer sb = new StringBuffer(); sb.append(key); - sb.append("("); + sb.append("("); //$NON-NLS-1$ // for (int i=0; i<values.getParameters().length; i++) { // if (i > 0) sb.append(", "); // sb.append(values.getParameters()[i]); // } - sb.append(")"); + sb.append(")"); //$NON-NLS-1$ return sb.toString(); } } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NameFragment.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NameFragment.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NameFragment.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -85,7 +85,7 @@ } else { content = Character.toUpperCase(content.charAt(1)) + content.substring(2, getContent().length()); - String getcontent = "get" + content; + String getcontent = "get" + content; //$NON-NLS-1$ for (int i=0; i<parentClass.getMethods().length; i++) { Method m = parentClass.getMethods()[i]; if (m.getName().equals(content) || m.getName().equals(getcontent)) { @@ -116,7 +116,7 @@ } else { content = Character.toUpperCase(content.charAt(1)) + content.substring(2, getContent().length()); - String getcontent = "get" + content; + String getcontent = "get" + content; //$NON-NLS-1$ for (int i=0; i<parentClass.getMethods().length; i++) { Method m = parentClass.getMethods()[i]; if (m.getName().equals(content) || m.getName().equals(getcontent)) { @@ -139,11 +139,11 @@ } public boolean isStartFragment () { - return !getContent().startsWith("."); + return !getContent().startsWith("."); //$NON-NLS-1$ } public static final String[] invalidMethods = { - "clone", "equals", "finalize", "getClass", "hashCode", "notify", "notifyAll", "toString", "wait"}; + "clone", "equals", "finalize", "getClass", "hashCode", "notify", "notifyAll", "toString", "wait"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ public ICompletionProposal[] getMethodCompletionProposals (int subOffset, int offset, Class parentClass, IResource file) { if (instanceOf(parentClass, String.class) || instanceOf(parentClass, Number.class) @@ -161,33 +161,33 @@ for (int i=0; i<pds.length; i++) { PropertyDescriptor pd = pds[i]; String propertyName = pd.getName(); - if (!propertyName.equals("class") && propertyName.toUpperCase().startsWith(pUpper)) { + if (!propertyName.equals("class") && propertyName.toUpperCase().startsWith(pUpper)) { //$NON-NLS-1$ proposals.add(new CompletionProposal( propertyName, offset - subOffset + 1, getContent().length()-1, propertyName.length(), - null, propertyName + " - " + pd.getReadMethod().getReturnType().getName(), null, null)); + null, propertyName + " - " + pd.getReadMethod().getReturnType().getName(), null, null)); //$NON-NLS-1$ } } for (int i=0; i<parentClass.getMethods().length; i++) { Method m = parentClass.getMethods()[i]; String mName = m.getName(); - if (m.getParameterTypes().length > 0 && mName.startsWith("get") && mName.toUpperCase().startsWith(pUpper)) { + if (m.getParameterTypes().length > 0 && mName.startsWith("get") && mName.toUpperCase().startsWith(pUpper)) { //$NON-NLS-1$ StringBuffer display = new StringBuffer(); display.append(mName); - display.append("("); + display.append("("); //$NON-NLS-1$ for (int j=0; j<m.getParameterTypes().length; j++) { - if (j > 0) display.append(", "); + if (j > 0) display.append(", "); //$NON-NLS-1$ display.append(m.getParameterTypes()[j].getName()); } - display.append(")"); - String actual = mName + "()"; + display.append(")"); //$NON-NLS-1$ + String actual = mName + "()"; //$NON-NLS-1$ int tLength = actual.length(); if (m.getParameterTypes().length > 0) tLength--; proposals.add(new CompletionProposal(actual, offset - subOffset + 1, getContent().length()-1, tLength, - null, display.toString() + " - " + m.getReturnType().getName(), null, null)); + null, display.toString() + " - " + m.getReturnType().getName(), null, null)); //$NON-NLS-1$ } } return completionProposals(proposals); Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NullFragment.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NullFragment.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/model/interpolation/NullFragment.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -28,7 +28,7 @@ public class NullFragment extends NameFragment { public NullFragment() { - super(0, ""); + super(0, ""); //$NON-NLS-1$ } public boolean isStartFragment() { Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlinePage.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlinePage.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/outline/OutlinePage.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -46,6 +46,7 @@ import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.dialogs.SelectionDialog; import org.eclipse.ui.views.contentoutline.ContentOutlinePage; +import org.jboss.ide.eclipse.freemarker.Messages; import org.jboss.ide.eclipse.freemarker.Plugin; import org.jboss.ide.eclipse.freemarker.configuration.ConfigurationManager; import org.jboss.ide.eclipse.freemarker.configuration.ContextValue; @@ -161,7 +162,7 @@ public SetContextEntryAction (OutlinePage outlinePage) { this.outlinePage = outlinePage; - this.setText("Set context class entry"); + this.setText(Messages.OutlinePage_SetContextClassEntryAction); this.setEnabled(true); } Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/ContextProperties.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/ContextProperties.java 2009-05-25 05:22:00 UTC (rev 15477) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/preferences/ContextProperties.java 2009-05-25 06:54:13 UTC (rev 15478) @@ -48,6 +48,7 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.dialogs.PropertyPage; +import org.jboss.ide.eclipse.freemarker.Messages; import org.jboss.ide.eclipse.freemarker.Plugin; import org.jboss.ide.eclipse.freemarker.configuration.ConfigurationManager; import org.jboss.ide.eclipse.freemarker.configuration.ContextValue; @@ -57,7 +58,7 @@ public ContextProperties() { super(); - setDescription("Create pre-determined Velocity context variables for all files under this resource"); + setDescription(Messages.ContextProperties_Description); } protected Control createContents(Composite parent) { @@ -112,8 +113,8 @@ // create the columns TableColumn keyColumn = new TableColumn(contextValuesTable, SWT.LEFT); TableColumn valueColumn = new TableColumn(contextValuesTable, SWT.LEFT); - keyColumn.setText("Name"); - valueColumn.setText("Type"); + keyColumn.setText(Messages.ContextProperties_KeyColumn); + valueColumn.setText(Messages.ContextProperties_ValueColumn); ColumnLayoutData keyColumnLayout = new ColumnWeightData(30, false); ColumnLayoutData valueColumnLayout = new ColumnWeightData(70, false); @@ -138,7 +139,7 @@ buttonComposite.setLayout(gl); buttonComposite.setVisible(true); addContextValueButton = new Button(buttonComposite, SWT.NATIVE); - addContextValueButton.setText("New"); + addContextValueButton.setText(Messages.ContextProperties_NewButton); addContextValueButton.setVisible(true); addContextValueButton .addSelectionListener(new AddContextValueButtonListener()); @@ -147,7 +148,7 @@ data.grabExcessHorizontalSpace = true; addContextValueButton.setLayoutData(data); editContextValueButton = new Button(buttonComposite, SWT.NATIVE); - editContextValueButton.setText("Edit"); + editContextValueButton.setText(Messages.ContextProperties_EditButton); editContextValueButton .addSelectionListener(new EditContextValueButtonListener()); data = new GridData(); @@ -155,7 +156,7 @@ data.grabExcessHorizontalSpace = true; editContextValueButton.setLayoutData(data); deleteContextValueButton = new Button(buttonComposite, SWT.NATIVE); - deleteContextValueButton.setText("Delete"); + deleteContextValueButton.setText(Messages.ContextProperties_DeleteButton); deleteContextValueButton .addSelectionListener(new ContextValueDeleteKeyListener()); data = new GridData(); @@ -269,8 +270,8 @@ if (index >= 0) { try { boolean confirm = MessageDialog - .openConfirm(new Shell(), "Confirmation", - "Are you sure you want to delete this context value?"); + .openConfirm(new Shell(), Messages.ContextProperties_ConfirmationTitle, + Messages.ContextProperties_DeleteValueConfirmation); if (confirm) { String key = contextValuesTable.getSelection()[0] .getText(0);

15 years, 4 months

1
0
0 / 0

← Newer
1
...
11
12
13
14
15
16
17
...
63
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2009