Author: DartPeng Date: 2010-08-04 07:05:44 -0400 (Wed, 04 Aug 2010) New Revision: 23913 Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/.classpath branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParam.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Param.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml Log: JBIDE-6776 regenerate EMF model Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/.classpath =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/.classpath 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/.classpath 2010-08-04 11:05:44 UTC (rev 23913) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore 2010-08-04 11:05:44 UTC (rev 23913) @@ -1,29 +1,30 @@ -<?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="core" - nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core"> - <eClassifiers xsi:type="ecore:EClass" name="Param"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Params"> - <eOperations name="getParam" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> - <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eOperations name="setParam" lowerBound="1" eType="#//Params"> - <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eOperations> - <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1" - eType="#//Param"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params"> - <eOperations name="setFilterType" eType="#//GlobalParams"> - <eParameters name="filterType" eType="#//StreamFilterType"/> - </eOperations> - <eOperations name="getFilterType" eType="#//StreamFilterType"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/> - <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/> -</ecore:EPackage> +<?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="core" + nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core"> + <eClassifiers xsi:type="ecore:EClass" name="Param"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Params"> + <eOperations name="getParam" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eOperations name="setParam" lowerBound="1" eType="#//Params"> + <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1" + eType="#//Param"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params"> + <eOperations name="setFilterType" eType="#//GlobalParams"> + <eParameters name="filterType" eType="#//StreamFilterType"/> + </eOperations> + <eOperations name="getFilterType" eType="#//StreamFilterType"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/> + <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/> +</ecore:EPackage> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore 2010-08-04 11:05:44 UTC (rev 23913) @@ -1,60 +1,60 @@ -<?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="javabean" - nsURI="http://www.milyn.org/smooks-ui/javabean/1.0.0" nsPrefix="javabean"> - <eClassifiers xsi:type="ecore:EClass" name="DecodeParam"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Wiring"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="setterMethod" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanIdRef" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="wireOnElement" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="wireOnElementNS" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Expression"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="setterMethod" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="execOnElement" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="execOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="initVal" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Value"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="setterMethod" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataNS" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="decoder" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultVal" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="decodeParams" upperBound="-1" - eType="#//DecodeParam"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Bean" eSuperTypes="smooks-core.ecore#//Component"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="valueBindings" upperBound="-1" - eType="#//Value"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="wireBindings" upperBound="-1" - eType="#//Wiring"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="expressionBindings" upperBound="-1" - eType="#//Expression"/> - </eClassifiers> -</ecore:EPackage> +<?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="javabean" + nsURI="http://www.milyn.org/smooks-ui/javabean/1.0.0" nsPrefix="javabean"> + <eClassifiers xsi:type="ecore:EClass" name="DecodeParam"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Wiring"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="setterMethod" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanIdRef" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="wireOnElement" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="wireOnElementNS" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Expression"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="setterMethod" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="execOnElement" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="execOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="initVal" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Value"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="setterMethod" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataNS" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="decoder" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultVal" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="decodeParams" upperBound="-1" + eType="#//DecodeParam"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Bean" eSuperTypes="smooks-core.ecore#//Component"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="beanClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="valueBindings" upperBound="-1" + eType="#//Value"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="wireBindings" upperBound="-1" + eType="#//Wiring"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="expressionBindings" upperBound="-1" + eType="#//Expression"/> + </eClassifiers> +</ecore:EPackage> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel 2010-08-04 11:05:44 UTC (rev 23913) @@ -1,76 +1,77 @@ -<?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="/org.jboss.tools.smooks.model/src-ecore" - creationSubmenus="true" modelPluginID="org.jboss.tools.smooks.model" templateDirectory="/org.jboss.tools.smooks.model/templates" - dynamicTemplates="true" redirection="" modelName="Smooks" modelPluginClass="" - rootImplementsInterface="" featureMapWrapperInternalInterface="" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="5.0" copyrightFields="false" publicConstructors="true" interfaceNamePattern="I{0}" - classNamePattern="{0}"> - <foreignModel>smooks-core.ecore</foreignModel> - <foreignModel>smooks-javabean.ecore</foreignModel> - <genPackages prefix="Core" basePackage="org.jboss.tools.smooks.model" disposableProviderFactory="true" - adapterFactory="false" classPackageSuffix="" ecorePackage="smooks-core.ecore#/"> - <genDataTypes ecoreDataType="smooks-core.ecore#//StreamFilterType"/> - <genClasses ecoreClass="smooks-core.ecore#//Param"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-core.ecore#//Param/name"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-core.ecore#//Param/value"/> - </genClasses> - <genClasses ecoreClass="smooks-core.ecore#//Params"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-core.ecore#//Params/params"/> - <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam"> - <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam/name"/> - </genOperations> - <genOperations ecoreOperation="smooks-core.ecore#//Params/setParam"> - <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/name"/> - <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/value"/> - </genOperations> - </genClasses> - <genClasses ecoreClass="smooks-core.ecore#//GlobalParams"> - <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/setFilterType"> - <genParameters ecoreParameter="smooks-core.ecore#//GlobalParams/setFilterType/filterType"/> - </genOperations> - <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/getFilterType"/> - </genClasses> - <genClasses image="false" ecoreClass="smooks-core.ecore#//Component"/> - </genPackages> - <genPackages prefix="JavaBean" basePackage="org.jboss.tools.smooks.model" disposableProviderFactory="true" - adapterFactory="false" classPackageSuffix="" contentTypeIdentifier="" ecorePackage="smooks-javabean.ecore#/"> - <genClasses ecoreClass="smooks-javabean.ecore#//DecodeParam"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//DecodeParam/name"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//DecodeParam/value"/> - </genClasses> - <genClasses ecoreClass="smooks-javabean.ecore#//Wiring"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/property"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/setterMethod"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/beanIdRef"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/wireOnElement"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/wireOnElementNS"/> - </genClasses> - <genClasses ecoreClass="smooks-javabean.ecore#//Expression"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/property"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/setterMethod"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/execOnElement"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/execOnElementNS"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/initVal"/> - </genClasses> - <genClasses ecoreClass="smooks-javabean.ecore#//Value"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/property"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/setterMethod"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/data"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/dataNS"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/decoder"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/defaultVal"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Value/decodeParams"/> - </genClasses> - <genClasses ecoreClass="smooks-javabean.ecore#//Bean"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/beanId"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/beanClass"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/createOnElement"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/createOnElementNS"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Bean/valueBindings"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Bean/wireBindings"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Bean/expressionBindings"/> - </genClasses> - </genPackages> -</genmodel:GenModel> +<?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="/org.jboss.tools.smooks.ecore.model/src" + creationSubmenus="true" modelPluginID="org.jboss.tools.smooks.model" templateDirectory="/org.jboss.tools.smooks.model/templates" + dynamicTemplates="true" redirection="" modelName="Smooks" modelPluginClass="" + rootImplementsInterface="" featureMapWrapperInternalInterface="" importerID="org.eclipse.emf.importer.ecore" + complianceLevel="5.0" copyrightFields="false" publicConstructors="true" interfaceNamePattern="I{0}" + classNamePattern="{0}"> + <foreignModel>smooks-core.ecore</foreignModel> + <foreignModel>smooks-javabean.ecore</foreignModel> + <genPackages prefix="Core" basePackage="org.jboss.tools.smooks.model" disposableProviderFactory="true" + adapterFactory="false" classPackageSuffix="" ecorePackage="smooks-core.ecore#/"> + <genDataTypes ecoreDataType="smooks-core.ecore#//StreamFilterType"/> + <genClasses ecoreClass="smooks-core.ecore#//Param"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-core.ecore#//Param/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-core.ecore#//Param/value"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-core.ecore#//Param/type"/> + </genClasses> + <genClasses ecoreClass="smooks-core.ecore#//Params"> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-core.ecore#//Params/params"/> + <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam"> + <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam/name"/> + </genOperations> + <genOperations ecoreOperation="smooks-core.ecore#//Params/setParam"> + <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/name"/> + <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/value"/> + </genOperations> + </genClasses> + <genClasses ecoreClass="smooks-core.ecore#//GlobalParams"> + <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/setFilterType"> + <genParameters ecoreParameter="smooks-core.ecore#//GlobalParams/setFilterType/filterType"/> + </genOperations> + <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/getFilterType"/> + </genClasses> + <genClasses image="false" ecoreClass="smooks-core.ecore#//Component"/> + </genPackages> + <genPackages prefix="JavaBean" basePackage="org.jboss.tools.smooks.model" disposableProviderFactory="true" + adapterFactory="false" classPackageSuffix="" contentTypeIdentifier="" ecorePackage="smooks-javabean.ecore#/"> + <genClasses ecoreClass="smooks-javabean.ecore#//DecodeParam"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//DecodeParam/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//DecodeParam/value"/> + </genClasses> + <genClasses ecoreClass="smooks-javabean.ecore#//Wiring"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/property"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/setterMethod"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/beanIdRef"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/wireOnElement"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Wiring/wireOnElementNS"/> + </genClasses> + <genClasses ecoreClass="smooks-javabean.ecore#//Expression"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/property"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/setterMethod"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/execOnElement"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/execOnElementNS"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Expression/initVal"/> + </genClasses> + <genClasses ecoreClass="smooks-javabean.ecore#//Value"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/property"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/setterMethod"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/data"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/dataNS"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/decoder"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Value/defaultVal"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Value/decodeParams"/> + </genClasses> + <genClasses ecoreClass="smooks-javabean.ecore#//Bean"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/beanId"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/beanClass"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/createOnElement"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute smooks-javabean.ecore#//Bean/createOnElementNS"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Bean/valueBindings"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Bean/wireBindings"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-javabean.ecore#//Bean/expressionBindings"/> + </genClasses> + </genPackages> +</genmodel:GenModel> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java 2010-08-04 11:05:44 UTC (rev 23913) @@ -160,6 +160,15 @@ * <!-- end-user-doc --> * @generated */ + public EAttribute getParam_Type() { + return (EAttribute)paramEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getParams() { return paramsEClass; } @@ -231,6 +240,7 @@ paramEClass = createEClass(PARAM); createEAttribute(paramEClass, PARAM__NAME); createEAttribute(paramEClass, PARAM__VALUE); + createEAttribute(paramEClass, PARAM__TYPE); paramsEClass = createEClass(PARAMS); createEReference(paramsEClass, PARAMS__PARAMS); @@ -277,6 +287,7 @@ initEClass(paramEClass, IParam.class, "Param", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getParam_Name(), ecorePackage.getEString(), "name", null, 0, 1, IParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getParam_Value(), ecorePackage.getEString(), "value", null, 0, 1, IParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getParam_Type(), ecorePackage.getEString(), "type", null, 0, 1, IParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(paramsEClass, IParams.class, "Params", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getParams_Params(), this.getParam(), null, "params", null, 0, -1, IParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java 2010-08-04 11:05:44 UTC (rev 23913) @@ -89,13 +89,22 @@ int PARAM__VALUE = 1; /** + * The feature id for the '<em><b>Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PARAM__TYPE = 2; + + /** * The number of structural features of the '<em>Param</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PARAM_FEATURE_COUNT = 2; + int PARAM_FEATURE_COUNT = 3; /** * The meta object id for the '{@link org.jboss.tools.smooks.model.core.Params <em>Params</em>}' class. @@ -216,6 +225,17 @@ EAttribute getParam_Value(); /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.core.IParam#getType <em>Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Type</em>'. + * @see org.jboss.tools.smooks.model.core.IParam#getType() + * @see #getParam() + * @generated + */ + EAttribute getParam_Type(); + + /** * Returns the meta object for class '{@link org.jboss.tools.smooks.model.core.IParams <em>Params</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -316,6 +336,14 @@ EAttribute PARAM__VALUE = eINSTANCE.getParam_Value(); /** + * The meta object literal for the '<em><b>Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute PARAM__TYPE = eINSTANCE.getParam_Type(); + + /** * The meta object literal for the '{@link org.jboss.tools.smooks.model.core.Params <em>Params</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParam.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParam.java 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParam.java 2010-08-04 11:05:44 UTC (rev 23913) @@ -18,6 +18,7 @@ * <ul> * <li>{@link org.jboss.tools.smooks.model.core.IParam#getName <em>Name</em>}</li> * <li>{@link org.jboss.tools.smooks.model.core.IParam#getValue <em>Value</em>}</li> + * <li>{@link org.jboss.tools.smooks.model.core.IParam#getType <em>Type</em>}</li> * </ul> * </p> * @@ -78,4 +79,30 @@ */ void setValue(String value); + /** + * Returns the value of the '<em><b>Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Type</em>' attribute. + * @see #setType(String) + * @see org.jboss.tools.smooks.model.core.ICorePackage#getParam_Type() + * @model + * @generated + */ + String getType(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.model.core.IParam#getType <em>Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Type</em>' attribute. + * @see #getType() + * @generated + */ + void setType(String value); + } // IParam Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Param.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Param.java 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Param.java 2010-08-04 11:05:44 UTC (rev 23913) @@ -22,6 +22,7 @@ * <ul> * <li>{@link org.jboss.tools.smooks.model.core.Param#getName <em>Name</em>}</li> * <li>{@link org.jboss.tools.smooks.model.core.Param#getValue <em>Value</em>}</li> + * <li>{@link org.jboss.tools.smooks.model.core.Param#getType <em>Type</em>}</li> * </ul> * </p> * @@ -69,10 +70,30 @@ protected String value = VALUE_EDEFAULT; /** + * The default value of the '{@link #getType() <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see #getType() * @generated + * @ordered */ + protected static final String TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getType() <em>Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getType() + * @generated + * @ordered + */ + protected String type = TYPE_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public Param() { super(); } @@ -134,6 +155,27 @@ * <!-- end-user-doc --> * @generated */ + public String getType() { + return type; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setType(String newType) { + String oldType = type; + type = newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ICorePackage.PARAM__TYPE, oldType, type)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { @@ -141,6 +183,8 @@ return getName(); case ICorePackage.PARAM__VALUE: return getValue(); + case ICorePackage.PARAM__TYPE: + return getType(); } return super.eGet(featureID, resolve, coreType); } @@ -159,6 +203,9 @@ case ICorePackage.PARAM__VALUE: setValue((String)newValue); return; + case ICorePackage.PARAM__TYPE: + setType((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -177,6 +224,9 @@ case ICorePackage.PARAM__VALUE: setValue(VALUE_EDEFAULT); return; + case ICorePackage.PARAM__TYPE: + setType(TYPE_EDEFAULT); + return; } super.eUnset(featureID); } @@ -193,6 +243,8 @@ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case ICorePackage.PARAM__VALUE: return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + case ICorePackage.PARAM__TYPE: + return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); } return super.eIsSet(featureID); } @@ -211,6 +263,8 @@ result.append(name); result.append(", value: "); result.append(value); + result.append(", type: "); + result.append(type); result.append(')'); return result.toString(); } Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl 2010-08-04 11:05:44 UTC (rev 23913) @@ -6,7 +6,7 @@ <params> <#list bean.params.params as param> <@writePreText bean=param /> - <param name="${param.name}">${param.value}</param> + <param <@writeAttribs bean=param attribs="name,type"/>>${param.value}</param> </#list> </params> </#if> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml 2010-08-04 11:04:57 UTC (rev 23912) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml 2010-08-04 11:05:44 UTC (rev 23913) @@ -25,6 +25,7 @@ </jb:bean> <jb:bean beanId="param" class="org.jboss.tools.smooks.model.core.Param" createOnElement="/smooks-resource-list/params/param"> <jb:value property="name" data="/smooks-resource-list/params/param/@name" /> + <jb:value property="type" data="/smooks-resource-list/params/param/@type" /> <jb:value property="value" data="/smooks-resource-list/params/param" /> </jb:bean>