Author: DartPeng Date: 2009-07-27 01:45:04 -0400 (Mon, 27 Jul 2009) New Revision: 16790 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/AbstractSmooksActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Calc11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Database11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Datasources11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting12ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/ISmooksActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean12ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/PersistenceActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader12ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Scripting11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/SeparatorActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Templating11ActionGrouper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Validation10ActionGrouper.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.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/editor/AbstractSmooksFormEditor.java Log: JBIDE-4656 1.Add actions for adding smooks1.2 elements 2.Change the smooks 1.2 elements' text Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-07-24 22:01:31 UTC (rev 16789) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-07-27 05:45:04 UTC (rev 16790) @@ -180,7 +180,7 @@ _UI_InlineDirective_replace_literal = replace _UI_InlineDirective_insertbefore_literal = insertbefore _UI_InlineDirective_insertafter_literal = insertafter -_UI_BindingsType_type = Bean +_UI_BindingsType_type = Bean v1.1 _UI_DecodeParamType_type = Decode Param _UI_ExpressionType_type = Expression Binding _UI_ValueType_type = Value Binding @@ -246,7 +246,7 @@ # CSV _UI_CsvDocumentRoot_type = Document Root -_UI_CsvReader_type = CSV Reader +_UI_CsvReader_type = CSV Reader v1.1 _UI_CsvDocumentRoot_mixed_feature = Mixed _UI_CsvDocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map _UI_CsvDocumentRoot_xSISchemaLocation_feature = XSI Schema Location @@ -306,7 +306,7 @@ _UI_HighWaterMark_type = High Water Mark _UI_Jndi_type = Jndi _UI_Message_type = Message -_UI_JmsRouter_type = JMS Router +_UI_JmsRouter_type = JMS Router v1.1 _UI_Session_type = Session _UI_Connection_factory_feature = Factory @@ -355,7 +355,7 @@ _UI_JsonDocumentRoot_type = Document Root _UI_Key_type = Key _UI_KeyMap_type = Key Map -_UI_JsonReader_type =JSON Reader +_UI_JsonReader_type =Json Reader v1.1 _UI_JsonDocumentRoot_mixed_feature = Mixed _UI_JsonDocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map @@ -376,7 +376,7 @@ # EDI Reader _UI_EDIDocumentRoot_type = EDI Document Root -_UI_EDIReader_type = EDI Reader +_UI_EDIReader_type = EDI Reader v1.1 _UI_EDIDocumentRoot_mixed_feature = Mixed _UI_EDIDocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map _UI_EDIDocumentRoot_xSISchemaLocation_feature = XSI Schema Location @@ -449,7 +449,7 @@ _UI_Binding_type = Binding _UI_CSV12DocumentRoot_type = CSV12 Document Root _UI_MapBinding_type = Map Binding -_UI_CSV12Reader_type = CSV12 Reader +_UI_CSV12Reader_type = CSV Reader v1.2 _UI_Binding_beanId_feature = Bean Id _UI_Binding_class_feature = Class _UI_CSV12DocumentRoot_mixed_feature = Mixed @@ -471,7 +471,7 @@ # EDI version 1.2 _UI_EDI12DocumentRoot_type = EDI12 Document Root -_UI_EDI12Reader_type = EDI12 Reader +_UI_EDI12Reader_type = EDI Reader v1.2 _UI_EDI12DocumentRoot_mixed_feature = Mixed _UI_EDI12DocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map _UI_EDI12DocumentRoot_xSISchemaLocation_feature = XSI Schema Location @@ -481,13 +481,13 @@ _UI_EDI12Reader_validate_feature = Validate # JavaBean version 1.2 -_UI_BeanType_type = Bean Type +_UI_BeanType_type = Bean v1.2 _UI_DecodeParamType_type = Decode Param Type _UI_Javabean12DocumentRoot_type = Document Root _UI_ExpressionType_type = Expression Type _UI_ResultType_type = Result Type -_UI_ValueType_type = Value Type -_UI_WiringType_type = Wiring Type +_UI_ValueType_type = Value Binding +_UI_WiringType_type = Bean Binding _UI_BeanType_group_feature = Group _UI_BeanType_value_feature = Value _UI_BeanType_wiring_feature = Wiring @@ -535,7 +535,7 @@ _UI_HighWaterMark_type = High Water Mark _UI_Jndi_type = Jndi _UI_Message_type = Message -_UI_Router_type = Router +_UI_Router_type = JMS Router v1.2 _UI_Session_type = Session _UI_Connection_factory_feature = Factory _UI_Connection_securityCredential_feature = Security Credential @@ -582,7 +582,7 @@ _UI_Json12DocumentRoot_type = Document Root _UI_Key_type = Key _UI_KeyMap_type = Key Map -_UI_Json12Reader_type = Reader +_UI_Json12Reader_type = Json Reader v1.2 _UI_Json12DocumentRoot_mixed_feature = Mixed _UI_Json12DocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map _UI_Json12DocumentRoot_xSISchemaLocation_feature = XSI Schema Location @@ -687,7 +687,7 @@ # rules version 1.0 _UI_Rules10DocumentRoot_type = Document Root _UI_RuleBase_type = Rule Base -_UI_RuleBasesType_type = Rule Bases Type +_UI_RuleBasesType_type = Rule Bases _UI_Rules10DocumentRoot_mixed_feature = Mixed _UI_Rules10DocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map _UI_Rules10DocumentRoot_xSISchemaLocation_feature = XSI Schema Location @@ -700,7 +700,7 @@ # validation version 1.0 _UI_Validation10DocumentRoot_type = Document Root -_UI_RuleType_type = Rule Type +_UI_RuleType_type = Rule _UI_Validation10DocumentRoot_mixed_feature = Mixed _UI_Validation10DocumentRoot_xMLNSPrefixMap_feature = XMLNS Prefix Map _UI_Validation10DocumentRoot_xSISchemaLocation_feature = XSI Schema Location 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-07-24 22:01:31 UTC (rev 16789) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/provider/SmooksResourceListTypeItemProvider.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -28,12 +28,16 @@ import org.jboss.tools.smooks.model.common.provider.AbstractAnyTypeItemProvider; import org.jboss.tools.smooks.model.csv.CsvFactory; import org.jboss.tools.smooks.model.csv.CsvPackage; +import org.jboss.tools.smooks.model.csv12.Csv12Factory; +import org.jboss.tools.smooks.model.csv12.Csv12Package; import org.jboss.tools.smooks.model.datasource.DatasourceFactory; import org.jboss.tools.smooks.model.datasource.DatasourcePackage; import org.jboss.tools.smooks.model.dbrouting.DbroutingFactory; 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.edi12.Edi12Factory; +import org.jboss.tools.smooks.model.edi12.Edi12Package; import org.jboss.tools.smooks.model.esbrouting.EsbroutingFactory; import org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage; import org.jboss.tools.smooks.model.fileRouting.FileRoutingFactory; @@ -46,13 +50,25 @@ import org.jboss.tools.smooks.model.iorouting.IoroutingPackage; import org.jboss.tools.smooks.model.javabean.JavabeanFactory; import org.jboss.tools.smooks.model.javabean.JavabeanPackage; +import org.jboss.tools.smooks.model.javabean12.Javabean12Factory; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingFactory; import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; +import org.jboss.tools.smooks.model.jmsrouting12.Jmsrouting12Factory; +import org.jboss.tools.smooks.model.jmsrouting12.Jmsrouting12Package; import org.jboss.tools.smooks.model.json.JsonFactory; import org.jboss.tools.smooks.model.json.JsonPackage; +import org.jboss.tools.smooks.model.json12.Json12Factory; +import org.jboss.tools.smooks.model.json12.Json12Package; +import org.jboss.tools.smooks.model.persistence12.Persistence12Factory; +import org.jboss.tools.smooks.model.persistence12.Persistence12Package; +import org.jboss.tools.smooks.model.rules10.Rules10Factory; +import org.jboss.tools.smooks.model.rules10.Rules10Package; import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.validation10.Validation10Factory; +import org.jboss.tools.smooks.model.validation10.Validation10Package; import org.jboss.tools.smooks.model.xsl.XslFactory; import org.jboss.tools.smooks.model.xsl.XslPackage; import org.jboss.tools.smooks.model.xsl.provider.Xsl1EditPlugin; @@ -63,8 +79,9 @@ * * @generated */ -public class SmooksResourceListTypeItemProvider extends AbstractAnyTypeItemProvider implements IEditingDomainItemProvider, - IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { +public class SmooksResourceListTypeItemProvider extends AbstractAnyTypeItemProvider implements + IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, + IItemPropertySource { /** * This constructs an instance from a factory and a notifier. <!-- * begin-user-doc --> <!-- end-user-doc --> @@ -101,11 +118,13 @@ * @generated */ protected void addDefaultConditionRefPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_SmooksResourceListType_defaultConditionRef_feature"), getString( + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SmooksResourceListType_defaultConditionRef_feature"), getString( "_UI_PropertyDescriptor_description", "_UI_SmooksResourceListType_defaultConditionRef_feature", - "_UI_SmooksResourceListType_type"), SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_CONDITION_REF, true, false, - false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + "_UI_SmooksResourceListType_type"), + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_CONDITION_REF, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -115,10 +134,12 @@ * @generated */ protected void addDefaultSelectorPropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_SmooksResourceListType_defaultSelector_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_SmooksResourceListType_defaultSelector_feature", - "_UI_SmooksResourceListType_type"), SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR, true, false, false, + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SmooksResourceListType_defaultSelector_feature"), getString( + "_UI_PropertyDescriptor_description", "_UI_SmooksResourceListType_defaultSelector_feature", + "_UI_SmooksResourceListType_type"), + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -129,11 +150,14 @@ * @generated */ protected void addDefaultSelectorNamespacePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_SmooksResourceListType_defaultSelectorNamespace_feature"), getString( - "_UI_PropertyDescriptor_description", "_UI_SmooksResourceListType_defaultSelectorNamespace_feature", - "_UI_SmooksResourceListType_type"), SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR_NAMESPACE, true, - false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SmooksResourceListType_defaultSelectorNamespace_feature"), getString( + "_UI_PropertyDescriptor_description", + "_UI_SmooksResourceListType_defaultSelectorNamespace_feature", + "_UI_SmooksResourceListType_type"), + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_SELECTOR_NAMESPACE, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -143,11 +167,13 @@ * @generated */ protected void addDefaultTargetProfilePropertyDescriptor(Object object) { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_SmooksResourceListType_defaultTargetProfile_feature"), getString( - "_UI_PropertyDescriptor_description", "_UI_SmooksResourceListType_defaultTargetProfile_feature", - "_UI_SmooksResourceListType_type"), SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_TARGET_PROFILE, true, false, - false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), + getString("_UI_SmooksResourceListType_defaultTargetProfile_feature"), getString( + "_UI_PropertyDescriptor_description", + "_UI_SmooksResourceListType_defaultTargetProfile_feature", "_UI_SmooksResourceListType_type"), + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__DEFAULT_TARGET_PROFILE, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -207,8 +233,8 @@ @Override public String getText(Object object) { String label = ((SmooksResourceListType) object).getDefaultSelectorNamespace(); - return label == null || label.length() == 0 ? getString("_UI_SmooksResourceListType_type") : getString("_UI_SmooksResourceListType_type") - + " " + label; + return label == null || label.length() == 0 ? getString("_UI_SmooksResourceListType_type") + : getString("_UI_SmooksResourceListType_type") + " " + label; } /** @@ -252,87 +278,188 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__PARAMS, SmooksFactory.eINSTANCE - .createParamsType())); + newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__PARAMS, + SmooksFactory.eINSTANCE.createParamsType())); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__CONDITIONS, SmooksFactory.eINSTANCE - .createConditionsType())); + newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__CONDITIONS, + SmooksFactory.eINSTANCE.createConditionsType())); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__PROFILES, SmooksFactory.eINSTANCE - .createProfilesType())); + newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__PROFILES, + SmooksFactory.eINSTANCE.createProfilesType())); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil - .createEntry(SmooksPackage.Literals.DOCUMENT_ROOT__READER, SmooksFactory.eINSTANCE.createReaderType()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil.createEntry( + SmooksPackage.Literals.DOCUMENT_ROOT__READER, SmooksFactory.eINSTANCE.createReaderType()))); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(SmooksPackage.Literals.DOCUMENT_ROOT__IMPORT, SmooksFactory.eINSTANCE.createImportType()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(SmooksPackage.Literals.DOCUMENT_ROOT__IMPORT, SmooksFactory.eINSTANCE + .createImportType()))); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(SmooksPackage.Literals.DOCUMENT_ROOT__RESOURCE_CONFIG, SmooksFactory.eINSTANCE.createResourceConfigType()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(SmooksPackage.Literals.DOCUMENT_ROOT__RESOURCE_CONFIG, SmooksFactory.eINSTANCE + .createResourceConfigType()))); /***********************************************/ // for CSV - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil - .createEntry(CsvPackage.Literals.CSV_DOCUMENT_ROOT__READER, CsvFactory.eINSTANCE.createCsvReader()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil.createEntry( + CsvPackage.Literals.CSV_DOCUMENT_ROOT__READER, CsvFactory.eINSTANCE.createCsvReader()))); // for EDI - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil - .createEntry(EdiPackage.Literals.EDI_DOCUMENT_ROOT__READER, EdiFactory.eINSTANCE.createEDIReader()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil.createEntry( + EdiPackage.Literals.EDI_DOCUMENT_ROOT__READER, EdiFactory.eINSTANCE.createEDIReader()))); // for JSON - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil - .createEntry(JsonPackage.Literals.JSON_DOCUMENT_ROOT__READER, JsonFactory.eINSTANCE.createJsonReader()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil.createEntry( + JsonPackage.Literals.JSON_DOCUMENT_ROOT__READER, JsonFactory.eINSTANCE.createJsonReader()))); // for calc - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(CalcPackage.Literals.CALC_DOCUMENT_ROOT__COUNTER, CalcFactory.eINSTANCE.createCounter()))); - + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(CalcPackage.Literals.CALC_DOCUMENT_ROOT__COUNTER, CalcFactory.eINSTANCE + .createCounter()))); + // for groovy - - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(GroovyPackage.Literals.DOCUMENT_ROOT__GROOVY, GroovyFactory.eINSTANCE.createGroovy()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(GroovyPackage.Literals.DOCUMENT_ROOT__GROOVY, GroovyFactory.eINSTANCE + .createGroovy()))); + // for datasource - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(DatasourcePackage.Literals.DATA_SOURCE_DOCUMENT_ROOT__DIRECT, DatasourceFactory.eINSTANCE.createDirect()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(DatasourcePackage.Literals.DATA_SOURCE_DOCUMENT_ROOT__DIRECT, + DatasourceFactory.eINSTANCE.createDirect()))); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(DatasourcePackage.Literals.DATA_SOURCE_DOCUMENT_ROOT__JNDI, DatasourceFactory.eINSTANCE.createDataSourceJndi()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(DatasourcePackage.Literals.DATA_SOURCE_DOCUMENT_ROOT__JNDI, + DatasourceFactory.eINSTANCE.createDataSourceJndi()))); // for javabean - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(JavabeanPackage.Literals.DOCUMENT_ROOT__BINDINGS, JavabeanFactory.eINSTANCE.createBindingsType()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(JavabeanPackage.Literals.DOCUMENT_ROOT__BINDINGS, JavabeanFactory.eINSTANCE + .createBindingsType()))); // for xsl - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(XslPackage.Literals.DOCUMENT_ROOT__XSL, XslFactory.eINSTANCE.createXsl()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(XslPackage.Literals.DOCUMENT_ROOT__XSL, XslFactory.eINSTANCE.createXsl()))); // for freemarker - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(FreemarkerPackage.Literals.DOCUMENT_ROOT__FREEMARKER, FreemarkerFactory.eINSTANCE.createFreemarker()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(FreemarkerPackage.Literals.DOCUMENT_ROOT__FREEMARKER, FreemarkerFactory.eINSTANCE + .createFreemarker()))); // for DB routing - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(DbroutingPackage.Literals.DOCUMENT_ROOT__EXECUTOR, DbroutingFactory.eINSTANCE.createExecutor()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(DbroutingPackage.Literals.DOCUMENT_ROOT__EXECUTOR, DbroutingFactory.eINSTANCE + .createExecutor()))); - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(DbroutingPackage.Literals.DOCUMENT_ROOT__RESULT_SET_ROW_SELECTOR, DbroutingFactory.eINSTANCE - .createResultSetRowSelector()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(DbroutingPackage.Literals.DOCUMENT_ROOT__RESULT_SET_ROW_SELECTOR, + DbroutingFactory.eINSTANCE.createResultSetRowSelector()))); // for IO routing - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(IoroutingPackage.Literals.IO_DOCUMENT_ROOT__ROUTER, IoroutingFactory.eINSTANCE.createIORouter()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(IoroutingPackage.Literals.IO_DOCUMENT_ROOT__ROUTER, IoroutingFactory.eINSTANCE + .createIORouter()))); // for JMS routing - newChildDescriptors.add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil - .createEntry(JmsroutingPackage.Literals.JMS_DOCUMENT_ROOT__ROUTER, JmsroutingFactory.eINSTANCE.createJmsRouter()))); + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(JmsroutingPackage.Literals.JMS_DOCUMENT_ROOT__ROUTER, JmsroutingFactory.eINSTANCE + .createJmsRouter()))); // 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()))); - + 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()))); + 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()))); + /***********************************************/ - /***********************************************/ + /****************** Add Smooks 1.2 items ********/ + // for Rules 1.0 + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Rules10Package.Literals.RULES10_DOCUMENT_ROOT__RULE_BASES, + Rules10Factory.eINSTANCE.createRuleBasesType()))); + + // for Persistence 1.2 + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Persistence12Package.Literals.PERSISTENCE12_DOCUMENT_ROOT__DELETER, + Persistence12Factory.eINSTANCE.createDeleter()))); + + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Persistence12Package.Literals.PERSISTENCE12_DOCUMENT_ROOT__FLUSHER, + Persistence12Factory.eINSTANCE.createFlusher()))); + + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Persistence12Package.Literals.PERSISTENCE12_DOCUMENT_ROOT__INSERTER, + Persistence12Factory.eINSTANCE.createInserter()))); + + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Persistence12Package.Literals.PERSISTENCE12_DOCUMENT_ROOT__LOCATOR, + Persistence12Factory.eINSTANCE.createLocator()))); + + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Persistence12Package.Literals.PERSISTENCE12_DOCUMENT_ROOT__UPDATER, + Persistence12Factory.eINSTANCE.createUpdater()))); + + // for Validation 1.0 + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Validation10Package.Literals.VALIDATION10_DOCUMENT_ROOT__RULE, + Validation10Factory.eINSTANCE.createRuleType()))); + + // for CSV 1.2 + newChildDescriptors + .add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, + FeatureMapUtil.createEntry(Csv12Package.Literals.CSV12_DOCUMENT_ROOT__READER, + Csv12Factory.eINSTANCE.createCSV12Reader()))); + + // for EDI 1.2 + newChildDescriptors + .add(createChildParameter(SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, + FeatureMapUtil.createEntry(Edi12Package.Literals.EDI12_DOCUMENT_ROOT__READER, + Edi12Factory.eINSTANCE.createEDI12Reader()))); + + // for JSON 1.2 + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_READER_GROUP, FeatureMapUtil.createEntry( + Json12Package.Literals.JSON12_DOCUMENT_ROOT__READER, Json12Factory.eINSTANCE + .createJson12Reader()))); + + // for JavaBean 1.2 + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Javabean12Package.Literals.JAVABEAN12_DOCUMENT_ROOT__BEAN, + Javabean12Factory.eINSTANCE.createBeanType()))); + + // for JMS Router 1.2 + newChildDescriptors.add(createChildParameter( + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, FeatureMapUtil + .createEntry(Jmsrouting12Package.Literals.JMS_ROUTING12_DOCUMENT_ROOT__ROUTER, + Jmsrouting12Factory.eINSTANCE.createRouter()))); + } /** 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-07-24 22:01:31 UTC (rev 16789) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksActionBarContributor.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -8,7 +8,10 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.ui.viewer.IViewerProvider; @@ -56,27 +59,28 @@ import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.actions.AddSmooksResourceAction; import org.jboss.tools.smooks.configuration.actions.ValidateSmooksAction; -import org.jboss.tools.smooks.model.calc.Counter; -import org.jboss.tools.smooks.model.datasource.DataSourceJndi; -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; -import org.jboss.tools.smooks.model.javabean.BindingsType; -import org.jboss.tools.smooks.model.jmsrouting.JmsRouter; +import org.jboss.tools.smooks.configuration.editors.actions.Calc11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.Database11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.Datasources11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.FragmentRouting11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.FragmentRouting12ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.JavaBean11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.JavaBean12ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.PersistenceActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.Reader11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.Reader12ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.Scripting11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.SeparatorActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.Templating11ActionGrouper; +import org.jboss.tools.smooks.configuration.editors.actions.Validation10ActionGrouper; import org.jboss.tools.smooks.model.medi.EdiMap; import org.jboss.tools.smooks.model.medi.MEdiFactory; import org.jboss.tools.smooks.model.medi.MEdiPackage; -import org.jboss.tools.smooks.model.smooks.AbstractReader; import org.jboss.tools.smooks.model.smooks.DocumentRoot; -import org.jboss.tools.smooks.model.smooks.ReaderType; import org.jboss.tools.smooks.model.smooks.SmooksFactory; import org.jboss.tools.smooks.model.smooks.SmooksPackage; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; -import org.jboss.tools.smooks.model.xsl.Xsl; /** * This is the action bar contributor for the Smooks model editor. <!-- @@ -371,7 +375,9 @@ super.runWithEvent(event); } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.jface.action.Action#isEnabled() */ @Override @@ -669,256 +675,79 @@ return false; } - protected void groupActions(MenuManager manager, Collection<?> createChildActions) { - MenuManager readerMenu = new MenuManager("Reader"); - manager.add(readerMenu); + private List<ISmooksActionGrouper> getSmooksActionGrouper() { + List<ISmooksActionGrouper> grouperList = new ArrayList<ISmooksActionGrouper>(); - MenuManager templatingMenu = new MenuManager("Templating"); - manager.add(templatingMenu); + grouperList.add(new JavaBean11ActionGrouper()); + grouperList.add(new Reader11ActionGrouper()); + grouperList.add(new Calc11ActionGrouper()); + grouperList.add(new Database11ActionGrouper()); + grouperList.add(new Datasources11ActionGrouper()); + grouperList.add(new FragmentRouting11ActionGrouper()); + grouperList.add(new Scripting11ActionGrouper()); + grouperList.add(new Templating11ActionGrouper()); + grouperList.add(new SeparatorActionGrouper("V1.1-V1.2")); + grouperList.add(new JavaBean12ActionGrouper()); + grouperList.add(new Reader12ActionGrouper()); + grouperList.add(new FragmentRouting12ActionGrouper()); + grouperList.add(new PersistenceActionGrouper()); + grouperList.add(new Validation10ActionGrouper()); + grouperList.add(new SeparatorActionGrouper("No Group actions")); + return grouperList; + } - MenuManager jbindingMenu = new MenuManager("Java Binding"); - manager.add(jbindingMenu); + protected void groupActions(MenuManager manager, Collection<?> createChildActions) { - MenuManager datasourcesMenu = new MenuManager("Datasources"); - manager.add(datasourcesMenu); + Map<Object, Object> map = new HashMap<Object, Object>(); - MenuManager scriptingMenu = new MenuManager("Scripting"); - manager.add(scriptingMenu); + List<ISmooksActionGrouper> grouperList = getSmooksActionGrouper(); + for (Iterator<?> iterator1 = grouperList.iterator(); iterator1.hasNext();) { + ISmooksActionGrouper grouper = (ISmooksActionGrouper) iterator1.next(); + if (grouper.isSeparator()) { + String name = grouper.getGroupName(); + if(name == null) name = ""; + Separator s = new Separator(name); + manager.add(s); + continue; + } else { + String name = grouper.getGroupName(); + if (name != null) { + MenuManager newMenu = new MenuManager(name); + manager.add(newMenu); + map.put(newMenu, grouper); + } + } + } - MenuManager fragmentRoutingMenu = new MenuManager("Fragment Routing"); - manager.add(fragmentRoutingMenu); - - MenuManager databaseMenu = new MenuManager("Database"); - manager.add(databaseMenu); - - MenuManager calcMenu = new MenuManager("Calc"); - manager.add(calcMenu); - for (Iterator<?> iterator = createChildActions.iterator(); iterator.hasNext();) { boolean added = false; AddSmooksResourceAction action = (AddSmooksResourceAction) iterator.next(); Object descriptor = action.getDescriptor(); - if (isCalcDescriptor(descriptor)) { - calcMenu.add(action); - added = true; + Iterator<?> menuIterator = map.keySet().iterator(); + while (menuIterator.hasNext()) { + MenuManager newMenu = (MenuManager) menuIterator.next(); + ISmooksActionGrouper grouper = (ISmooksActionGrouper) map.get(newMenu); + if (grouper.belongsToGroup(descriptor)) { + newMenu.add(action); + added = true; + break; + } } - - if (isReaderDescriptor(descriptor)) { - readerMenu.add(action); - added = true; - } - if (isTemplateDescriptor(descriptor)) { - templatingMenu.add(action); - added = true; - } - if (isJavaBindingDescriptor(descriptor)) { - jbindingMenu.add(action); - added = true; - } - if (isDatasourcesDescriptor(descriptor)) { - datasourcesMenu.add(action); - added = true; - } - - if(isDatabaseDescriptor(descriptor)){ - databaseMenu.add(action); - added = true; - } - if (isScriptingDescriptor(descriptor)) { - scriptingMenu.add(action); - added = true; - } - if (isFragmentRoutingDescriptor(descriptor)) { - fragmentRoutingMenu.add(action); - added = true; - } + if (!added) { manager.add(action); } } - orderReaderAction(readerMenu); - orderTemplateAction(templatingMenu); - orderJBindingAction(jbindingMenu); - orderDatasourceAction(datasourcesMenu); - orderScriptAction(scriptingMenu); - orderFragmentAction(fragmentRoutingMenu); - orderDatabaseAction(databaseMenu); - orderCalcAction(calcMenu); - } - - protected void orderCalcAction(MenuManager database) { - // TODO Auto-generated method stub - - } - - protected void orderDatabaseAction(MenuManager database) { - // TODO Auto-generated method stub - - } - - protected void orderScriptAction(MenuManager scripting) { - // TODO Auto-generated method stub - - } - - protected void orderFragmentAction(MenuManager fragmentRouting) { - // TODO Auto-generated method stub - - } - - protected void orderDatasourceAction(MenuManager datasources) { - // TODO Auto-generated method stub - - } - - protected void orderJBindingAction(MenuManager jbinding) { - // TODO Auto-generated method stub - - } - - protected void orderTemplateAction(MenuManager templating) { - // TODO Auto-generated method stub - - } - - protected void orderReaderAction(MenuManager readers) { - IContributionItem[] items = readers.getItems(); - for (int i = 0; i < items.length; i++) { - IContributionItem item = items[i]; - if (item instanceof ActionContributionItem) { - IAction action = ((ActionContributionItem) item).getAction(); - if (action instanceof AddSmooksResourceAction) { - AddSmooksResourceAction action1 = (AddSmooksResourceAction) action; - Object descriptor = action1.getDescriptor(); - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - Object value = AdapterFactoryEditingDomain.unwrap(parameter.getValue()); - if (value instanceof ReaderType) { - int index = items.length - 1; - readers.remove(item); - readers.insert(index, item); - return; - } - } - } - } - } + Iterator<?> menuIterator = map.keySet().iterator(); + while (menuIterator.hasNext()) { + MenuManager newMenu = (MenuManager) menuIterator.next(); + ISmooksActionGrouper grouper = (ISmooksActionGrouper) map.get(newMenu); + grouper.orderActions(newMenu); } - } - - protected boolean isCalcDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Counter) { - return true; - } - } - } - return false; - } - private boolean isDatabaseDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof ResultSetRowSelector) { - return true; - } - } - } - return false; } - - private boolean isFragmentRoutingDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof JmsRouter) { - return true; - } - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof OutputStream) { - return true; - } - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Executor) { - return true; - } - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof RouteBean) { - return true; - } - } - } - return false; - } - private boolean isScriptingDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Groovy) { - return true; - } - } - } - return false; - } - - private boolean isDatasourcesDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof DataSourceJndi) { - return true; - } - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Direct) { - return true; - } - } - } - return false; - } - - private boolean isJavaBindingDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof BindingsType) { - return true; - } - } - } - return false; - } - - private boolean isTemplateDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Freemarker) { - return true; - } - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof Xsl) { - return true; - } - } - } - return false; - } - - private boolean isReaderDescriptor(Object descriptor) { - if (descriptor instanceof CommandParameter) { - CommandParameter parameter = (CommandParameter) descriptor; - if (parameter.getValue() != null) { - if (AdapterFactoryEditingDomain.unwrap(parameter.getValue()) instanceof AbstractReader) { - return true; - } - } - } - return false; - } - protected void updateRootElementAddAction() { addSmooks11ResourceListAction.setEnabled(false); addMap10ResourceListAction.setEnabled(false); Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/AbstractSmooksActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/AbstractSmooksActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/AbstractSmooksActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,29 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.eclipse.emf.edit.command.CommandParameter; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.jface.action.MenuManager; + +public abstract class AbstractSmooksActionGrouper implements ISmooksActionGrouper { + + public boolean belongsToGroup(Object descriptor) { + if (descriptor instanceof CommandParameter) { + CommandParameter parameter = (CommandParameter) descriptor; + if (parameter.getValue() != null) { + return canAdd(AdapterFactoryEditingDomain.unwrap(parameter.getValue())); + } + } + return false; + } + + abstract protected boolean canAdd(Object value); + + public void orderActions(MenuManager menuManager) { + + } + + public boolean isSeparator() { + return false; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/AbstractSmooksActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Calc11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Calc11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Calc11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,19 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.calc.Counter; + +public class Calc11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof Counter) { + return true; + } + return false; + } + + public String getGroupName() { + return "Calc"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Calc11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Database11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Database11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Database11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,19 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.dbrouting.ResultSetRowSelector; + +public class Database11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof ResultSetRowSelector) { + return true; + } + return false; + } + + public String getGroupName() { + return "Database"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Database11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Datasources11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Datasources11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Datasources11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,23 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.datasource.DataSourceJndi; +import org.jboss.tools.smooks.model.datasource.Direct; + +public class Datasources11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof DataSourceJndi) { + return true; + } + if (value instanceof Direct) { + return true; + } + return false; + } + + public String getGroupName() { + return "Datasources"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Datasources11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,31 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.dbrouting.Executor; +import org.jboss.tools.smooks.model.esbrouting.RouteBean; +import org.jboss.tools.smooks.model.fileRouting.OutputStream; +import org.jboss.tools.smooks.model.jmsrouting.JmsRouter; + +public class FragmentRouting11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof JmsRouter) { + return true; + } + if (value instanceof OutputStream) { + return true; + } + if (value instanceof Executor) { + return true; + } + if (value instanceof RouteBean) { + return true; + } + return false; + } + + public String getGroupName() { + return "Fragment Routing v1.1"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting12ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting12ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting12ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,19 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.jmsrouting12.Router; + +public class FragmentRouting12ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof Router) { + return true; + } + return false; + } + + public String getGroupName() { + return "Fragment Routing v1.2"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/FragmentRouting12ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/ISmooksActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/ISmooksActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/ISmooksActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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.actions; + +import org.eclipse.jface.action.MenuManager; + +/** + * @author Dart + * + */ +public interface ISmooksActionGrouper { + + public boolean isSeparator(); + + public String getGroupName(); + + public void orderActions(MenuManager calcMenu); + + public boolean belongsToGroup(Object descriptor); +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/ISmooksActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,19 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.javabean.BindingsType; + +public class JavaBean11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof BindingsType) { + return true; + } + return false; + } + + public String getGroupName() { + return "Java Binding v1.1"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean12ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean12ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean12ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,19 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.javabean12.BeanType; + +public class JavaBean12ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof BeanType) { + return true; + } + return false; + } + + public String getGroupName() { + return "Java Binding v1.2"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/JavaBean12ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/PersistenceActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/PersistenceActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/PersistenceActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,57 @@ +/******************************************************************************* + * 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.actions; + +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.jboss.tools.smooks.model.persistence12.Deleter; +import org.jboss.tools.smooks.model.persistence12.Flusher; +import org.jboss.tools.smooks.model.persistence12.Inserter; +import org.jboss.tools.smooks.model.persistence12.Locator; +import org.jboss.tools.smooks.model.persistence12.Updater; + +/** + * @author Dart + * + */ +public class PersistenceActionGrouper extends AbstractSmooksActionGrouper { + + public static final String NAME = "Persistence"; + + + + @Override + protected boolean canAdd(Object value) { + if (AdapterFactoryEditingDomain.unwrap(value) instanceof Inserter) { + return true; + } + if (AdapterFactoryEditingDomain.unwrap(value) instanceof Updater) { + return true; + } + if (AdapterFactoryEditingDomain.unwrap(value) instanceof Deleter) { + return true; + } + if (AdapterFactoryEditingDomain.unwrap(value) instanceof Locator) { + return true; + } + if (AdapterFactoryEditingDomain.unwrap(value) instanceof Flusher) { + return true; + } + return false; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper#getGroupName() + */ + public String getGroupName() { + return NAME; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/PersistenceActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,67 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.eclipse.emf.edit.command.CommandParameter; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.jface.action.ActionContributionItem; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IContributionItem; +import org.eclipse.jface.action.MenuManager; +import org.jboss.tools.smooks.configuration.actions.AddSmooksResourceAction; +import org.jboss.tools.smooks.model.csv.CsvReader; +import org.jboss.tools.smooks.model.edi.EDIReader; +import org.jboss.tools.smooks.model.json.JsonReader; +import org.jboss.tools.smooks.model.smooks.ReaderType; + +public class Reader11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof CsvReader) { + return true; + } + if (value instanceof EDIReader) { + return true; + } + if (value instanceof JsonReader) { + return true; + } + if (value instanceof ReaderType) { + return true; + } + return false; + } + + public String getGroupName() { + return "Reader v1.1"; + } + + @Override + public void orderActions(MenuManager menuManager) { + IContributionItem[] items = menuManager.getItems(); + for (int i = 0; i < items.length; i++) { + IContributionItem item = items[i]; + if (item instanceof ActionContributionItem) { + IAction action = ((ActionContributionItem) item).getAction(); + if (action instanceof AddSmooksResourceAction) { + AddSmooksResourceAction action1 = (AddSmooksResourceAction) action; + Object descriptor = action1.getDescriptor(); + if (descriptor instanceof CommandParameter) { + CommandParameter parameter = (CommandParameter) descriptor; + if (parameter.getValue() != null) { + Object value = AdapterFactoryEditingDomain.unwrap(parameter.getValue()); + if (value instanceof ReaderType) { + int index = items.length - 1; + menuManager.remove(item); + menuManager.insert(index, item); + return; + } + } + } + } + } + } + } + + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader12ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader12ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader12ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,57 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.eclipse.jface.action.MenuManager; +import org.jboss.tools.smooks.model.csv12.CSV12Reader; +import org.jboss.tools.smooks.model.edi12.EDI12Reader; +import org.jboss.tools.smooks.model.json12.Json12Reader; + +public class Reader12ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof CSV12Reader) { + return true; + } + if (value instanceof EDI12Reader) { + return true; + } + if (value instanceof Json12Reader) { + return true; + } + return false; + } + + public String getGroupName() { + return "Reader v1.2"; + } + + @Override + public void orderActions(MenuManager menuManager) { +// IContributionItem[] items = menuManager.getItems(); +// for (int i = 0; i < items.length; i++) { +// IContributionItem item = items[i]; +// if (item instanceof ActionContributionItem) { +// IAction action = ((ActionContributionItem) item).getAction(); +// if (action instanceof AddSmooksResourceAction) { +// AddSmooksResourceAction action1 = (AddSmooksResourceAction) action; +// Object descriptor = action1.getDescriptor(); +// if (descriptor instanceof CommandParameter) { +// CommandParameter parameter = (CommandParameter) descriptor; +// if (parameter.getValue() != null) { +// Object value = AdapterFactoryEditingDomain.unwrap(parameter.getValue()); +// if (value instanceof ReaderType) { +// int index = items.length - 1; +// menuManager.remove(item); +// menuManager.insert(index, item); +// return; +// } +// } +// } +// } +// } +// } + } + + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Reader12ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Scripting11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Scripting11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Scripting11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,19 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.groovy.Groovy; + +public class Scripting11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof Groovy) { + return true; + } + return false; + } + + public String getGroupName() { + return "Scripting"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Scripting11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/SeparatorActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/SeparatorActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/SeparatorActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,57 @@ +/******************************************************************************* + * 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.actions; + +/** + * @author Dart + * + */ +public class SeparatorActionGrouper extends AbstractSmooksActionGrouper { + + private String groupName = null; + + public SeparatorActionGrouper(){ + super(); + } + + public SeparatorActionGrouper(String groupName){ + super(); + setGroupName(groupName); + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.configuration.editors.actions.AbstractSmooksActionGrouper#canAdd(java.lang.Object) + */ + @Override + protected boolean canAdd(Object value) { + return false; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper#getGroupName() + */ + public String getGroupName() { + // TODO Auto-generated method stub + return groupName; + } + + @Override + public boolean isSeparator() { + return true; + } + + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/SeparatorActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Templating11ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Templating11ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Templating11ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,23 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.freemarker.Freemarker; +import org.jboss.tools.smooks.model.xsl.Xsl; + +public class Templating11ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof Freemarker) { + return true; + } + if (value instanceof Xsl) { + return true; + } + return false; + } + + public String getGroupName() { + return "Templating"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Templating11ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Validation10ActionGrouper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Validation10ActionGrouper.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Validation10ActionGrouper.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -0,0 +1,23 @@ +package org.jboss.tools.smooks.configuration.editors.actions; + +import org.jboss.tools.smooks.model.rules10.RuleBasesType; +import org.jboss.tools.smooks.model.validation10.RuleType; + +public class Validation10ActionGrouper extends AbstractSmooksActionGrouper { + + @Override + protected boolean canAdd(Object value) { + if (value instanceof RuleType) { + return true; + } + if (value instanceof RuleBasesType) { + return true; + } + return false; + } + + public String getGroupName() { + return "Validation"; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/actions/Validation10ActionGrouper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-07-24 22:01:31 UTC (rev 16789) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-07-27 05:45:04 UTC (rev 16790) @@ -59,9 +59,11 @@ import org.jboss.tools.smooks.model.calc.provider.CalcItemProviderAdapterFactory; import org.jboss.tools.smooks.model.common.provider.CommonItemProviderAdapterFactory; import org.jboss.tools.smooks.model.csv.provider.CsvItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.csv12.provider.Csv12ItemProviderAdapterFactory; 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.edi12.provider.Edi12ItemProviderAdapterFactory; 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; @@ -69,10 +71,16 @@ import org.jboss.tools.smooks.model.groovy.provider.GroovyItemProviderAdapterFactory; import org.jboss.tools.smooks.model.iorouting.provider.IoroutingItemProviderAdapterFactory; import org.jboss.tools.smooks.model.javabean.provider.JavabeanItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.javabean12.provider.Javabean12ItemProviderAdapterFactory; import org.jboss.tools.smooks.model.jmsrouting.provider.JmsroutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.jmsrouting12.provider.Jmsrouting12ItemProviderAdapterFactory; import org.jboss.tools.smooks.model.json.provider.JsonItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.json12.provider.Json12ItemProviderAdapterFactory; import org.jboss.tools.smooks.model.medi.provider.MEdiItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.persistence12.provider.Persistence12ItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.rules10.provider.Rules10ItemProviderAdapterFactory; import org.jboss.tools.smooks.model.smooks.provider.SmooksItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.validation10.provider.Validation10ItemProviderAdapterFactory; import org.jboss.tools.smooks.model.xsl.provider.XslItemProviderAdapterFactory; import org.jboss.tools.smooks10.model.smooks.util.SmooksResourceFactoryImpl; @@ -191,9 +199,10 @@ } } - private void initEditingDomain() { + protected void initEditingDomain() { adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - + + // add smooks 1.1.2 EMF item provider model adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new XslItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new FreemarkerItemProviderAdapterFactory()); @@ -213,6 +222,17 @@ adapterFactory.addAdapterFactory(new FileRoutingItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); adapterFactory.addAdapterFactory(new EsbroutingItemProviderAdapterFactory()); + + // add smooks 1.2 EMF itemprovider + adapterFactory.addAdapterFactory(new Json12ItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Edi12ItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Javabean12ItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Csv12ItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Rules10ItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Validation10ItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Jmsrouting12ItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new Persistence12ItemProviderAdapterFactory()); + BasicCommandStack commandStack = new BasicCommandStack(); handleCommandStack(commandStack); editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());