Author: DartPeng Date: 2008-09-16 23:33:13 -0400 (Tue, 16 Sep 2008) New Revision: 10278 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/AbstractResourceConfigItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ConditionTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/DocumentRootItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ImportTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ParamTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfileTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfilesTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceConfigTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksItemProviderAdapterFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksResourceListTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ISourceModelAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ITargetModelAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.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/analyzer/NormalSmooksModelPackage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.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/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/modelparser/SmooksConfigurationFileGenerateContext.java trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java Log: because the smooks emf model package name is changed , so all file's contents were changed too Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -42,6 +42,14 @@ import org.jboss.tools.smooks.graphical.GraphInformations; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; import org.jboss.tools.smooks.javabean.model.JavaBeanModelFactory; +import org.jboss.tools.smooks.model.AbstractResourceConfig; +import org.jboss.tools.smooks.model.ParamType; +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.util.SmooksModelUtils; import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; @@ -51,15 +59,7 @@ import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; import org.jboss.tools.smooks.utils.ProjectClassLoader; import org.jboss.tools.smooks.utils.UIUtils; -import org.milyn.xsd.smooks.AbstractResourceConfig; -import org.milyn.xsd.smooks.ParamType; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.ResourceType; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; -import org.milyn.xsd.smooks.SmooksResourceListType; import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; -import org.milyn.xsd.smooks.util.SmooksModelUtils; /** * @author Dart Peng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/AbstractResourceConfigItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/AbstractResourceConfigItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/AbstractResourceConfigItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -24,7 +24,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.AbstractResourceConfig} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.AbstractResourceConfig} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ConditionTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ConditionTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ConditionTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -26,11 +26,11 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.ConditionType; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.ConditionType; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.ConditionType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ConditionType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/DocumentRootItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/DocumentRootItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/DocumentRootItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -26,12 +26,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.DocumentRoot; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.DocumentRoot} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.DocumentRoot} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ImportTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ImportTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ImportTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -23,11 +23,11 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.ImportType; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.ImportType; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.ImportType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ImportType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ParamTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ParamTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ParamTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -33,12 +33,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.ParamType; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.ParamType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ParamType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfileTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfileTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfileTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -26,11 +26,11 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.ProfileType; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.ProfileType; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.ProfileType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ProfileType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfilesTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfilesTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ProfilesTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -26,12 +26,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.ProfilesType; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.ProfilesType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.ProfilesType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ProfilesType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceConfigTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceConfigTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceConfigTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -25,12 +25,12 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.ResourceConfigType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ResourceConfigType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/ResourceTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -26,11 +26,11 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.ResourceType; -import org.milyn.xsd.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksPackage; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.ResourceType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.ResourceType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksItemProviderAdapterFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksItemProviderAdapterFactory.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksItemProviderAdapterFactory.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -25,7 +25,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.milyn.xsd.smooks.util.SmooksAdapterFactory; +import org.jboss.tools.smooks.model.util.SmooksAdapterFactory; /** * This is the factory that is used to provide the interfaces needed to support Viewers. @@ -76,7 +76,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.ConditionType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.ConditionType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -84,7 +84,7 @@ protected ConditionTypeItemProvider conditionTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.ConditionType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.ConditionType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -99,7 +99,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.DocumentRoot} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.DocumentRoot} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -107,7 +107,7 @@ protected DocumentRootItemProvider documentRootItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.DocumentRoot}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.DocumentRoot}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -122,7 +122,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.ImportType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.ImportType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -130,7 +130,7 @@ protected ImportTypeItemProvider importTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.ImportType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.ImportType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -145,7 +145,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.ParamType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.ParamType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -153,7 +153,7 @@ protected ParamTypeItemProvider paramTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.ParamType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.ParamType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -168,7 +168,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.ProfilesType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.ProfilesType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -176,7 +176,7 @@ protected ProfilesTypeItemProvider profilesTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.ProfilesType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.ProfilesType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -191,7 +191,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.ProfileType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.ProfileType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -199,7 +199,7 @@ protected ProfileTypeItemProvider profileTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.ProfileType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.ProfileType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -214,7 +214,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.ResourceConfigType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.ResourceConfigType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -222,7 +222,7 @@ protected ResourceConfigTypeItemProvider resourceConfigTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.ResourceConfigType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.ResourceConfigType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -237,7 +237,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.ResourceType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.ResourceType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -245,7 +245,7 @@ protected ResourceTypeItemProvider resourceTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.ResourceType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.ResourceType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -260,7 +260,7 @@ } /** - * This keeps track of the one adapter used for all {@link org.milyn.xsd.smooks.SmooksResourceListType} instances. + * This keeps track of the one adapter used for all {@link org.jboss.tools.smooks.model.SmooksResourceListType} instances. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -268,7 +268,7 @@ protected SmooksResourceListTypeItemProvider smooksResourceListTypeItemProvider; /** - * This creates an adapter for a {@link org.milyn.xsd.smooks.SmooksResourceListType}. + * This creates an adapter for a {@link org.jboss.tools.smooks.model.SmooksResourceListType}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksResourceListTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksResourceListTypeItemProvider.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/src/org/milyn/xsd/smooks/provider/SmooksResourceListTypeItemProvider.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -30,12 +30,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; -import org.milyn.xsd.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.SmooksResourceListType; /** - * This is the item provider adapter for a {@link org.milyn.xsd.smooks.SmooksResourceListType} object. + * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.SmooksResourceListType} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -22,13 +22,13 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; -import org.milyn.xsd.smooks.ParamType; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; -import org.milyn.xsd.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +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.util.SmooksModelUtils; import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; -import org.milyn.xsd.smooks.util.SmooksModelUtils; /** * @author Dart Peng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -12,8 +12,8 @@ import java.util.List; +import org.jboss.tools.smooks.model.SmooksResourceListType; import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; -import org.milyn.xsd.smooks.SmooksResourceListType; /** * @author Dart Peng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ISourceModelAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ISourceModelAnalyzer.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ISourceModelAnalyzer.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.smooks.graphical.GraphInformations; -import org.milyn.xsd.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.SmooksResourceListType; /** * @author Dart Peng<br> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ITargetModelAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ITargetModelAnalyzer.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ITargetModelAnalyzer.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IFile; import org.jboss.tools.smooks.graphical.GraphInformations; -import org.milyn.xsd.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.SmooksResourceListType; /** * @author Dart Peng<br> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -import org.milyn.xsd.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceConfigType; /** * @author Dart Peng<br> 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -13,10 +13,10 @@ import java.util.Iterator; import java.util.List; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.ResourceType; -import org.milyn.xsd.smooks.SmooksResourceListType; -import org.milyn.xsd.smooks.util.SmooksConstants; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; /** * @author Dart Peng<br> @@ -63,7 +63,7 @@ return false; String selector = config.getSelector(); if (selector != null) { - return SmooksConstants.GLOBAL_PARAMETERS.equals(selector.trim()); + return SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector.trim()); } return false; } @@ -75,7 +75,7 @@ if (resource != null) { String r = resource.getValue(); if(r != null) - return SmooksConstants.DATE_DECODER.equals(r.trim()); + return SmooksModelConstants.DATE_DECODER.equals(r.trim()); } return false; } @@ -87,7 +87,7 @@ if (resource != null) { String resourceString = resource.getValue(); if(resourceString != null) - return SmooksConstants.BEAN_POPULATOR.equals(resourceString.trim()); + return SmooksModelConstants.BEAN_POPULATOR.equals(resourceString.trim()); } return false; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -import org.milyn.xsd.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceConfigType; /** * @author Dart Peng<br> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -14,8 +14,8 @@ import java.util.List; import org.eclipse.emf.edit.domain.EditingDomain; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksResourceListType; /** * @author Dart Peng<br> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -22,11 +22,11 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.DocumentRoot; +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.ui.modelparser.SmooksConfigurationFileGenerateContext; -import org.milyn.xsd.smooks.DocumentRoot; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksPackage; -import org.milyn.xsd.smooks.SmooksResourceListType; import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; public class SmooksFileBuilder { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BeanPopulatorWarrper.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui; -import org.milyn.xsd.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceConfigType; /** * @author Dart Peng<br> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/DateTypeWarrper.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui; -import org.milyn.xsd.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceConfigType; /** * @author Dart Peng<br> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ResourceConfigWarrper.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui; -import org.milyn.xsd.smooks.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceConfigType; /** * @author Dart Peng<br> 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -20,8 +20,8 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; +import org.jboss.tools.smooks.model.ResourceConfigType; import org.jboss.tools.smooks.ui.ResourceConfigWarrper; -import org.milyn.xsd.smooks.ResourceConfigType; /** * @author Dart Peng<br> 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -23,8 +23,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.milyn.xsd.smooks.SmooksPackage; -import org.milyn.xsd.smooks.util.SmooksModelUtils; +import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; /** * @author Dart Peng<br> 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.milyn.xsd.smooks.util.SmooksModelUtils; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; /** * @author Dart Peng<br> 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -10,13 +10,14 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; import org.jboss.tools.smooks.ui.BeanPopulatorWarrper; import org.jboss.tools.smooks.ui.DateTypeWarrper; import org.jboss.tools.smooks.ui.ResourceConfigWarrper; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.ResourceType; -import org.milyn.xsd.smooks.util.SmooksConstants; + /** * @author Dart Peng<br> * Date : Sep 16, 2008 @@ -41,7 +42,7 @@ ResourceType resource = type.getResource(); if (resource == null) return false; - if (SmooksConstants.BEAN_POPULATOR.equals(resource.getValue())) { + if (SmooksModelConstants.BEAN_POPULATOR.equals(resource.getValue())) { return true; } return false; @@ -51,7 +52,7 @@ ResourceType resource = type.getResource(); if (resource == null) return false; - if (SmooksConstants.DATE_DECODER.equals(resource.getValue())) { + if (SmooksModelConstants.DATE_DECODER.equals(resource.getValue())) { 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -34,9 +34,9 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; -import org.milyn.xsd.smooks.DocumentRoot; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl; import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; -import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl; /** * @author Dart Peng 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -110,6 +110,12 @@ import org.jboss.tools.smooks.graphical.GraphicalPackage; import org.jboss.tools.smooks.graphical.MappingDataType; import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; +import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl; import org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard; import org.jboss.tools.smooks.ui.IViewerInitor; import org.jboss.tools.smooks.ui.StructuredDataCreationWizardDailog; @@ -127,12 +133,6 @@ import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; import org.jboss.tools.smooks.ui.wizards.TransformDataSelectionWizard; import org.jboss.tools.smooks.utils.UIUtils; -import org.milyn.xsd.smooks.DocumentRoot; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksResourceListType; -import org.milyn.xsd.smooks.util.SmooksConstants; -import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl; /** * @author Dart Peng @@ -657,7 +657,7 @@ SmooksConfigurationFileGenerateContext context) { context.setSourceDataTypeID(this.sourceDataTypeID); context.setTargetDataTypeID(this.targetDataTypeID); - context.setSmooksType(SmooksConstants.SAX); + context.setSmooksType(SmooksModelConstants.SAX); context.setDataMappingRootModel(this.rootModel); } 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-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -32,12 +32,12 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.impl.ResourceConfigTypeImpl; import org.jboss.tools.smooks.ui.BeanPopulatorWarrper; import org.jboss.tools.smooks.ui.DateTypeWarrper; import org.jboss.tools.smooks.ui.ResourceConfigWarrper; import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.impl.ResourceConfigTypeImpl; /** * @author Dart Peng<br> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -15,8 +15,8 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.model.SmooksResourceListType; import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; -import org.milyn.xsd.smooks.SmooksResourceListType; /** * @author Dart Peng Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -20,6 +20,13 @@ import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; import org.jboss.tools.smooks.graphical.GraphInformations; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.ParamType; +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.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; @@ -30,13 +37,6 @@ import org.jboss.tools.smooks.utils.UIUtils; import org.jboss.tools.smooks.xml.model.AbstractXMLObject; import org.jboss.tools.smooks.xml.model.TagPropertyObject; -import org.milyn.xsd.smooks.ParamType; -import org.milyn.xsd.smooks.ResourceConfigType; -import org.milyn.xsd.smooks.ResourceType; -import org.milyn.xsd.smooks.SmooksFactory; -import org.milyn.xsd.smooks.SmooksResourceListType; -import org.milyn.xsd.smooks.util.SmooksConstants; -import org.milyn.xsd.smooks.util.SmooksModelUtils; /** * @author Dart Peng @@ -103,7 +103,7 @@ // create a resource and add it to resourceConfig ResourceType resourceType = SmooksFactory.eINSTANCE .createResourceType(); - resourceType.setValue(SmooksConstants.BEAN_POPULATOR); + resourceType.setValue(SmooksModelConstants.BEAN_POPULATOR); resourceConfigType.setResource(resourceType); // create param for resourceConfig @@ -116,15 +116,15 @@ } addParamTypeToResourceConfig(resourceConfigType, - SmooksConstants.BEAN_ID, beanID); + SmooksModelConstants.BEAN_ID, beanID); // add beanClass param addParamTypeToResourceConfig(resourceConfigType, - SmooksConstants.BEAN_CLASS, target.getBeanClassString()); + SmooksModelConstants.BEAN_CLASS, target.getBeanClassString()); // add bindings param ParamType bindingsParam = addParamTypeToResourceConfig( - resourceConfigType, SmooksConstants.BINDINGS, null); + resourceConfigType, SmooksModelConstants.BINDINGS, null); processBindingsParam(bindingsParam, target,source, context, listType); // } Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-09-17 03:31:02 UTC (rev 10277) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-09-17 03:33:13 UTC (rev 10278) @@ -35,11 +35,11 @@ import org.jboss.tools.smooks.graphical.GraphInformations; import org.jboss.tools.smooks.graphical.GraphicalPackage; import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer; -import org.milyn.xsd.smooks.DocumentRoot; -import org.milyn.xsd.smooks.SmooksPackage; -import org.milyn.xsd.smooks.SmooksResourceListType; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl; import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory; -import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl; /** * @author Dart Peng Date : 2008-9-1