[jbosstools-commits] JBoss Tools SVN: r12158 - in trunk/smooks/plugins: org.jboss.tools.smooks.core/model and 9 other directories.

Author: DartPeng Date: 2008-12-01 05:07:49 -0500 (Mon, 01 Dec 2008) New Revision: 12158 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks.ecore trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks1_0.xsd Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/ResourceType.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksPackage.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/ResourceTypeImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksFactoryImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksPackageImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/provider/ResourceTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksAdapterFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksSwitch.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java Log: JBIDE-3320 1.Modify the Smooks EMF model and generate new codes 2.Add new GUI for editing XSL external file path/inner file contents Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks.ecore =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks.ecore (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks.ecore 2008-12-01 10:07:49 UTC (rev 12158) @@ -0,0 +1,348 @@ +<?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="smooks" + nsURI="http://www.milyn.org/xsd/smooks-1.0.xsd" nsPrefix="smooks"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractResourceConfig" abstract="true"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="abstract-resource-config"/> + <details key="kind" value="empty"/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ConditionType"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Resource Targetting Condition"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="condition_._type"/> + <details key="kind" value="simple"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value=":0"/> + <details key="kind" value="simple"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="evaluator" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" + defaultValueLiteral="org.milyn.javabean.expression.BeanMapExpressionEvaluator" + unsettable="true"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="evaluator"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value=""/> + <details key="kind" value="mixed"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1" + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="elementWildcard"/> + <details key="name" value=":mixed"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1" + eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry" + transient="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="xmlns:prefix"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1" + eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry" + transient="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="xsi:schemaLocation"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="abstractResourceConfig" + upperBound="-2" eType="#//AbstractResourceConfig" changeable="false" volatile="true" + transient="true" derived="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="abstract-resource-config"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="condition" upperBound="-2" + eType="#//ConditionType" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="condition"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="import" upperBound="-2" + eType="#//ImportType" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="import"/> + <details key="namespace" value="##targetNamespace"/> + <details key="affiliation" value="abstract-resource-config"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="param" upperBound="-2" + eType="#//ParamType" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="param"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="profile" upperBound="-2" + eType="#//ProfileType" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="profile"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="profiles" upperBound="-2" + eType="#//ProfilesType" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="profiles"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="resource" upperBound="-2" + eType="#//ResourceType" volatile="true" transient="true" derived="true" containment="true" + resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="resource"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="resourceConfig" upperBound="-2" + eType="#//ResourceConfigType" volatile="true" transient="true" derived="true" + containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="resource-config"/> + <details key="namespace" value="##targetNamespace"/> + <details key="affiliation" value="abstract-resource-config"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="smooksResourceList" upperBound="-2" + eType="#//SmooksResourceListType" volatile="true" transient="true" derived="true" + containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="smooks-resource-list"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ImportType" eSuperTypes="#//AbstractResourceConfig"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Smooks Resource Configuration Import"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="import_._type"/> + <details key="kind" value="empty"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="file" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="file"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ParamType" eSuperTypes="http://www.eclipse.org/emf/2003/XMLType#//AnyType"... + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Resource Parameter"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="param_._type"/> + <details key="kind" value="mixed"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="name"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="type"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ProfilesType"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="List of Profiles"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="profiles_._type"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EReference" name="profile" lowerBound="1" + upperBound="-1" eType="#//ProfileType" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="profile"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ProfileType"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Profile Configuration. Basically allows you to specify the name of a&#xA; base profile along with a list of its sub-profiles.&#xA; "/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="profile_._type"/> + <details key="kind" value="simple"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value=":0"/> + <details key="kind" value="simple"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseProfile" lowerBound="1" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="base-profile"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="subProfiles" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="sub-profiles"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ResourceConfigType" eSuperTypes="#//AbstractResourceConfig"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Smooks Resource Configuration"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="resource-config_._type"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EReference" name="resource" eType="#//ResourceType" + containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="resource"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//ConditionType" + containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="condition"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="param" upperBound="-1" + eType="#//ParamType" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="param"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="selector" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="selector"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="selectorNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="selector-namespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetProfile" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="target-profile"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ResourceType" eSuperTypes="http://www.eclipse.org/emf/2003/XMLType#//AnyType"... + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Resource Configuration Resource Type (xsl, class etc)"/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="resource_._type"/> + <details key="kind" value="mixed"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="type"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="SmooksResourceListType"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="List of Smooks Resource Configuration."/> + </eAnnotations> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="smooks-resource-list_._type"/> + <details key="kind" value="elementOnly"/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EReference" name="profiles" eType="#//ProfilesType" + containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="profiles"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractResourceConfigGroup" + unique="false" lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="group"/> + <details key="name" value="abstract-resource-config:group"/> + <details key="namespace" value="##targetNamespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="abstractResourceConfig" + lowerBound="1" upperBound="-1" eType="#//AbstractResourceConfig" changeable="false" + volatile="true" transient="true" derived="true" containment="true" resolveProxies="false"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="abstract-resource-config"/> + <details key="namespace" value="##targetNamespace"/> + <details key="group" value="abstract-resource-config:group"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultSelector" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="default-selector"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultSelectorNamespace" + eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//AnyURI"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="default-selector-namespace"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultTargetProfile" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="attribute"/> + <details key="name" value="default-target-profile"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> +</ecore:EPackage> Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks.ecore ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks1_0.xsd =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks1_0.xsd (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks1_0.xsd 2008-12-01 10:07:49 UTC (rev 12158) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:smooks="http://www.milyn.org/xsd/smooks-1.0.xsd" targetNamespace="http://www.milyn.org/xsd/smooks-1.0.xsd" elementFormDefault="qualified"> + + <xs:element name="smooks-resource-list"> + <xs:complexType> + <xs:annotation> + <xs:documentation xml:lang="en">List of Smooks Resource Configuration.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" ref="smooks:profiles"/> + <xs:element minOccurs="1" maxOccurs="unbounded" ref="smooks:abstract-resource-config"/> + </xs:sequence> + <xs:attribute name="default-target-profile" type="xs:string"/> + <xs:attribute name="default-selector" type="xs:string"/> + <xs:attribute name="default-selector-namespace" type="xs:anyURI"/> + </xs:complexType> + </xs:element> + + <xs:element name="profiles"> + <xs:complexType> + <xs:annotation> + <xs:documentation xml:lang="en">List of Profiles</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element minOccurs="1" maxOccurs="unbounded" ref="smooks:profile"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="profile"> + <xs:complexType> + <xs:annotation> + <xs:documentation xml:lang="en">Profile Configuration. Basically allows you to specify the name of a + base profile along with a list of its sub-profiles. + </xs:documentation> + </xs:annotation> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute name="base-profile" type="xs:string" use="required"/> + <xs:attribute name="sub-profiles" type="xs:string"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + + <xs:complexType name="abstract-resource-config" abstract="true"/> + <xs:element name="abstract-resource-config" type="smooks:abstract-resource-config" abstract="true"/> + + <xs:element name="import" substitutionGroup="smooks:abstract-resource-config"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="smooks:abstract-resource-config"> + <xs:annotation> + <xs:documentation xml:lang="en">Smooks Resource Configuration Import</xs:documentation> + </xs:annotation> + <xs:attribute name="file" use="required" type="xs:anyURI"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="resource-config" substitutionGroup="smooks:abstract-resource-config"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="smooks:abstract-resource-config"> + <xs:annotation> + <xs:documentation xml:lang="en">Smooks Resource Configuration</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="1" ref="smooks:resource"/> + <xs:element minOccurs="0" maxOccurs="1" ref="smooks:condition"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="smooks:param"/> + </xs:sequence> + <xs:attribute name="selector" type="xs:string"/> + <xs:attribute name="selector-namespace" type="xs:anyURI"/> + <xs:attribute name="target-profile" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="resource"> + <xs:complexType> + <xs:annotation> + <xs:documentation xml:lang="en">Resource Configuration Resource Type (xsl, class etc)</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:anyType"> + <xs:attribute name="type" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="condition"> + <xs:complexType> + <xs:annotation> + <xs:documentation xml:lang="en">Resource Targetting Condition</xs:documentation> + </xs:annotation> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute name="evaluator" type="xs:string" default="org.milyn.javabean.expression.BeanMapExpressionEvaluator"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + + <xs:element name="param"> + <xs:complexType> + <xs:annotation> + <xs:documentation xml:lang="en">Resource Parameter</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:anyType"> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="type" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> \ No newline at end of file Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/model/smooks1_0.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/ResourceType.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/ResourceType.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/ResourceType.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -8,6 +8,8 @@ import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.xml.type.AnyType; + /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Resource Type</b></em>'. @@ -20,44 +22,16 @@ * <p> * The following features are supported: * <ul> - * <li>{@link org.jboss.tools.smooks.model.ResourceType#getValue <em>Value</em>}</li> - * <li>{@link org.jboss.tools.smooks.model.ResourceType#getType <em>Type</em>}</li> + * <li>{@link smooks.ResourceType#getType <em>Type</em>}</li> * </ul> * </p> * - * @see org.jboss.tools.smooks.model.SmooksPackage#getResourceType() - * @model extendedMetaData="name='resource_._type' kind='simple'" + * @see smooks.SmooksPackage#getResourceType() + * @model extendedMetaData="name='resource_._type' kind='mixed'" * @generated */ -public interface ResourceType extends EObject { +public interface ResourceType extends EObject, AnyType { /** - * Returns the value of the '<em><b>Value</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Value</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Value</em>' attribute. - * @see #setValue(String) - * @see org.jboss.tools.smooks.model.SmooksPackage#getResourceType_Value() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" - * extendedMetaData="name=':0' kind='simple'" - * @generated - */ - String getValue(); - - /** - * Sets the value of the '{@link org.jboss.tools.smooks.model.ResourceType#getValue <em>Value</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Value</em>' attribute. - * @see #getValue() - * @generated - */ - void setValue(String value); - - /** * Returns the value of the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <p> @@ -67,7 +41,7 @@ * <!-- end-user-doc --> * @return the value of the '<em>Type</em>' attribute. * @see #setType(String) - * @see org.jboss.tools.smooks.model.SmooksPackage#getResourceType_Type() + * @see smooks.SmooksPackage#getResourceType_Type() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * extendedMetaData="kind='attribute' name='type'" * @generated @@ -75,7 +49,7 @@ String getType(); /** - * Sets the value of the '{@link org.jboss.tools.smooks.model.ResourceType#getType <em>Type</em>}' attribute. + * Sets the value of the '{@link smooks.ResourceType#getType <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Type</em>' attribute. @@ -83,5 +57,13 @@ * @generated */ void setType(String value); + + String getStringValue(); + + void setStringValue(String value); + + String getCDATAValue(); + + void setCDATAValue(String value); } // ResourceType Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksFactory.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksFactory.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -13,7 +13,7 @@ * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.SmooksPackage + * @see smooks.SmooksPackage * @generated */ public interface SmooksFactory extends EFactory { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksPackage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksPackage.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/SmooksPackage.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -24,7 +24,7 @@ * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.SmooksFactory + * @see smooks.SmooksFactory * @model kind="package" * @generated */ @@ -51,7 +51,7 @@ * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = null; + String eNS_PREFIX = "smooks"; /** * The singleton instance of the package. @@ -62,11 +62,11 @@ SmooksPackage eINSTANCE = org.jboss.tools.smooks.model.impl.SmooksPackageImpl.init(); /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.AbstractResourceConfigImpl <em>Abstract Resource Config</em>}' class. + * The meta object id for the '{@link smooks.impl.AbstractResourceConfigImpl <em>Abstract Resource Config</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.AbstractResourceConfigImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getAbstractResourceConfig() + * @see smooks.impl.AbstractResourceConfigImpl + * @see smooks.impl.SmooksPackageImpl#getAbstractResourceConfig() * @generated */ int ABSTRACT_RESOURCE_CONFIG = 0; @@ -81,11 +81,11 @@ int ABSTRACT_RESOURCE_CONFIG_FEATURE_COUNT = 0; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.ConditionTypeImpl <em>Condition Type</em>}' class. + * The meta object id for the '{@link smooks.impl.ConditionTypeImpl <em>Condition Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ConditionTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getConditionType() + * @see smooks.impl.ConditionTypeImpl + * @see smooks.impl.SmooksPackageImpl#getConditionType() * @generated */ int CONDITION_TYPE = 1; @@ -118,11 +118,11 @@ int CONDITION_TYPE_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.DocumentRootImpl <em>Document Root</em>}' class. + * The meta object id for the '{@link smooks.impl.DocumentRootImpl <em>Document Root</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.DocumentRootImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getDocumentRoot() + * @see smooks.impl.DocumentRootImpl + * @see smooks.impl.SmooksPackageImpl#getDocumentRoot() * @generated */ int DOCUMENT_ROOT = 2; @@ -245,11 +245,11 @@ int DOCUMENT_ROOT_FEATURE_COUNT = 12; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.ImportTypeImpl <em>Import Type</em>}' class. + * The meta object id for the '{@link smooks.impl.ImportTypeImpl <em>Import Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ImportTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getImportType() + * @see smooks.impl.ImportTypeImpl + * @see smooks.impl.SmooksPackageImpl#getImportType() * @generated */ int IMPORT_TYPE = 3; @@ -273,11 +273,11 @@ int IMPORT_TYPE_FEATURE_COUNT = ABSTRACT_RESOURCE_CONFIG_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.ParamTypeImpl <em>Param Type</em>}' class. + * The meta object id for the '{@link smooks.impl.ParamTypeImpl <em>Param Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ParamTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getParamType() + * @see smooks.impl.ParamTypeImpl + * @see smooks.impl.SmooksPackageImpl#getParamType() * @generated */ int PARAM_TYPE = 4; @@ -337,11 +337,11 @@ int PARAM_TYPE_FEATURE_COUNT = XMLTypePackage.ANY_TYPE_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.ProfilesTypeImpl <em>Profiles Type</em>}' class. + * The meta object id for the '{@link smooks.impl.ProfilesTypeImpl <em>Profiles Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ProfilesTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getProfilesType() + * @see smooks.impl.ProfilesTypeImpl + * @see smooks.impl.SmooksPackageImpl#getProfilesType() * @generated */ int PROFILES_TYPE = 5; @@ -365,11 +365,11 @@ int PROFILES_TYPE_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.ProfileTypeImpl <em>Profile Type</em>}' class. + * The meta object id for the '{@link smooks.impl.ProfileTypeImpl <em>Profile Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ProfileTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getProfileType() + * @see smooks.impl.ProfileTypeImpl + * @see smooks.impl.SmooksPackageImpl#getProfileType() * @generated */ int PROFILE_TYPE = 6; @@ -411,11 +411,11 @@ int PROFILE_TYPE_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.ResourceConfigTypeImpl <em>Resource Config Type</em>}' class. + * The meta object id for the '{@link smooks.impl.ResourceConfigTypeImpl <em>Resource Config Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ResourceConfigTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getResourceConfigType() + * @see smooks.impl.ResourceConfigTypeImpl + * @see smooks.impl.SmooksPackageImpl#getResourceConfigType() * @generated */ int RESOURCE_CONFIG_TYPE = 7; @@ -484,32 +484,50 @@ int RESOURCE_CONFIG_TYPE_FEATURE_COUNT = ABSTRACT_RESOURCE_CONFIG_FEATURE_COUNT + 6; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.ResourceTypeImpl <em>Resource Type</em>}' class. + * The meta object id for the '{@link smooks.impl.ResourceTypeImpl <em>Resource Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ResourceTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getResourceType() + * @see smooks.impl.ResourceTypeImpl + * @see smooks.impl.SmooksPackageImpl#getResourceType() * @generated */ int RESOURCE_TYPE = 8; /** - * The feature id for the '<em><b>Value</b></em>' attribute. + * The feature id for the '<em><b>Mixed</b></em>' attribute list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RESOURCE_TYPE__VALUE = 0; + int RESOURCE_TYPE__MIXED = XMLTypePackage.ANY_TYPE__MIXED; /** + * The feature id for the '<em><b>Any</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int RESOURCE_TYPE__ANY = XMLTypePackage.ANY_TYPE__ANY; + + /** + * The feature id for the '<em><b>Any Attribute</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int RESOURCE_TYPE__ANY_ATTRIBUTE = XMLTypePackage.ANY_TYPE__ANY_ATTRIBUTE; + + /** * The feature id for the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RESOURCE_TYPE__TYPE = 1; + int RESOURCE_TYPE__TYPE = XMLTypePackage.ANY_TYPE_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Resource Type</em>' class. @@ -518,14 +536,14 @@ * @generated * @ordered */ - int RESOURCE_TYPE_FEATURE_COUNT = 2; + int RESOURCE_TYPE_FEATURE_COUNT = XMLTypePackage.ANY_TYPE_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.jboss.tools.smooks.model.impl.SmooksResourceListTypeImpl <em>Resource List Type</em>}' class. + * The meta object id for the '{@link smooks.impl.SmooksResourceListTypeImpl <em>Resource List Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.SmooksResourceListTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getSmooksResourceListType() + * @see smooks.impl.SmooksResourceListTypeImpl + * @see smooks.impl.SmooksPackageImpl#getSmooksResourceListType() * @generated */ int SMOOKS_RESOURCE_LIST_TYPE = 9; @@ -595,485 +613,474 @@ /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.AbstractResourceConfig <em>Abstract Resource Config</em>}'. + * Returns the meta object for class '{@link smooks.AbstractResourceConfig <em>Abstract Resource Config</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Abstract Resource Config</em>'. - * @see org.jboss.tools.smooks.model.AbstractResourceConfig + * @see smooks.AbstractResourceConfig * @generated */ EClass getAbstractResourceConfig(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.ConditionType <em>Condition Type</em>}'. + * Returns the meta object for class '{@link smooks.ConditionType <em>Condition Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Condition Type</em>'. - * @see org.jboss.tools.smooks.model.ConditionType + * @see smooks.ConditionType * @generated */ EClass getConditionType(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ConditionType#getValue <em>Value</em>}'. + * Returns the meta object for the attribute '{@link smooks.ConditionType#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Value</em>'. - * @see org.jboss.tools.smooks.model.ConditionType#getValue() + * @see smooks.ConditionType#getStringValue() * @see #getConditionType() * @generated */ EAttribute getConditionType_Value(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ConditionType#getEvaluator <em>Evaluator</em>}'. + * Returns the meta object for the attribute '{@link smooks.ConditionType#getEvaluator <em>Evaluator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Evaluator</em>'. - * @see org.jboss.tools.smooks.model.ConditionType#getEvaluator() + * @see smooks.ConditionType#getEvaluator() * @see #getConditionType() * @generated */ EAttribute getConditionType_Evaluator(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.DocumentRoot <em>Document Root</em>}'. + * Returns the meta object for class '{@link smooks.DocumentRoot <em>Document Root</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Document Root</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot + * @see smooks.DocumentRoot * @generated */ EClass getDocumentRoot(); /** - * Returns the meta object for the attribute list '{@link org.jboss.tools.smooks.model.DocumentRoot#getMixed <em>Mixed</em>}'. + * Returns the meta object for the attribute list '{@link smooks.DocumentRoot#getMixed <em>Mixed</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Mixed</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getMixed() + * @see smooks.DocumentRoot#getMixed() * @see #getDocumentRoot() * @generated */ EAttribute getDocumentRoot_Mixed(); /** - * Returns the meta object for the map '{@link org.jboss.tools.smooks.model.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'. + * Returns the meta object for the map '{@link smooks.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the map '<em>XMLNS Prefix Map</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getXMLNSPrefixMap() + * @see smooks.DocumentRoot#getXMLNSPrefixMap() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_XMLNSPrefixMap(); /** - * Returns the meta object for the map '{@link org.jboss.tools.smooks.model.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'. + * Returns the meta object for the map '{@link smooks.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the map '<em>XSI Schema Location</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getXSISchemaLocation() + * @see smooks.DocumentRoot#getXSISchemaLocation() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_XSISchemaLocation(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getAbstractResourceConfig <em>Abstract Resource Config</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getAbstractResourceConfig <em>Abstract Resource Config</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Abstract Resource Config</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getAbstractResourceConfig() + * @see smooks.DocumentRoot#getAbstractResourceConfig() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_AbstractResourceConfig(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getCondition <em>Condition</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getCondition <em>Condition</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Condition</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getCondition() + * @see smooks.DocumentRoot#getCondition() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_Condition(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getImport <em>Import</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getImport <em>Import</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Import</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getImport() + * @see smooks.DocumentRoot#getImport() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_Import(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getParam <em>Param</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getParam <em>Param</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Param</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getParam() + * @see smooks.DocumentRoot#getParam() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_Param(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getProfile <em>Profile</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getProfile <em>Profile</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Profile</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getProfile() + * @see smooks.DocumentRoot#getProfile() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_Profile(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getProfiles <em>Profiles</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getProfiles <em>Profiles</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Profiles</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getProfiles() + * @see smooks.DocumentRoot#getProfiles() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_Profiles(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getResource <em>Resource</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getResource <em>Resource</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Resource</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getResource() + * @see smooks.DocumentRoot#getResource() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_Resource(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getResourceConfig <em>Resource Config</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getResourceConfig <em>Resource Config</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Resource Config</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getResourceConfig() + * @see smooks.DocumentRoot#getResourceConfig() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_ResourceConfig(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.DocumentRoot#getSmooksResourceList <em>Smooks Resource List</em>}'. + * Returns the meta object for the containment reference '{@link smooks.DocumentRoot#getSmooksResourceList <em>Smooks Resource List</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Smooks Resource List</em>'. - * @see org.jboss.tools.smooks.model.DocumentRoot#getSmooksResourceList() + * @see smooks.DocumentRoot#getSmooksResourceList() * @see #getDocumentRoot() * @generated */ EReference getDocumentRoot_SmooksResourceList(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.ImportType <em>Import Type</em>}'. + * Returns the meta object for class '{@link smooks.ImportType <em>Import Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Import Type</em>'. - * @see org.jboss.tools.smooks.model.ImportType + * @see smooks.ImportType * @generated */ EClass getImportType(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ImportType#getFile <em>File</em>}'. + * Returns the meta object for the attribute '{@link smooks.ImportType#getFile <em>File</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>File</em>'. - * @see org.jboss.tools.smooks.model.ImportType#getFile() + * @see smooks.ImportType#getFile() * @see #getImportType() * @generated */ EAttribute getImportType_File(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.ParamType <em>Param Type</em>}'. + * Returns the meta object for class '{@link smooks.ParamType <em>Param Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Param Type</em>'. - * @see org.jboss.tools.smooks.model.ParamType + * @see smooks.ParamType * @generated */ EClass getParamType(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ParamType#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link smooks.ParamType#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.jboss.tools.smooks.model.ParamType#getName() + * @see smooks.ParamType#getName() * @see #getParamType() * @generated */ EAttribute getParamType_Name(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ParamType#getType <em>Type</em>}'. + * Returns the meta object for the attribute '{@link smooks.ParamType#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.ParamType#getType() + * @see smooks.ParamType#getType() * @see #getParamType() * @generated */ EAttribute getParamType_Type(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.ProfilesType <em>Profiles Type</em>}'. + * Returns the meta object for class '{@link smooks.ProfilesType <em>Profiles Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Profiles Type</em>'. - * @see org.jboss.tools.smooks.model.ProfilesType + * @see smooks.ProfilesType * @generated */ EClass getProfilesType(); /** - * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.ProfilesType#getProfile <em>Profile</em>}'. + * Returns the meta object for the containment reference list '{@link smooks.ProfilesType#getProfile <em>Profile</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Profile</em>'. - * @see org.jboss.tools.smooks.model.ProfilesType#getProfile() + * @see smooks.ProfilesType#getProfile() * @see #getProfilesType() * @generated */ EReference getProfilesType_Profile(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.ProfileType <em>Profile Type</em>}'. + * Returns the meta object for class '{@link smooks.ProfileType <em>Profile Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Profile Type</em>'. - * @see org.jboss.tools.smooks.model.ProfileType + * @see smooks.ProfileType * @generated */ EClass getProfileType(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ProfileType#getValue <em>Value</em>}'. + * Returns the meta object for the attribute '{@link smooks.ProfileType#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Value</em>'. - * @see org.jboss.tools.smooks.model.ProfileType#getValue() + * @see smooks.ProfileType#getStringValue() * @see #getProfileType() * @generated */ EAttribute getProfileType_Value(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ProfileType#getBaseProfile <em>Base Profile</em>}'. + * Returns the meta object for the attribute '{@link smooks.ProfileType#getBaseProfile <em>Base Profile</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Base Profile</em>'. - * @see org.jboss.tools.smooks.model.ProfileType#getBaseProfile() + * @see smooks.ProfileType#getBaseProfile() * @see #getProfileType() * @generated */ EAttribute getProfileType_BaseProfile(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ProfileType#getSubProfiles <em>Sub Profiles</em>}'. + * Returns the meta object for the attribute '{@link smooks.ProfileType#getSubProfiles <em>Sub Profiles</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Sub Profiles</em>'. - * @see org.jboss.tools.smooks.model.ProfileType#getSubProfiles() + * @see smooks.ProfileType#getSubProfiles() * @see #getProfileType() * @generated */ EAttribute getProfileType_SubProfiles(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.ResourceConfigType <em>Resource Config Type</em>}'. + * Returns the meta object for class '{@link smooks.ResourceConfigType <em>Resource Config Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Resource Config Type</em>'. - * @see org.jboss.tools.smooks.model.ResourceConfigType + * @see smooks.ResourceConfigType * @generated */ EClass getResourceConfigType(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.ResourceConfigType#getResource <em>Resource</em>}'. + * Returns the meta object for the containment reference '{@link smooks.ResourceConfigType#getResource <em>Resource</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Resource</em>'. - * @see org.jboss.tools.smooks.model.ResourceConfigType#getResource() + * @see smooks.ResourceConfigType#getResource() * @see #getResourceConfigType() * @generated */ EReference getResourceConfigType_Resource(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.ResourceConfigType#getCondition <em>Condition</em>}'. + * Returns the meta object for the containment reference '{@link smooks.ResourceConfigType#getCondition <em>Condition</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Condition</em>'. - * @see org.jboss.tools.smooks.model.ResourceConfigType#getCondition() + * @see smooks.ResourceConfigType#getCondition() * @see #getResourceConfigType() * @generated */ EReference getResourceConfigType_Condition(); /** - * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.ResourceConfigType#getParam <em>Param</em>}'. + * Returns the meta object for the containment reference list '{@link smooks.ResourceConfigType#getParam <em>Param</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Param</em>'. - * @see org.jboss.tools.smooks.model.ResourceConfigType#getParam() + * @see smooks.ResourceConfigType#getParam() * @see #getResourceConfigType() * @generated */ EReference getResourceConfigType_Param(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ResourceConfigType#getSelector <em>Selector</em>}'. + * Returns the meta object for the attribute '{@link smooks.ResourceConfigType#getSelector <em>Selector</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Selector</em>'. - * @see org.jboss.tools.smooks.model.ResourceConfigType#getSelector() + * @see smooks.ResourceConfigType#getSelector() * @see #getResourceConfigType() * @generated */ EAttribute getResourceConfigType_Selector(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ResourceConfigType#getSelectorNamespace <em>Selector Namespace</em>}'. + * Returns the meta object for the attribute '{@link smooks.ResourceConfigType#getSelectorNamespace <em>Selector Namespace</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Selector Namespace</em>'. - * @see org.jboss.tools.smooks.model.ResourceConfigType#getSelectorNamespace() + * @see smooks.ResourceConfigType#getSelectorNamespace() * @see #getResourceConfigType() * @generated */ EAttribute getResourceConfigType_SelectorNamespace(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ResourceConfigType#getTargetProfile <em>Target Profile</em>}'. + * Returns the meta object for the attribute '{@link smooks.ResourceConfigType#getTargetProfile <em>Target Profile</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Target Profile</em>'. - * @see org.jboss.tools.smooks.model.ResourceConfigType#getTargetProfile() + * @see smooks.ResourceConfigType#getTargetProfile() * @see #getResourceConfigType() * @generated */ EAttribute getResourceConfigType_TargetProfile(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.ResourceType <em>Resource Type</em>}'. + * Returns the meta object for class '{@link smooks.ResourceType <em>Resource Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Resource Type</em>'. - * @see org.jboss.tools.smooks.model.ResourceType + * @see smooks.ResourceType * @generated */ EClass getResourceType(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ResourceType#getValue <em>Value</em>}'. + * Returns the meta object for the attribute '{@link smooks.ResourceType#getType <em>Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Value</em>'. - * @see org.jboss.tools.smooks.model.ResourceType#getValue() - * @see #getResourceType() - * @generated - */ - EAttribute getResourceType_Value(); - - /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.ResourceType#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.ResourceType#getType() + * @see smooks.ResourceType#getType() * @see #getResourceType() * @generated */ EAttribute getResourceType_Type(); /** - * Returns the meta object for class '{@link org.jboss.tools.smooks.model.SmooksResourceListType <em>Resource List Type</em>}'. + * Returns the meta object for class '{@link smooks.SmooksResourceListType <em>Resource List Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Resource List Type</em>'. - * @see org.jboss.tools.smooks.model.SmooksResourceListType + * @see smooks.SmooksResourceListType * @generated */ EClass getSmooksResourceListType(); /** - * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.model.SmooksResourceListType#getProfiles <em>Profiles</em>}'. + * Returns the meta object for the containment reference '{@link smooks.SmooksResourceListType#getProfiles <em>Profiles</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Profiles</em>'. - * @see org.jboss.tools.smooks.model.SmooksResourceListType#getProfiles() + * @see smooks.SmooksResourceListType#getProfiles() * @see #getSmooksResourceListType() * @generated */ EReference getSmooksResourceListType_Profiles(); /** - * Returns the meta object for the attribute list '{@link org.jboss.tools.smooks.model.SmooksResourceListType#getAbstractResourceConfigGroup <em>Abstract Resource Config Group</em>}'. + * Returns the meta object for the attribute list '{@link smooks.SmooksResourceListType#getAbstractResourceConfigGroup <em>Abstract Resource Config Group</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Abstract Resource Config Group</em>'. - * @see org.jboss.tools.smooks.model.SmooksResourceListType#getAbstractResourceConfigGroup() + * @see smooks.SmooksResourceListType#getAbstractResourceConfigGroup() * @see #getSmooksResourceListType() * @generated */ EAttribute getSmooksResourceListType_AbstractResourceConfigGroup(); /** - * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.SmooksResourceListType#getAbstractResourceConfig <em>Abstract Resource Config</em>}'. + * Returns the meta object for the containment reference list '{@link smooks.SmooksResourceListType#getAbstractResourceConfig <em>Abstract Resource Config</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Abstract Resource Config</em>'. - * @see org.jboss.tools.smooks.model.SmooksResourceListType#getAbstractResourceConfig() + * @see smooks.SmooksResourceListType#getAbstractResourceConfig() * @see #getSmooksResourceListType() * @generated */ EReference getSmooksResourceListType_AbstractResourceConfig(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.SmooksResourceListType#getDefaultSelector <em>Default Selector</em>}'. + * Returns the meta object for the attribute '{@link smooks.SmooksResourceListType#getDefaultSelector <em>Default Selector</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Default Selector</em>'. - * @see org.jboss.tools.smooks.model.SmooksResourceListType#getDefaultSelector() + * @see smooks.SmooksResourceListType#getDefaultSelector() * @see #getSmooksResourceListType() * @generated */ EAttribute getSmooksResourceListType_DefaultSelector(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.SmooksResourceListType#getDefaultSelectorNamespace <em>Default Selector Namespace</em>}'. + * Returns the meta object for the attribute '{@link smooks.SmooksResourceListType#getDefaultSelectorNamespace <em>Default Selector Namespace</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Default Selector Namespace</em>'. - * @see org.jboss.tools.smooks.model.SmooksResourceListType#getDefaultSelectorNamespace() + * @see smooks.SmooksResourceListType#getDefaultSelectorNamespace() * @see #getSmooksResourceListType() * @generated */ EAttribute getSmooksResourceListType_DefaultSelectorNamespace(); /** - * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.model.SmooksResourceListType#getDefaultTargetProfile <em>Default Target Profile</em>}'. + * Returns the meta object for the attribute '{@link smooks.SmooksResourceListType#getDefaultTargetProfile <em>Default Target Profile</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Default Target Profile</em>'. - * @see org.jboss.tools.smooks.model.SmooksResourceListType#getDefaultTargetProfile() + * @see smooks.SmooksResourceListType#getDefaultTargetProfile() * @see #getSmooksResourceListType() * @generated */ @@ -1102,21 +1109,21 @@ */ interface Literals { /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.AbstractResourceConfigImpl <em>Abstract Resource Config</em>}' class. + * The meta object literal for the '{@link smooks.impl.AbstractResourceConfigImpl <em>Abstract Resource Config</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.AbstractResourceConfigImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getAbstractResourceConfig() + * @see smooks.impl.AbstractResourceConfigImpl + * @see smooks.impl.SmooksPackageImpl#getAbstractResourceConfig() * @generated */ EClass ABSTRACT_RESOURCE_CONFIG = eINSTANCE.getAbstractResourceConfig(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.ConditionTypeImpl <em>Condition Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.ConditionTypeImpl <em>Condition Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ConditionTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getConditionType() + * @see smooks.impl.ConditionTypeImpl + * @see smooks.impl.SmooksPackageImpl#getConditionType() * @generated */ EClass CONDITION_TYPE = eINSTANCE.getConditionType(); @@ -1138,11 +1145,11 @@ EAttribute CONDITION_TYPE__EVALUATOR = eINSTANCE.getConditionType_Evaluator(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.DocumentRootImpl <em>Document Root</em>}' class. + * The meta object literal for the '{@link smooks.impl.DocumentRootImpl <em>Document Root</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.DocumentRootImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getDocumentRoot() + * @see smooks.impl.DocumentRootImpl + * @see smooks.impl.SmooksPackageImpl#getDocumentRoot() * @generated */ EClass DOCUMENT_ROOT = eINSTANCE.getDocumentRoot(); @@ -1244,11 +1251,11 @@ EReference DOCUMENT_ROOT__SMOOKS_RESOURCE_LIST = eINSTANCE.getDocumentRoot_SmooksResourceList(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.ImportTypeImpl <em>Import Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.ImportTypeImpl <em>Import Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ImportTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getImportType() + * @see smooks.impl.ImportTypeImpl + * @see smooks.impl.SmooksPackageImpl#getImportType() * @generated */ EClass IMPORT_TYPE = eINSTANCE.getImportType(); @@ -1262,11 +1269,11 @@ EAttribute IMPORT_TYPE__FILE = eINSTANCE.getImportType_File(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.ParamTypeImpl <em>Param Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.ParamTypeImpl <em>Param Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ParamTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getParamType() + * @see smooks.impl.ParamTypeImpl + * @see smooks.impl.SmooksPackageImpl#getParamType() * @generated */ EClass PARAM_TYPE = eINSTANCE.getParamType(); @@ -1288,11 +1295,11 @@ EAttribute PARAM_TYPE__TYPE = eINSTANCE.getParamType_Type(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.ProfilesTypeImpl <em>Profiles Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.ProfilesTypeImpl <em>Profiles Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ProfilesTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getProfilesType() + * @see smooks.impl.ProfilesTypeImpl + * @see smooks.impl.SmooksPackageImpl#getProfilesType() * @generated */ EClass PROFILES_TYPE = eINSTANCE.getProfilesType(); @@ -1306,11 +1313,11 @@ EReference PROFILES_TYPE__PROFILE = eINSTANCE.getProfilesType_Profile(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.ProfileTypeImpl <em>Profile Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.ProfileTypeImpl <em>Profile Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ProfileTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getProfileType() + * @see smooks.impl.ProfileTypeImpl + * @see smooks.impl.SmooksPackageImpl#getProfileType() * @generated */ EClass PROFILE_TYPE = eINSTANCE.getProfileType(); @@ -1340,11 +1347,11 @@ EAttribute PROFILE_TYPE__SUB_PROFILES = eINSTANCE.getProfileType_SubProfiles(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.ResourceConfigTypeImpl <em>Resource Config Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.ResourceConfigTypeImpl <em>Resource Config Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ResourceConfigTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getResourceConfigType() + * @see smooks.impl.ResourceConfigTypeImpl + * @see smooks.impl.SmooksPackageImpl#getResourceConfigType() * @generated */ EClass RESOURCE_CONFIG_TYPE = eINSTANCE.getResourceConfigType(); @@ -1398,24 +1405,16 @@ EAttribute RESOURCE_CONFIG_TYPE__TARGET_PROFILE = eINSTANCE.getResourceConfigType_TargetProfile(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.ResourceTypeImpl <em>Resource Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.ResourceTypeImpl <em>Resource Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.ResourceTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getResourceType() + * @see smooks.impl.ResourceTypeImpl + * @see smooks.impl.SmooksPackageImpl#getResourceType() * @generated */ EClass RESOURCE_TYPE = eINSTANCE.getResourceType(); /** - * The meta object literal for the '<em><b>Value</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute RESOURCE_TYPE__VALUE = eINSTANCE.getResourceType_Value(); - - /** * The meta object literal for the '<em><b>Type</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1424,11 +1423,11 @@ EAttribute RESOURCE_TYPE__TYPE = eINSTANCE.getResourceType_Type(); /** - * The meta object literal for the '{@link org.jboss.tools.smooks.model.impl.SmooksResourceListTypeImpl <em>Resource List Type</em>}' class. + * The meta object literal for the '{@link smooks.impl.SmooksResourceListTypeImpl <em>Resource List Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.impl.SmooksResourceListTypeImpl - * @see org.jboss.tools.smooks.model.impl.SmooksPackageImpl#getSmooksResourceListType() + * @see smooks.impl.SmooksResourceListTypeImpl + * @see smooks.impl.SmooksPackageImpl#getSmooksResourceListType() * @generated */ EClass SMOOKS_RESOURCE_LIST_TYPE = eINSTANCE.getSmooksResourceListType(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/ResourceTypeImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/ResourceTypeImpl.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/ResourceTypeImpl.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -11,10 +11,12 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; +import org.eclipse.emf.ecore.xml.type.impl.AnyTypeImpl; + import org.jboss.tools.smooks.model.ResourceType; import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; /** * <!-- begin-user-doc --> @@ -23,35 +25,14 @@ * <p> * The following features are implemented: * <ul> - * <li>{@link org.jboss.tools.smooks.model.impl.ResourceTypeImpl#getValue <em>Value</em>}</li> - * <li>{@link org.jboss.tools.smooks.model.impl.ResourceTypeImpl#getType <em>Type</em>}</li> + * <li>{@link smooks.impl.ResourceTypeImpl#getType <em>Type</em>}</li> * </ul> * </p> * * @generated */ -public class ResourceTypeImpl extends EObjectImpl implements ResourceType { +public class ResourceTypeImpl extends AnyTypeImpl implements ResourceType { /** - * The default value of the '{@link #getValue() <em>Value</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getValue() - * @generated - * @ordered - */ - protected static final String VALUE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getValue() - * @generated - * @ordered - */ - protected String value = VALUE_EDEFAULT; - - /** * The default value of the '{@link #getType() <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -70,6 +51,8 @@ * @ordered */ protected String type = TYPE_EDEFAULT; + + protected String value = null; /** * <!-- begin-user-doc --> @@ -95,27 +78,6 @@ * <!-- end-user-doc --> * @generated */ - public String getValue() { - return value; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setValue(String newValue) { - String oldValue = value; - value = newValue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SmooksPackage.RESOURCE_TYPE__VALUE, oldValue, value)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public String getType() { return type; } @@ -140,8 +102,6 @@ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case SmooksPackage.RESOURCE_TYPE__VALUE: - return getValue(); case SmooksPackage.RESOURCE_TYPE__TYPE: return getType(); } @@ -156,9 +116,6 @@ @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case SmooksPackage.RESOURCE_TYPE__VALUE: - setValue((String)newValue); - return; case SmooksPackage.RESOURCE_TYPE__TYPE: setType((String)newValue); return; @@ -174,9 +131,6 @@ @Override public void eUnset(int featureID) { switch (featureID) { - case SmooksPackage.RESOURCE_TYPE__VALUE: - setValue(VALUE_EDEFAULT); - return; case SmooksPackage.RESOURCE_TYPE__TYPE: setType(TYPE_EDEFAULT); return; @@ -192,8 +146,6 @@ @Override public boolean eIsSet(int featureID) { switch (featureID) { - case SmooksPackage.RESOURCE_TYPE__VALUE: - return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); case SmooksPackage.RESOURCE_TYPE__TYPE: return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); } @@ -210,12 +162,26 @@ if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (value: "); - result.append(value); - result.append(", type: "); + result.append(" (type: "); result.append(type); result.append(')'); return result.toString(); } + public String getStringValue() { + return SmooksModelUtils.getAnyTypeText(this); + } + + public void setStringValue(String value) { + SmooksModelUtils.setTextToAnyType(this, value); + } + + public String getCDATAValue() { + return SmooksModelUtils.getAnyTypeCDATA(this); + } + + public void setCDATAValue(String value) { + SmooksModelUtils.setCDATAToAnyType(this, value); + } + } //ResourceTypeImpl Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksFactoryImpl.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksFactoryImpl.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -9,13 +9,20 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; +import org.jboss.tools.smooks.model.ConditionType; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.ImportType; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ProfileType; +import org.jboss.tools.smooks.model.ProfilesType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.SmooksResourceListType; -import org.jboss.tools.smooks.model.*; - /** * <!-- begin-user-doc --> * An implementation of the model <b>Factory</b>. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksPackageImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksPackageImpl.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/impl/SmooksPackageImpl.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -10,11 +10,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; - import org.eclipse.emf.ecore.impl.EPackageImpl; - import org.eclipse.emf.ecore.xml.type.XMLTypePackage; - import org.jboss.tools.smooks.model.AbstractResourceConfig; import org.jboss.tools.smooks.model.ConditionType; import org.jboss.tools.smooks.model.DocumentRoot; @@ -116,7 +113,7 @@ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.jboss.tools.smooks.model.SmooksPackage#eNS_URI + * @see smooks.SmooksPackage#eNS_URI * @see #init() * @generated */ @@ -505,7 +502,7 @@ * <!-- end-user-doc --> * @generated */ - public EAttribute getResourceType_Value() { + public EAttribute getResourceType_Type() { return (EAttribute)resourceTypeEClass.getEStructuralFeatures().get(0); } @@ -514,15 +511,6 @@ * <!-- end-user-doc --> * @generated */ - public EAttribute getResourceType_Type() { - return (EAttribute)resourceTypeEClass.getEStructuralFeatures().get(1); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public EClass getSmooksResourceListType() { return smooksResourceListTypeEClass; } @@ -653,7 +641,6 @@ createEAttribute(resourceConfigTypeEClass, RESOURCE_CONFIG_TYPE__TARGET_PROFILE); resourceTypeEClass = createEClass(RESOURCE_TYPE); - createEAttribute(resourceTypeEClass, RESOURCE_TYPE__VALUE); createEAttribute(resourceTypeEClass, RESOURCE_TYPE__TYPE); smooksResourceListTypeEClass = createEClass(SMOOKS_RESOURCE_LIST_TYPE); @@ -699,13 +686,14 @@ importTypeEClass.getESuperTypes().add(this.getAbstractResourceConfig()); paramTypeEClass.getESuperTypes().add(theXMLTypePackage.getAnyType()); resourceConfigTypeEClass.getESuperTypes().add(this.getAbstractResourceConfig()); + resourceTypeEClass.getESuperTypes().add(theXMLTypePackage.getAnyType()); // Initialize classes and features; add operations and parameters initEClass(abstractResourceConfigEClass, AbstractResourceConfig.class, "AbstractResourceConfig", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(conditionTypeEClass, ConditionType.class, "ConditionType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getConditionType_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, ConditionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getConditionType_Evaluator(), theXMLTypePackage.getString(), "evaluator", null, 1, 1, ConditionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getConditionType_Evaluator(), theXMLTypePackage.getString(), "evaluator", "org.milyn.javabean.expression.BeanMapExpressionEvaluator", 0, 1, ConditionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -745,7 +733,6 @@ initEAttribute(getResourceConfigType_TargetProfile(), theXMLTypePackage.getString(), "targetProfile", null, 0, 1, ResourceConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(resourceTypeEClass, ResourceType.class, "ResourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getResourceType_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, ResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getResourceType_Type(), theXMLTypePackage.getString(), "type", null, 0, 1, ResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(smooksResourceListTypeEClass, SmooksResourceListType.class, "SmooksResourceListType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1037,16 +1024,9 @@ source, new String[] { "name", "resource_._type", - "kind", "simple" + "kind", "mixed" }); addAnnotation - (getResourceType_Value(), - source, - new String[] { - "name", ":0", - "kind", "simple" - }); - addAnnotation (getResourceType_Type(), source, new String[] { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/provider/ResourceTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/provider/ResourceTypeItemProvider.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/provider/ResourceTypeItemProvider.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -12,9 +12,11 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.util.FeatureMapUtil; +import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; +import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -25,12 +27,12 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; - import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ResourceType} object. + * This is the item provider adapter for a {@link smooks.ResourceType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -64,26 +66,25 @@ if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addValuePropertyDescriptor(object); addTypePropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * This adds a property descriptor for the Value feature. + * This adds a property descriptor for the Type feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void addValuePropertyDescriptor(Object object) { + protected void addTypePropertyDescriptor(Object object) { itemPropertyDescriptors.add (createItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_ResourceType_value_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ResourceType_value_feature", "_UI_ResourceType_type"), - SmooksPackage.Literals.RESOURCE_TYPE__VALUE, + getString("_UI_ResourceType_type_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_ResourceType_type_feature", "_UI_ResourceType_type"), + SmooksPackage.Literals.RESOURCE_TYPE__TYPE, true, false, false, @@ -93,28 +94,37 @@ } /** - * This adds a property descriptor for the Type feature. + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected void addTypePropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ResourceType_type_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ResourceType_type_feature", "_UI_ResourceType_type"), - SmooksPackage.Literals.RESOURCE_TYPE__TYPE, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { + if (childrenFeatures == null) { + super.getChildrenFeatures(object); + childrenFeatures.add(XMLTypePackage.Literals.ANY_TYPE__MIXED); + childrenFeatures.add(XMLTypePackage.Literals.ANY_TYPE__ANY_ATTRIBUTE); + } + return childrenFeatures; } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EStructuralFeature getChildFeature(Object object, Object child) { + // Check the type of the specified child object and return the proper feature to use for + // adding (see {@link AddCommand}) it as a child. + + return super.getChildFeature(object, child); + } + + /** * This returns ResourceType.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -133,7 +143,7 @@ */ @Override public String getText(Object object) { - String label = ((ResourceType)object).getValue(); + String label = ((ResourceType)object).getType(); return label == null || label.length() == 0 ? getString("_UI_ResourceType_type") : getString("_UI_ResourceType_type") + " " + label; @@ -151,10 +161,13 @@ updateChildren(notification); switch (notification.getFeatureID(ResourceType.class)) { - case SmooksPackage.RESOURCE_TYPE__VALUE: case SmooksPackage.RESOURCE_TYPE__TYPE: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; + case SmooksPackage.RESOURCE_TYPE__MIXED: + case SmooksPackage.RESOURCE_TYPE__ANY_ATTRIBUTE: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); + return; } super.notifyChanged(notification); } @@ -169,6 +182,90 @@ @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT, + ""))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, + ""))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__PROCESSING_INSTRUCTION, + XMLTypeFactory.eINSTANCE.createProcessingInstruction()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, + ""))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__CONDITION, + SmooksFactory.eINSTANCE.createConditionType()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__IMPORT, + SmooksFactory.eINSTANCE.createImportType()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__PARAM, + SmooksFactory.eINSTANCE.createParamType()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__PROFILE, + SmooksFactory.eINSTANCE.createProfileType()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__PROFILES, + SmooksFactory.eINSTANCE.createProfilesType()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__RESOURCE, + SmooksFactory.eINSTANCE.createResourceType()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__RESOURCE_CONFIG, + SmooksFactory.eINSTANCE.createResourceConfigType()))); + + newChildDescriptors.add + (createChildParameter + (XMLTypePackage.Literals.ANY_TYPE__MIXED, + FeatureMapUtil.createEntry + (SmooksPackage.Literals.DOCUMENT_ROOT__SMOOKS_RESOURCE_LIST, + SmooksFactory.eINSTANCE.createSmooksResourceListType()))); } /** @@ -179,7 +276,7 @@ */ @Override public ResourceLocator getResourceLocator() { - return Smooks_1_0EditPlugin.INSTANCE; + return Smooks_1_0EditPlugin.INSTANCE; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksAdapterFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksAdapterFactory.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksAdapterFactory.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -8,21 +8,27 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.xml.type.AnyType; +import org.jboss.tools.smooks.model.AbstractResourceConfig; +import org.jboss.tools.smooks.model.ConditionType; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.ImportType; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ProfileType; +import org.jboss.tools.smooks.model.ProfilesType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.SmooksResourceListType; -import org.jboss.tools.smooks.model.*; - /** * <!-- begin-user-doc --> * The <b>Adapter Factory</b> for the model. * It provides an adapter <code>createXXX</code> method for each class of the model. * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.SmooksPackage + * @see smooks.SmooksPackage * @generated */ public class SmooksAdapterFactory extends AdapterFactoryImpl { @@ -138,13 +144,13 @@ /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.AbstractResourceConfig <em>Abstract Resource Config</em>}'. + * Creates a new adapter for an object of class '{@link smooks.AbstractResourceConfig <em>Abstract Resource Config</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.AbstractResourceConfig + * @see smooks.AbstractResourceConfig * @generated */ public Adapter createAbstractResourceConfigAdapter() { @@ -152,13 +158,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.ConditionType <em>Condition Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.ConditionType <em>Condition Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.ConditionType + * @see smooks.ConditionType * @generated */ public Adapter createConditionTypeAdapter() { @@ -166,13 +172,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.DocumentRoot <em>Document Root</em>}'. + * Creates a new adapter for an object of class '{@link smooks.DocumentRoot <em>Document Root</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.DocumentRoot + * @see smooks.DocumentRoot * @generated */ public Adapter createDocumentRootAdapter() { @@ -180,13 +186,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.ImportType <em>Import Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.ImportType <em>Import Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.ImportType + * @see smooks.ImportType * @generated */ public Adapter createImportTypeAdapter() { @@ -194,13 +200,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.ParamType <em>Param Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.ParamType <em>Param Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.ParamType + * @see smooks.ParamType * @generated */ public Adapter createParamTypeAdapter() { @@ -208,13 +214,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.ProfilesType <em>Profiles Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.ProfilesType <em>Profiles Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.ProfilesType + * @see smooks.ProfilesType * @generated */ public Adapter createProfilesTypeAdapter() { @@ -222,13 +228,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.ProfileType <em>Profile Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.ProfileType <em>Profile Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.ProfileType + * @see smooks.ProfileType * @generated */ public Adapter createProfileTypeAdapter() { @@ -236,13 +242,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.ResourceConfigType <em>Resource Config Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.ResourceConfigType <em>Resource Config Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.ResourceConfigType + * @see smooks.ResourceConfigType * @generated */ public Adapter createResourceConfigTypeAdapter() { @@ -250,13 +256,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.ResourceType <em>Resource Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.ResourceType <em>Resource Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.ResourceType + * @see smooks.ResourceType * @generated */ public Adapter createResourceTypeAdapter() { @@ -264,13 +270,13 @@ } /** - * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.model.SmooksResourceListType <em>Resource List Type</em>}'. + * Creates a new adapter for an object of class '{@link smooks.SmooksResourceListType <em>Resource List Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.jboss.tools.smooks.model.SmooksResourceListType + * @see smooks.SmooksResourceListType * @generated */ public Adapter createSmooksResourceListTypeAdapter() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -30,6 +30,9 @@ */ public class SmooksModelUtils { + + public static final String TYPE_XSL = "xsl"; + public static final String BEAN_CLASS = "beanClass"; public static final String BEAN_ID = "beanId"; @@ -72,7 +75,42 @@ } return null; } + + public static boolean isBeanPopulatorResource(ResourceConfigType type) { + ResourceType resource = type.getResource(); + if (resource == null) + return false; + String value = resource.getStringValue(); + if(value != null) value = value.trim(); + if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { + return true; + } + return false; + } + + public static boolean isInnerFileContents(ResourceConfigType resourceConfig){ + ResourceType resource = resourceConfig.getResource(); + if(resource == null) return false; + String type = resource.getType(); + if(type != null) type = type.trim(); + return TYPE_XSL.equals(type); + } + public static boolean isDateTypeSelector(ResourceConfigType type) { + ResourceType resource = type.getResource(); + if (resource == null) + return false; + String value = resource.getStringValue(); + if(value != null) value = value.trim(); + for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { + String decoderClass = SmooksModelConstants.DECODER_CLASSES[i]; + if(decoderClass.equals(value)){ + return true; + } + } + return false; + } + public static String getTransformType(ResourceConfigType resourceConfig) { ParamType typeParam = null; if (resourceConfig == null) @@ -82,7 +120,8 @@ for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType param = (ParamType) iterator.next(); String name = param.getName(); - if(name != null) name = name.trim(); + if (name != null) + name = name.trim(); if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(name)) { typeParam = param; break; @@ -106,7 +145,7 @@ if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param .getName())) { cleanTextToSmooksType(param); - setTextToSmooksType(param, type); + setTextToAnyType(param, type); } } } @@ -116,7 +155,7 @@ ResourceConfigType resourceConfig) { ResourceType resource = resourceConfig.getResource(); if (resource != null) { - String value = resource.getValue(); + String value = resource.getStringValue(); if (value != null) { if (value.startsWith("\\")) { return true; @@ -132,7 +171,8 @@ public static boolean isTransformTypeResourceConfig( ResourceConfigType resourceConfig) { String selector = resourceConfig.getSelector(); - if(selector != null) selector = selector.trim(); + if (selector != null) + selector = selector.trim(); if (!SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { return false; } @@ -144,7 +184,8 @@ for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType p = (ParamType) iterator.next(); String paramName = p.getName(); - if(paramName != null) paramName = paramName.trim(); + if (paramName != null) + paramName = paramName.trim(); if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(paramName)) { return true; } @@ -169,7 +210,7 @@ resourceConfigType.getParam().add(param); } param.setName(paramName); - setTextToSmooksType(param, value); + setTextToAnyType(param, value); } public static String getParmaText(String paramName, @@ -202,6 +243,18 @@ return null; } + public static String getAnyTypeCDATA(AnyType anyType) { + Object value = anyType.getMixed().get( + XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); + if (value != null) { + if (value instanceof List && !((List) value).isEmpty()) { + return ((List) value).get(0).toString().trim(); + } + // return value.toString(); + } + return null; + } + public static AnyType createBindingType(String property, String selector, String type, String uri) { if (uri == null) { @@ -228,11 +281,21 @@ XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, text); } - public static void setTextToSmooksType(AnyType smooksModel, String text) { + public static void appendCDATAToSmooksType(AnyType smooksModel, String text) { + smooksModel.getMixed().add( + XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, text); + } + + public static void setTextToAnyType(AnyType smooksModel, String text) { cleanTextToSmooksType(smooksModel); appendTextToSmooksType(smooksModel, text); } + public static void setCDATAToAnyType(AnyType smooksModel, String text) { + cleanCDATAToSmooksType(smooksModel); + appendCDATAToSmooksType(smooksModel, text); + } + public static void cleanTextToSmooksType(AnyType smooksModel) { Object obj = smooksModel.getMixed().get( XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT, true); @@ -240,4 +303,12 @@ ((List) obj).clear(); } } + + public static void cleanCDATAToSmooksType(AnyType smooksModel) { + Object obj = smooksModel.getMixed().get( + XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA, true); + if (obj instanceof List) { + ((List) obj).clear(); + } + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksSwitch.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksSwitch.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksSwitch.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -10,11 +10,19 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.emf.ecore.xml.type.AnyType; +import org.jboss.tools.smooks.model.AbstractResourceConfig; +import org.jboss.tools.smooks.model.ConditionType; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.ImportType; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ProfileType; +import org.jboss.tools.smooks.model.ProfilesType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.SmooksResourceListType; -import org.jboss.tools.smooks.model.*; - /** * <!-- begin-user-doc --> * The <b>Switch</b> for the model's inheritance hierarchy. @@ -25,7 +33,7 @@ * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.jboss.tools.smooks.model.SmooksPackage + * @see smooks.SmooksPackage * @generated */ public class SmooksSwitch<T> { @@ -143,6 +151,7 @@ case SmooksPackage.RESOURCE_TYPE: { ResourceType resourceType = (ResourceType)theEObject; T result = caseResourceType(resourceType); + if (result == null) result = caseAnyType(resourceType); if (result == null) result = defaultCase(theEObject); return result; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -79,7 +79,7 @@ return false; ResourceType resource = config.getResource(); if (resource != null) { - String r = resource.getValue(); + String r = resource.getStringValue(); if (r != null) { for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { String decoder = SmooksModelConstants.DECODER_CLASSES[i]; @@ -97,7 +97,7 @@ return false; ResourceType resource = config.getResource(); if (resource != null) { - String resourceString = resource.getValue(); + String resourceString = resource.getStringValue(); if (resourceString != null) return SmooksModelConstants.BEAN_POPULATOR .equals(resourceString.trim()); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -274,7 +274,7 @@ setConnectionUsed(connection); ResourceType resource = SmooksFactory.eINSTANCE.createResourceType(); - resource.setValue(BEANPOPULATOR); + resource.setStringValue(BEANPOPULATOR); resourceConfig.setResource(resource); ParamType beanIdParam = SmooksFactory.eINSTANCE.createParamType(); @@ -553,7 +553,7 @@ // find the first BeanPopulator resource config , this is the root. String resourceClazz = null; if (rt != null) { - resourceClazz = rt.getValue(); + resourceClazz = rt.getStringValue(); } if (resourceClazz != null) resourceClazz = resourceClazz.trim(); @@ -748,7 +748,7 @@ ResourceType resourceType = rc.getResource(); if (resourceType == null) continue; - String resource = resourceType.getValue(); + String resource = resourceType.getStringValue(); if (resource != null) resource = resource.trim(); if (BEANPOPULATOR.equals(resource)) { @@ -859,7 +859,7 @@ ResourceType resourceType = rc.getResource(); if (resourceType == null) continue; - String resource = resourceType.getValue(); + String resource = resourceType.getStringValue(); if (resource != null) resource = resource.trim(); if (BEANPOPULATOR.equals(resource)) { @@ -909,7 +909,7 @@ continue; if (resourceType == null) continue; - String resource = resourceType.getValue(); + String resource = resourceType.getStringValue(); if (resource != null) resource = resource.trim(); if (!BEANPOPULATOR.equals(resource)) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -40,7 +40,7 @@ protected ResourceConfigType oldResourceConfigList; - protected ResourceConfigType resourceConfigList; + protected ResourceConfigType resourceConfig; protected IManagedForm managedForm ; @@ -120,8 +120,8 @@ * @see org.eclipse.ui.forms.IFormPart#isStale() */ public boolean isStale() { - if (oldResourceConfigList != resourceConfigList) { - oldResourceConfigList = resourceConfigList; + if (oldResourceConfigList != resourceConfig) { + oldResourceConfigList = resourceConfig; return true; } return false; @@ -159,8 +159,8 @@ } public SmooksResourceListType getSmooksResourceList(){ - if(resourceConfigList != null){ - EObject parent = resourceConfigList.eContainer(); + if(resourceConfig != null){ + EObject parent = resourceConfig.eContainer(); while(parent != null){ EObject temp = parent.eContainer(); if(temp == null){ @@ -190,10 +190,10 @@ Object obj = ((IStructuredSelection) selection) .getFirstElement(); if(obj instanceof ResourceConfigType){ - resourceConfigList = (ResourceConfigType)obj; + resourceConfig = (ResourceConfigType)obj; } if(obj instanceof ResourceConfigWarrper){ - resourceConfigList = ((ResourceConfigWarrper)obj).getResourceConfig(); + resourceConfig = ((ResourceConfigWarrper)obj).getResourceConfig(); } refresh(); } @@ -224,11 +224,11 @@ } protected ResourceConfigType getResourceConfigList() { - return resourceConfigList; + return resourceConfig; } protected void setResourceConfigList(ResourceConfigType resourceConfigList) { - this.resourceConfigList = resourceConfigList; + this.resourceConfig = resourceConfigList; } protected EditingDomain getDomain() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -217,19 +217,19 @@ } private void configControls() { - if (resourceConfigList != null) { + if (resourceConfig != null) { String selector = ""; - selector = resourceConfigList.getSelector(); + selector = resourceConfig.getSelector(); if (selector == null) selector = ""; selectorText.setText(selector); String beanClass = SmooksModelUtils.getParmaText("beanClass", - resourceConfigList); + resourceConfig); if (beanClass == null) beanClass = ""; String beanId = SmooksModelUtils.getParmaText("beanId", - resourceConfigList); + resourceConfig); if (beanId == null) beanId = ""; @@ -244,7 +244,7 @@ String beanIdStr = beanIDText.getText(); if (beanIdStr == null) return; - List paramList = resourceConfigList.getParam(); + List paramList = resourceConfig.getParam(); ParamType beanId = null; for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType param = (ParamType) iterator.next(); @@ -257,11 +257,11 @@ if (beanId == null) { beanId = SmooksFactory.eINSTANCE.createParamType(); beanId.setName(SmooksModelConstants.BEAN_ID); - AddCommand.create(domain, resourceConfigList, + AddCommand.create(domain, resourceConfig, SmooksPackage.eINSTANCE.getResourceConfigType_Param(), beanId).execute(); } - SmooksModelUtils.setTextToSmooksType(beanId, beanIdStr); + SmooksModelUtils.setTextToAnyType(beanId, beanIdStr); this.parentEditor.fireEditorDirty(true); } @@ -271,7 +271,7 @@ String beanClassStr = beanClassText.getText(); if (beanClassStr == null) return; - List paramList = resourceConfigList.getParam(); + List paramList = resourceConfig.getParam(); ParamType beanClass = null; for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType param = (ParamType) iterator.next(); @@ -284,11 +284,11 @@ if (beanClass == null) { beanClass = SmooksFactory.eINSTANCE.createParamType(); beanClass.setName(SmooksModelConstants.BEAN_CLASS); - AddCommand.create(domain, resourceConfigList, + AddCommand.create(domain, resourceConfig, SmooksPackage.eINSTANCE.getResourceConfigType_Param(), beanClass).execute(); } - SmooksModelUtils.setTextToSmooksType(beanClass, beanClassStr); + SmooksModelUtils.setTextToAnyType(beanClass, beanClassStr); this.parentEditor.fireEditorDirty(true); } @@ -298,7 +298,7 @@ String selector = selectorText.getText(); if (selector != null) { Command command = SetCommand.create(this.getDomain(), - resourceConfigList, SmooksPackage.eINSTANCE + resourceConfig, SmooksPackage.eINSTANCE .getResourceConfigType_Selector(), selector); getDomain().getCommandStack().execute(command); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -135,16 +135,16 @@ protected void setDecoderClass() { String text = decoderCombo.getText(); if(text == null) text = ""; - if(this.resourceConfigList != null){ - ResourceType resource = resourceConfigList.getResource(); + if(this.resourceConfig != null){ + ResourceType resource = resourceConfig.getResource(); if(resource == null){ resource = SmooksFactory.eINSTANCE.createResourceType(); - resourceConfigList.setResource(resource); + resourceConfig.setResource(resource); } - if(text.trim().equals(resource.getValue())){ + if(text.trim().equals(resource.getStringValue())){ return; } - resource.setValue(text); + resource.setStringValue(text); this.parentEditor.fireEditorDirty(true); } @@ -153,34 +153,34 @@ protected void setFormat() { String format = formatText.getText(); if(format == null) format = ""; - SmooksModelUtils.setParamText("format", format, resourceConfigList); + SmooksModelUtils.setParamText("format", format, resourceConfig); this.parentEditor.fireEditorDirty(true); } protected void setLocalLang() { String ll = localeLangaugeCombo.getText(); if(ll == null) ll = ""; - SmooksModelUtils.setParamText("locale-language", ll, resourceConfigList); + SmooksModelUtils.setParamText("locale-language", ll, resourceConfig); this.parentEditor.fireEditorDirty(true); } protected void setLocalContry() { String lc = localeContryCombo.getText(); if(lc == null) lc = ""; - SmooksModelUtils.setParamText("locale-country", lc, resourceConfigList); + SmooksModelUtils.setParamText("locale-country", lc, resourceConfig); this.parentEditor.fireEditorDirty(true); } protected void setSelector() { String text = selectorText.getText(); if(text == null || text.length() == 0){ - resourceConfigList.setSelector(""); + resourceConfig.setSelector(""); this.parentEditor.fireEditorDirty(true); return; } text = DECODER+ ":" + text; - if(this.resourceConfigList != null){ - resourceConfigList.setSelector(text); + if(this.resourceConfig != null){ + resourceConfig.setSelector(text); this.parentEditor.fireEditorDirty(true); } } @@ -195,21 +195,21 @@ @Override protected void initSectionUI() { - if(this.resourceConfigList != null){ - String formate = SmooksModelUtils.getParmaText("format", resourceConfigList); //$NON-NLS-1$ - String locallang = SmooksModelUtils.getParmaText("locale-language", resourceConfigList); //$NON-NLS-1$ - String localcontry = SmooksModelUtils.getParmaText("locale-country", resourceConfigList); //$NON-NLS-1$ + if(this.resourceConfig != null){ + String formate = SmooksModelUtils.getParmaText("format", resourceConfig); //$NON-NLS-1$ + String locallang = SmooksModelUtils.getParmaText("locale-language", resourceConfig); //$NON-NLS-1$ + String localcontry = SmooksModelUtils.getParmaText("locale-country", resourceConfig); //$NON-NLS-1$ String decoderClass = ""; - ResourceType resource = resourceConfigList.getResource(); + ResourceType resource = resourceConfig.getResource(); if(resource != null){ - decoderClass = resource.getValue(); + decoderClass = resource.getStringValue(); if(decoderClass != null) decoderClass = decoderClass.trim(); } if(formate == null) formate = ""; //$NON-NLS-1$ if(locallang == null) locallang = ""; //$NON-NLS-1$ if(localcontry == null) localcontry = ""; //$NON-NLS-1$ - String selector = resourceConfigList.getSelector(); + String selector = resourceConfig.getSelector(); selector = getSelectorName(selector); selectorText.setText(selector); formatText.setText(formate); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -113,7 +113,7 @@ if (selector1.equals("decoder")) { ResourceType resource = config.getResource(); if (resource != null) { - String value = resource.getValue(); + String value = resource.getStringValue(); if (value != null) value = value.trim(); for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -20,80 +20,186 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Text; import org.jboss.tools.smooks.model.ResourceType; import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; /** * @author dart - * + * */ -public class DocumentResourceTypeDetailPage extends AbstractSmooksModelDetailPage { +public class DocumentResourceTypeDetailPage extends + AbstractSmooksModelDetailPage { + private static final int INNER = 0; + private static final int EXTERNAL = 1; private Text text; private Text selectorText; + private Button innerCheckButton; + private Button externalCheckButton; + private Text innerContentText; + private Button browseButton; + private boolean isInit = true; public DocumentResourceTypeDetailPage(SmooksFormEditor parentEditor, EditingDomain domain) { super(parentEditor, domain); } - protected void createSectionContents(Composite parent) { - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - parent.setLayout(layout); - this.formToolKit.createLabel(parent, Messages.getString("DocumentResourceTypeDetailPage.Selector")); //$NON-NLS-1$ - selectorText = formToolKit.createText(parent, ""); //$NON-NLS-1$ - selectorText.addModifyListener(new ModifyListener(){ + protected void createExternlaSelectionGUI(Composite parent) { - public void modifyText(ModifyEvent e) { - if(!canFireChange) return; - resetSelector(selectorText.getText()); - } - - }); + this.formToolKit.createLabel(parent, Messages + .getString("DocumentResourceTypeDetailPage.DocPath")); //$NON-NLS-1$ + Composite fileCom = formToolKit.createComposite(parent); GridData gd = new GridData(GridData.FILL_HORIZONTAL); - selectorText.setLayoutData(gd); - - this.formToolKit.createLabel(parent, Messages.getString("DocumentResourceTypeDetailPage.DocPath")); //$NON-NLS-1$ - Composite fileCom = formToolKit.createComposite(parent); - gd = new GridData(GridData.FILL_HORIZONTAL); fileCom.setLayoutData(gd); + GridLayout layout = new GridLayout(); + layout.numColumns = 2; fileCom.setLayout(layout); text = formToolKit.createText(fileCom, ""); //$NON-NLS-1$ gd = new GridData(GridData.FILL_HORIZONTAL); gd.grabExcessHorizontalSpace = true; text.setLayoutData(gd); - text.addModifyListener(new ModifyListener(){ + text.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - if(!canFireChange) return; + if (!canFireChange) + return; resetPath(text.getText()); } }); - - - Button browseButton = formToolKit.createButton(fileCom, Messages.getString("DocumentResourceTypeDetailPage.BrowseFile"), SWT.NONE); //$NON-NLS-1$ - browseButton.addSelectionListener(new SelectionAdapter(){ + browseButton = formToolKit + .createButton( + fileCom, + Messages + .getString("DocumentResourceTypeDetailPage.BrowseFile"), SWT.NONE); //$NON-NLS-1$ + browseButton.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { super.widgetSelected(e); browseFileSystem(); } - + }); - formToolKit.paintBordersFor(parent); formToolKit.paintBordersFor(fileCom); + } - - protected void resetSelector(String selector){ - Command command = SetCommand.create(domain, resourceConfigList, SmooksPackage.eINSTANCE.getResourceConfigType_Selector(), selector); + + protected void handleRadioButtons() { + externalCheckButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + boolean checked = externalCheckButton.getSelection(); + if (checked) { + switchGUI(EXTERNAL); + } + } + }); + + innerCheckButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + boolean checked = innerCheckButton.getSelection(); + if (checked) { + switchGUI(INNER); + } + } + }); + } + + protected void createSectionContents(Composite parent) { + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + parent.setLayout(layout); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + + this.formToolKit.createLabel(parent, Messages + .getString("DocumentResourceTypeDetailPage.Selector")); //$NON-NLS-1$ + selectorText = formToolKit.createText(parent, ""); //$NON-NLS-1$ + selectorText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + if (!canFireChange) + return; + resetSelector(selectorText.getText()); + } + }); + selectorText.setLayoutData(gd); + + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + externalCheckButton = formToolKit.createButton(parent, + "External File Selection", SWT.RADIO); + externalCheckButton.setLayoutData(gd); + + createExternlaSelectionGUI(parent); + + // Inner contents modify + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + innerCheckButton = formToolKit.createButton(parent, + "Inner template file contents", SWT.RADIO); + innerCheckButton.setLayoutData(gd); + + createInnerContentsGUI(parent); + + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + formToolKit.createSeparator(parent, SWT.HORIZONTAL).setLayoutData(gd); + + formToolKit.paintBordersFor(parent); + + handleRadioButtons(); + + } + + protected void createInnerContentsGUI(Composite parent) { + GridData gd = new GridData(GridData.BEGINNING); + gd.verticalAlignment = GridData.BEGINNING; + formToolKit.createLabel(parent, "File Contents").setLayoutData(gd); + innerContentText = formToolKit.createText(parent, "", SWT.MULTI + | SWT.V_SCROLL | SWT.H_SCROLL); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.heightHint = 200; + innerContentText.setLayoutData(gd); + } + + protected void resetSelector(String selector) { + Command command = SetCommand.create(domain, resourceConfig, + SmooksPackage.eINSTANCE.getResourceConfigType_Selector(), + selector); domain.getCommandStack().execute(command); -// resourceConfigList.getse + // resourceConfigList.getse } - - protected void browseFileSystem(){ - IFile[] files = WorkspaceResourceDialog.openFileSelection(this.parentEditor.getSite() - .getShell(), + + public void switchGUI(int key) { + ResourceType resource = resourceConfig.getResource(); + if (key == INNER) { + this.browseButton.setEnabled(false); + this.text.setEnabled(false); + this.innerContentText.setEnabled(true); + SmooksModelUtils.cleanTextToSmooksType(resource); + String text = innerContentText.getText(); + if (text != null) { + SmooksModelUtils.setCDATAToAnyType(resource, text); + } + } else { + this.browseButton.setEnabled(true); + this.text.setEnabled(true); + this.innerContentText.setEnabled(false); + SmooksModelUtils.cleanCDATAToSmooksType(resource); + String text = this.text.getText(); + if (text != null) { + SmooksModelUtils.setTextToAnyType(resource, text); + } + } + this.parentEditor.fireEditorDirty(true); + } + + protected void browseFileSystem() { + IFile[] files = WorkspaceResourceDialog.openFileSelection( + this.parentEditor.getSite().getShell(), "", "", false, null, Collections.EMPTY_LIST); //$NON-NLS-1$ //$NON-NLS-2$ // dialog.setInitialSelections(selectedResources); if (files.length > 0) { @@ -103,29 +209,76 @@ return; } } - - protected void resetPath(String path){ - if(this.resourceConfigList != null){ - ResourceType resource = resourceConfigList.getResource(); - if(resource == null){ + + protected void resetPath(String path) { + if (this.resourceConfig != null) { + ResourceType resource = resourceConfig.getResource(); + if (resource == null) { return; } - Command command = SetCommand.create(domain, resource, SmooksPackage.eINSTANCE.getResourceType_Value(), path); - domain.getCommandStack().execute(command); + SmooksModelUtils.setTextToAnyType(resource, path); } } protected void initSectionUI() { - if(this.resourceConfigList != null){ - String selector = resourceConfigList.getSelector(); - if(selector != null) selectorText.setText(selector); - ResourceType resource = resourceConfigList.getResource(); - if(resource != null){ - String path = resource.getValue(); - if(path == null) path = ""; //$NON-NLS-1$ - text.setText(path); + if (this.resourceConfig != null) { + String selector = resourceConfig.getSelector(); + if (selector != null) + selectorText.setText(selector); + ResourceType resource = resourceConfig.getResource(); + if (resource != null) { + if (isInit) { + + if (SmooksModelUtils.isInnerFileContents(resourceConfig)) { + String cdata = resource.getCDATAValue(); + if (cdata == null) + cdata = ""; + innerContentText.setText(cdata); + innerCheckButton.setSelection(true); + switchGUI(INNER); + isInit = false; + } + if (SmooksModelUtils + .isFilePathResourceConfig(resourceConfig)) { + String path = resource.getStringValue(); + if (path == null) + path = ""; //$NON-NLS-1$ + text.setText(path); + externalCheckButton.setSelection(true); + switchGUI(EXTERNAL); + isInit = false; + } + + } else { + int style = getFileContentStyle(); + if (style == INNER) { + String cdata = resource.getCDATAValue(); + if (cdata == null) + cdata = ""; + innerContentText.setText(cdata); + } + if (style == EXTERNAL) { + String path = resource.getStringValue(); + if (path == null) + path = ""; //$NON-NLS-1$ + text.setText(path); + } + } } } } + private int getFileContentStyle() { + if (externalCheckButton.getSelection() + && innerCheckButton.getSelection()) { + return -1; + } + + if (externalCheckButton.getSelection()) + return EXTERNAL; + if (innerCheckButton.getSelection()) + return INNER; + return -1; + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -26,48 +26,21 @@ */ public class ResourceConfigWarrperFactory { - public static ResourceConfigWarrper createResourceConfigWarrper( ResourceConfigType type) { - if (isBeanPopulatorResource(type)) { + if (SmooksModelUtils.isBeanPopulatorResource(type)) { BeanPopulatorWarrper p = new BeanPopulatorWarrper(type); return p; } - if(isDateTypeSelector(type)){ + if(SmooksModelUtils.isDateTypeSelector(type)){ DateTypeWarrper warrper = new DateTypeWarrper(type); return warrper; } - if(SmooksModelUtils.isFilePathResourceConfig(type)){ + if(SmooksModelUtils.isFilePathResourceConfig(type) || SmooksModelUtils.isInnerFileContents(type)){ DocumentSelectionWarrper warrper = new DocumentSelectionWarrper(type); return warrper; } return null; } - public static boolean isBeanPopulatorResource(ResourceConfigType type) { - ResourceType resource = type.getResource(); - if (resource == null) - return false; - String value = resource.getValue(); - if(value != null) value = value.trim(); - if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { - return true; - } - return false; - } - - public static boolean isDateTypeSelector(ResourceConfigType type) { - ResourceType resource = type.getResource(); - if (resource == null) - return false; - String value = resource.getValue(); - if(value != null) value = value.trim(); - for (int i = 0; i < SmooksModelConstants.DECODER_CLASSES.length; i++) { - String decoderClass = SmooksModelConstants.DECODER_CLASSES[i]; - if(decoderClass.equals(value)){ - return true; - } - } - return false; - } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -38,6 +38,7 @@ import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.ResourceType; import org.jboss.tools.smooks.model.SmooksFactory; import org.jboss.tools.smooks.model.SmooksResourceListType; import org.jboss.tools.smooks.model.provider.SmooksItemProviderAdapterFactory; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -1517,7 +1517,7 @@ GridLayout gl = new GridLayout(); gl.numColumns = 2; gl.marginHeight = 0; - gl.marginWidth = 0 ; + gl.marginWidth = 0; fixComposite.setLayout(gl); Label notifyLabel = new Label(fixComposite, SWT.NONE); Hyperlink fixLink = getManagedForm().getToolkit() @@ -1551,10 +1551,11 @@ item.setText(resolveCommand.getResolveDescription()); item.setImage(resolveCommand.getImage()); } - fixLink.addHyperlinkListener(new IHyperlinkListener(){ + fixLink.addHyperlinkListener(new IHyperlinkListener() { public void linkActivated(HyperlinkEvent e) { - menu.setLocation(getSite().getShell().getDisplay().getCursorLocation()); + menu.setLocation(getSite().getShell().getDisplay() + .getCursorLocation()); menu.setVisible(true); } @@ -1563,7 +1564,7 @@ public void linkExited(HyperlinkEvent e) { } - + }); notifyLabel.setMenu(menu); GridData nlgd = new GridData(GridData.FILL_HORIZONTAL); @@ -1593,6 +1594,8 @@ try { IMappingAnalyzer analyzer = AnalyzerFactory.getInstance() .getMappingAnalyzer(sourceDataTypeID, targetDataTypeID); + if (analyzer == null) + return; SmooksConfigurationFileGenerateContext context = this .createContext(); this.initSmooksConfigurationFileGenerateContext(context); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -424,7 +424,11 @@ .getSmooksResourceList(), SmooksPackage.eINSTANCE .getSmooksResourceListType_AbstractResourceConfig(), config); + try{ domain.getCommandStack().execute(command); + }catch(Exception e){ + e.printStackTrace(); + } dateTypeViewer.refresh(); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -46,7 +46,7 @@ ResourceType resource = SmooksFactory.eINSTANCE .createResourceType(); config.setResource(resource); - resource.setValue(SmooksModelConstants.BEAN_POPULATOR); + resource.setStringValue(SmooksModelConstants.BEAN_POPULATOR); ParamType idParmType = SmooksFactory.eINSTANCE.createParamType(); ParamType classParmType = SmooksFactory.eINSTANCE.createParamType(); @@ -67,7 +67,7 @@ .createResourceType(); config.setResource(resource); - resource.setValue(SmooksModelConstants.DATE_DECODER); + resource.setStringValue(SmooksModelConstants.DATE_DECODER); ParamType formate = SmooksFactory.eINSTANCE.createParamType(); ParamType language = SmooksFactory.eINSTANCE.createParamType(); @@ -89,7 +89,7 @@ // config.setSelector(SmooksModelConstants.AT_DOCUMENT); ResourceType resource = SmooksFactory.eINSTANCE .createResourceType(); - resource.setValue("/"); //$NON-NLS-1$ + resource.setStringValue("/"); //$NON-NLS-1$ config.setResource(resource); return config; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-12-01 04:00:30 UTC (rev 12157) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-12-01 10:07:49 UTC (rev 12158) @@ -141,7 +141,7 @@ // create a resource and add it to resourceConfig ResourceType resourceType = SmooksFactory.eINSTANCE .createResourceType(); - resourceType.setValue(SmooksModelConstants.BEAN_POPULATOR); + resourceType.setStringValue(SmooksModelConstants.BEAN_POPULATOR); resourceConfigType.setResource(resourceType); // create param for resourceConfig @@ -287,7 +287,7 @@ ResourceType resource = resourceConfig.getResource(); if (resource == null) continue; - String populator = resource.getValue(); + String populator = resource.getStringValue(); if (populator != null) populator = populator.trim(); if (!JavaBeanAnalyzer.BEANPOPULATOR.equals(populator)) @@ -565,7 +565,7 @@ ResourceType rt = resource.getResource(); if (rt == null) continue; - String value = rt.getValue(); + String value = rt.getStringValue(); if (value != null) value = value.trim(); if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) {