Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java?rev=1417666&r1=1417665&r2=1417666&view=diff ============================================================================== --- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java (original) +++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java Wed Dec 5 22:06:57 2012 @@ -7,6 +7,7 @@ package org.apache.axis.model.wsdd.impl; import java.util.Collection; +import java.util.List; import java.util.Iterator; import org.apache.axis.model.wsdd.ArrayMapping; @@ -18,7 +19,6 @@ import org.apache.axis.model.wsdd.Style; import org.apache.axis.model.wsdd.TypeMapping; import org.apache.axis.model.wsdd.Use; import org.apache.axis.model.wsdd.WSDDFactory; -import org.apache.axis.model.wsdd.WSDDPackage; import org.eclipse.emf.common.notify.NotificationChain; @@ -176,7 +176,7 @@ public class ServiceImpl extends Deploya * @generated */ protected EClass eStaticClass() { - return WSDDPackage.Literals.SERVICE; + return WSDDPackageImpl.Literals.SERVICE; } /** @@ -238,7 +238,7 @@ public class ServiceImpl extends Deploya * <!-- end-user-doc --> * @generated */ - public EList getParameters() { + public List getParameters() { if (parameters == null) { parameters = new BasicInternalEList(Parameter.class); } @@ -250,7 +250,7 @@ public class ServiceImpl extends Deploya * <!-- end-user-doc --> * @generated */ - public EList getOperations() { + public List getOperations() { if (operations == null) { operations = new BasicInternalEList(Operation.class); } @@ -262,7 +262,7 @@ public class ServiceImpl extends Deploya * <!-- end-user-doc --> * @generated */ - public EList getTypeMappings() { + public List getTypeMappings() { if (typeMappings == null) { typeMappings = new BasicInternalEList(TypeMapping.class); } @@ -274,7 +274,7 @@ public class ServiceImpl extends Deploya * <!-- end-user-doc --> * @generated */ - public EList getBeanMappings() { + public List getBeanMappings() { if (beanMappings == null) { beanMappings = new BasicInternalEList(BeanMapping.class); } @@ -286,7 +286,7 @@ public class ServiceImpl extends Deploya * <!-- end-user-doc --> * @generated */ - public EList getArrayMappings() { + public List getArrayMappings() { if (arrayMappings == null) { arrayMappings = new BasicInternalEList(ArrayMapping.class); } @@ -301,7 +301,7 @@ public class ServiceImpl extends Deploya return; } } - Parameter param = WSDDFactory.eINSTANCE.createParameter(); + Parameter param = WSDDFactory.INSTANCE.createParameter(); param.setName(name); param.setValue(value); getParameters().add(param); @@ -314,15 +314,15 @@ public class ServiceImpl extends Deploya */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case WSDDPackage.SERVICE__PARAMETERS: + case WSDDPackageImpl.SERVICE__PARAMETERS: return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs); - case WSDDPackage.SERVICE__OPERATIONS: + case WSDDPackageImpl.SERVICE__OPERATIONS: return ((InternalEList)getOperations()).basicRemove(otherEnd, msgs); - case WSDDPackage.SERVICE__TYPE_MAPPINGS: + case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS: return ((InternalEList)getTypeMappings()).basicRemove(otherEnd, msgs); - case WSDDPackage.SERVICE__BEAN_MAPPINGS: + case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS: return ((InternalEList)getBeanMappings()).basicRemove(otherEnd, msgs); - case WSDDPackage.SERVICE__ARRAY_MAPPINGS: + case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS: return ((InternalEList)getArrayMappings()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); @@ -335,21 +335,21 @@ public class ServiceImpl extends Deploya */ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case WSDDPackage.SERVICE__PROVIDER: + case WSDDPackageImpl.SERVICE__PROVIDER: return getProvider(); - case WSDDPackage.SERVICE__USE: + case WSDDPackageImpl.SERVICE__USE: return getUse(); - case WSDDPackage.SERVICE__STYLE: + case WSDDPackageImpl.SERVICE__STYLE: return getStyle(); - case WSDDPackage.SERVICE__PARAMETERS: + case WSDDPackageImpl.SERVICE__PARAMETERS: return getParameters(); - case WSDDPackage.SERVICE__OPERATIONS: + case WSDDPackageImpl.SERVICE__OPERATIONS: return getOperations(); - case WSDDPackage.SERVICE__TYPE_MAPPINGS: + case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS: return getTypeMappings(); - case WSDDPackage.SERVICE__BEAN_MAPPINGS: + case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS: return getBeanMappings(); - case WSDDPackage.SERVICE__ARRAY_MAPPINGS: + case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS: return getArrayMappings(); } return super.eGet(featureID, resolve, coreType); @@ -362,32 +362,32 @@ public class ServiceImpl extends Deploya */ public void eSet(int featureID, Object newValue) { switch (featureID) { - case WSDDPackage.SERVICE__PROVIDER: + case WSDDPackageImpl.SERVICE__PROVIDER: setProvider(newValue); return; - case WSDDPackage.SERVICE__USE: + case WSDDPackageImpl.SERVICE__USE: setUse((Use)newValue); return; - case WSDDPackage.SERVICE__STYLE: + case WSDDPackageImpl.SERVICE__STYLE: setStyle((Style)newValue); return; - case WSDDPackage.SERVICE__PARAMETERS: + case WSDDPackageImpl.SERVICE__PARAMETERS: getParameters().clear(); getParameters().addAll((Collection)newValue); return; - case WSDDPackage.SERVICE__OPERATIONS: + case WSDDPackageImpl.SERVICE__OPERATIONS: getOperations().clear(); getOperations().addAll((Collection)newValue); return; - case WSDDPackage.SERVICE__TYPE_MAPPINGS: + case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS: getTypeMappings().clear(); getTypeMappings().addAll((Collection)newValue); return; - case WSDDPackage.SERVICE__BEAN_MAPPINGS: + case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS: getBeanMappings().clear(); getBeanMappings().addAll((Collection)newValue); return; - case WSDDPackage.SERVICE__ARRAY_MAPPINGS: + case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS: getArrayMappings().clear(); getArrayMappings().addAll((Collection)newValue); return; @@ -402,28 +402,28 @@ public class ServiceImpl extends Deploya */ public void eUnset(int featureID) { switch (featureID) { - case WSDDPackage.SERVICE__PROVIDER: + case WSDDPackageImpl.SERVICE__PROVIDER: setProvider(PROVIDER_EDEFAULT); return; - case WSDDPackage.SERVICE__USE: + case WSDDPackageImpl.SERVICE__USE: setUse(USE_EDEFAULT); return; - case WSDDPackage.SERVICE__STYLE: + case WSDDPackageImpl.SERVICE__STYLE: setStyle(STYLE_EDEFAULT); return; - case WSDDPackage.SERVICE__PARAMETERS: + case WSDDPackageImpl.SERVICE__PARAMETERS: getParameters().clear(); return; - case WSDDPackage.SERVICE__OPERATIONS: + case WSDDPackageImpl.SERVICE__OPERATIONS: getOperations().clear(); return; - case WSDDPackage.SERVICE__TYPE_MAPPINGS: + case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS: getTypeMappings().clear(); return; - case WSDDPackage.SERVICE__BEAN_MAPPINGS: + case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS: getBeanMappings().clear(); return; - case WSDDPackage.SERVICE__ARRAY_MAPPINGS: + case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS: getArrayMappings().clear(); return; } @@ -437,21 +437,21 @@ public class ServiceImpl extends Deploya */ public boolean eIsSet(int featureID) { switch (featureID) { - case WSDDPackage.SERVICE__PROVIDER: + case WSDDPackageImpl.SERVICE__PROVIDER: return PROVIDER_EDEFAULT == null ? provider != null : !PROVIDER_EDEFAULT.equals(provider); - case WSDDPackage.SERVICE__USE: + case WSDDPackageImpl.SERVICE__USE: return use != USE_EDEFAULT; - case WSDDPackage.SERVICE__STYLE: + case WSDDPackageImpl.SERVICE__STYLE: return style != STYLE_EDEFAULT; - case WSDDPackage.SERVICE__PARAMETERS: + case WSDDPackageImpl.SERVICE__PARAMETERS: return parameters != null && !parameters.isEmpty(); - case WSDDPackage.SERVICE__OPERATIONS: + case WSDDPackageImpl.SERVICE__OPERATIONS: return operations != null && !operations.isEmpty(); - case WSDDPackage.SERVICE__TYPE_MAPPINGS: + case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS: return typeMappings != null && !typeMappings.isEmpty(); - case WSDDPackage.SERVICE__BEAN_MAPPINGS: + case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS: return beanMappings != null && !beanMappings.isEmpty(); - case WSDDPackage.SERVICE__ARRAY_MAPPINGS: + case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS: return arrayMappings != null && !arrayMappings.isEmpty(); } return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java?rev=1417666&r1=1417665&r2=1417666&view=diff ============================================================================== --- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java (original) +++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java Wed Dec 5 22:06:57 2012 @@ -7,7 +7,6 @@ package org.apache.axis.model.wsdd.impl; import org.apache.axis.model.wsdd.TypeMapping; -import org.apache.axis.model.wsdd.WSDDPackage; import org.eclipse.emf.ecore.EClass; @@ -81,7 +80,7 @@ public class TypeMappingImpl extends Map * @generated */ protected EClass eStaticClass() { - return WSDDPackage.Literals.TYPE_MAPPING; + return WSDDPackageImpl.Literals.TYPE_MAPPING; } /** @@ -127,9 +126,9 @@ public class TypeMappingImpl extends Map */ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case WSDDPackage.TYPE_MAPPING__SERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER: return getSerializer(); - case WSDDPackage.TYPE_MAPPING__DESERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER: return getDeserializer(); } return super.eGet(featureID, resolve, coreType); @@ -142,10 +141,10 @@ public class TypeMappingImpl extends Map */ public void eSet(int featureID, Object newValue) { switch (featureID) { - case WSDDPackage.TYPE_MAPPING__SERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER: setSerializer((String)newValue); return; - case WSDDPackage.TYPE_MAPPING__DESERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER: setDeserializer((String)newValue); return; } @@ -159,10 +158,10 @@ public class TypeMappingImpl extends Map */ public void eUnset(int featureID) { switch (featureID) { - case WSDDPackage.TYPE_MAPPING__SERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER: setSerializer(SERIALIZER_EDEFAULT); return; - case WSDDPackage.TYPE_MAPPING__DESERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER: setDeserializer(DESERIALIZER_EDEFAULT); return; } @@ -176,9 +175,9 @@ public class TypeMappingImpl extends Map */ public boolean eIsSet(int featureID) { switch (featureID) { - case WSDDPackage.TYPE_MAPPING__SERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER: return SERIALIZER_EDEFAULT == null ? serializer != null : !SERIALIZER_EDEFAULT.equals(serializer); - case WSDDPackage.TYPE_MAPPING__DESERIALIZER: + case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER: return DESERIALIZER_EDEFAULT == null ? deserializer != null : !DESERIALIZER_EDEFAULT.equals(deserializer); } return super.eIsSet(featureID); Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java?rev=1417666&r1=1417665&r2=1417666&view=diff ============================================================================== --- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java (original) +++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java Wed Dec 5 22:06:57 2012 @@ -25,14 +25,22 @@ import org.eclipse.emf.ecore.plugin.Ecor */ public class WSDDFactoryImpl extends EFactoryImpl implements WSDDFactory { /** + * The singleton instance of the factory. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final WSDDFactoryImpl eINSTANCE = init(); + + /** * Creates the default factory implementation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public static WSDDFactory init() { + public static WSDDFactoryImpl init() { try { - WSDDFactory theWSDDFactory = (WSDDFactory)EPackage.Registry.INSTANCE.getEFactory("http://xml.apache.org/axis/wsdd/";); + WSDDFactoryImpl theWSDDFactory = (WSDDFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http://xml.apache.org/axis/wsdd/";); if (theWSDDFactory != null) { return theWSDDFactory; } @@ -60,15 +68,15 @@ public class WSDDFactoryImpl extends EFa */ public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { - case WSDDPackage.PARAMETER: return createParameter(); - case WSDDPackage.TYPE_MAPPING: return createTypeMapping(); - case WSDDPackage.ARRAY_MAPPING: return createArrayMapping(); - case WSDDPackage.BEAN_MAPPING: return createBeanMapping(); - case WSDDPackage.OPERATION_PARAMETER: return createOperationParameter(); - case WSDDPackage.FAULT: return createFault(); - case WSDDPackage.OPERATION: return createOperation(); - case WSDDPackage.SERVICE: return createService(); - case WSDDPackage.DEPLOYMENT: return createDeployment(); + case WSDDPackageImpl.PARAMETER: return (EObject)createParameter(); + case WSDDPackageImpl.TYPE_MAPPING: return (EObject)createTypeMapping(); + case WSDDPackageImpl.ARRAY_MAPPING: return (EObject)createArrayMapping(); + case WSDDPackageImpl.BEAN_MAPPING: return (EObject)createBeanMapping(); + case WSDDPackageImpl.OPERATION_PARAMETER: return (EObject)createOperationParameter(); + case WSDDPackageImpl.FAULT: return (EObject)createFault(); + case WSDDPackageImpl.OPERATION: return (EObject)createOperation(); + case WSDDPackageImpl.SERVICE: return (EObject)createService(); + case WSDDPackageImpl.DEPLOYMENT: return (EObject)createDeployment(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -81,11 +89,11 @@ public class WSDDFactoryImpl extends EFa */ public Object createFromString(EDataType eDataType, String initialValue) { switch (eDataType.getClassifierID()) { - case WSDDPackage.USE: + case WSDDPackageImpl.USE: return createUseFromString(eDataType, initialValue); - case WSDDPackage.STYLE: + case WSDDPackageImpl.STYLE: return createStyleFromString(eDataType, initialValue); - case WSDDPackage.PARAMETER_MODE: + case WSDDPackageImpl.PARAMETER_MODE: return createParameterModeFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); @@ -99,11 +107,11 @@ public class WSDDFactoryImpl extends EFa */ public String convertToString(EDataType eDataType, Object instanceValue) { switch (eDataType.getClassifierID()) { - case WSDDPackage.USE: + case WSDDPackageImpl.USE: return convertUseToString(eDataType, instanceValue); - case WSDDPackage.STYLE: + case WSDDPackageImpl.STYLE: return convertStyleToString(eDataType, instanceValue); - case WSDDPackage.PARAMETER_MODE: + case WSDDPackageImpl.PARAMETER_MODE: return convertParameterModeToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); @@ -265,8 +273,8 @@ public class WSDDFactoryImpl extends EFa * <!-- end-user-doc --> * @generated */ - public WSDDPackage getWSDDPackage() { - return (WSDDPackage)getEPackage(); + public WSDDPackageImpl getWSDDPackage() { + return (WSDDPackageImpl)getEPackage(); } /** @@ -275,8 +283,8 @@ public class WSDDFactoryImpl extends EFa * @deprecated * @generated */ - public static WSDDPackage getPackage() { - return WSDDPackage.eINSTANCE; + public static WSDDPackageImpl getPackage() { + return WSDDPackageImpl.eINSTANCE; } } //WSDDFactoryImpl
