From f138d9780cb3f4ca16f0b41032ed53f6d9c97926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20No=C3=ABl?= Date: Thu, 27 Oct 2016 15:31:24 +0200 Subject: [PATCH] Revert part of 1fb222b7 Related to PETALSSTUD-327: we don't deprecate address yet actually. --- .../model/soap.ecore | 9 -- .../model/soap.genmodel | 1 - .../services/soap/soap/SoapPackage.java | 82 ++++++----------- .../services/soap/soap/SoapProvides.java | 59 +----------- .../soap/soap/impl/SoapFactoryImpl.java | 6 +- .../soap/soap/impl/SoapPackageImpl.java | 71 ++++++-------- .../soap/soap/impl/SoapProvidesImpl.java | 92 +------------------ .../soap/v41/SoapProvidesWizardPage41.java | 27 +++--- .../v44/SoapConsumesEditorContribution44.java | 68 -------------- .../soap/v44/SoapConsumesWizard44.java | 24 +---- .../soap/v44/SoapConsumesWizardPage44.java | 56 ----------- .../services/soap/v44/SoapDescription44.java | 19 +--- .../soap/v44/SoapEditorContribution44.java | 3 +- .../v44/SoapProvidesEditorContribution44.java | 22 +---- .../soap/v44/SoapProvidesWizard44.java | 18 +--- .../soap/v44/SoapProvidesWizardPage44.java | 44 +-------- 16 files changed, 91 insertions(+), 510 deletions(-) delete mode 100644 plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesEditorContribution44.java delete mode 100644 plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizardPage44.java diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.ecore b/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.ecore index c1bd77ae..561a786e 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.ecore +++ b/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.ecore @@ -16,15 +16,6 @@
- - -
-
-
-
- -
diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.genmodel b/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.genmodel index 615cf70d..f843c155 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.genmodel +++ b/plugins/com.ebmwebsourcing.petals.services.soap/model/soap.genmodel @@ -46,7 +46,6 @@ - diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapPackage.java b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapPackage.java index ef666561..491adea3 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapPackage.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapPackage.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2016, Linagora + * Copyright (c) 2011-2013, Linagora * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,7 +9,7 @@ * Contributors: * Linagora - initial API and implementation *******************************************************************************/ - + package com.ebmwebsourcing.petals.services.soap.soap; import com.ebmwebsourcing.petals.services.cdk.cdk5.Cdk5Package; @@ -196,15 +196,6 @@ public interface SoapPackage extends EPackage { */ int SOAP_PROVIDES__ADDRESS = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 0; - /** - * The feature id for the 'Wsa To' attribute. - * - * - * @generated - * @ordered - */ - int SOAP_PROVIDES__WSA_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 1; - /** * The feature id for the 'Wsa Reply To' attribute. * @@ -212,7 +203,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__WSA_REPLY_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 2; + int SOAP_PROVIDES__WSA_REPLY_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 1; /** * The feature id for the 'Wsa From' attribute. @@ -221,7 +212,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__WSA_FROM = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 3; + int SOAP_PROVIDES__WSA_FROM = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 2; /** * The feature id for the 'Wsa Fault To' attribute. @@ -230,7 +221,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__WSA_FAULT_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 4; + int SOAP_PROVIDES__WSA_FAULT_TO = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 3; /** * The feature id for the 'Soap Version' attribute. @@ -239,7 +230,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__SOAP_VERSION = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 5; + int SOAP_PROVIDES__SOAP_VERSION = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 4; /** * The feature id for the 'Chunked Mode' attribute. @@ -248,7 +239,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__CHUNKED_MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 6; + int SOAP_PROVIDES__CHUNKED_MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 5; /** * The feature id for the 'Synchonous Timeout' attribute. @@ -257,7 +248,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__SYNCHONOUS_TIMEOUT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 7; + int SOAP_PROVIDES__SYNCHONOUS_TIMEOUT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 6; /** * The feature id for the 'Cleanup Transport' attribute. @@ -266,7 +257,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__CLEANUP_TRANSPORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 8; + int SOAP_PROVIDES__CLEANUP_TRANSPORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 7; /** * The feature id for the 'Mode' attribute. @@ -275,7 +266,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 9; + int SOAP_PROVIDES__MODE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 8; /** * The feature id for the 'Proxy Host' attribute. @@ -284,7 +275,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__PROXY_HOST = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 10; + int SOAP_PROVIDES__PROXY_HOST = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 9; /** * The feature id for the 'Proxy Port' attribute. @@ -293,7 +284,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__PROXY_PORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 11; + int SOAP_PROVIDES__PROXY_PORT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 10; /** * The feature id for the 'Proxy User' attribute. @@ -302,7 +293,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__PROXY_USER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 12; + int SOAP_PROVIDES__PROXY_USER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 11; /** * The feature id for the 'Proxy Password' attribute. @@ -311,7 +302,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__PROXY_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 13; + int SOAP_PROVIDES__PROXY_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 12; /** * The feature id for the 'Proxy Domain' attribute. @@ -320,7 +311,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__PROXY_DOMAIN = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 14; + int SOAP_PROVIDES__PROXY_DOMAIN = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 13; /** * The feature id for the 'Headers Filter' attribute. @@ -329,7 +320,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HEADERS_FILTER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 15; + int SOAP_PROVIDES__HEADERS_FILTER = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 14; /** * The feature id for the 'Inject Headers' attribute. @@ -338,7 +329,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__INJECT_HEADERS = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 16; + int SOAP_PROVIDES__INJECT_HEADERS = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 15; /** * The feature id for the 'Headers To Inject' attribute. @@ -347,7 +338,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HEADERS_TO_INJECT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 17; + int SOAP_PROVIDES__HEADERS_TO_INJECT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 16; /** * The feature id for the 'Http Basic Auth Username' attribute. @@ -356,7 +347,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HTTP_BASIC_AUTH_USERNAME = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 18; + int SOAP_PROVIDES__HTTP_BASIC_AUTH_USERNAME = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 17; /** * The feature id for the 'Http Basic Auth Password' attribute. @@ -365,7 +356,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HTTP_BASIC_AUTH_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 19; + int SOAP_PROVIDES__HTTP_BASIC_AUTH_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 18; /** * The feature id for the 'Enable Compatibility For' attribute. @@ -374,7 +365,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__ENABLE_COMPATIBILITY_FOR = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 20; + int SOAP_PROVIDES__ENABLE_COMPATIBILITY_FOR = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 19; /** * The feature id for the 'Enable Wsa' attribute. @@ -383,7 +374,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__ENABLE_WSA = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 21; + int SOAP_PROVIDES__ENABLE_WSA = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 20; /** * The feature id for the 'Https Truststore File' attribute. @@ -392,7 +383,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HTTPS_TRUSTSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 22; + int SOAP_PROVIDES__HTTPS_TRUSTSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 21; /** * The feature id for the 'Https Truststore Password' attribute. @@ -401,7 +392,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HTTPS_TRUSTSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 23; + int SOAP_PROVIDES__HTTPS_TRUSTSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 22; /** * The feature id for the 'Https Keystore File' attribute. @@ -410,7 +401,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HTTPS_KEYSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 24; + int SOAP_PROVIDES__HTTPS_KEYSTORE_FILE = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 23; /** * The feature id for the 'Https Keystore Password' attribute. @@ -419,7 +410,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES__HTTPS_KEYSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 25; + int SOAP_PROVIDES__HTTPS_KEYSTORE_PASSWORD = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 24; /** * The number of structural features of the 'Provides' class. @@ -428,7 +419,7 @@ public interface SoapPackage extends EPackage { * @generated * @ordered */ - int SOAP_PROVIDES_FEATURE_COUNT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 26; + int SOAP_PROVIDES_FEATURE_COUNT = Cdk5Package.CDK5_PROVIDES_FEATURE_COUNT + 25; /** * The meta object id for the '{@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapConsumesImpl Consumes}' class. @@ -1171,17 +1162,6 @@ public interface SoapPackage extends EPackage { */ EAttribute getSoapProvides_HttpsKeystorePassword(); - /** - * Returns the meta object for the attribute '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo Wsa To}'. - * - * - * @return the meta object for the attribute 'Wsa To'. - * @see com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo() - * @see #getSoapProvides() - * @generated - */ - EAttribute getSoapProvides_WsaTo(); - /** * Returns the meta object for class '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapConsumes Consumes}'. * @@ -1695,14 +1675,6 @@ interface Literals { */ EAttribute SOAP_PROVIDES__HTTPS_KEYSTORE_PASSWORD = eINSTANCE.getSoapProvides_HttpsKeystorePassword(); - /** - * The meta object literal for the 'Wsa To' attribute feature. - * - * - * @generated - */ - EAttribute SOAP_PROVIDES__WSA_TO = eINSTANCE.getSoapProvides_WsaTo(); - /** * The meta object literal for the '{@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapConsumesImpl Consumes}' class. * diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapProvides.java b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapProvides.java index 736a5e42..4044e589 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapProvides.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/SoapProvides.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2016, Linagora + * Copyright (c) 2011-2013, Linagora * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,7 +9,7 @@ * Contributors: * Linagora - initial API and implementation *******************************************************************************/ - + package com.ebmwebsourcing.petals.services.soap.soap; import com.ebmwebsourcing.petals.services.cdk.cdk5.CDK5Provides; @@ -23,7 +23,6 @@ * The following features are supported: *
    *
  • {@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getAddress Address}
    • - *
  • {@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo Wsa To}
    • *
  • {@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaReplyTo Wsa Reply To}
    • *
  • {@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaFrom Wsa From}
    • *
  • {@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaFaultTo Wsa Fault To}
    • @@ -874,58 +873,4 @@ public interface SoapProvides extends CDK5Provides { */ void setHttpsKeystorePassword(String value); - /** - * Returns the value of the 'Wsa To' attribute. - * - *

    - * If the meaning of the 'Wsa To' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Wsa To' attribute. - * @see #isSetWsaTo() - * @see #unsetWsaTo() - * @see #setWsaTo(String) - * @see com.ebmwebsourcing.petals.services.soap.soap.SoapPackage#getSoapProvides_WsaTo() - * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" derived="true" - * extendedMetaData="group='#group:0' namespace='##targetNamespace' kind='element'" - * @generated - */ - String getWsaTo(); - - /** - * Sets the value of the '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo Wsa To}' attribute. - * - * - * @param value the new value of the 'Wsa To' attribute. - * @see #isSetWsaTo() - * @see #unsetWsaTo() - * @see #getWsaTo() - * @generated - */ - void setWsaTo(String value); - - /** - * Unsets the value of the '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo Wsa To}' attribute. - * - * - * @see #isSetWsaTo() - * @see #getWsaTo() - * @see #setWsaTo(String) - * @generated - */ - void unsetWsaTo(); - - /** - * Returns whether the value of the '{@link com.ebmwebsourcing.petals.services.soap.soap.SoapProvides#getWsaTo Wsa To}' attribute is set. - * - * - * @return whether the value of the 'Wsa To' attribute is set. - * @see #unsetWsaTo() - * @see #getWsaTo() - * @see #setWsaTo(String) - * @generated - */ - boolean isSetWsaTo(); - } // SoapProvides diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapFactoryImpl.java b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapFactoryImpl.java index ba90a4a8..25653fb8 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapFactoryImpl.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapFactoryImpl.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2016, Linagora + * Copyright (c) 2011-2013, Linagora * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,7 +9,7 @@ * Contributors: * Linagora - initial API and implementation *******************************************************************************/ - + package com.ebmwebsourcing.petals.services.soap.soap.impl; import com.ebmwebsourcing.petals.services.soap.soap.*; @@ -38,7 +38,7 @@ public class SoapFactoryImpl extends EFactoryImpl implements SoapFactory { */ public static SoapFactory init() { try { - SoapFactory theSoapFactory = (SoapFactory)EPackage.Registry.INSTANCE.getEFactory(SoapPackage.eNS_URI); + SoapFactory theSoapFactory = (SoapFactory)EPackage.Registry.INSTANCE.getEFactory("http://petals.ow2.org/components/soap/version-4"); if (theSoapFactory != null) { return theSoapFactory; } diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapPackageImpl.java b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapPackageImpl.java index ddb3965d..f519e528 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapPackageImpl.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapPackageImpl.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2016, Linagora + * Copyright (c) 2011-2013, Linagora * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,7 +9,7 @@ * Contributors: * Linagora - initial API and implementation *******************************************************************************/ - + package com.ebmwebsourcing.petals.services.soap.soap.impl; import com.ebmwebsourcing.petals.services.cdk.cdk5.Cdk5Package; @@ -171,7 +171,7 @@ public EAttribute getSoapProvides_Address() { * @generated */ public EAttribute getSoapProvides_WsaReplyTo() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(2); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(1); } /** @@ -180,7 +180,7 @@ public EAttribute getSoapProvides_WsaReplyTo() { * @generated */ public EAttribute getSoapProvides_WsaFrom() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(3); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(2); } /** @@ -189,7 +189,7 @@ public EAttribute getSoapProvides_WsaFrom() { * @generated */ public EAttribute getSoapProvides_WsaFaultTo() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(4); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(3); } /** @@ -198,7 +198,7 @@ public EAttribute getSoapProvides_WsaFaultTo() { * @generated */ public EAttribute getSoapProvides_SoapVersion() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(5); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(4); } /** @@ -207,7 +207,7 @@ public EAttribute getSoapProvides_SoapVersion() { * @generated */ public EAttribute getSoapProvides_ChunkedMode() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(6); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(5); } /** @@ -216,7 +216,7 @@ public EAttribute getSoapProvides_ChunkedMode() { * @generated */ public EAttribute getSoapProvides_SynchonousTimeout() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(7); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(6); } /** @@ -225,7 +225,7 @@ public EAttribute getSoapProvides_SynchonousTimeout() { * @generated */ public EAttribute getSoapProvides_CleanupTransport() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(8); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(7); } /** @@ -234,7 +234,7 @@ public EAttribute getSoapProvides_CleanupTransport() { * @generated */ public EAttribute getSoapProvides_Mode() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(9); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(8); } /** @@ -243,7 +243,7 @@ public EAttribute getSoapProvides_Mode() { * @generated */ public EAttribute getSoapProvides_ProxyHost() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(10); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(9); } /** @@ -252,7 +252,7 @@ public EAttribute getSoapProvides_ProxyHost() { * @generated */ public EAttribute getSoapProvides_ProxyPort() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(11); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(10); } /** @@ -261,7 +261,7 @@ public EAttribute getSoapProvides_ProxyPort() { * @generated */ public EAttribute getSoapProvides_ProxyUser() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(12); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(11); } /** @@ -270,7 +270,7 @@ public EAttribute getSoapProvides_ProxyUser() { * @generated */ public EAttribute getSoapProvides_ProxyPassword() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(13); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(12); } /** @@ -279,7 +279,7 @@ public EAttribute getSoapProvides_ProxyPassword() { * @generated */ public EAttribute getSoapProvides_ProxyDomain() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(14); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(13); } /** @@ -288,7 +288,7 @@ public EAttribute getSoapProvides_ProxyDomain() { * @generated */ public EAttribute getSoapProvides_HeadersFilter() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(15); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(14); } /** @@ -297,7 +297,7 @@ public EAttribute getSoapProvides_HeadersFilter() { * @generated */ public EAttribute getSoapProvides_InjectHeaders() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(16); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(15); } /** @@ -306,7 +306,7 @@ public EAttribute getSoapProvides_InjectHeaders() { * @generated */ public EAttribute getSoapProvides_HeadersToInject() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(17); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(16); } /** @@ -315,7 +315,7 @@ public EAttribute getSoapProvides_HeadersToInject() { * @generated */ public EAttribute getSoapProvides_HttpBasicAuthUsername() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(18); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(17); } /** @@ -324,7 +324,7 @@ public EAttribute getSoapProvides_HttpBasicAuthUsername() { * @generated */ public EAttribute getSoapProvides_HttpBasicAuthPassword() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(19); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(18); } /** @@ -333,7 +333,7 @@ public EAttribute getSoapProvides_HttpBasicAuthPassword() { * @generated */ public EAttribute getSoapProvides_EnableCompatibilityFor() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(20); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(19); } /** @@ -342,7 +342,7 @@ public EAttribute getSoapProvides_EnableCompatibilityFor() { * @generated */ public EAttribute getSoapProvides_EnableWsa() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(21); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(20); } /** @@ -351,7 +351,7 @@ public EAttribute getSoapProvides_EnableWsa() { * @generated */ public EAttribute getSoapProvides_HttpsTruststoreFile() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(22); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(21); } /** @@ -360,7 +360,7 @@ public EAttribute getSoapProvides_HttpsTruststoreFile() { * @generated */ public EAttribute getSoapProvides_HttpsTruststorePassword() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(23); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(22); } /** @@ -369,7 +369,7 @@ public EAttribute getSoapProvides_HttpsTruststorePassword() { * @generated */ public EAttribute getSoapProvides_HttpsKeystoreFile() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(24); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(23); } /** @@ -378,16 +378,7 @@ public EAttribute getSoapProvides_HttpsKeystoreFile() { * @generated */ public EAttribute getSoapProvides_HttpsKeystorePassword() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(25); - } - - /** - * - * - * @generated - */ - public EAttribute getSoapProvides_WsaTo() { - return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(1); + return (EAttribute)soapProvidesEClass.getEStructuralFeatures().get(24); } /** @@ -654,7 +645,6 @@ public void createPackageContents() { // Create classes and their features soapProvidesEClass = createEClass(SOAP_PROVIDES); createEAttribute(soapProvidesEClass, SOAP_PROVIDES__ADDRESS); - createEAttribute(soapProvidesEClass, SOAP_PROVIDES__WSA_TO); createEAttribute(soapProvidesEClass, SOAP_PROVIDES__WSA_REPLY_TO); createEAttribute(soapProvidesEClass, SOAP_PROVIDES__WSA_FROM); createEAttribute(soapProvidesEClass, SOAP_PROVIDES__WSA_FAULT_TO); @@ -751,7 +741,6 @@ public void initializePackageContents() { // Initialize classes and features; add operations and parameters initEClass(soapProvidesEClass, SoapProvides.class, "SoapProvides", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSoapProvides_Address(), theXMLTypePackage.getString(), "address", null, 1, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getSoapProvides_WsaTo(), theXMLTypePackage.getString(), "wsaTo", null, 1, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEAttribute(getSoapProvides_WsaReplyTo(), theXMLTypePackage.getString(), "wsaReplyTo", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getSoapProvides_WsaFrom(), theXMLTypePackage.getString(), "wsaFrom", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getSoapProvides_WsaFaultTo(), theXMLTypePackage.getString(), "wsaFaultTo", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -845,14 +834,6 @@ protected void createExtendedMetaDataAnnotations() { "namespace", "##targetNamespace", "kind", "element" }); - addAnnotation - (getSoapProvides_WsaTo(), - source, - new String[] { - "group", "#group:0", - "namespace", "##targetNamespace", - "kind", "element" - }); addAnnotation (getSoapProvides_WsaReplyTo(), source, diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapProvidesImpl.java b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapProvidesImpl.java index f38c37ce..0fa00245 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapProvidesImpl.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src-model/com/ebmwebsourcing/petals/services/soap/soap/impl/SoapProvidesImpl.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2011-2016, Linagora + * Copyright (c) 2011-2013, Linagora * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,7 +9,7 @@ * Contributors: * Linagora - initial API and implementation *******************************************************************************/ - + package com.ebmwebsourcing.petals.services.soap.soap.impl; import com.ebmwebsourcing.petals.services.cdk.cdk5.impl.CDK5ProvidesImpl; @@ -34,7 +34,6 @@ * The following features are implemented: *
      *
    • {@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapProvidesImpl#getAddress Address}
      • - *
    • {@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapProvidesImpl#getWsaTo Wsa To}
      • *
    • {@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapProvidesImpl#getWsaReplyTo Wsa Reply To}
      • *
    • {@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapProvidesImpl#getWsaFrom Wsa From}
      • *
    • {@link com.ebmwebsourcing.petals.services.soap.soap.impl.SoapProvidesImpl#getWsaFaultTo Wsa Fault To}
      • @@ -94,35 +93,6 @@ public class SoapProvidesImpl extends CDK5ProvidesImpl implements SoapProvides { */ protected boolean addressESet; - /** - * The default value of the '{@link #getWsaTo() Wsa To}' attribute. - * - * - * @see #getWsaTo() - * @generated - * @ordered - */ - protected static final String WSA_TO_EDEFAULT = null; - - /** - * The cached value of the '{@link #getWsaTo() Wsa To}' attribute. - * - * - * @see #getWsaTo() - * @generated - * @ordered - */ - protected String wsaTo = WSA_TO_EDEFAULT; - - /** - * This is true if the Wsa To attribute has been set. - * - * - * @generated - * @ordered - */ - protected boolean wsaToESet; - /** * The default value of the '{@link #getWsaReplyTo() Wsa Reply To}' attribute. * @@ -1308,52 +1278,6 @@ public void setHttpsKeystorePassword(String newHttpsKeystorePassword) { eNotify(new ENotificationImpl(this, Notification.SET, SoapPackage.SOAP_PROVIDES__HTTPS_KEYSTORE_PASSWORD, oldHttpsKeystorePassword, httpsKeystorePassword)); } - /** - * - * - * @generated - */ - public String getWsaTo() { - return wsaTo; - } - - /** - * - * - * @generated - */ - public void setWsaTo(String newWsaTo) { - String oldWsaTo = wsaTo; - wsaTo = newWsaTo; - boolean oldWsaToESet = wsaToESet; - wsaToESet = true; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, SoapPackage.SOAP_PROVIDES__WSA_TO, oldWsaTo, wsaTo, !oldWsaToESet)); - } - - /** - * - * - * @generated - */ - public void unsetWsaTo() { - String oldWsaTo = wsaTo; - boolean oldWsaToESet = wsaToESet; - wsaTo = WSA_TO_EDEFAULT; - wsaToESet = false; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, SoapPackage.SOAP_PROVIDES__WSA_TO, oldWsaTo, WSA_TO_EDEFAULT, oldWsaToESet)); - } - - /** - * - * - * @generated - */ - public boolean isSetWsaTo() { - return wsaToESet; - } - /** * * @@ -1364,8 +1288,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SoapPackage.SOAP_PROVIDES__ADDRESS: return getAddress(); - case SoapPackage.SOAP_PROVIDES__WSA_TO: - return getWsaTo(); case SoapPackage.SOAP_PROVIDES__WSA_REPLY_TO: return getWsaReplyTo(); case SoapPackage.SOAP_PROVIDES__WSA_FROM: @@ -1429,9 +1351,6 @@ public void eSet(int featureID, Object newValue) { case SoapPackage.SOAP_PROVIDES__ADDRESS: setAddress((String)newValue); return; - case SoapPackage.SOAP_PROVIDES__WSA_TO: - setWsaTo((String)newValue); - return; case SoapPackage.SOAP_PROVIDES__WSA_REPLY_TO: setWsaReplyTo((String)newValue); return; @@ -1519,9 +1438,6 @@ public void eUnset(int featureID) { case SoapPackage.SOAP_PROVIDES__ADDRESS: unsetAddress(); return; - case SoapPackage.SOAP_PROVIDES__WSA_TO: - unsetWsaTo(); - return; case SoapPackage.SOAP_PROVIDES__WSA_REPLY_TO: setWsaReplyTo(WSA_REPLY_TO_EDEFAULT); return; @@ -1608,8 +1524,6 @@ public boolean eIsSet(int featureID) { switch (featureID) { case SoapPackage.SOAP_PROVIDES__ADDRESS: return isSetAddress(); - case SoapPackage.SOAP_PROVIDES__WSA_TO: - return isSetWsaTo(); case SoapPackage.SOAP_PROVIDES__WSA_REPLY_TO: return WSA_REPLY_TO_EDEFAULT == null ? wsaReplyTo != null : !WSA_REPLY_TO_EDEFAULT.equals(wsaReplyTo); case SoapPackage.SOAP_PROVIDES__WSA_FROM: @@ -1674,8 +1588,6 @@ public String toString() { StringBuffer result = new StringBuffer(super.toString()); result.append(" (address: "); if (addressESet) result.append(address); else result.append(""); - result.append(", wsaTo: "); - if (wsaToESet) result.append(wsaTo); else result.append(""); result.append(", wsaReplyTo: "); result.append(wsaReplyTo); result.append(", wsaFrom: "); diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v41/SoapProvidesWizardPage41.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v41/SoapProvidesWizardPage41.java index f6796d2d..204e6ccc 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v41/SoapProvidesWizardPage41.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v41/SoapProvidesWizardPage41.java @@ -12,16 +12,17 @@ package com.ebmwebsourcing.petals.services.soap.v41; -import org.eclipse.core.databinding.DataBindingContext; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.forms.widgets.FormToolkit; - -import com.ebmwebsourcing.petals.common.internal.provisional.emf.EObjectUIHelper; -import com.ebmwebsourcing.petals.common.internal.provisional.utils.SwtFactory; -import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; -import com.ebmwebsourcing.petals.services.soap.soap.SoapVersion; -import com.ebmwebsourcing.petals.services.su.extensions.SuWizardSettings; +import org.eclipse.core.databinding.DataBindingContext; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.widgets.FormToolkit; + +import com.ebmwebsourcing.petals.common.internal.provisional.emf.EObjectUIHelper; +import com.ebmwebsourcing.petals.common.internal.provisional.utils.SwtFactory; +import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; +import com.ebmwebsourcing.petals.services.soap.soap.SoapVersion; +import com.ebmwebsourcing.petals.services.su.extensions.SuWizardSettings; import com.ebmwebsourcing.petals.services.su.wizards.pages.SimpleFeatureListSuWizardPage; /** @@ -36,13 +37,17 @@ public class SoapProvidesWizardPage41 extends SimpleFeatureListSuWizardPage { * Constructor. */ public SoapProvidesWizardPage41() { - super( + this( SoapPackage.Literals.SOAP_PROVIDES__ADDRESS, SoapPackage.Literals.SOAP_PROVIDES__SOAP_VERSION, SoapPackage.Literals.SOAP_PROVIDES__CHUNKED_MODE, SoapPackage.Literals.SOAP_PROVIDES__CLEANUP_TRANSPORT, SoapPackage.Literals.SOAP_PROVIDES__MODE ); + } + + protected SoapProvidesWizardPage41(EStructuralFeature... features) { + super(features); } diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesEditorContribution44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesEditorContribution44.java deleted file mode 100644 index 623f34a9..00000000 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesEditorContribution44.java +++ /dev/null @@ -1,68 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2016, Linagora - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Linagora - initial API and implementation - *******************************************************************************/ - -package com.ebmwebsourcing.petals.services.soap.v44; - -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.forms.widgets.FormToolkit; - -import com.ebmwebsourcing.petals.common.internal.provisional.emf.EObjectUIHelper; -import com.ebmwebsourcing.petals.common.internal.provisional.formeditor.ISharedEdition; -import com.ebmwebsourcing.petals.services.cdk.editor.CDK5JBIEndpointUIHelper; -import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; -import com.ebmwebsourcing.petals.services.su.editor.extensibility.JbiEditorDetailsContribution; -import com.ebmwebsourcing.petals.services.su.editor.su.JBIEndpointUIHelpers; -import com.ebmwebsourcing.petals.services.su.editor.su.JBIEndpointUIHelpers.CommonUIBean; -import com.sun.java.xml.ns.jbi.AbstractEndpoint; - -/** - * @author Victor Noel - Linagora - */ -public class SoapConsumesEditorContribution44 extends JbiEditorDetailsContribution { - - @Override - public void addMainSUContent(final AbstractEndpoint endpoint, FormToolkit toolkit, final Composite mainTab, ISharedEdition ise) { - - Composite composite = createCommonConsumeSection( mainTab, toolkit ); - CommonUIBean commonUiBean = JBIEndpointUIHelpers.createCommonEndpointUI( endpoint, toolkit, composite, ise ); - - composite = createEditorSection( mainTab, toolkit, CDK5JBIEndpointUIHelper.CONSUME_TITLE, CDK5JBIEndpointUIHelper.CONSUME_DESC, true ); - CDK5JBIEndpointUIHelper.createConsumesUI( endpoint, toolkit, composite, ise, commonUiBean ); - - composite = createEditorSection( mainTab, toolkit, "SOAP", true ); - EObjectUIHelper.generateWidgets( - endpoint, - toolkit, - composite, - ise.getEditingDomain(), - ise.getDataBindingContext(), - true, - SoapPackage.Literals.SOAP_CONSUMES__SOAP_SERVICE_NAME, - SoapPackage.Literals.SOAP_CONSUMES__SOAP_ACTION ); - } - - @Override - public void addAdvancedSUContent(AbstractEndpoint endpoint, FormToolkit toolkit, Composite advancedTab, ISharedEdition ise) { - - Composite composite = createEditorSection( advancedTab, toolkit, "Miscellaneous" ); - EObjectUIHelper.generateWidgets(endpoint, toolkit, composite, ise.getEditingDomain(), ise.getDataBindingContext(), true, - SoapPackage.Literals.SOAP_CONSUMES__ENABLE_COMPATIBILITY_FOR, - SoapPackage.Literals.SOAP_CONSUMES__ENABLE_HTTP_TRANSPORT, - SoapPackage.Literals.SOAP_CONSUMES__ENABLE_HTTPS_TRANSPORT, - SoapPackage.Literals.SOAP_CONSUMES__ENABLE_JMS_TRANSPORT, - SoapPackage.Literals.SOAP_CONSUMES__ENABLE_WSA, - SoapPackage.Literals.SOAP_CONSUMES__HTTP_SERVICES_REDIRECTION ); - - composite = createEditorSection( advancedTab, toolkit, "CDK Parameters" ); - CDK5JBIEndpointUIHelper.generateDefaultCdkWidgetsForConsumesEditor( endpoint, toolkit, composite, ise ); - } -} diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizard44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizard44.java index 86bbc997..51a89f37 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizard44.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizard44.java @@ -12,36 +12,16 @@ package com.ebmwebsourcing.petals.services.soap.v44; -import com.ebmwebsourcing.petals.services.cdk.Cdk5Utils; -import com.ebmwebsourcing.petals.services.soap.soap.SoapMode; -import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; -import com.ebmwebsourcing.petals.services.soap.v40.SoapConsumesWizard40; +import com.ebmwebsourcing.petals.services.soap.v41.SoapConsumesWizard41; import com.ebmwebsourcing.petals.services.su.extensions.ComponentVersionDescription; -import com.ebmwebsourcing.petals.services.su.wizards.pages.AbstractSuWizardPage; -import com.sun.java.xml.ns.jbi.AbstractEndpoint; -import com.sun.java.xml.ns.jbi.Consumes; /** * @author Victor Noel - Linagora */ -public class SoapConsumesWizard44 extends SoapConsumesWizard40 { +public class SoapConsumesWizard44 extends SoapConsumesWizard41 { @Override public ComponentVersionDescription getComponentVersionDescription() { return new SoapDescription44(); } - - @Override - protected void presetServiceValues( AbstractEndpoint endpoint ) { - Cdk5Utils.setInitialConsumesValues((Consumes) endpoint); - getNewlyCreatedEndpoint().eSet( SoapPackage.Literals.SOAP_CONSUMES__SOAP_SERVICE_NAME, "" ); - getNewlyCreatedEndpoint().eSet( SoapPackage.Literals.SOAP_CONSUMES__MODE, SoapMode.SOAP ); - getNewlyCreatedEndpoint().eSet( SoapPackage.Literals.SOAP_CONSUMES__ENABLE_HTTP_TRANSPORT, true ); - getNewlyCreatedEndpoint().eSet( SoapPackage.Literals.SOAP_CONSUMES__ENABLE_JMS_TRANSPORT, false ); - } - - @Override - protected AbstractSuWizardPage[] getLastCustomWizardPages() { - return new AbstractSuWizardPage[] { new SoapConsumesWizardPage44()}; - } } diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizardPage44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizardPage44.java deleted file mode 100644 index e2e8bb4a..00000000 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapConsumesWizardPage44.java +++ /dev/null @@ -1,56 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2016, Linagora - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Linagora - initial API and implementation - *******************************************************************************/ - -package com.ebmwebsourcing.petals.services.soap.v44; - -import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; -import com.ebmwebsourcing.petals.services.su.wizards.pages.SimpleFeatureListSuWizardPage; -import com.sun.java.xml.ns.jbi.AbstractEndpoint; - -/** - * @author Victor Noel - Linagora - */ -public class SoapConsumesWizardPage44 extends SimpleFeatureListSuWizardPage { - - private String oldServiceName; - - public SoapConsumesWizardPage44() { - super( - SoapPackage.Literals.SOAP_CONSUMES__SOAP_SERVICE_NAME, - SoapPackage.Literals.SOAP_CONSUMES__SOAP_ACTION, - SoapPackage.Literals.SOAP_CONSUMES__ENABLE_HTTP_TRANSPORT, - SoapPackage.Literals.SOAP_CONSUMES__ENABLE_JMS_TRANSPORT); - } - - @Override - public void setVisible( boolean visible ) { - - if( visible ) { - AbstractEndpoint ae = getNewlyCreatedEndpoint(); - String newServiceName = null; - if( ae.getServiceName() != null ) - newServiceName = ae.getServiceName().getLocalPart(); - else if( ae.getInterfaceName() != null ) - newServiceName = ae.getInterfaceName().getLocalPart(); - - if( newServiceName == null ) - newServiceName = ""; - - if( this.oldServiceName == null || ! this.oldServiceName.equals( newServiceName )) { - this.oldServiceName = newServiceName; - ae.eSet( SoapPackage.Literals.SOAP_CONSUMES__SOAP_SERVICE_NAME, newServiceName ); - } - } - - super.setVisible( visible ); - } -} diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapDescription44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapDescription44.java index 7193fead..50df92fc 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapDescription44.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapDescription44.java @@ -12,31 +12,16 @@ package com.ebmwebsourcing.petals.services.soap.v44; -import com.ebmwebsourcing.petals.services.soap.SoapDescription; +import com.ebmwebsourcing.petals.services.soap.v41.SoapDescription41; /** * @author Victor Noel - Linagora */ -public class SoapDescription44 extends SoapDescription { +public class SoapDescription44 extends SoapDescription41 { @Override public String getComponentVersion() { return "4.4.2"; } - - @Override - public boolean isProvide() { - return true; - } - - @Override - public boolean isConsume() { - return true; - } - - @Override - public boolean isProxy() { - return false; - } } diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapEditorContribution44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapEditorContribution44.java index 8d419b30..57322631 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapEditorContribution44.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapEditorContribution44.java @@ -12,6 +12,7 @@ package com.ebmwebsourcing.petals.services.soap.v44; +import com.ebmwebsourcing.petals.services.soap.editor.SoapConsumesEditorContribution; import com.ebmwebsourcing.petals.services.su.editor.extensibility.EditorContributionSupport; import com.ebmwebsourcing.petals.services.su.editor.extensibility.JbiEditorDetailsContribution; @@ -27,6 +28,6 @@ protected JbiEditorDetailsContribution getProvidesContribution() { @Override protected JbiEditorDetailsContribution getConsumesContribution() { - return new SoapConsumesEditorContribution44(); + return new SoapConsumesEditorContribution(); } } diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesEditorContribution44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesEditorContribution44.java index b7f3cb6d..e0a8cf42 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesEditorContribution44.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesEditorContribution44.java @@ -18,32 +18,14 @@ import com.ebmwebsourcing.petals.common.internal.provisional.emf.EObjectUIHelper; import com.ebmwebsourcing.petals.common.internal.provisional.formeditor.ISharedEdition; import com.ebmwebsourcing.petals.services.cdk.editor.CDK5JBIEndpointUIHelper; +import com.ebmwebsourcing.petals.services.soap.editor.SoapProvidesEditorContribution; import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; -import com.ebmwebsourcing.petals.services.su.editor.extensibility.JbiEditorDetailsContribution; import com.sun.java.xml.ns.jbi.AbstractEndpoint; /** * @author Victor Noel - Linagora */ -public class SoapProvidesEditorContribution44 extends JbiEditorDetailsContribution { - - @Override - public void addMainSUContent( final AbstractEndpoint endpoint, FormToolkit toolkit, final Composite mainTab, ISharedEdition ise ) { - - Composite composite = createCommonProvideSection( mainTab, toolkit ); - CDK5JBIEndpointUIHelper.createProvidesUI(endpoint, toolkit, composite, ise); - - composite = createEditorSection( mainTab, toolkit, "SOAP Parameters", true ); - EObjectUIHelper.generateEditorWidgets( - endpoint, - toolkit, - composite, - ise.getEditingDomain(), - ise.getDataBindingContext(), - true, - SoapPackage.Literals.SOAP_PROVIDES__WSA_TO, - SoapPackage.Literals.SOAP_PROVIDES__SOAP_VERSION); - } +public class SoapProvidesEditorContribution44 extends SoapProvidesEditorContribution { @Override public void addAdvancedSUContent(AbstractEndpoint endpoint, FormToolkit toolkit, Composite advancedTab, ISharedEdition ise) { diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizard44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizard44.java index 65194859..f246109f 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizard44.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizard44.java @@ -12,18 +12,12 @@ package com.ebmwebsourcing.petals.services.soap.v44; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; - -import com.ebmwebsourcing.petals.services.cdk.cdk5.Cdk5Package; import com.ebmwebsourcing.petals.services.cdk.Cdk5Utils; import com.ebmwebsourcing.petals.services.soap.soap.SoapMode; import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; import com.ebmwebsourcing.petals.services.soap.soap.SoapVersion; +import com.ebmwebsourcing.petals.services.soap.v41.SoapProvidesWizard41; import com.ebmwebsourcing.petals.services.su.extensions.ComponentVersionDescription; -import com.ebmwebsourcing.petals.services.su.wizards.AbstractServiceUnitWizard; import com.ebmwebsourcing.petals.services.su.wizards.pages.AbstractSuWizardPage; import com.sun.java.xml.ns.jbi.AbstractEndpoint; import com.sun.java.xml.ns.jbi.Provides; @@ -31,7 +25,7 @@ /** * @author Victor Noel - Linagora */ -public class SoapProvidesWizard44 extends AbstractServiceUnitWizard { +public class SoapProvidesWizard44 extends SoapProvidesWizard41 { @Override public ComponentVersionDescription getComponentVersionDescription() { @@ -41,7 +35,7 @@ public ComponentVersionDescription getComponentVersionDescription() { @Override protected void presetServiceValues(AbstractEndpoint endpoint) { Cdk5Utils.setInitialProvidesValues((Provides)endpoint); - getNewlyCreatedEndpoint().eSet(SoapPackage.Literals.SOAP_PROVIDES__WSA_TO, null); + getNewlyCreatedEndpoint().eSet(SoapPackage.Literals.SOAP_PROVIDES__ADDRESS, null); getNewlyCreatedEndpoint().eSet(SoapPackage.Literals.SOAP_PROVIDES__SOAP_VERSION, SoapVersion.SOAP_11); getNewlyCreatedEndpoint().eSet(SoapPackage.Literals.SOAP_PROVIDES__CHUNKED_MODE, false); getNewlyCreatedEndpoint().eSet(SoapPackage.Literals.SOAP_PROVIDES__MODE, SoapMode.SOAP ); @@ -51,10 +45,4 @@ protected void presetServiceValues(AbstractEndpoint endpoint) { protected AbstractSuWizardPage[] getLastCustomWizardPages() { return new AbstractSuWizardPage[] { new SoapProvidesWizardPage44()}; } - - @Override - protected IStatus performLastActions(IFolder resourceDirectory, AbstractEndpoint newlyCreatedEndpoint, IProgressMonitor monitor) { - newlyCreatedEndpoint.eSet(Cdk5Package.Literals.CDK5_PROVIDES__WSDL, this.finalWsdlFileLocation ); - return Status.OK_STATUS; - } } diff --git a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizardPage44.java b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizardPage44.java index 23545965..cb212668 100644 --- a/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizardPage44.java +++ b/plugins/com.ebmwebsourcing.petals.services.soap/src/com/ebmwebsourcing/petals/services/soap/v44/SoapProvidesWizardPage44.java @@ -20,24 +20,19 @@ import com.ebmwebsourcing.petals.common.internal.provisional.emf.EObjectUIHelper; import com.ebmwebsourcing.petals.common.internal.provisional.utils.SwtFactory; import com.ebmwebsourcing.petals.services.soap.soap.SoapPackage; -import com.ebmwebsourcing.petals.services.soap.soap.SoapVersion; -import com.ebmwebsourcing.petals.services.su.extensions.SuWizardSettings; -import com.ebmwebsourcing.petals.services.su.wizards.pages.SimpleFeatureListSuWizardPage; +import com.ebmwebsourcing.petals.services.soap.v41.SoapProvidesWizardPage41; /** * @author Victor Noel - Linagora */ -public class SoapProvidesWizardPage44 extends SimpleFeatureListSuWizardPage { - - private String oldSoapVersion, oldSoapAddress; - +public class SoapProvidesWizardPage44 extends SoapProvidesWizardPage41 { /** * Constructor. */ public SoapProvidesWizardPage44() { super( - SoapPackage.Literals.SOAP_PROVIDES__WSA_TO, + SoapPackage.Literals.SOAP_PROVIDES__ADDRESS, SoapPackage.Literals.SOAP_PROVIDES__SOAP_VERSION, SoapPackage.Literals.SOAP_PROVIDES__CHUNKED_MODE, SoapPackage.Literals.SOAP_PROVIDES__MODE @@ -54,39 +49,8 @@ public void createControl(Composite parent) { FormToolkit tk = new FormToolkit(getShell().getDisplay()); EObjectUIHelper.generateWidgets(getNewlyCreatedEndpoint(), tk, res, null, this.dbc, false, - SoapPackage.Literals.SOAP_PROVIDES__WSA_TO, + SoapPackage.Literals.SOAP_PROVIDES__ADDRESS, SoapPackage.Literals.SOAP_PROVIDES__SOAP_VERSION, SoapPackage.Literals.SOAP_PROVIDES__CHUNKED_MODE); } - - @Override - public void setVisible( boolean visible ) { - - if( visible ) { - boolean refresh = false; - SuWizardSettings settings = getWizard().getSettings(); - if( this.oldSoapAddress == null || this.oldSoapAddress.equals( settings.soapAddress )) { - this.oldSoapAddress = settings.soapAddress; - refresh = true; - } - - if( this.oldSoapVersion == null || this.oldSoapVersion.equals( settings.soapVersion )) { - this.oldSoapVersion = settings.soapVersion; - refresh = true; - } - - if( refresh ) { - getNewlyCreatedEndpoint().eSet( SoapPackage.Literals.SOAP_PROVIDES__WSA_TO, settings.soapAddress ); - SoapVersion soapVersion = null; - if( "1.1".equals( settings.soapVersion )) - soapVersion = SoapVersion.SOAP_11; - else if( "1.2".equals( settings.soapVersion )) - soapVersion = SoapVersion.SOAP_12; - - getNewlyCreatedEndpoint().eSet( SoapPackage.Literals.SOAP_PROVIDES__SOAP_VERSION, soapVersion ); - } - } - - super.setVisible( visible ); - } }