You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/12/05 23:07:01 UTC
svn commit: r1417666 [1/3] - in /axis/axis1/java/branches/EMF:
axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/ axis-model/model/
axis-model/src/main/java/org/apache/axis/model/wsdd/
axis-model/src/main/java/org/apache/axis/model/wsdd/impl/
Author: veithen
Date: Wed Dec 5 22:06:57 2012
New Revision: 1417666
URL: http://svn.apache.org/viewvc?rev=1417666&view=rev
Log:
Removed references to EMF classes and interfaces.
Removed:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDPackage.java
Modified:
axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
axis/axis1/java/branches/EMF/axis-model/model/wsdd.genmodel
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Style.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
Modified: axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java (original)
+++ axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java Wed Dec 5 22:06:57 2012
@@ -153,7 +153,7 @@ public class JavaDeployWriter extends Ja
* @throws IOException
*/
protected void writeFileBody(PrintWriter pw) throws IOException {
- Deployment deployment = WSDDFactory.eINSTANCE.createDeployment();
+ Deployment deployment = WSDDFactory.INSTANCE.createDeployment();
writeDeployServices(deployment);
WSDDUtil.write(deployment, pw);
} // writeFileBody
@@ -206,7 +206,7 @@ public class JavaDeployWriter extends Ja
if (hasMIME) {
QName bQName = binding.getQName();
- TypeMapping typeMapping = WSDDFactory.eINSTANCE.createTypeMapping();
+ TypeMapping typeMapping = WSDDFactory.INSTANCE.createTypeMapping();
typeMapping.setQname(new QName(bQName.getNamespaceURI(), "DataHandler"));
typeMapping.setType(new QName(WSDDConstants.URI_WSDD_JAVA, "javax.activation.DataHandler", WSDDConstants.NS_PREFIX_WSDD_JAVA));
typeMapping.setSerializer("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
@@ -278,7 +278,7 @@ public class JavaDeployWriter extends Ja
if (innerType == null) {
// no arrays
- TypeMapping typeMapping = WSDDFactory.eINSTANCE.createTypeMapping();
+ TypeMapping typeMapping = WSDDFactory.INSTANCE.createTypeMapping();
typeMapping.setQname(type.getQName());
typeMapping.setType(new QName(WSDDConstants.URI_WSDD_JAVA, javaType));
typeMapping.setSerializer(serializerFactory);
@@ -287,7 +287,7 @@ public class JavaDeployWriter extends Ja
service.getTypeMappings().add(typeMapping);
} else {
// arrays
- ArrayMapping arrayMapping = WSDDFactory.eINSTANCE.createArrayMapping();
+ ArrayMapping arrayMapping = WSDDFactory.INSTANCE.createArrayMapping();
arrayMapping.setQname(type.getQName());
arrayMapping.setType(new QName(WSDDConstants.URI_WSDD_JAVA, javaType));
arrayMapping.setEncodingStyle(encodingStyle);
@@ -337,7 +337,7 @@ public class JavaDeployWriter extends Ja
}
}
- org.apache.axis.model.wsdd.Service wsddService = WSDDFactory.eINSTANCE.createService();
+ org.apache.axis.model.wsdd.Service wsddService = WSDDFactory.INSTANCE.createService();
wsddService.setName(serviceName);
wsddService.setProvider(new QName(WSDDConstants.URI_WSDD_JAVA, "RPC"));
wsddService.setStyle(org.apache.axis.model.wsdd.Style.get(style.getValue()));
@@ -513,7 +513,7 @@ public class JavaDeployWriter extends Ja
QName bindingQName, ArrayList faults,
String SOAPAction) {
- org.apache.axis.model.wsdd.Operation operation = WSDDFactory.eINSTANCE.createOperation();
+ org.apache.axis.model.wsdd.Operation operation = WSDDFactory.INSTANCE.createOperation();
operation.setName(javaOperName);
@@ -553,7 +553,7 @@ public class JavaDeployWriter extends Ja
QName paramQName = param.getQName();
QName paramType = Utils.getXSIType(param);
- OperationParameter parameter = WSDDFactory.eINSTANCE.createOperationParameter();
+ OperationParameter parameter = WSDDFactory.INSTANCE.createOperationParameter();
if (paramQName == null) {
parameter.setName(param.getName());
@@ -592,7 +592,7 @@ public class JavaDeployWriter extends Ja
Utils.getFullExceptionName(faultInfo.getMessage(),
symbolTable);
- Fault fault = WSDDFactory.eINSTANCE.createFault();
+ Fault fault = WSDDFactory.INSTANCE.createFault();
fault.setName(faultInfo.getName());
fault.setQname(faultQName);
fault.setClass(className);
Modified: axis/axis1/java/branches/EMF/axis-model/model/wsdd.genmodel
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/model/wsdd.genmodel?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/model/wsdd.genmodel (original)
+++ axis/axis1/java/branches/EMF/axis-model/model/wsdd.genmodel Wed Dec 5 22:06:57 2012
@@ -3,17 +3,18 @@
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/axis-model/src/main/java"
editDirectory="" editorDirectory="" modelPluginID="" redirection="" modelName="Wsdd"
- editPluginClass="" editorPluginClass="" updateClasspath="false" testsDirectory=""
- testSuiteClass="" importerID="org.eclipse.emf.importer.ecore" bundleManifest="false"
- suppressNotification="true" suppressGenModelAnnotations="false" copyrightFields="false"
- binaryCompatibleReflectiveMethods="true" editPluginID="" editorPluginID="" runtimeVersion="2.2"
- language="" interfaceNamePattern="" classNamePattern="">
+ editPluginClass="" editorPluginClass="" updateClasspath="false" rootExtendsInterface=""
+ suppressEMFTypes="true" suppressEMFMetaData="true" testsDirectory="" testSuiteClass=""
+ importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" suppressNotification="true"
+ suppressGenModelAnnotations="false" copyrightFields="false" binaryCompatibleReflectiveMethods="true"
+ editPluginID="" editorPluginID="" runtimeVersion="2.2" language="" interfaceNamePattern=""
+ classNamePattern="">
<foreignModel>wsdd.ecore</foreignModel>
<genPackages prefix="WSDD" basePackage="org.apache.axis.model" disposableProviderFactory="true"
adapterFactory="false" contentTypeIdentifier="" ecorePackage="wsdd.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="wsdd.ecore#//Use">
- <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Use/LITERAL"/>
<genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Use/ENCODED"/>
+ <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Use/LITERAL"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="wsdd.ecore#//Style">
<genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Style/RPC"/>
@@ -21,6 +22,11 @@
<genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Style/WRAPPED"/>
<genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Style/MESSAGE"/>
</genEnums>
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="wsdd.ecore#//ParameterMode">
+ <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//ParameterMode/IN"/>
+ <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//ParameterMode/OUT"/>
+ <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//ParameterMode/INOUT"/>
+ </genEnums>
<genClasses ecoreClass="wsdd.ecore#//Parameter">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Parameter/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Parameter/value"/>
@@ -38,6 +44,34 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//ArrayMapping/innerType"/>
</genClasses>
<genClasses ecoreClass="wsdd.ecore#//BeanMapping"/>
+ <genClasses ecoreClass="wsdd.ecore#//OperationParameter">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//OperationParameter/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//OperationParameter/qname"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//OperationParameter/type"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//OperationParameter/mode"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//OperationParameter/inHeader"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//OperationParameter/outHeader"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//OperationParameter/itemQName"/>
+ </genClasses>
+ <genClasses ecoreClass="wsdd.ecore#//Fault">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Fault/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Fault/qname"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Fault/class"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Fault/type"/>
+ </genClasses>
+ <genClasses ecoreClass="wsdd.ecore#//Operation">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/qname"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/returnQName"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/returnType"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/returnItemQName"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/returnItemType"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/soapAction"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/mep"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Operation/returnHeader"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Operation/parameters"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Operation/faults"/>
+ </genClasses>
<genClasses image="false" ecoreClass="wsdd.ecore#//DeployableItem">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//DeployableItem/name"/>
</genClasses>
@@ -46,9 +80,14 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Service/use"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wsdd.ecore#//Service/style"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Service/parameters"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Service/operations"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Service/typeMappings"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Service/beanMappings"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Service/arrayMappings"/>
+ <genOperations ecoreOperation="wsdd.ecore#//Service/setParameter">
+ <genParameters ecoreParameter="wsdd.ecore#//Service/setParameter/name"/>
+ <genParameters ecoreParameter="wsdd.ecore#//Service/setParameter/value"/>
+ </genOperations>
</genClasses>
<genClasses ecoreClass="wsdd.ecore#//Deployment">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference wsdd.ecore#//Deployment/services"/>
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java Wed Dec 5 22:06:57 2012
@@ -19,7 +19,6 @@ package org.apache.axis.model.wsdd;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getArrayMapping()
* @model
* @generated
*/
@@ -34,7 +33,6 @@ public interface ArrayMapping extends Ma
* <!-- end-user-doc -->
* @return the value of the '<em>Inner Type</em>' attribute.
* @see #setInnerType(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getArrayMapping_InnerType()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java Wed Dec 5 22:06:57 2012
@@ -13,7 +13,6 @@ package org.apache.axis.model.wsdd;
* <!-- end-user-doc -->
*
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getBeanMapping()
* @model
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java Wed Dec 5 22:06:57 2012
@@ -6,8 +6,6 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.ecore.EObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Deployable Item</b></em>'.
@@ -20,11 +18,10 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getDeployableItem()
* @model abstract="true"
* @generated
*/
-public interface DeployableItem extends EObject {
+public interface DeployableItem {
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -35,7 +32,6 @@ public interface DeployableItem extends
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getDeployableItem_Name()
* @model
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java Wed Dec 5 22:06:57 2012
@@ -6,9 +6,7 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -22,11 +20,10 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getDeployment()
* @model extendedMetaData="name='deployment' kind='element'"
* @generated
*/
-public interface Deployment extends EObject {
+public interface Deployment {
/**
* Returns the value of the '<em><b>Services</b></em>' containment reference list.
* The list contents are of type {@link org.apache.axis.model.wsdd.Service}.
@@ -37,11 +34,10 @@ public interface Deployment extends EObj
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Services</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getDeployment_Services()
* @model type="org.apache.axis.model.wsdd.Service" containment="true"
* extendedMetaData="name='service' kind='element' namespace='##targetNamespace'"
* @generated
*/
- EList getServices();
+ List getServices();
} // Deployment
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java Wed Dec 5 22:06:57 2012
@@ -6,8 +6,6 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.ecore.EObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Fault</b></em>'.
@@ -23,11 +21,10 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getFault()
* @model
* @generated
*/
-public interface Fault extends EObject {
+public interface Fault {
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -38,7 +35,6 @@ public interface Fault extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getFault_Name()
* @model
* @generated
*/
@@ -64,7 +60,6 @@ public interface Fault extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Qname</em>' attribute.
* @see #setQname(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getFault_Qname()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -90,7 +85,6 @@ public interface Fault extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Class</em>' attribute.
* @see #setClass(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getFault_Class()
* @model
* @generated
*/
@@ -116,7 +110,6 @@ public interface Fault extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Type</em>' attribute.
* @see #setType(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getFault_Type()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java Wed Dec 5 22:06:57 2012
@@ -6,8 +6,6 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.ecore.EObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Mapping</b></em>'.
@@ -22,11 +20,10 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getMapping()
* @model abstract="true"
* @generated
*/
-public interface Mapping extends EObject {
+public interface Mapping {
/**
* Returns the value of the '<em><b>Qname</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -37,7 +34,6 @@ public interface Mapping extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Qname</em>' attribute.
* @see #setQname(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getMapping_Qname()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -63,7 +59,6 @@ public interface Mapping extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Type</em>' attribute.
* @see #setType(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getMapping_Type()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -89,7 +84,6 @@ public interface Mapping extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Encoding Style</em>' attribute.
* @see #setEncodingStyle(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getMapping_EncodingStyle()
* @model
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java Wed Dec 5 22:06:57 2012
@@ -6,9 +6,7 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -32,11 +30,10 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation()
* @model
* @generated
*/
-public interface Operation extends EObject {
+public interface Operation {
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -47,7 +44,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_Name()
* @model
* @generated
*/
@@ -73,7 +69,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Qname</em>' attribute.
* @see #setQname(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_Qname()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -99,7 +94,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Return QName</em>' attribute.
* @see #setReturnQName(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_ReturnQName()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -125,7 +119,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Return Type</em>' attribute.
* @see #setReturnType(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_ReturnType()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -151,7 +144,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Return Item QName</em>' attribute.
* @see #setReturnItemQName(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_ReturnItemQName()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -177,7 +169,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Return Item Type</em>' attribute.
* @see #setReturnItemType(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_ReturnItemType()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -203,7 +194,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Soap Action</em>' attribute.
* @see #setSoapAction(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_SoapAction()
* @model
* @generated
*/
@@ -229,7 +219,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Mep</em>' attribute.
* @see #setMep(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_Mep()
* @model
* @generated
*/
@@ -255,7 +244,6 @@ public interface Operation extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Return Header</em>' attribute.
* @see #setReturnHeader(Boolean)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_ReturnHeader()
* @model
* @generated
*/
@@ -281,12 +269,11 @@ public interface Operation extends EObje
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Parameters</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_Parameters()
* @model type="org.apache.axis.model.wsdd.OperationParameter" containment="true"
* extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'"
* @generated
*/
- EList getParameters();
+ List getParameters();
/**
* Returns the value of the '<em><b>Faults</b></em>' containment reference list.
@@ -298,11 +285,10 @@ public interface Operation extends EObje
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Faults</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperation_Faults()
* @model type="org.apache.axis.model.wsdd.Fault" containment="true"
* extendedMetaData="kind='element' name='fault' namespace='##targetNamespace'"
* @generated
*/
- EList getFaults();
+ List getFaults();
} // Operation
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java Wed Dec 5 22:06:57 2012
@@ -6,8 +6,6 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.ecore.EObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Operation Parameter</b></em>'.
@@ -26,11 +24,10 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter()
* @model
* @generated
*/
-public interface OperationParameter extends EObject {
+public interface OperationParameter {
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -41,7 +38,6 @@ public interface OperationParameter exte
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter_Name()
* @model
* @generated
*/
@@ -67,7 +63,6 @@ public interface OperationParameter exte
* <!-- end-user-doc -->
* @return the value of the '<em>Qname</em>' attribute.
* @see #setQname(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter_Qname()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -93,7 +88,6 @@ public interface OperationParameter exte
* <!-- end-user-doc -->
* @return the value of the '<em>Type</em>' attribute.
* @see #setType(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter_Type()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -121,7 +115,6 @@ public interface OperationParameter exte
* @return the value of the '<em>Mode</em>' attribute.
* @see org.apache.axis.model.wsdd.ParameterMode
* @see #setMode(ParameterMode)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter_Mode()
* @model
* @generated
*/
@@ -148,7 +141,6 @@ public interface OperationParameter exte
* <!-- end-user-doc -->
* @return the value of the '<em>In Header</em>' attribute.
* @see #setInHeader(Boolean)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter_InHeader()
* @model
* @generated
*/
@@ -174,7 +166,6 @@ public interface OperationParameter exte
* <!-- end-user-doc -->
* @return the value of the '<em>Out Header</em>' attribute.
* @see #setOutHeader(Boolean)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter_OutHeader()
* @model
* @generated
*/
@@ -200,7 +191,6 @@ public interface OperationParameter exte
* <!-- end-user-doc -->
* @return the value of the '<em>Item QName</em>' attribute.
* @see #setItemQName(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getOperationParameter_ItemQName()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java Wed Dec 5 22:06:57 2012
@@ -6,8 +6,6 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.ecore.EObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Parameter</b></em>'.
@@ -21,11 +19,10 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getParameter()
* @model
* @generated
*/
-public interface Parameter extends EObject {
+public interface Parameter {
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -36,7 +33,6 @@ public interface Parameter extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getParameter_Name()
* @model
* @generated
*/
@@ -62,7 +58,6 @@ public interface Parameter extends EObje
* <!-- end-user-doc -->
* @return the value of the '<em>Value</em>' attribute.
* @see #setValue(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getParameter_Value()
* @model
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java Wed Dec 5 22:06:57 2012
@@ -10,18 +10,16 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
/**
* <!-- begin-user-doc -->
* A representation of the literals of the enumeration '<em><b>Parameter Mode</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.WSDDPackage#getParameterMode()
+ * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterMode()
* @model
* @generated
*/
-public final class ParameterMode extends AbstractEnumerator {
+public final class ParameterMode extends InternalParameterMode {
/**
* The '<em><b>IN</b></em>' literal value.
* <!-- begin-user-doc -->
@@ -176,3 +174,21 @@ public final class ParameterMode extends
}
} //ParameterMode
+
+/**
+ * A private implementation class to construct the instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+class InternalParameterMode extends org.eclipse.emf.common.util.AbstractEnumerator {
+ /**
+ * Only this class can construct instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected InternalParameterMode(int value, String name, String literal) {
+ super(value, name, literal);
+ }
+}
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java Wed Dec 5 22:06:57 2012
@@ -6,7 +6,7 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
/**
* <!-- begin-user-doc -->
@@ -27,7 +27,6 @@ import org.eclipse.emf.common.util.EList
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService()
* @model
* @generated
*/
@@ -42,7 +41,6 @@ public interface Service extends Deploya
* <!-- end-user-doc -->
* @return the value of the '<em>Provider</em>' attribute.
* @see #setProvider(Object)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_Provider()
* @model dataType="org.eclipse.emf.ecore.xml.type.QName"
* @generated
*/
@@ -70,7 +68,6 @@ public interface Service extends Deploya
* @return the value of the '<em>Use</em>' attribute.
* @see org.apache.axis.model.wsdd.Use
* @see #setUse(Use)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_Use()
* @model
* @generated
*/
@@ -99,7 +96,6 @@ public interface Service extends Deploya
* @return the value of the '<em>Style</em>' attribute.
* @see org.apache.axis.model.wsdd.Style
* @see #setStyle(Style)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_Style()
* @model
* @generated
*/
@@ -126,12 +122,11 @@ public interface Service extends Deploya
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Parameters</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_Parameters()
* @model type="org.apache.axis.model.wsdd.Parameter" containment="true"
* extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'"
* @generated
*/
- EList getParameters();
+ List getParameters();
/**
* Returns the value of the '<em><b>Operations</b></em>' containment reference list.
@@ -143,12 +138,11 @@ public interface Service extends Deploya
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Operations</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_Operations()
* @model type="org.apache.axis.model.wsdd.Operation" containment="true"
* extendedMetaData="kind='element' name='operation' namespace='##targetNamespace'"
* @generated
*/
- EList getOperations();
+ List getOperations();
/**
* Returns the value of the '<em><b>Type Mappings</b></em>' containment reference list.
@@ -160,12 +154,11 @@ public interface Service extends Deploya
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Type Mappings</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_TypeMappings()
* @model type="org.apache.axis.model.wsdd.TypeMapping" containment="true"
* extendedMetaData="kind='element' name='typeMapping' namespace='##targetNamespace'"
* @generated
*/
- EList getTypeMappings();
+ List getTypeMappings();
/**
* Returns the value of the '<em><b>Bean Mappings</b></em>' containment reference list.
@@ -177,12 +170,11 @@ public interface Service extends Deploya
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Bean Mappings</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_BeanMappings()
* @model type="org.apache.axis.model.wsdd.BeanMapping" containment="true"
* extendedMetaData="kind='element' name='beanMapping' namespace='##targetNamespace'"
* @generated
*/
- EList getBeanMappings();
+ List getBeanMappings();
/**
* Returns the value of the '<em><b>Array Mappings</b></em>' containment reference list.
@@ -194,12 +186,11 @@ public interface Service extends Deploya
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Array Mappings</em>' containment reference list.
- * @see org.apache.axis.model.wsdd.WSDDPackage#getService_ArrayMappings()
* @model type="org.apache.axis.model.wsdd.ArrayMapping" containment="true"
* extendedMetaData="kind='element' name='arrayMapping' namespace='##targetNamespace'"
* @generated
*/
- EList getArrayMappings();
+ List getArrayMappings();
/**
* <!-- begin-user-doc -->
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Style.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Style.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Style.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Style.java Wed Dec 5 22:06:57 2012
@@ -10,18 +10,16 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
/**
* <!-- begin-user-doc -->
* A representation of the literals of the enumeration '<em><b>Style</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.WSDDPackage#getStyle()
+ * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getStyle()
* @model
* @generated
*/
-public final class Style extends AbstractEnumerator {
+public final class Style extends InternalStyle {
/**
* The '<em><b>RPC</b></em>' literal value.
* <!-- begin-user-doc -->
@@ -203,3 +201,21 @@ public final class Style extends Abstrac
}
} //Style
+
+/**
+ * A private implementation class to construct the instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+class InternalStyle extends org.eclipse.emf.common.util.AbstractEnumerator {
+ /**
+ * Only this class can construct instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected InternalStyle(int value, String name, String literal) {
+ super(value, name, literal);
+ }
+}
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java Wed Dec 5 22:06:57 2012
@@ -20,7 +20,6 @@ package org.apache.axis.model.wsdd;
* </ul>
* </p>
*
- * @see org.apache.axis.model.wsdd.WSDDPackage#getTypeMapping()
* @model
* @generated
*/
@@ -35,7 +34,6 @@ public interface TypeMapping extends Map
* <!-- end-user-doc -->
* @return the value of the '<em>Serializer</em>' attribute.
* @see #setSerializer(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getTypeMapping_Serializer()
* @model
* @generated
*/
@@ -61,7 +59,6 @@ public interface TypeMapping extends Map
* <!-- end-user-doc -->
* @return the value of the '<em>Deserializer</em>' attribute.
* @see #setDeserializer(String)
- * @see org.apache.axis.model.wsdd.WSDDPackage#getTypeMapping_Deserializer()
* @model
* @generated
*/
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java Wed Dec 5 22:06:57 2012
@@ -10,18 +10,16 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
/**
* <!-- begin-user-doc -->
* A representation of the literals of the enumeration '<em><b>Use</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.WSDDPackage#getUse()
+ * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getUse()
* @model
* @generated
*/
-public final class Use extends AbstractEnumerator {
+public final class Use extends InternalUse {
/**
* The '<em><b>ENCODED</b></em>' literal value.
* <!-- begin-user-doc -->
@@ -149,3 +147,21 @@ public final class Use extends AbstractE
}
} //Use
+
+/**
+ * A private implementation class to construct the instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+class InternalUse extends org.eclipse.emf.common.util.AbstractEnumerator {
+ /**
+ * Only this class can construct instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected InternalUse(int value, String name, String literal) {
+ super(value, name, literal);
+ }
+}
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java?rev=1417666&r1=1417665&r2=1417666&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java Wed Dec 5 22:06:57 2012
@@ -6,25 +6,21 @@
*/
package org.apache.axis.model.wsdd;
-import org.eclipse.emf.ecore.EFactory;
-
/**
* <!-- begin-user-doc -->
* 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.apache.axis.model.wsdd.WSDDPackage
* @generated
*/
-public interface WSDDFactory extends EFactory {
+public interface WSDDFactory {
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- WSDDFactory eINSTANCE = org.apache.axis.model.wsdd.impl.WSDDFactoryImpl.init();
-
+ WSDDFactory INSTANCE = org.apache.axis.model.wsdd.impl.WSDDFactoryImpl.eINSTANCE;
/**
* Returns a new object of class '<em>Parameter</em>'.
* <!-- begin-user-doc -->
@@ -106,13 +102,4 @@ public interface WSDDFactory extends EFa
*/
Deployment createDeployment();
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- WSDDPackage getWSDDPackage();
-
} //WSDDFactory
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.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/ArrayMappingImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.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.ArrayMapping;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.ecore.EClass;
@@ -60,7 +59,7 @@ public class ArrayMappingImpl extends Ma
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.ARRAY_MAPPING;
+ return WSDDPackageImpl.Literals.ARRAY_MAPPING;
}
/**
@@ -88,7 +87,7 @@ public class ArrayMappingImpl extends Ma
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.ARRAY_MAPPING__INNER_TYPE:
+ case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
return getInnerType();
}
return super.eGet(featureID, resolve, coreType);
@@ -101,7 +100,7 @@ public class ArrayMappingImpl extends Ma
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.ARRAY_MAPPING__INNER_TYPE:
+ case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
setInnerType(newValue);
return;
}
@@ -115,7 +114,7 @@ public class ArrayMappingImpl extends Ma
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.ARRAY_MAPPING__INNER_TYPE:
+ case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
setInnerType(INNER_TYPE_EDEFAULT);
return;
}
@@ -129,7 +128,7 @@ public class ArrayMappingImpl extends Ma
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.ARRAY_MAPPING__INNER_TYPE:
+ case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
return INNER_TYPE_EDEFAULT == null ? innerType != null : !INNER_TYPE_EDEFAULT.equals(innerType);
}
return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.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/BeanMappingImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.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.BeanMapping;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.ecore.EClass;
@@ -36,7 +35,7 @@ public class BeanMappingImpl extends Map
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.BEAN_MAPPING;
+ return WSDDPackageImpl.Literals.BEAN_MAPPING;
}
} //BeanMappingImpl
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.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/DeployableItemImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.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.DeployableItem;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.ecore.EClass;
@@ -62,7 +61,7 @@ public abstract class DeployableItemImpl
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.DEPLOYABLE_ITEM;
+ return WSDDPackageImpl.Literals.DEPLOYABLE_ITEM;
}
/**
@@ -90,7 +89,7 @@ public abstract class DeployableItemImpl
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.DEPLOYABLE_ITEM__NAME:
+ case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
return getName();
}
return super.eGet(featureID, resolve, coreType);
@@ -103,7 +102,7 @@ public abstract class DeployableItemImpl
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.DEPLOYABLE_ITEM__NAME:
+ case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
setName((String)newValue);
return;
}
@@ -117,7 +116,7 @@ public abstract class DeployableItemImpl
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.DEPLOYABLE_ITEM__NAME:
+ case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
setName(NAME_EDEFAULT);
return;
}
@@ -131,7 +130,7 @@ public abstract class DeployableItemImpl
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.DEPLOYABLE_ITEM__NAME:
+ case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
}
return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.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/DeploymentImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java Wed Dec 5 22:06:57 2012
@@ -8,9 +8,9 @@ package org.apache.axis.model.wsdd.impl;
import java.util.Collection;
+import java.util.List;
import org.apache.axis.model.wsdd.Deployment;
import org.apache.axis.model.wsdd.Service;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -63,7 +63,7 @@ public class DeploymentImpl extends EObj
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.DEPLOYMENT;
+ return WSDDPackageImpl.Literals.DEPLOYMENT;
}
/**
@@ -71,7 +71,7 @@ public class DeploymentImpl extends EObj
* <!-- end-user-doc -->
* @generated
*/
- public EList getServices() {
+ public List getServices() {
if (services == null) {
services = new BasicInternalEList(Service.class);
}
@@ -85,7 +85,7 @@ public class DeploymentImpl extends EObj
*/
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case WSDDPackage.DEPLOYMENT__SERVICES:
+ case WSDDPackageImpl.DEPLOYMENT__SERVICES:
return ((InternalEList)getServices()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -98,7 +98,7 @@ public class DeploymentImpl extends EObj
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.DEPLOYMENT__SERVICES:
+ case WSDDPackageImpl.DEPLOYMENT__SERVICES:
return getServices();
}
return super.eGet(featureID, resolve, coreType);
@@ -111,7 +111,7 @@ public class DeploymentImpl extends EObj
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.DEPLOYMENT__SERVICES:
+ case WSDDPackageImpl.DEPLOYMENT__SERVICES:
getServices().clear();
getServices().addAll((Collection)newValue);
return;
@@ -126,7 +126,7 @@ public class DeploymentImpl extends EObj
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.DEPLOYMENT__SERVICES:
+ case WSDDPackageImpl.DEPLOYMENT__SERVICES:
getServices().clear();
return;
}
@@ -140,7 +140,7 @@ public class DeploymentImpl extends EObj
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.DEPLOYMENT__SERVICES:
+ case WSDDPackageImpl.DEPLOYMENT__SERVICES:
return services != null && !services.isEmpty();
}
return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.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/FaultImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.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.Fault;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.ecore.EClass;
@@ -125,7 +124,7 @@ public class FaultImpl extends EObjectIm
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.FAULT;
+ return WSDDPackageImpl.Literals.FAULT;
}
/**
@@ -207,13 +206,13 @@ public class FaultImpl extends EObjectIm
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.FAULT__NAME:
+ case WSDDPackageImpl.FAULT__NAME:
return getName();
- case WSDDPackage.FAULT__QNAME:
+ case WSDDPackageImpl.FAULT__QNAME:
return getQname();
- case WSDDPackage.FAULT__CLASS:
+ case WSDDPackageImpl.FAULT__CLASS:
return getClass_();
- case WSDDPackage.FAULT__TYPE:
+ case WSDDPackageImpl.FAULT__TYPE:
return getType();
}
return super.eGet(featureID, resolve, coreType);
@@ -226,16 +225,16 @@ public class FaultImpl extends EObjectIm
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.FAULT__NAME:
+ case WSDDPackageImpl.FAULT__NAME:
setName((String)newValue);
return;
- case WSDDPackage.FAULT__QNAME:
+ case WSDDPackageImpl.FAULT__QNAME:
setQname(newValue);
return;
- case WSDDPackage.FAULT__CLASS:
+ case WSDDPackageImpl.FAULT__CLASS:
setClass((String)newValue);
return;
- case WSDDPackage.FAULT__TYPE:
+ case WSDDPackageImpl.FAULT__TYPE:
setType(newValue);
return;
}
@@ -249,16 +248,16 @@ public class FaultImpl extends EObjectIm
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.FAULT__NAME:
+ case WSDDPackageImpl.FAULT__NAME:
setName(NAME_EDEFAULT);
return;
- case WSDDPackage.FAULT__QNAME:
+ case WSDDPackageImpl.FAULT__QNAME:
setQname(QNAME_EDEFAULT);
return;
- case WSDDPackage.FAULT__CLASS:
+ case WSDDPackageImpl.FAULT__CLASS:
setClass(CLASS_EDEFAULT);
return;
- case WSDDPackage.FAULT__TYPE:
+ case WSDDPackageImpl.FAULT__TYPE:
setType(TYPE_EDEFAULT);
return;
}
@@ -272,13 +271,13 @@ public class FaultImpl extends EObjectIm
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.FAULT__NAME:
+ case WSDDPackageImpl.FAULT__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case WSDDPackage.FAULT__QNAME:
+ case WSDDPackageImpl.FAULT__QNAME:
return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
- case WSDDPackage.FAULT__CLASS:
+ case WSDDPackageImpl.FAULT__CLASS:
return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
- case WSDDPackage.FAULT__TYPE:
+ case WSDDPackageImpl.FAULT__TYPE:
return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
}
return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.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/MappingImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.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.Mapping;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.ecore.EClass;
@@ -104,7 +103,7 @@ public abstract class MappingImpl extend
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.MAPPING;
+ return WSDDPackageImpl.Literals.MAPPING;
}
/**
@@ -168,11 +167,11 @@ public abstract class MappingImpl extend
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.MAPPING__QNAME:
+ case WSDDPackageImpl.MAPPING__QNAME:
return getQname();
- case WSDDPackage.MAPPING__TYPE:
+ case WSDDPackageImpl.MAPPING__TYPE:
return getType();
- case WSDDPackage.MAPPING__ENCODING_STYLE:
+ case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
return getEncodingStyle();
}
return super.eGet(featureID, resolve, coreType);
@@ -185,13 +184,13 @@ public abstract class MappingImpl extend
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.MAPPING__QNAME:
+ case WSDDPackageImpl.MAPPING__QNAME:
setQname(newValue);
return;
- case WSDDPackage.MAPPING__TYPE:
+ case WSDDPackageImpl.MAPPING__TYPE:
setType(newValue);
return;
- case WSDDPackage.MAPPING__ENCODING_STYLE:
+ case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
setEncodingStyle((String)newValue);
return;
}
@@ -205,13 +204,13 @@ public abstract class MappingImpl extend
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.MAPPING__QNAME:
+ case WSDDPackageImpl.MAPPING__QNAME:
setQname(QNAME_EDEFAULT);
return;
- case WSDDPackage.MAPPING__TYPE:
+ case WSDDPackageImpl.MAPPING__TYPE:
setType(TYPE_EDEFAULT);
return;
- case WSDDPackage.MAPPING__ENCODING_STYLE:
+ case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
setEncodingStyle(ENCODING_STYLE_EDEFAULT);
return;
}
@@ -225,11 +224,11 @@ public abstract class MappingImpl extend
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.MAPPING__QNAME:
+ case WSDDPackageImpl.MAPPING__QNAME:
return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
- case WSDDPackage.MAPPING__TYPE:
+ case WSDDPackageImpl.MAPPING__TYPE:
return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case WSDDPackage.MAPPING__ENCODING_STYLE:
+ case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
return ENCODING_STYLE_EDEFAULT == null ? encodingStyle != null : !ENCODING_STYLE_EDEFAULT.equals(encodingStyle);
}
return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.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/OperationImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java Wed Dec 5 22:06:57 2012
@@ -8,10 +8,10 @@ package org.apache.axis.model.wsdd.impl;
import java.util.Collection;
+import java.util.List;
import org.apache.axis.model.wsdd.Fault;
import org.apache.axis.model.wsdd.Operation;
import org.apache.axis.model.wsdd.OperationParameter;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -264,7 +264,7 @@ public class OperationImpl extends EObje
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.OPERATION;
+ return WSDDPackageImpl.Literals.OPERATION;
}
/**
@@ -434,7 +434,7 @@ public class OperationImpl extends EObje
* <!-- end-user-doc -->
* @generated
*/
- public EList getParameters() {
+ public List getParameters() {
if (parameters == null) {
parameters = new BasicInternalEList(OperationParameter.class);
}
@@ -446,7 +446,7 @@ public class OperationImpl extends EObje
* <!-- end-user-doc -->
* @generated
*/
- public EList getFaults() {
+ public List getFaults() {
if (faults == null) {
faults = new BasicInternalEList(Fault.class);
}
@@ -460,9 +460,9 @@ public class OperationImpl extends EObje
*/
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case WSDDPackage.OPERATION__PARAMETERS:
+ case WSDDPackageImpl.OPERATION__PARAMETERS:
return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
- case WSDDPackage.OPERATION__FAULTS:
+ case WSDDPackageImpl.OPERATION__FAULTS:
return ((InternalEList)getFaults()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -475,27 +475,27 @@ public class OperationImpl extends EObje
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.OPERATION__NAME:
+ case WSDDPackageImpl.OPERATION__NAME:
return getName();
- case WSDDPackage.OPERATION__QNAME:
+ case WSDDPackageImpl.OPERATION__QNAME:
return getQname();
- case WSDDPackage.OPERATION__RETURN_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_QNAME:
return getReturnQName();
- case WSDDPackage.OPERATION__RETURN_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_TYPE:
return getReturnType();
- case WSDDPackage.OPERATION__RETURN_ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
return getReturnItemQName();
- case WSDDPackage.OPERATION__RETURN_ITEM_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
return getReturnItemType();
- case WSDDPackage.OPERATION__SOAP_ACTION:
+ case WSDDPackageImpl.OPERATION__SOAP_ACTION:
return getSoapAction();
- case WSDDPackage.OPERATION__MEP:
+ case WSDDPackageImpl.OPERATION__MEP:
return getMep();
- case WSDDPackage.OPERATION__RETURN_HEADER:
+ case WSDDPackageImpl.OPERATION__RETURN_HEADER:
return getReturnHeader();
- case WSDDPackage.OPERATION__PARAMETERS:
+ case WSDDPackageImpl.OPERATION__PARAMETERS:
return getParameters();
- case WSDDPackage.OPERATION__FAULTS:
+ case WSDDPackageImpl.OPERATION__FAULTS:
return getFaults();
}
return super.eGet(featureID, resolve, coreType);
@@ -508,38 +508,38 @@ public class OperationImpl extends EObje
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.OPERATION__NAME:
+ case WSDDPackageImpl.OPERATION__NAME:
setName((String)newValue);
return;
- case WSDDPackage.OPERATION__QNAME:
+ case WSDDPackageImpl.OPERATION__QNAME:
setQname(newValue);
return;
- case WSDDPackage.OPERATION__RETURN_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_QNAME:
setReturnQName(newValue);
return;
- case WSDDPackage.OPERATION__RETURN_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_TYPE:
setReturnType(newValue);
return;
- case WSDDPackage.OPERATION__RETURN_ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
setReturnItemQName(newValue);
return;
- case WSDDPackage.OPERATION__RETURN_ITEM_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
setReturnItemType(newValue);
return;
- case WSDDPackage.OPERATION__SOAP_ACTION:
+ case WSDDPackageImpl.OPERATION__SOAP_ACTION:
setSoapAction((String)newValue);
return;
- case WSDDPackage.OPERATION__MEP:
+ case WSDDPackageImpl.OPERATION__MEP:
setMep((String)newValue);
return;
- case WSDDPackage.OPERATION__RETURN_HEADER:
+ case WSDDPackageImpl.OPERATION__RETURN_HEADER:
setReturnHeader((Boolean)newValue);
return;
- case WSDDPackage.OPERATION__PARAMETERS:
+ case WSDDPackageImpl.OPERATION__PARAMETERS:
getParameters().clear();
getParameters().addAll((Collection)newValue);
return;
- case WSDDPackage.OPERATION__FAULTS:
+ case WSDDPackageImpl.OPERATION__FAULTS:
getFaults().clear();
getFaults().addAll((Collection)newValue);
return;
@@ -554,37 +554,37 @@ public class OperationImpl extends EObje
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.OPERATION__NAME:
+ case WSDDPackageImpl.OPERATION__NAME:
setName(NAME_EDEFAULT);
return;
- case WSDDPackage.OPERATION__QNAME:
+ case WSDDPackageImpl.OPERATION__QNAME:
setQname(QNAME_EDEFAULT);
return;
- case WSDDPackage.OPERATION__RETURN_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_QNAME:
setReturnQName(RETURN_QNAME_EDEFAULT);
return;
- case WSDDPackage.OPERATION__RETURN_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_TYPE:
setReturnType(RETURN_TYPE_EDEFAULT);
return;
- case WSDDPackage.OPERATION__RETURN_ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
setReturnItemQName(RETURN_ITEM_QNAME_EDEFAULT);
return;
- case WSDDPackage.OPERATION__RETURN_ITEM_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
setReturnItemType(RETURN_ITEM_TYPE_EDEFAULT);
return;
- case WSDDPackage.OPERATION__SOAP_ACTION:
+ case WSDDPackageImpl.OPERATION__SOAP_ACTION:
setSoapAction(SOAP_ACTION_EDEFAULT);
return;
- case WSDDPackage.OPERATION__MEP:
+ case WSDDPackageImpl.OPERATION__MEP:
setMep(MEP_EDEFAULT);
return;
- case WSDDPackage.OPERATION__RETURN_HEADER:
+ case WSDDPackageImpl.OPERATION__RETURN_HEADER:
setReturnHeader(RETURN_HEADER_EDEFAULT);
return;
- case WSDDPackage.OPERATION__PARAMETERS:
+ case WSDDPackageImpl.OPERATION__PARAMETERS:
getParameters().clear();
return;
- case WSDDPackage.OPERATION__FAULTS:
+ case WSDDPackageImpl.OPERATION__FAULTS:
getFaults().clear();
return;
}
@@ -598,27 +598,27 @@ public class OperationImpl extends EObje
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.OPERATION__NAME:
+ case WSDDPackageImpl.OPERATION__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case WSDDPackage.OPERATION__QNAME:
+ case WSDDPackageImpl.OPERATION__QNAME:
return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
- case WSDDPackage.OPERATION__RETURN_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_QNAME:
return RETURN_QNAME_EDEFAULT == null ? returnQName != null : !RETURN_QNAME_EDEFAULT.equals(returnQName);
- case WSDDPackage.OPERATION__RETURN_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_TYPE:
return RETURN_TYPE_EDEFAULT == null ? returnType != null : !RETURN_TYPE_EDEFAULT.equals(returnType);
- case WSDDPackage.OPERATION__RETURN_ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
return RETURN_ITEM_QNAME_EDEFAULT == null ? returnItemQName != null : !RETURN_ITEM_QNAME_EDEFAULT.equals(returnItemQName);
- case WSDDPackage.OPERATION__RETURN_ITEM_TYPE:
+ case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
return RETURN_ITEM_TYPE_EDEFAULT == null ? returnItemType != null : !RETURN_ITEM_TYPE_EDEFAULT.equals(returnItemType);
- case WSDDPackage.OPERATION__SOAP_ACTION:
+ case WSDDPackageImpl.OPERATION__SOAP_ACTION:
return SOAP_ACTION_EDEFAULT == null ? soapAction != null : !SOAP_ACTION_EDEFAULT.equals(soapAction);
- case WSDDPackage.OPERATION__MEP:
+ case WSDDPackageImpl.OPERATION__MEP:
return MEP_EDEFAULT == null ? mep != null : !MEP_EDEFAULT.equals(mep);
- case WSDDPackage.OPERATION__RETURN_HEADER:
+ case WSDDPackageImpl.OPERATION__RETURN_HEADER:
return RETURN_HEADER_EDEFAULT == null ? returnHeader != null : !RETURN_HEADER_EDEFAULT.equals(returnHeader);
- case WSDDPackage.OPERATION__PARAMETERS:
+ case WSDDPackageImpl.OPERATION__PARAMETERS:
return parameters != null && !parameters.isEmpty();
- case WSDDPackage.OPERATION__FAULTS:
+ case WSDDPackageImpl.OPERATION__FAULTS:
return faults != null && !faults.isEmpty();
}
return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.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/OperationParameterImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java Wed Dec 5 22:06:57 2012
@@ -8,7 +8,6 @@ package org.apache.axis.model.wsdd.impl;
import org.apache.axis.model.wsdd.OperationParameter;
import org.apache.axis.model.wsdd.ParameterMode;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.ecore.EClass;
@@ -189,7 +188,7 @@ public class OperationParameterImpl exte
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.OPERATION_PARAMETER;
+ return WSDDPackageImpl.Literals.OPERATION_PARAMETER;
}
/**
@@ -325,19 +324,19 @@ public class OperationParameterImpl exte
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.OPERATION_PARAMETER__NAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
return getName();
- case WSDDPackage.OPERATION_PARAMETER__QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
return getQname();
- case WSDDPackage.OPERATION_PARAMETER__TYPE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
return getType();
- case WSDDPackage.OPERATION_PARAMETER__MODE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
return getMode();
- case WSDDPackage.OPERATION_PARAMETER__IN_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
return getInHeader();
- case WSDDPackage.OPERATION_PARAMETER__OUT_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
return getOutHeader();
- case WSDDPackage.OPERATION_PARAMETER__ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
return getItemQName();
}
return super.eGet(featureID, resolve, coreType);
@@ -350,25 +349,25 @@ public class OperationParameterImpl exte
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.OPERATION_PARAMETER__NAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
setName((String)newValue);
return;
- case WSDDPackage.OPERATION_PARAMETER__QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
setQname(newValue);
return;
- case WSDDPackage.OPERATION_PARAMETER__TYPE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
setType(newValue);
return;
- case WSDDPackage.OPERATION_PARAMETER__MODE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
setMode((ParameterMode)newValue);
return;
- case WSDDPackage.OPERATION_PARAMETER__IN_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
setInHeader((Boolean)newValue);
return;
- case WSDDPackage.OPERATION_PARAMETER__OUT_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
setOutHeader((Boolean)newValue);
return;
- case WSDDPackage.OPERATION_PARAMETER__ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
setItemQName(newValue);
return;
}
@@ -382,25 +381,25 @@ public class OperationParameterImpl exte
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.OPERATION_PARAMETER__NAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
setName(NAME_EDEFAULT);
return;
- case WSDDPackage.OPERATION_PARAMETER__QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
setQname(QNAME_EDEFAULT);
return;
- case WSDDPackage.OPERATION_PARAMETER__TYPE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
setType(TYPE_EDEFAULT);
return;
- case WSDDPackage.OPERATION_PARAMETER__MODE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
setMode(MODE_EDEFAULT);
return;
- case WSDDPackage.OPERATION_PARAMETER__IN_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
setInHeader(IN_HEADER_EDEFAULT);
return;
- case WSDDPackage.OPERATION_PARAMETER__OUT_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
setOutHeader(OUT_HEADER_EDEFAULT);
return;
- case WSDDPackage.OPERATION_PARAMETER__ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
setItemQName(ITEM_QNAME_EDEFAULT);
return;
}
@@ -414,19 +413,19 @@ public class OperationParameterImpl exte
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.OPERATION_PARAMETER__NAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case WSDDPackage.OPERATION_PARAMETER__QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
- case WSDDPackage.OPERATION_PARAMETER__TYPE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case WSDDPackage.OPERATION_PARAMETER__MODE:
+ case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
return mode != MODE_EDEFAULT;
- case WSDDPackage.OPERATION_PARAMETER__IN_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
return IN_HEADER_EDEFAULT == null ? inHeader != null : !IN_HEADER_EDEFAULT.equals(inHeader);
- case WSDDPackage.OPERATION_PARAMETER__OUT_HEADER:
+ case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
return OUT_HEADER_EDEFAULT == null ? outHeader != null : !OUT_HEADER_EDEFAULT.equals(outHeader);
- case WSDDPackage.OPERATION_PARAMETER__ITEM_QNAME:
+ case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
return ITEM_QNAME_EDEFAULT == null ? itemQName != null : !ITEM_QNAME_EDEFAULT.equals(itemQName);
}
return super.eIsSet(featureID);
Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.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/ParameterImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.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.Parameter;
-import org.apache.axis.model.wsdd.WSDDPackage;
import org.eclipse.emf.ecore.EClass;
@@ -83,7 +82,7 @@ public class ParameterImpl extends EObje
* @generated
*/
protected EClass eStaticClass() {
- return WSDDPackage.Literals.PARAMETER;
+ return WSDDPackageImpl.Literals.PARAMETER;
}
/**
@@ -129,9 +128,9 @@ public class ParameterImpl extends EObje
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case WSDDPackage.PARAMETER__NAME:
+ case WSDDPackageImpl.PARAMETER__NAME:
return getName();
- case WSDDPackage.PARAMETER__VALUE:
+ case WSDDPackageImpl.PARAMETER__VALUE:
return getValue();
}
return super.eGet(featureID, resolve, coreType);
@@ -144,10 +143,10 @@ public class ParameterImpl extends EObje
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case WSDDPackage.PARAMETER__NAME:
+ case WSDDPackageImpl.PARAMETER__NAME:
setName((String)newValue);
return;
- case WSDDPackage.PARAMETER__VALUE:
+ case WSDDPackageImpl.PARAMETER__VALUE:
setValue((String)newValue);
return;
}
@@ -161,10 +160,10 @@ public class ParameterImpl extends EObje
*/
public void eUnset(int featureID) {
switch (featureID) {
- case WSDDPackage.PARAMETER__NAME:
+ case WSDDPackageImpl.PARAMETER__NAME:
setName(NAME_EDEFAULT);
return;
- case WSDDPackage.PARAMETER__VALUE:
+ case WSDDPackageImpl.PARAMETER__VALUE:
setValue(VALUE_EDEFAULT);
return;
}
@@ -178,9 +177,9 @@ public class ParameterImpl extends EObje
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
- case WSDDPackage.PARAMETER__NAME:
+ case WSDDPackageImpl.PARAMETER__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case WSDDPackage.PARAMETER__VALUE:
+ case WSDDPackageImpl.PARAMETER__VALUE:
return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
}
return super.eIsSet(featureID);