Author: DartPeng Date: 2009-04-06 11:48:52 -0400 (Mon, 06 Apr 2009) New Revision: 14523 Modified: workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.configuration/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.core/model/smooks.ecore workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.model.edit/src/common/provider/AbstractAnyTypeItemProvider.java Log: Modified: workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.configuration/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java =================================================================== --- workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.configuration/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-04-06 15:42:17 UTC (rev 14522) +++ workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.configuration/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-04-06 15:48:52 UTC (rev 14523) @@ -292,13 +292,14 @@ resource.save(options); monitor.worked(1); } + ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone(); + textEditor.doRevertToSaved(); + firePropertyChange(PROP_DIRTY); } catch (IOException e) { SmooksConfigurationActivator.getDefault().log(e); } finally { monitor.done(); } - ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone(); - firePropertyChange(PROP_DIRTY); } } Modified: workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.core/model/smooks.ecore =================================================================== --- workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.core/model/smooks.ecore 2009-04-06 15:42:17 UTC (rev 14522) +++ workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.core/model/smooks.ecore 2009-04-06 15:48:52 UTC (rev 14523) @@ -3,13 +3,14 @@ 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"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractResourceConfig" abstract="true" + eSuperTypes="#//AbstractType"> <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"> + <eClassifiers xsi:type="ecore:EClass" name="ConditionType" eSuperTypes="#//AbstractType"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Resource Targetting Condition"/> </eAnnotations> @@ -159,7 +160,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ParamType" eSuperTypes="http://www.eclipse.org/emf/2003/XMLType#//AnyType"... + <eClassifiers xsi:type="ecore:EClass" name="ParamType" eSuperTypes="#//AbstractType"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Resource Parameter"/> </eAnnotations> @@ -180,7 +181,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ProfilesType"> + <eClassifiers xsi:type="ecore:EClass" name="ProfilesType" eSuperTypes="#//AbstractType"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="List of Profiles"/> </eAnnotations> @@ -197,7 +198,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ProfileType"> + <eClassifiers xsi:type="ecore:EClass" name="ProfileType" eSuperTypes="#//AbstractType"> <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> @@ -276,7 +277,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ResourceType" eSuperTypes="http://www.eclipse.org/emf/2003/XMLType#//AnyType"... + <eClassifiers xsi:type="ecore:EClass" name="ResourceType" eSuperTypes="#//AbstractType"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Resource Configuration Resource Type (xsl, class etc)"/> </eAnnotations> @@ -291,7 +292,7 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SmooksResourceListType"> + <eClassifiers xsi:type="ecore:EClass" name="SmooksResourceListType" eSuperTypes="#//AbstractType"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="List of Smooks Resource Configuration."/> </eAnnotations> @@ -345,4 +346,5 @@ </eAnnotations> </eStructuralFeatures> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="AbstractType" abstract="true" eSuperTypes="http://www.eclipse.org/emf/2003/XMLType#//AnyType"... </ecore:EPackage> Modified: workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.model.edit/src/common/provider/AbstractAnyTypeItemProvider.java =================================================================== --- workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.model.edit/src/common/provider/AbstractAnyTypeItemProvider.java 2009-04-06 15:42:17 UTC (rev 14522) +++ workspace/dart/smooksConfigurationsEditor/org.jboss.tools.smooks.model.edit/src/common/provider/AbstractAnyTypeItemProvider.java 2009-04-06 15:48:52 UTC (rev 14523) @@ -153,145 +153,145 @@ (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 - (XslPackage.Literals.DOCUMENT_ROOT__XSL, - XslFactory.eINSTANCE.createXsl()))); - - 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__CONDITIONS, - SmooksFactory.eINSTANCE.createConditionsType()))); - - newChildDescriptors.add - (createChildParameter - (XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry - (SmooksPackage.Literals.DOCUMENT_ROOT__FEATURES, - SmooksFactory.eINSTANCE.createFeaturesType()))); - - newChildDescriptors.add - (createChildParameter - (XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry - (SmooksPackage.Literals.DOCUMENT_ROOT__HANDLER, - SmooksFactory.eINSTANCE.createHandlerType()))); - - newChildDescriptors.add - (createChildParameter - (XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry - (SmooksPackage.Literals.DOCUMENT_ROOT__HANDLERS, - SmooksFactory.eINSTANCE.createHandlersType()))); - - 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__PARAMS, - SmooksFactory.eINSTANCE.createParamsType()))); - - 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__READER, - SmooksFactory.eINSTANCE.createReaderType()))); - - 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__SET_OFF, - SmooksFactory.eINSTANCE.createSetOffType()))); - - newChildDescriptors.add - (createChildParameter - (XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry - (SmooksPackage.Literals.DOCUMENT_ROOT__SET_ON, - SmooksFactory.eINSTANCE.createSetOnType()))); - - newChildDescriptors.add - (createChildParameter - (XMLTypePackage.Literals.ANY_TYPE__MIXED, - FeatureMapUtil.createEntry - (SmooksPackage.Literals.DOCUMENT_ROOT__SMOOKS_RESOURCE_LIST, - SmooksFactory.eINSTANCE.createSmooksResourceListType()))); +// 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 +// (XslPackage.Literals.DOCUMENT_ROOT__XSL, +// XslFactory.eINSTANCE.createXsl()))); +// +// 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__CONDITIONS, +// SmooksFactory.eINSTANCE.createConditionsType()))); +// +// newChildDescriptors.add +// (createChildParameter +// (XMLTypePackage.Literals.ANY_TYPE__MIXED, +// FeatureMapUtil.createEntry +// (SmooksPackage.Literals.DOCUMENT_ROOT__FEATURES, +// SmooksFactory.eINSTANCE.createFeaturesType()))); +// +// newChildDescriptors.add +// (createChildParameter +// (XMLTypePackage.Literals.ANY_TYPE__MIXED, +// FeatureMapUtil.createEntry +// (SmooksPackage.Literals.DOCUMENT_ROOT__HANDLER, +// SmooksFactory.eINSTANCE.createHandlerType()))); +// +// newChildDescriptors.add +// (createChildParameter +// (XMLTypePackage.Literals.ANY_TYPE__MIXED, +// FeatureMapUtil.createEntry +// (SmooksPackage.Literals.DOCUMENT_ROOT__HANDLERS, +// SmooksFactory.eINSTANCE.createHandlersType()))); +// +// 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__PARAMS, +// SmooksFactory.eINSTANCE.createParamsType()))); +// +// 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__READER, +// SmooksFactory.eINSTANCE.createReaderType()))); +// +// 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__SET_OFF, +// SmooksFactory.eINSTANCE.createSetOffType()))); +// +// newChildDescriptors.add +// (createChildParameter +// (XMLTypePackage.Literals.ANY_TYPE__MIXED, +// FeatureMapUtil.createEntry +// (SmooksPackage.Literals.DOCUMENT_ROOT__SET_ON, +// SmooksFactory.eINSTANCE.createSetOnType()))); +// +// newChildDescriptors.add +// (createChildParameter +// (XMLTypePackage.Literals.ANY_TYPE__MIXED, +// FeatureMapUtil.createEntry +// (SmooksPackage.Literals.DOCUMENT_ROOT__SMOOKS_RESOURCE_LIST, +// SmooksFactory.eINSTANCE.createSmooksResourceListType()))); } /**