bugfix(TUP-24978) can not download ojdbc8-12.2.0.1.jar (#2793)

* bugfix(TUP-24978) Download jar

* bugfix(TUP-24986) For maven artifact resolver, rever to http transporter

* bugfix(TUP-24978) Remove unused import

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/PasswordEncryptUtil.java

@@ -21,29 +21,25 @@ import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESKeySpec;
 
 import org.apache.commons.codec.binary.Base64;
-import org.talend.utils.security.AESEncryption;
+import org.talend.utils.security.StudioEncryption;
 
 /**
  * DOC chuang class global comment. Detailled comment
  */
 public class PasswordEncryptUtil {
 
-    public static String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
+    public static final String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
 
-    private static String rawKey = "Talend-Key"; //$NON-NLS-1$
-
-    public static String PREFIX_PASSWORD = "ENC:["; //$NON-NLS-1$
-
-    public static String POSTFIX_PASSWORD = "]"; //$NON-NLS-1$
+    private static final String RAWKEY = "Talend-Key"; //$NON-NLS-1$
 
     private static SecretKey key = null;
 
-    private static SecureRandom secureRandom = new SecureRandom();
+    private static final SecureRandom SECURERANDOM = new SecureRandom();
 
     private static SecretKey getSecretKey() throws Exception {
         if (key == null) {
 
-            byte rawKeyData[] = rawKey.getBytes();
+            byte rawKeyData[] = RAWKEY.getBytes();
             DESKeySpec dks = new DESKeySpec(rawKeyData);
             SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); //$NON-NLS-1$
             key = keyFactory.generateSecret(dks);
@@ -65,7 +61,7 @@ public class PasswordEncryptUtil {
 
         SecretKey key = getSecretKey();
         Cipher c = Cipher.getInstance("DES"); //$NON-NLS-1$
-        c.init(Cipher.ENCRYPT_MODE, key, secureRandom);
+        c.init(Cipher.ENCRYPT_MODE, key, SECURERANDOM);
         byte[] cipherByte = c.doFinal(input.getBytes());
         String dec = new String(Base64.encodeBase64(cipherByte));
         return dec;
@@ -85,7 +81,7 @@ public class PasswordEncryptUtil {
         byte[] dec = Base64.decodeBase64(input.getBytes());
         SecretKey key = getSecretKey();
         Cipher c = Cipher.getInstance("DES"); //$NON-NLS-1$
-        c.init(Cipher.DECRYPT_MODE, key, secureRandom);
+        c.init(Cipher.DECRYPT_MODE, key, SECURERANDOM);
         byte[] clearByte = c.doFinal(dec);
         return new String(clearByte);
     }
@@ -99,7 +95,7 @@ public class PasswordEncryptUtil {
         if (input == null) {
             return input;
         }
-        return PREFIX_PASSWORD + AESEncryption.encryptPassword(input) + POSTFIX_PASSWORD;
+        return StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.ROUTINE).encrypt(input);
     }
 
     /**

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java

@@ -19,6 +19,7 @@ import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Properties;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
@@ -192,6 +193,27 @@ public class VersionUtils {
         return talendVersion;
     }
 
+    public static String getTalendPureVersion(String fullProductVersion) {
+        String version = fullProductVersion;
+        String[] splitStr = fullProductVersion.split("-"); //$NON-NLS-1$
+        Pattern pattern = Pattern.compile("((\\d+\\.){2}\\d.*)"); //$NON-NLS-1$
+        StringBuffer versionStr = new StringBuffer();
+        boolean find = false;
+        for (String str : splitStr) {
+            if (find) {
+                versionStr.append("-").append(str); //$NON-NLS-1$
+            }else {
+                Matcher matcher = pattern.matcher(str);
+                if (matcher.find()) {
+                    find = true;
+                    versionStr.append(str); // $NON-NLS-1$
+                }
+            }
+        }
+
+        return getTalendVersion(versionStr.toString());
+    }
+
     public static String getTalendVersion(String productVersion) {
         try {
             org.osgi.framework.Version v = new org.osgi.framework.Version(productVersion);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java

@@ -89,6 +89,8 @@ public interface ILibraryManagerService extends IService {
      * @return
      */
     public boolean retrieve(String jarNeeded, String pathToStore, IProgressMonitor... monitorWrap);
+    
+    public boolean retrieve(String jarNeeded, String jarURL, String pathToStore, IProgressMonitor... monitorWrap);
 
     public boolean retrieve(String jarNeeded, String pathToStore, boolean showDialog, IProgressMonitor... monitorWrap);
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQRepositoryService.java

@@ -210,4 +210,9 @@ public interface ITDQRepositoryService extends IService {
      * @param ruManager: RepositoryUpdateManager
      */
     void updateAllContextInAnalysisAndReport(RepositoryUpdateManager ruManager, Object parameter, boolean isUpdated);
+
+    /**
+     * @param chooseContext the context name which want to swtich
+     */
+    void popupSwitchContextFailedMessage(String chooseContext);
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -166,9 +166,9 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             "redshift-jdbc42-no-awssdk-1.2.32.1056.jar")), //$NON-NLS-1$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.32.1056.jar", "aws-java-sdk-1.11.406.jar", "jackson-core-2.9.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    "jackson-databind-2.9.5.jar", "jackson-annotations-2.9.0.jar", "httpcore-4.4.9.jar", "httpclient-4.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
-                    "joda-time-2.8.1.jar", "commons-logging-1.1.3.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.32.1056.jar", "aws-java-sdk-1.11.406.jar", "jackson-core-2.9.9.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "jackson-databind-2.9.9.jar", "jackson-annotations-2.9.0.jar", "httpcore-4.4.9.jar", "httpclient-4.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+                    "joda-time-2.8.1.jar", "commons-logging-1.1.3.jar", "commons-codec-1.6.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.30-bin.jar")); //$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponent.java

@@ -60,6 +60,15 @@ public interface IComponent {
 
     public String getOriginalName();
 
+    /**
+     * Only for component display (palette,search)
+     * 
+     * @return
+     */
+    default public String getDisplayName() {
+        return getName();
+    }
+
     public String getLongName();
 
     public String getOriginalFamilyName();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -2845,10 +2845,6 @@ public class RepositoryToComponentProperty {
         if (value.equals("USE_ENCODING")) {
             return connection.isUseFileNameEncoding();
         }
-        
-        if(value.equals("CONNECTION_TIMEOUT")) {
-        	return connection.getTimeout();
-        }
 
         if (value.equals("ENCODING")) {
             if (isContextMode(connection, connection.getCustomEncode())) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/AbstractNode.java

@@ -39,7 +39,7 @@ public abstract class AbstractNode implements INode {
 
     private ComponentProperties componentProperties;
 
-    List<? extends IElementParameter> elementParameters;
+    List<? extends IElementParameter> elementParameters = new ArrayList<IElementParameter>();
 
     private List<? extends IConnection> outgoingConnections = new ArrayList<IConnection>();
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -575,6 +575,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
     public final static ERepositoryObjectType METADATA_SAP_BW_INFOOBJECT = ERepositoryObjectType
             .valueOf("METADATA_SAP_BW_INFOOBJECT"); //$NON-NLS-1$
 
+    public final static ERepositoryObjectType JDBC = ERepositoryObjectType.valueOf("JDBC"); //$NON-NLS-1$
+
     private static Map<String, ERepositoryObjectType> typeCacheById = new HashMap<String, ERepositoryObjectType>();
 
     ERepositoryObjectType(String key, String folder, String type, boolean isStaticNode, int ordinal, String[] products,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java

@@ -684,16 +684,15 @@ public class NodeUtil {
             }
             List<? extends IConnection> listInConns = node.getIncomingConnections();
             if (listInConns != null && listInConns.size() > 0) {
-                String retResult = getPrivateConnClassName(listInConns.get(0));
-                if (retResult == null) {
-                    return conn.getName();
-                } else {
-                    return retResult;
+                for (IConnection connection : listInConns) {
+                    if (EConnectionType.FLOW_REF != connection.getLineStyle()) {
+                        String retResult = getPrivateConnClassName(connection);
+                        return retResult != null ? retResult : conn.getName();
+                    }
                 }
             }
         }
         return null;
-
     }
 
     /**

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/ParameterValueUtil.java

@@ -41,11 +41,11 @@ import org.talend.core.model.process.EParameterFieldType;
 import org.talend.core.model.process.IContextParameter;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.utils.TalendQuoteUtils;
-import org.talend.daikon.security.CryptoHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ElementValueType;
 import org.talend.repository.ProjectManager;
+import org.talend.utils.security.StudioEncryption;
 
 /**
  * cli class global comment. Detailled comment
@@ -842,7 +842,8 @@ public final class ParameterValueUtil {
         if (contextParam != null) {
             String docValue = contextParam.getValue();
             if (docValue != null) {
-                String encryptValue = CryptoHelper.getDefault().encrypt(docValue);
+                String encryptValue = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM)
+                        .encrypt(docValue);
                 if (encryptValue != null) {
                     return encryptValue;
                 }
@@ -878,7 +879,8 @@ public final class ParameterValueUtil {
         if (param != null) {
             Object docValue = param.getValue();
             if (docValue != null && docValue instanceof String) {
-                String encryptValue = CryptoHelper.getDefault().encrypt(docValue.toString());
+                String encryptValue = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM)
+                        .encrypt(docValue.toString());
                 if (encryptValue != null) {
                     return encryptValue;
                 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenUrlHelper.java

@@ -19,7 +19,7 @@ import java.net.URLDecoder;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.Assert;
 import org.talend.commons.exception.ExceptionHandler;
-import org.talend.daikon.security.CryptoHelper;
+import org.talend.utils.security.StudioEncryption;
 
 /**
  * DOC ggu class global comment. Detailled comment
@@ -47,8 +47,6 @@ public class MavenUrlHelper {
 
     public static final String USER_PASSWORD_SPLITER = ":";
 
-    private static CryptoHelper cryptoHelper;
-
     public static MavenArtifact parseMvnUrl(String mvnUrl) {
         return parseMvnUrl(mvnUrl, true);
     }
@@ -332,19 +330,12 @@ public class MavenUrlHelper {
         return uri;
     }
 
-    private static CryptoHelper getCryptoHelper() {
-        if (cryptoHelper == null) {
-            cryptoHelper = CryptoHelper.getDefault();
-        }
-        return cryptoHelper;
-    }
-
     public static String encryptPassword(String password) {
-        return getCryptoHelper().encrypt(password);
+        return StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).encrypt(password);
     }
 
     public static String decryptPassword(String password) {
-        return getCryptoHelper().decrypt(password);
+        return StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(password);
     }
 
 	public static String generateModuleNameByMavenURI(String uri) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/IJobletProviderService.java

@@ -99,6 +99,8 @@ public interface IJobletProviderService extends IService {
     public IEditorPart openJobletItem(JobletProcessItem item);
 
     public boolean isJobletItem(Item item);
+    
+    public boolean isJobletProcess(IProcess process);
 
     public Action getMoveToJobletAction(IWorkbenchPart part, INode jobletNode, Map<INode, IConnection> nodeMap);
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/StudioSSLContextProvider.java

@@ -22,8 +22,8 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.prefs.SSLPreferenceConstants;
 import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.daikon.security.CryptoHelper;
 import org.talend.daikon.security.SSLContextProvider;
+import org.talend.utils.security.StudioEncryption;
 
 /**
  *
@@ -34,7 +34,7 @@ public class StudioSSLContextProvider {
 
     private static SSLContext context;
 
-    private static final IPreferenceStore store = CoreRuntimePlugin.getInstance().getCoreService().getPreferenceStore();
+    private static final IPreferenceStore STORE = CoreRuntimePlugin.getInstance().getCoreService().getPreferenceStore();
 
     public static synchronized SSLContext getContext() throws Exception {
         if (null == context) {
@@ -44,15 +44,14 @@ public class StudioSSLContextProvider {
     }
 
     public static synchronized void buildContext() throws Exception {
-        String keypath = store.getString(SSLPreferenceConstants.KEYSTORE_FILE);
-        String keypass = store.getString(SSLPreferenceConstants.KEYSTORE_PASSWORD);
-        String keytype = store.getString(SSLPreferenceConstants.KEYSTORE_TYPE);
-        String trustpath = store.getString(SSLPreferenceConstants.TRUSTSTORE_FILE);
-        String trustpass = store.getString(SSLPreferenceConstants.TRUSTSTORE_PASSWORD);
-        String trusttype = store.getString(SSLPreferenceConstants.TRUSTSTORE_TYPE);
-        CryptoHelper cryptoHelper = CryptoHelper.getDefault();
-        keypass = cryptoHelper.decrypt(keypass);
-        trustpass = cryptoHelper.decrypt(trustpass);
+        String keypath = STORE.getString(SSLPreferenceConstants.KEYSTORE_FILE);
+        String keypass = STORE.getString(SSLPreferenceConstants.KEYSTORE_PASSWORD);
+        String keytype = STORE.getString(SSLPreferenceConstants.KEYSTORE_TYPE);
+        String trustpath = STORE.getString(SSLPreferenceConstants.TRUSTSTORE_FILE);
+        String trustpass = STORE.getString(SSLPreferenceConstants.TRUSTSTORE_PASSWORD);
+        String trusttype = STORE.getString(SSLPreferenceConstants.TRUSTSTORE_TYPE);
+        keypass = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(keypass);
+        trustpass = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(trustpass);
         try {
             if (StringUtils.isEmpty(keypath) && StringUtils.isEmpty(trustpath)) {
                 context = null;
@@ -88,12 +87,12 @@ public class StudioSSLContextProvider {
 
     private static void changeProperty() {
         final IPreferenceStore sslStore = CoreRuntimePlugin.getInstance().getCoreService().getPreferenceStore();
-        CryptoHelper cryptoHelper = CryptoHelper.getDefault();
         String keyStore = sslStore.getString(SSLPreferenceConstants.KEYSTORE_FILE);
         if (keyStore != null && !"".equals(keyStore.trim())) {
             System.setProperty(SSLPreferenceConstants.KEYSTORE_FILE, keyStore);
             System.setProperty(SSLPreferenceConstants.KEYSTORE_PASSWORD,
-                    cryptoHelper.decrypt(sslStore.getString(SSLPreferenceConstants.KEYSTORE_PASSWORD)));
+                    StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM)
+                            .decrypt(sslStore.getString(SSLPreferenceConstants.KEYSTORE_PASSWORD)));
             System.setProperty(SSLPreferenceConstants.KEYSTORE_TYPE, sslStore.getString(SSLPreferenceConstants.KEYSTORE_TYPE));
         } else {
             System.clearProperty(SSLPreferenceConstants.KEYSTORE_FILE);
@@ -104,7 +103,8 @@ public class StudioSSLContextProvider {
         if (trustStore != null && !"".equals(trustStore.trim())) {
             System.setProperty(SSLPreferenceConstants.TRUSTSTORE_FILE, trustStore);
             System.setProperty(SSLPreferenceConstants.TRUSTSTORE_PASSWORD,
-                    cryptoHelper.decrypt(sslStore.getString(SSLPreferenceConstants.TRUSTSTORE_PASSWORD)));
+                    StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM)
+                            .decrypt(sslStore.getString(SSLPreferenceConstants.TRUSTSTORE_PASSWORD)));
             System.setProperty(SSLPreferenceConstants.TRUSTSTORE_TYPE, sslStore.getString(SSLPreferenceConstants.TRUSTSTORE_TYPE));
         } else {
             System.clearProperty(SSLPreferenceConstants.TRUSTSTORE_FILE);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/AbstractRoutineSynchronizer.java

@@ -19,8 +19,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -80,6 +81,8 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
     }
 
     private Collection<RoutineItem> getAll(ERepositoryObjectType type, boolean syncRef) throws SystemException {
+        // init code project
+        getRunProcessService().getTalendCodeJavaProject(type);
         // remove routine with same name in reference project
         final Map<String, RoutineItem> beansList = new HashMap<String, RoutineItem>();
         for (IRepositoryViewObject obj : getRepositoryService().getProxyRepositoryFactory().getAll(type)) {
@@ -96,34 +99,37 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
         return (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
     }
 
-    private void getReferencedProjectRoutine(final Map<String, RoutineItem> beansList, final Project project,
-            ERepositoryObjectType routineType, boolean syncRef) throws SystemException {
-        List<IRepositoryViewObject> list = getRepositoryService().getProxyRepositoryFactory().getAll(project, routineType);
-
-        if (list.size() == 0) {
+    private Set<IRepositoryViewObject> getReferencedProjectRoutine(final Map<String, RoutineItem> beansList,
+            final Project project, ERepositoryObjectType routineType, boolean syncRef) throws SystemException {
+        // init ref code project
+        if (syncRef) {
             getRunProcessService().getTalendCodeJavaProject(routineType, project.getTechnicalLabel());
-        } else {
-            for (IRepositoryViewObject obj : list) {
-                final String key = obj.getProperty().getLabel();
-                // it does not have a routine with same name
-                if (!beansList.containsKey(key)) {
-                    beansList.put(key, (RoutineItem) obj.getProperty().getItem());
-                }
-                if (syncRef) {
-                    // sync routine
-                    syncRoutine((RoutineItem) obj.getProperty().getItem(), false, true, true);
-                }
+        }
+        Set<IRepositoryViewObject> routines = new HashSet<>();
+        routines.addAll(getRepositoryService().getProxyRepositoryFactory().getAll(project, routineType));
+        for (IRepositoryViewObject obj : routines) {
+            final String key = obj.getProperty().getLabel();
+            // it does not have a routine with same name
+            if (!beansList.containsKey(key)) {
+                beansList.put(key, (RoutineItem) obj.getProperty().getItem());
             }
         }
-
+        for (ProjectReference projectReference : project.getProjectReferenceList()) {
+            routines.addAll(getReferencedProjectRoutine(beansList, new Project(projectReference.getReferencedProject()),
+                    routineType, syncRef));
+        }
         if (syncRef) {
+            routines.stream().forEach(obj -> {
+                try {
+                    syncRoutine((RoutineItem) obj.getProperty().getItem(), project.getTechnicalLabel(), true, true);
+                } catch (SystemException e) {
+                    ExceptionHandler.process(e);
+                }
+            });
             // sync system routine
             syncSystemRoutine(project);
         }
-
-        for (ProjectReference projectReference : project.getProjectReferenceList()) {
-            getReferencedProjectRoutine(beansList, new Project(projectReference.getReferencedProject()), routineType, syncRef);
-        }
+        return routines;
     }
 
     protected void syncSystemRoutine(Project project) throws SystemException {
@@ -136,24 +142,17 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
     }
 
     protected IFile getRoutineFile(RoutineItem routineItem) throws SystemException {
-        return getRoutineFile(routineItem, true);
+        return getRoutineFile(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel());
     }
 
-    protected IFile getRoutineFile(RoutineItem routineItem, boolean currentProject) throws SystemException {
-        String projectTechName;
-        if (currentProject) {
-            projectTechName = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
-        } else {
-            projectTechName = ProjectManager.getInstance().getProject(routineItem).getTechnicalLabel();
-        }
+    protected IFile getRoutineFile(RoutineItem routineItem, String projectTechName) throws SystemException {
         ITalendProcessJavaProject talendProcessJavaProject = getRunProcessService()
                 .getTalendCodeJavaProject(ERepositoryObjectType.getItemType(routineItem), projectTechName);
         if (talendProcessJavaProject == null) {
             return null;
         }
         IFolder routineFolder = talendProcessJavaProject.getSrcSubFolder(null, routineItem.getPackageType());
-        IFile file = routineFolder.getFile(routineItem.getProperty().getLabel() + JavaUtils.JAVA_EXTENSION);
-        return file;
+        return routineFolder.getFile(routineItem.getProperty().getLabel() + JavaUtils.JAVA_EXTENSION);
     }
 
     private IFile getProcessFile(ProcessItem item) throws SystemException {
@@ -201,30 +200,31 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
 
     @Override
     public void syncRoutine(RoutineItem routineItem, boolean copyToTemp) throws SystemException {
-        syncRoutine(routineItem, true, copyToTemp, false);
+        syncRoutine(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), copyToTemp, false);
     }
 
     @Override
     public void syncRoutine(RoutineItem routineItem, boolean copyToTemp, boolean forceUpdate) throws SystemException {
-        syncRoutine(routineItem, true, copyToTemp, forceUpdate);
+        syncRoutine(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), copyToTemp, forceUpdate);
     }
 
     @Override
-    public void syncRoutine(RoutineItem routineItem, boolean currentProject, boolean copyToTemp, boolean forceUpdate) throws SystemException {
+    public void syncRoutine(RoutineItem routineItem, String projectTechName, boolean copyToTemp, boolean forceUpdate)
+            throws SystemException {
         boolean needSync = false;
         if (routineItem != null) {
             if (forceUpdate || !isRoutineUptodate(routineItem)) {
                 needSync = true;
             } else {
-                IFile file = getRoutineFile(routineItem, currentProject);
+                IFile file = getRoutineFile(routineItem, projectTechName);
                 if (file != null && !file.exists()) {
                     needSync = true;
                 }
             }
         }
         if (needSync) {
-            doSyncRoutine(routineItem, currentProject, copyToTemp);
-            if (currentProject) {
+            doSyncRoutine(routineItem, projectTechName, copyToTemp);
+            if (ProjectManager.getInstance().getCurrentProject().getTechnicalLabel().equals(projectTechName)) {
                 setRoutineAsUptodate(routineItem);
             }
         }
@@ -232,14 +232,14 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
 
     public void syncRoutine(RoutineItem routineItem) throws SystemException {
         if (routineItem != null) {
-            doSyncRoutine(routineItem, true, true);
+            doSyncRoutine(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), true);
             setRoutineAsUptodate(routineItem);
         }
     }
 
-    private void doSyncRoutine(RoutineItem routineItem, boolean currentProject, boolean copyToTemp) throws SystemException {
+    private void doSyncRoutine(RoutineItem routineItem, String projectTechName, boolean copyToTemp) throws SystemException {
         try {
-            IFile file = getRoutineFile(routineItem, currentProject);
+            IFile file = getRoutineFile(routineItem, projectTechName);
             if (file == null) {
                 return;
             }
@@ -382,7 +382,7 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
     @Override
     public void syncAllBeansForLogOn() throws SystemException {
         for (RoutineItem beanItem : getBeans(true)) {
-            syncRoutine(beanItem, true, true, true);
+            syncRoutine(beanItem, true, true);
         }
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/ITalendSynchronizer.java

@@ -45,7 +45,8 @@ public interface ITalendSynchronizer {
 
     void syncRoutine(RoutineItem routineItem, boolean copyToTemp, boolean forceUpdate) throws SystemException;
 
-    void syncRoutine(RoutineItem routineItem, boolean currentProject, boolean copyToTemp, boolean forceUpdate) throws SystemException;
+    void syncRoutine(RoutineItem routineItem, String projectTechName, boolean copyToTemp, boolean forceUpdate)
+            throws SystemException;
 
     IFile getFile(Item item) throws SystemException;
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IProcessor.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.designer.runprocess;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
@@ -298,6 +299,8 @@ public interface IProcessor {
     String[] getJVMArgs();
 
     Set<ModuleNeeded> getNeededModules(int options);
+    
+    public void updateModulesAfterSetLog4j(Collection<ModuleNeeded> modulesNeeded);
 
     Set<JobInfo> getBuildChildrenJobs();
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java

@@ -216,6 +216,8 @@ public interface IRunProcessService extends IService {
 
     ITalendProcessJavaProject getTalendJobJavaProject(Property property);
 
+    IFolder getCodeSrcFolder(ERepositoryObjectType type, String projectTechName);
+
     ITalendProcessJavaProject getTempJavaProject();
 
     void clearProjectRelatedSettings();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java

@@ -200,6 +200,10 @@ public final class ProjectManager {
      * return all the referenced projects of current project.
      */
     public List<Project> getAllReferencedProjects(boolean force) {
+        return getAllReferencedProjects(getCurrentProject(), force);
+    }
+
+    public List<Project> getAllReferencedProjects(Project targetProject, boolean force) {
         List<Project> allReferencedprojects = new ArrayList<Project>();
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IProxyRepositoryService.class)) {
             if (this.getCurrentProject() == null) {
@@ -212,7 +216,7 @@ public final class ProjectManager {
             IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
             if (factory != null) {
                 List<org.talend.core.model.properties.Project> rProjects = factory
-                        .getReferencedProjects(this.getCurrentProject());
+                        .getReferencedProjects(targetProject);
                 if (rProjects != null) {
                     for (org.talend.core.model.properties.Project p : rProjects) {
                         Project project = new Project(p);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ui/login/connections/ConnectionUserPerReader.java

@@ -35,6 +35,7 @@ import org.talend.core.model.general.ConnectionBean;
 import org.talend.utils.json.JSONArray;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
+import org.talend.utils.security.EncryptedProperties;
 
 /**
  * DOC hwang class global comment. Detailled comment
@@ -126,8 +127,8 @@ public class ConnectionUserPerReader {
         if (!isHaveUserPer()) {
             createPropertyFile();
         }
-        try {
-            proper.load(new FileInputStream(perfile));
+        try (FileInputStream fi = new FileInputStream(perfile)) {
+            proper.load(fi);
             isRead = true;
         } catch (FileNotFoundException e) {
             e.printStackTrace();
@@ -176,9 +177,7 @@ public class ConnectionUserPerReader {
             }
             proper.setProperty("connection.define", usersJsonArray.toString());//$NON-NLS-1$
         }
-        try {
-
-            FileOutputStream out = new FileOutputStream(perfile);
+        try (FileOutputStream out = new FileOutputStream(perfile)) {
             proper.store(out, null);
         } catch (Exception e) {
             e.printStackTrace();
@@ -202,9 +201,8 @@ public class ConnectionUserPerReader {
                 proper.remove("connection.lastConnection"); //$NON-NLS-1$
             }
         }
-        FileOutputStream out;
-        try {
-            out = new FileOutputStream(perfile);
+        ;
+        try (FileOutputStream out = new FileOutputStream(perfile)) {
             proper.store(out, null);
         } catch (Exception e) {
             e.printStackTrace();
@@ -286,9 +284,7 @@ public class ConnectionUserPerReader {
         IPreferenceStore prefStore = PlatformUI.getPreferenceStore();
         proper.setProperty("connection.readRegistration", Integer.toString(prefStore.getInt("REGISTRATION_TRIES")));
         proper.setProperty("connection.readRegistrationDone", Integer.toString(prefStore.getInt("REGISTRATION_DONE")));
-        try {
-
-            FileOutputStream out = new FileOutputStream(perfile);
+        try (FileOutputStream out = new FileOutputStream(perfile)) {
             proper.store(out, null);
         } catch (Exception e) {
             e.printStackTrace();
@@ -317,8 +313,7 @@ public class ConnectionUserPerReader {
             String val = entry.getValue();
             proper.setProperty(key, val);
         }
-        try {
-            FileOutputStream out = new FileOutputStream(perfile);
+        try (FileOutputStream out = new FileOutputStream(perfile)) {
             proper.store(out, null);
         } catch (Exception e) {
             e.printStackTrace();
@@ -334,9 +329,7 @@ public class ConnectionUserPerReader {
         }
         IPreferenceStore prefStore = PlatformUI.getPreferenceStore();
         proper.setProperty("connection.licenseManagement", Integer.toString(prefStore.getInt("LICENSE_VALIDATION_DONE")));
-        try {
-
-            FileOutputStream out = new FileOutputStream(perfile);
+        try (FileOutputStream out = new FileOutputStream(perfile)) {
             proper.store(out, null);
         } catch (Exception e) {
             e.printStackTrace();
@@ -362,8 +355,7 @@ public class ConnectionUserPerReader {
             this.readProperties();
         }
         proper.setProperty("connection.installDone", Boolean.TRUE.toString()); //$NON-NLS-1$
-        try {
-            FileOutputStream out = new FileOutputStream(perfile);
+        try (FileOutputStream out = new FileOutputStream(perfile)) {
             proper.store(out, null);
         } catch (Exception e) {
             e.printStackTrace();

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/DefaultTokenCollector.java

@@ -18,8 +18,8 @@ import org.talend.core.GlobalServiceRegister;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.branding.IBrandingService;
-import org.talend.daikon.security.CryptoHelper;
 import org.talend.daikon.token.TokenGenerator;
+import org.talend.utils.security.StudioEncryption;
 
 import us.monoid.json.JSONObject;
 
@@ -47,7 +47,7 @@ public class DefaultTokenCollector extends AbstractTokenCollector {
     }
 
     public static String calcUniqueId() {
-        return TokenGenerator.generateMachineToken(new CryptoHelper(CryptoHelper.PASSPHRASE));
+        return TokenGenerator.generateMachineToken((src) -> StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).encrypt(src));
     }
 
     /*

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -2616,20 +2616,32 @@ public class ProcessorUtilities {
     }
 
     public static boolean isEsbJob(IProcess process) {
+        return isEsbJob(process, false);
+    }
+
+    public static boolean isEsbJob(IProcess process, boolean checkCurrentProcess) {
 
         if (process instanceof IProcess2) {
-            Set<JobInfo> infos = ProcessorUtilities.getChildrenJobInfo(((IProcess2) process).getProperty().getItem(), false);
 
-            for (JobInfo jobInfo : infos) {
-                ProcessType processType = jobInfo.getProcessItem().getProcess();
-                EList<NodeType> nodes = processType.getNode();
-                for (NodeType nodeType : nodes) {
-                    if (isEsbComponentName(nodeType.getComponentName())) {
+            if (checkCurrentProcess) {
+                for (INode n : process.getGraphicalNodes()) {
+                    if (isEsbComponentName(n.getComponent().getName())) {
                         return true;
                     }
                 }
-            }
+            } else {
+                Set<JobInfo> infos = ProcessorUtilities.getChildrenJobInfo(((IProcess2) process).getProperty().getItem(), false);
 
+                for (JobInfo jobInfo : infos) {
+                    ProcessType processType = jobInfo.getProcessItem().getProcess();
+                    EList<NodeType> nodes = processType.getNode();
+                    for (NodeType nodeType : nodes) {
+                        if (isEsbComponentName(nodeType.getComponentName())) {
+                            return true;
+                        }
+                    }
+                }
+            }
             return false;
         }
 

main/plugins/org.talend.designer.maven.aether/.classpath

@@ -1,29 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpclient.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-connector-basic.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-impl.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-classpath.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-file.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-http.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-wagon.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-util.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-utils.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/slf4j-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/wagon-provider-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-aether-provider-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-model-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-model-builder-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-repository-metadata-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-interpolation-1.19.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.17.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-file.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-http.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/wagon-file.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jsoup.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/wagon-http-shared.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/wagon-http.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/httpclient.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/httpcore.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-connector-basic.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-impl.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-classpath.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-wagon.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/plexus-utils.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/wagon-provider-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-aether-provider-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-model-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-model-builder-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-repository-metadata-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/plexus-interpolation-1.19.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.17.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

main/plugins/org.talend.designer.maven.aether/META-INF/MANIFEST.MF

@@ -26,13 +26,17 @@ Bundle-ClassPath: .,
  lib/maven-resolver-impl.jar,
  lib/maven-resolver-spi.jar,
  lib/maven-resolver-transport-classpath.jar,
- lib/maven-resolver-transport-file.jar,
- lib/maven-resolver-transport-http.jar,
  lib/maven-resolver-transport-wagon.jar,
  lib/maven-resolver-util.jar,
  lib/plexus-utils.jar,
  lib/slf4j-api.jar,
- lib/wagon-provider-api.jar
+ lib/wagon-provider-api.jar,
+ lib/jsoup.jar,
+ lib/wagon-http-shared.jar,
+ lib/wagon-http.jar,
+ lib/wagon-file.jar,
+ lib/maven-resolver-transport-file.jar,
+ lib/maven-resolver-transport-http.jar
 Export-Package: org.talend.designer.maven.aether,
  org.talend.designer.maven.aether.comparator,
  org.talend.designer.maven.aether.node,

main/plugins/org.talend.designer.maven.aether/build.properties

@@ -2,4 +2,10 @@ source.. = src/main/java/
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               lib/
+               lib/,\
+               lib/jsoup.jar,\
+               lib/wagon-http-shared.jar,\
+               lib/wagon-http.jar,\
+               lib/wagon-file.jar,\
+               lib/maven-resolver-transport-file.jar,\
+               lib/maven-resolver-transport-http.jar

main/plugins/org.talend.designer.maven.aether/pom.xml

@@ -11,6 +11,7 @@
   <packaging>eclipse-plugin</packaging>
   <properties>
     <maven.resolver.version>1.3.1</maven.resolver.version>
+    <wagon.version>3.0.0</wagon.version>
   </properties>
 
   <dependencies>
@@ -45,10 +46,20 @@
       <version>${maven.resolver.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-file</artifactId>
+      <version>${wagon.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http</artifactId>
+      <version>${wagon.version}</version>
+    </dependency>
+    <dependency>
+    <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-transport-file</artifactId>
       <version>${maven.resolver.version}</version>
-    </dependency>
+      </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-transport-http</artifactId>

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/RepositorySystemFactory.java

@@ -17,24 +17,20 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.codehaus.plexus.PlexusContainerException;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.deployment.DeployRequest;
-import org.eclipse.aether.impl.DefaultServiceLocator;
 import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transport.file.FileTransporterFactory;
-import org.eclipse.aether.transport.http.HttpTransporterFactory;
 import org.eclipse.aether.util.artifact.SubArtifact;
 import org.eclipse.aether.util.listener.ChainedRepositoryListener;
 import org.eclipse.aether.util.listener.ChainedTransferListener;
 import org.eclipse.aether.util.repository.AuthenticationBuilder;
+import org.talend.designer.maven.aether.util.MavenLibraryResolverProvider;
 
 /**
  * created by wchen on Aug 10, 2017 Detailled comment
@@ -44,32 +40,16 @@ public class RepositorySystemFactory {
 
     private static Map<LocalRepository, DefaultRepositorySystemSession> sessions = new HashMap<LocalRepository, DefaultRepositorySystemSession>();
 
-    private static RepositorySystem system;
-
-    private static RepositorySystem newRepositorySystem() {
-        DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
-        locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
-        locator.addService(TransporterFactory.class, FileTransporterFactory.class);
-        locator.addService(TransporterFactory.class, HttpTransporterFactory.class);
-
-        locator.setErrorHandler(new DefaultServiceLocator.ErrorHandler() {
-
-            @Override
-            public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable exception) {
-                exception.printStackTrace();
-            }
-        });
-
-        return locator.getService(RepositorySystem.class);
-    }
-
-    private static DefaultRepositorySystemSession newRepositorySystemSession(String localRepositoryPath) {
+    private static DefaultRepositorySystemSession newRepositorySystemSession(String localRepositoryPath)
+            throws PlexusContainerException {
         LocalRepository localRepo = new LocalRepository(localRepositoryPath);
         DefaultRepositorySystemSession repositorySystemSession = sessions.get(localRepo);
         if (repositorySystemSession == null) {
             repositorySystemSession = MavenRepositorySystemUtils.newSession();
             repositorySystemSession
-                    .setLocalRepositoryManager(system.newLocalRepositoryManager(repositorySystemSession, localRepo));
+                    .setLocalRepositoryManager(
+                            MavenLibraryResolverProvider.newRepositorySystem().newLocalRepositoryManager(repositorySystemSession,
+                                    localRepo));
             repositorySystemSession.setTransferListener(new ChainedTransferListener());
             repositorySystemSession.setRepositoryListener(new ChainedRepositoryListener());
         }
@@ -81,9 +61,7 @@ public class RepositorySystemFactory {
             String userName, String password, String groupId, String artifactId, String classifier, String extension,
             String version) throws Exception {
         DefaultRepositorySystemSession session = null;
-        if (system == null) {
-            system = newRepositorySystem();
-        }
+        RepositorySystem system = MavenLibraryResolverProvider.newRepositorySystem();
         session = newRepositorySystemSession(localRepository);
 
         DeployRequest deployRequest = new DeployRequest();

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/DynamicDistributionAetherUtils.java

@@ -36,10 +36,11 @@ import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.collection.DependencySelector;
-import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.graph.DefaultDependencyNode;
 import org.eclipse.aether.graph.Exclusion;
 import org.eclipse.aether.impl.DefaultServiceLocator;
+import org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator;
+import org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider;
 import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
@@ -48,10 +49,6 @@ import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.aether.resolution.VersionRangeRequest;
 import org.eclipse.aether.resolution.VersionRangeResult;
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transport.file.FileTransporterFactory;
-import org.eclipse.aether.transport.http.HttpTransporterFactory;
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -111,11 +108,11 @@ public class DynamicDistributionAetherUtils {
 
         RepositorySystem repoSystem = null;
         if (multiThread) {
-            repoSystem = newRepositorySystem();
+            repoSystem = MavenLibraryResolverProvider.newRepositorySystemForResolver();
         } else {
             repoSystem = repoSystemMap.get(key);
             if (repoSystem == null) {
-                repoSystem = newRepositorySystem();
+                repoSystem = MavenLibraryResolverProvider.newRepositorySystemForResolver();
                 repoSystemMap.put(key, repoSystem);
             }
         }
@@ -283,7 +280,7 @@ public class DynamicDistributionAetherUtils {
         if (monitor == null) {
             monitor = new DummyDynamicMonitor();
         }
-        RepositorySystem repSystem = newRepositorySystem();
+        RepositorySystem repSystem = MavenLibraryResolverProvider.newRepositorySystemForResolver();
         RepositorySystemSession repSysSession = newSession(repSystem, localPath, monitor);
         updateDependencySelector((DefaultRepositorySystemSession) repSysSession, monitor);
 
@@ -329,7 +326,7 @@ public class DynamicDistributionAetherUtils {
         if (monitor == null) {
             monitor = new DummyDynamicMonitor();
         }
-        RepositorySystem repSystem = newRepositorySystem();
+        RepositorySystem repSystem = MavenLibraryResolverProvider.newRepositorySystemForResolver();
         RepositorySystemSession repSysSession = newSession(repSystem, localPath, monitor);
         updateDependencySelector((DefaultRepositorySystemSession) repSysSession, monitor);
 
@@ -411,15 +408,6 @@ public class DynamicDistributionAetherUtils {
     // }
     // }
 
-    private static RepositorySystem newRepositorySystem() {
-        DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
-        locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
-        locator.addService(TransporterFactory.class, FileTransporterFactory.class);
-        locator.addService(TransporterFactory.class, HttpTransporterFactory.class);
-
-        return locator.getService(RepositorySystem.class);
-    }
-
     private static RepositorySystemSession newSession(RepositorySystem system, String repositoryPath, IDynamicMonitor monitor)
             throws CoreException {
         DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/MavenLibraryResolverProvider.java

@@ -18,6 +18,12 @@ import java.util.Map;
 import org.apache.maven.model.License;
 import org.apache.maven.model.Model;
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.providers.file.FileWagon;
+import org.apache.maven.wagon.providers.http.HttpWagon;
+import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.PlexusContainerException;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
@@ -25,6 +31,8 @@ import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.impl.DefaultServiceLocator;
+import org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator;
+import org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider;
 import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
@@ -34,6 +42,7 @@ import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
 import org.eclipse.aether.spi.connector.transport.TransporterFactory;
 import org.eclipse.aether.transport.file.FileTransporterFactory;
 import org.eclipse.aether.transport.http.HttpTransporterFactory;
+import org.eclipse.aether.transport.wagon.WagonTransporterFactory;
 import org.eclipse.aether.util.repository.AuthenticationBuilder;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.talend.core.nexus.ArtifactRepositoryBean;
@@ -70,8 +79,8 @@ public class MavenLibraryResolverProvider {
         return instance;
     }
 
-    private MavenLibraryResolverProvider() {
-        defaultRepoSystem = newRepositorySystem();
+    private MavenLibraryResolverProvider() throws PlexusContainerException {
+        defaultRepoSystem = newRepositorySystemForResolver();
         defaultRepoSystemSession = newSession(defaultRepoSystem, getLocalMVNRepository());
         ArtifactRepositoryBean talendServer = TalendLibsServerManager.getInstance().getTalentArtifactServer();
         if (talendServer.getUserName() == null && talendServer.getPassword() == null) {
@@ -146,12 +155,44 @@ public class MavenLibraryResolverProvider {
         return repository;
     }
 
-    private RepositorySystem newRepositorySystem() {
+    public static RepositorySystem newRepositorySystem() throws PlexusContainerException {
+        DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
+        locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
+        // TUP-24695 change to wagon transporters
+        locator.addService(TransporterFactory.class, WagonTransporterFactory.class);
+
+        PlexusContainer pc = new DefaultPlexusContainer();
+
+        pc.addComponent(new HttpWagon(), Wagon.class, "http");
+        pc.addComponent(new FileWagon(), Wagon.class, "file");
+
+        WagonTransporterFactory tf = (WagonTransporterFactory) locator.getService(TransporterFactory.class);
+        tf.setWagonConfigurator(new PlexusWagonConfigurator(pc));
+        tf.setWagonProvider(new PlexusWagonProvider(pc));
+
+        locator.setErrorHandler(new DefaultServiceLocator.ErrorHandler() {
+
+            @Override
+            public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable exception) {
+                exception.printStackTrace();
+            }
+        });
+        return locator.getService(RepositorySystem.class);
+    }
+
+    public static RepositorySystem newRepositorySystemForResolver() {
         DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
         locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
         locator.addService(TransporterFactory.class, FileTransporterFactory.class);
         locator.addService(TransporterFactory.class, HttpTransporterFactory.class);
 
+        locator.setErrorHandler(new DefaultServiceLocator.ErrorHandler() {
+
+            @Override
+            public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable exception) {
+                exception.printStackTrace();
+            }
+        });
         return locator.getService(RepositorySystem.class);
     }
 

main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
     
     <properties>
-        <tcomp.version>1.1.10</tcomp.version>
+        <tcomp.version>1.1.14</tcomp.version>
         <slf4j.version>1.7.25</slf4j.version>
     </properties>
     

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/preference/M2eUserSettingForTalendLoginTask.java

@@ -294,20 +294,25 @@ public class M2eUserSettingForTalendLoginTask extends AbstractLoginTask {
         boolean isLocal = isLocalRepository();
         IPath localRepoPath = null;
         if (!isLocal) {
-            String mvnHome = System.getenv("M2_HOME"); //$NON-NLS-1$
-            if (mvnHome == null) {
-                mvnHome = System.getenv("MAVEN_HOME"); //$NON-NLS-1$
-            }
-            if (StringUtils.isNotBlank(mvnHome)) {
-                File globalSettings = new File(mvnHome).toPath().resolve("conf").resolve("settings.xml").toFile(); //$NON-NLS-1$ //$NON-NLS-2$
-                if (globalSettings.exists()) {
-                    DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-                    Document document = builder.parse(globalSettings);
-                    Node node = document.getElementsByTagName("localRepository").item(0); //$NON-NLS-1$
-                    if (node != null) {
-                        String repoPath = node.getTextContent();
-                        if (StringUtils.isNotBlank(repoPath)) {
-                            localRepoPath = new Path(repoPath);
+            String customMavenRepoistory = System.getProperty("maven.local.repository");
+            if (customMavenRepoistory != null) {
+                localRepoPath = new Path(customMavenRepoistory);
+            } else {
+                String mvnHome = System.getenv("M2_HOME"); //$NON-NLS-1$
+                if (mvnHome == null) {
+                    mvnHome = System.getenv("MAVEN_HOME"); //$NON-NLS-1$
+                }
+                if (StringUtils.isNotBlank(mvnHome)) {
+                    File globalSettings = new File(mvnHome).toPath().resolve("conf").resolve("settings.xml").toFile(); //$NON-NLS-1$ //$NON-NLS-2$
+                    if (globalSettings.exists()) {
+                        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+                        Document document = builder.parse(globalSettings);
+                        Node node = document.getElementsByTagName("localRepository").item(0); //$NON-NLS-1$
+                        if (node != null) {
+                            String repoPath = node.getTextContent();
+                            if (StringUtils.isNotBlank(repoPath)) {
+                                localRepoPath = new Path(repoPath);
+                            }
                         }
                     }
                 }

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java

@@ -16,6 +16,7 @@ import static org.talend.designer.maven.model.TalendJavaProjectConstants.*;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -74,6 +75,7 @@ import org.talend.core.runtime.services.IFilterService;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.designer.core.ICamelDesignerCoreService;
 import org.talend.designer.maven.launch.MavenPomCommandLauncher;
+import org.talend.designer.maven.model.MavenSystemFolders;
 import org.talend.designer.maven.model.TalendJavaProjectConstants;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.template.MavenTemplateManager;
@@ -111,9 +113,6 @@ public class AggregatorPomsHelper {
             throws Exception {
         IFile pomFile = getProjectRootPom();
         if (force || !pomFile.exists()) {
-            if (model == null) {
-                model = getCodeProjectTemplateModel();
-            }
             PomUtil.savePom(monitor, model, pomFile);
         }
     }
@@ -124,8 +123,7 @@ public class AggregatorPomsHelper {
         if (pomFile != null && pomFile.exists()) {
             Model oldModel = MavenPlugin.getMavenModelManager().readMavenModel(pomFile);
             List<Profile> profiles = oldModel.getProfiles().stream()
-                    .filter(profile -> StringUtils.startsWithIgnoreCase(profile.getId(), projectTechName))
-                    .collect(Collectors.toList());
+                    .filter(profile -> matchModuleProfile(profile.getId(), projectTechName)).collect(Collectors.toList());
             newModel.setModules(oldModel.getModules());
             newModel.getProfiles().addAll(profiles);
         }
@@ -298,11 +296,12 @@ public class AggregatorPomsHelper {
             if (PomIdsHelper.useProfileModule()) {
                 List<Profile> profiles = collectRefProjectProfiles(references);
                 Iterator<Profile> iterator = model.getProfiles().listIterator();
-                iterator.forEachRemaining(profile -> {
-                    if (StringUtils.startsWithIgnoreCase(profile.getId(), projectTechName)) {
+                while (iterator.hasNext()) {
+                    Profile profile = iterator.next();
+                    if (matchModuleProfile(profile.getId(), projectTechName)) {
                         iterator.remove();
                     }
-                });
+                }
                 model.getProfiles().addAll(profiles);
             } else {
                 List<String> refPrjectModules = new ArrayList<>();
@@ -313,11 +312,12 @@ public class AggregatorPomsHelper {
                 });
                 List<String> modules = model.getModules();
                 Iterator<String> iterator = modules.listIterator();
-                iterator.forEachRemaining(modulePath -> {
+                while (iterator.hasNext()) {
+                    String modulePath = iterator.next();
                     if (modulePath.startsWith("../../")) { //$NON-NLS-1$
                         iterator.remove();
                     }
-                });
+                }
                 modules.addAll(refPrjectModules);
             }
             createRootPom(model, true, monitor);
@@ -494,6 +494,10 @@ public class AggregatorPomsHelper {
         return null;
     }
 
+    public IFolder getCodeSrcFolder(ERepositoryObjectType codeType) {
+        return getCodeFolder(codeType).getFolder(MavenSystemFolders.JAVA.getPath());
+    }
+
     public IFolder getProcessFolder(ERepositoryObjectType type) {
         return getProjectPomsFolder().getFolder(DIR_JOBS).getFolder(type.getFolder());
     }
@@ -714,7 +718,7 @@ public class AggregatorPomsHelper {
         if (!needUpdateRefProjectModules()) {
             Model model = MavenPlugin.getMavenModelManager().readMavenModel(getProjectRootPom());
             List<Profile> profiles = model.getProfiles();
-            return profiles.stream().filter(profile -> StringUtils.startsWithIgnoreCase(profile.getId(), projectTechName))
+            return profiles.stream().filter(profile -> matchModuleProfile(profile.getId(), projectTechName))
                     .collect(Collectors.toList());
         }
         if (references == null) {
@@ -789,7 +793,13 @@ public class AggregatorPomsHelper {
         monitor.beginTask("", size); //$NON-NLS-1$
         // project pom
         monitor.subTask("Synchronize project pom"); //$NON-NLS-1$
-        createRootPom(null, true, monitor);
+        Model model = getCodeProjectTemplateModel();
+        if (PomIdsHelper.useProfileModule()) {
+            model.getProfiles().addAll(collectRefProjectProfiles(null));
+        } else {
+            model.getModules().addAll(collectRefProjectModules(null));
+        }
+        createRootPom(model, true, monitor);
         installRootPom(true);
         monitor.worked(1);
         if (monitor.isCanceled()) {
@@ -843,13 +853,7 @@ public class AggregatorPomsHelper {
         // sync project pom again with all modules.
         monitor.subTask("Synchronize project pom with modules"); //$NON-NLS-1$
         collectCodeModules(modules);
-        Model model = getCodeProjectTemplateModel();
-        if (PomIdsHelper.useProfileModule()) {
-            model.getProfiles().addAll(collectRefProjectProfiles(null));
-        } else {
-            modules.addAll(collectRefProjectModules(null));
-        }
-        model.setModules(modules);
+        model.getModules().addAll(modules);
         createRootPom(model, true, monitor);
         installRootPom(true);
         monitor.worked(1);
@@ -908,6 +912,12 @@ public class AggregatorPomsHelper {
         return MavenTemplateManager.getCodeProjectTemplateModel(parameters);
     }
 
+    public static boolean matchModuleProfile(String profileId, String projectTechName) {
+        // FIXME get profile id from extension point.
+        List<String> otherProfiles = Arrays.asList("docker", "cloud-publisher", "nexus"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        return !otherProfiles.contains(profileId) && StringUtils.startsWithIgnoreCase(profileId, projectTechName + "_");
+    }
+
     private static IRunProcessService getRunProcessService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
             IRunProcessService runProcessService =

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/ProcessorDependenciesManager.java

@@ -167,6 +167,7 @@ public class ProcessorDependenciesManager {
         if (modulesNeeded.isEmpty()) {
             modulesNeeded = processor.getNeededModules(TalendProcessOptionConstants.MODULES_WITH_JOBLET);
         }
+        processor.updateModulesAfterSetLog4j(modulesNeeded);
         neededLibraries.addAll(modulesNeeded);
 
         // add testcase modules

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/ProjectPomManager.java

@@ -69,13 +69,7 @@ public class ProjectPomManager {
         if (monitor == null) {
             monitor = new NullProgressMonitor();
         }
-        Model projectModel = MODEL_MANAGER.readMavenModel(projectPomFile);
-        Model templateModel = MavenTemplateManager.getCodeProjectTemplateModel();
-        for (String module : projectModel.getModules()) {
-            templateModel.addModule(module);
-        }
-
-        PomUtil.savePom(monitor, templateModel, projectPomFile);
+        new AggregatorPomsHelper().createRootPom(monitor);
     }
 
     /**

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java

@@ -220,6 +220,29 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                     MavenArtifact mvnArtifact = MavenUrlHelper.parseMvnUrl(module.getMavenUri());
                     include.setValue(mvnArtifact.getGroupId() + ":" + mvnArtifact.getArtifactId()); //$NON-NLS-1$
                 }
+                
+                //removing digital signatures from uber jar
+                Xpp3Dom filters = new Xpp3Dom("filters"); //$NON-NLS-1$
+                Xpp3Dom filter = new Xpp3Dom("filter"); //$NON-NLS-1$
+                Xpp3Dom artifact = new Xpp3Dom("artifact"); //$NON-NLS-1$
+                artifact.setValue("*:*");
+                Xpp3Dom filterExcludes = new Xpp3Dom("excludes"); //$NON-NLS-1$
+                Xpp3Dom excludeSF = new Xpp3Dom("exclude");
+                excludeSF.setValue("META-INF/*.SF");
+                Xpp3Dom excludeDSA = new Xpp3Dom("exclude");
+                excludeDSA.setValue("META-INF/*.DSA");
+                Xpp3Dom excludeRSA = new Xpp3Dom("exclude");
+                excludeRSA.setValue("META-INF/*.RSA");
+
+                filterExcludes.addChild(excludeSF);
+                filterExcludes.addChild(excludeDSA);
+                filterExcludes.addChild(excludeRSA);
+                
+                filter.addChild(artifact);
+                filter.addChild(filterExcludes);
+                filters.addChild(filter);
+                configuration.addChild(filters);
+                
                 plugins.add(shade);
             }
         }

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenStandardJobOSGiPom.java

@@ -152,11 +152,13 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
         model.addProperty("talend.job.finalName", "${talend.job.name}-bundle-${project.version}");
         Build build = model.getBuild();
         
-        IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
+            IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
 
-        if (isServiceOperation || service.isRESTService((ProcessItem) getJobProcessor().getProperty().getItem())
-                || isRouteOperation(getJobProcessor().getProperty())) {
-            build.addPlugin(addSkipDockerMavenPlugin());
+            if (isServiceOperation || service.isRESTService((ProcessItem) getJobProcessor().getProperty().getItem())
+                    || isRouteOperation(getJobProcessor().getProperty())) {
+                build.addPlugin(addSkipDockerMavenPlugin());
+            }
         }
         
         if (isServiceOperation) {
@@ -283,25 +285,25 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
         List<IRepositoryViewObject> serviceRepoList = null;
 
         boolean isDataServiceOperation = false;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
+            IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+            try {
+                IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+                serviceRepoList = factory.getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "SERVICES"));
 
-        IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
-
-        try {
-            IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
-            serviceRepoList = factory.getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "SERVICES"));
-
-            for (IRepositoryViewObject serviceItem : serviceRepoList) {
-                if (service != null) {
-                    List<String> jobIds = service.getSerivceRelatedJobIds(serviceItem.getProperty().getItem());
-                    if (jobIds.contains(property.getId())) {
-                        isDataServiceOperation = true;
-                        break;
+                for (IRepositoryViewObject serviceItem : serviceRepoList) {
+                    if (service != null) {
+                        List<String> jobIds = service.getSerivceRelatedJobIds(serviceItem.getProperty().getItem());
+                        if (jobIds.contains(property.getId())) {
+                            isDataServiceOperation = true;
+                            break;
+                        }
                     }
                 }
-            }
 
-        } catch (PersistenceException e) {
-            ExceptionHandler.process(e);
+            } catch (PersistenceException e) {
+                ExceptionHandler.process(e);
+            }
         }
 
         return isDataServiceOperation;
@@ -311,32 +313,33 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
         List<IRepositoryViewObject> routeRepoList = null;
 
         boolean isRouteOperation = false;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
 
-        IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+            IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
 
-        try {
-            IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
-            routeRepoList = factory.getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "ROUTE"));
+            try {
+                IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+                routeRepoList = factory.getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "ROUTE"));
 
-            for (IRepositoryViewObject routeItem : routeRepoList) {
-                if (service != null) {
+                for (IRepositoryViewObject routeItem : routeRepoList) {
+                    if (service != null) {
 
-                    List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(routeItem.getId(),
-                            routeItem.getVersion(), RelationshipItemBuilder.JOB_RELATION);
-                    for (Relation relation : relations) {
-                        if (relation.getType() == RelationshipItemBuilder.JOB_RELATION) {
-                            if (relation.getId().equals(property.getId())) {
-                                isRouteOperation = true;
+                        List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(routeItem.getId(),
+                                routeItem.getVersion(), RelationshipItemBuilder.JOB_RELATION);
+                        for (Relation relation : relations) {
+                            if (relation.getType() == RelationshipItemBuilder.JOB_RELATION) {
+                                if (relation.getId().equals(property.getId())) {
+                                    isRouteOperation = true;
+                                }
                             }
                         }
                     }
                 }
+
+            } catch (PersistenceException e) {
+                ExceptionHandler.process(e);
             }
-
-        } catch (PersistenceException e) {
-            ExceptionHandler.process(e);
         }
-
         return isRouteOperation;
     }
 }

main/plugins/org.talend.librariesmanager/resources/java/routines/Mathematical.java

@@ -286,7 +286,7 @@ public class Mathematical {
      *
      */
     public static double LN(double a) {
-        return Math.log(a) / Math.E;
+        return Math.log(a);
     }
 
     /**

main/plugins/org.talend.librariesmanager/resources/java/routines/system/GlobalResource.java

@@ -14,28 +14,23 @@ package routines.system;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class GlobalResource {
 
-    // let it support the top level Object
-    public static Map<Object, Object> resourceMap = new HashMap<Object, Object>();
+	// let it support the top level Object
+	public static Map<Object, Object> resourceMap = new HashMap<Object, Object>();
 
-    // when there is multiple threads wants to insert stats&logs&meta into DB, it is used as a locker. bug:22677
-    public static TalendMultiThreadLockMap resourceLockMap = new TalendMultiThreadLockMap();
+	// when there is multiple threads wants to insert stats&logs&meta into DB, it is
+	// used as a locker. bug:22677
+	public static TalendMultiThreadLockMap resourceLockMap = new TalendMultiThreadLockMap();
 
-    public static class TalendMultiThreadLockMap {
+	public static class TalendMultiThreadLockMap {
 
-        private Map<Object, Object> tMultiTheadLockMap = new HashMap<Object, Object>();
+		private Map<Object, Object> tMultiTheadLockMap = new ConcurrentHashMap<>();
 
-        public Object get(Object key) {
-            if (tMultiTheadLockMap.get(key) == null) {
-                synchronized (TalendMultiThreadLockMap.this) {
-                    if (tMultiTheadLockMap.get(key) == null) {
-                        tMultiTheadLockMap.put(key, new Object());
-                    }
-                }
-            }
-            return tMultiTheadLockMap.get(key);
-        }
-    }
+		public Object get(Object key) {
+			return tMultiTheadLockMap.computeIfAbsent(key, k -> new Object());
+		}
+	}
 }

main/plugins/org.talend.librariesmanager/resources/java/routines/system/PasswordEncryptUtil.java

@@ -21,21 +21,24 @@ import org.talend.daikon.crypto.KeySources;
  */
 public class PasswordEncryptUtil {
 
-    public static String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
+    public static final String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
 
     private static final String ENCRYPTION_KEY = "Talend_TalendKey";
     
-    public static String PREFIX_PASSWORD = "ENC:["; //$NON-NLS-1$
+    private static final String PREFIX_PASSWORD = "ENC:["; //$NON-NLS-1$
     
-    public static String POSTFIX_PASSWORD = "]"; //$NON-NLS-1$
+    private static final String POSTFIX_PASSWORD = "]"; //$NON-NLS-1$
 
-    private static Encryption defaultEncryption;
+    private static final Encryption ENCRYPTION = new Encryption(KeySources.fixedKey(ENCRYPTION_KEY), CipherSources.getDefault());
+
+    private PasswordEncryptUtil() {
+    }
 
     public static String encryptPassword(String input) throws Exception {
         if (input == null) {
             return input;
         }
-        return PREFIX_PASSWORD + getEncryption().encrypt(input) + POSTFIX_PASSWORD;
+        return PREFIX_PASSWORD + ENCRYPTION.encrypt(input) + POSTFIX_PASSWORD;
     }
 
     public static String decryptPassword(String input) {
@@ -44,7 +47,7 @@ public class PasswordEncryptUtil {
         }
         if (input.startsWith(PREFIX_PASSWORD) && input.endsWith(POSTFIX_PASSWORD)) {
             try {
-                return getEncryption()
+                return ENCRYPTION
                         .decrypt(input.substring(PREFIX_PASSWORD.length(), input.length() - POSTFIX_PASSWORD.length()));
             } catch (Exception e) {
                 // do nothing
@@ -53,13 +56,6 @@ public class PasswordEncryptUtil {
         return input;
     }
 
-    private static Encryption getEncryption() {
-        if (defaultEncryption == null) {
-            defaultEncryption = new Encryption(KeySources.fixedKey(ENCRYPTION_KEY), CipherSources.aes());
-        }
-        return defaultEncryption;
-    }
-
     public static final String PASSWORD_FOR_LOGS_VALUE = "...";
 
 }

main/plugins/org.talend.librariesmanager/resources/java/routines/system/RunStat.java

@@ -502,6 +502,13 @@ public class RunStat implements Runnable {
     	}
     }
     
+    /**
+     * TBD-9420 fix 
+     */
+    public synchronized void log(String iterateId, int mode, int nbLine, String connectionUniqueName) {
+		log(connectionUniqueName+iterateId, mode, nbLine);
+    }
+    
     /**
      * work for avoiding the 65535 issue
      */

main/plugins/org.talend.librariesmanager/resources/java/routines/system/StringUtils.java

@@ -403,8 +403,25 @@ public class StringUtils {
 
         return sb.toString();
     }
-
-
+    
+    /**
+     * check if string contains search string case-insensitivity
+     * the code is copied from apache commons-lang3 StringUtils and do some adjust to avoid the useless code
+     */
+    public static boolean containsIgnoreCase(final String str, final String searchStr) {
+        if (str == null || searchStr == null) {
+            return false;
+        }
+        final int len = searchStr.length();
+        final int max = str.length() - len;
+        for (int i = 0; i <= max; i++) {
+            if (str.regionMatches(true, i, searchStr, 0, len)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
     /**
      * return null value not "null" String when obj is null that is the only difference with String.valueOf(Object obj)
      *

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ModulesNeededProvider.java

@@ -706,8 +706,13 @@ public class ModulesNeededProvider {
                 ModuleNeeded toAdd = new ModuleNeeded(context, currentImport.getMODULE(), currentImport.getMESSAGE(),
                         isRequired);
                 toAdd.setMavenUri(currentImport.getMVN());
-                if (!isRequired && "BeanItem".equals(routine.eClass().getName())) {
-                	toAdd.getExtraAttributes().put("IS_OSGI_EXCLUDED", Boolean.TRUE);
+                if (!isRequired) {
+                    if ("BeanItem".equals(routine.eClass().getName())) {
+                        toAdd.getExtraAttributes().put("IS_OSGI_EXCLUDED", Boolean.TRUE);
+                    }
+                    if ("RoutineItem".equals(routine.eClass().getName())) {
+                        continue;
+                    }
                 }
                 // toAdd.setStatus(ELibraryInstallStatus.INSTALLED);
                 importNeedsList.add(toAdd);

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java

@@ -299,6 +299,17 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
         return retrieve(testModule, pathToStore, popUp, refresh);
     }
 
+	@Override
+	public boolean retrieve(String jarNeeded, String mavenUri, String pathToStore, IProgressMonitor... monitorWrap) {
+		ModuleNeeded testModule = new ModuleNeeded("", jarNeeded, "", true);
+		if(mavenUri != null) {
+			testModule.setMavenUri(mavenUri);
+		}
+        boolean refresh = true;
+        return retrieve(testModule, pathToStore, true, refresh);
+	}
+
+
     private boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, boolean refresh) {
         String jarNeeded = module.getModuleName();
         String sourcePath = null;

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/nexus/AbstractArtifactRepositoryHandler.java

@@ -13,9 +13,13 @@
 package org.talend.librariesmanager.nexus;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
+import org.apache.commons.lang.StringUtils;
 import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.IRepositoryArtifactHandler;
 import org.talend.core.nexus.NexusConstants;
@@ -62,10 +66,22 @@ public abstract class AbstractArtifactRepositoryHandler implements IRepositoryAr
         if (props == null) {
             props = new Hashtable<String, String>();
         }
-        String repositories = null;
-        String custom_server = serverBean.getServer();
+
         String custom_user = serverBean.getUserName();
         String custom_pass = serverBean.getPassword();
+        try {
+            if (StringUtils.isNotBlank(custom_user)) {
+                custom_user = URLEncoder.encode(custom_user, StandardCharsets.UTF_8.toString());
+            }
+            if (StringUtils.isNotBlank(custom_pass)) {
+                custom_pass = URLEncoder.encode(custom_pass, StandardCharsets.UTF_8.toString());
+            }
+        } catch (UnsupportedEncodingException e1) {
+            throw new RuntimeException(e1);
+        }
+
+        String repositories = null;
+        String custom_server = serverBean.getServer();
         String release_rep = serverBean.getRepositoryId();
         String snapshot_rep = serverBean.getSnapshotRepId();
         if (custom_server.endsWith(NexusConstants.SLASH)) {

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/SwitchContextGroupNameImpl.java

@@ -74,6 +74,16 @@ public class SwitchContextGroupNameImpl implements ISwitchContext {
      */
     @Override
     public boolean updateContextGroup(ConnectionItem connItem, String selectedContext) {
+        return updateContextGroup(connItem, selectedContext, null);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.core.model.metadata.builder.database.ISwitchContext#updateContextGroup(org.talend.core.model.
+     * properties .ContextItem, org.talend.core.model.metadata.builder.connection.Connection)
+     */
+    public boolean updateContextGroup(ConnectionItem connItem, String selectedContext, String originalContext) {
         if (connItem == null) {
             return false;
         }
@@ -81,9 +91,9 @@ public class SwitchContextGroupNameImpl implements ISwitchContext {
         // MOD msjian 2012-2-13 TDQ-4559: make it support file/mdm connection
         if (con != null) {
             // TDQ-4559~
-            String oldContextName = con.getContextName();
+            String oldContextName = originalContext == null ? con.getContextName() : originalContext;
 
-            if (!isContextIsValid(selectedContext, con)) {
+            if (!isContextIsValid(selectedContext, oldContextName, con)) {
                 return false;
             }
             con.setContextName(selectedContext);
@@ -112,8 +122,7 @@ public class SwitchContextGroupNameImpl implements ISwitchContext {
      * @param selectedContext
      * @paramconn
      */
-    private boolean isContextIsValid(String selectedContext, Connection conn) {
-        String oldContextName = conn.getContextName();
+    private boolean isContextIsValid(String selectedContext, String oldContextName, Connection conn) {
         boolean retCode = false;
         if (conn instanceof DatabaseConnection) {
             EDatabaseTypeName dbType = EDatabaseTypeName.getTypeFromDbType(((DatabaseConnection) conn).getDatabaseType());

main/plugins/org.talend.model/META-INF/MANIFEST.MF

@@ -2,18 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.talend.model;singleton:=true
-Automatic-Module-Name: org.talend.model
 Bundle-Version: 7.3.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.talend.core.model;
-  uses:="org.osgi.framework,
-   org.eclipse.core.runtime",
- org.talend.core.model.component_cache;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util",
+Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core.runtime",
+ org.talend.core.model.component_cache;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
  org.talend.core.model.component_cache.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -30,9 +24,7 @@ Export-Package: org.talend.core.model;
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecore.xmi.impl,
    org.talend.core.model.component_cache",
- org.talend.core.model.expression;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util",
+ org.talend.core.model.expression;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
  org.talend.core.model.expression.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -80,9 +72,7 @@ Export-Package: org.talend.core.model;
    org.talend.designer.core.model.utils.emf.talendfile,
    org.talend.core.model.metadata.builder.connection,
    org.eclipse.gmf.runtime.notation",
- org.talend.core.model.properties.helper;
-  uses:="org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.resource.impl",
+ org.talend.core.model.properties.helper;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.resource.impl",
  org.talend.core.model.properties.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -100,16 +90,9 @@ Export-Package: org.talend.core.model;
    org.talend.core.model.properties,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl",
- org.talend.core.model.resources;
-  uses:="org.eclipse.emf.ecore,
-   org.talend.core.model.properties",
- org.talend.cwm.constants;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util",
- org.talend.cwm.constants.impl;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.ecore.impl,
-   org.talend.cwm.constants",
+ org.talend.core.model.resources;uses:="org.eclipse.emf.ecore,org.talend.core.model.properties",
+ org.talend.cwm.constants;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.talend.cwm.constants.impl;uses:="org.eclipse.emf.ecore,org.eclipse.emf.ecore.impl,org.talend.cwm.constants",
  org.talend.cwm.helper;
   uses:="org.eclipse.emf.ecore,
    orgomg.cwm.foundation.businessinformation,
@@ -157,9 +140,7 @@ Export-Package: org.talend.core.model;
    org.eclipse.emf.common.notify.impl,
    org.talend.core.model.metadata.builder.connection,
    org.talend.cwm.relational",
- org.talend.cwm.softwaredeployment;
-  uses:="org.eclipse.emf.ecore,
-   orgomg.cwm.foundation.softwaredeployment",
+ org.talend.cwm.softwaredeployment;uses:="org.eclipse.emf.ecore,orgomg.cwm.foundation.softwaredeployment",
  org.talend.cwm.softwaredeployment.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -172,10 +153,7 @@ Export-Package: org.talend.core.model;
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl,
    org.talend.cwm.softwaredeployment",
- org.talend.cwm.xml;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util,
-   orgomg.cwm.resource.xml",
+ org.talend.cwm.xml;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,orgomg.cwm.resource.xml",
  org.talend.cwm.xml.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -190,9 +168,7 @@ Export-Package: org.talend.core.model;
    org.eclipse.emf.common.notify.impl,
    orgomg.cwm.resource.xml,
    org.talend.cwm.xml",
- org.talend.designer.business.model.business;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util",
+ org.talend.designer.business.model.business;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
  org.talend.designer.business.model.business.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -204,10 +180,7 @@ Export-Package: org.talend.core.model;
    org.talend.designer.business.model.business,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl",
- org.talend.designer.core.model.utils.emf.component;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util",
+ org.talend.designer.core.model.utils.emf.component;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  org.talend.designer.core.model.utils.emf.component.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -226,10 +199,7 @@ Export-Package: org.talend.core.model;
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecore.util,
    org.talend.designer.core.model.utils.emf.component",
- org.talend.designer.core.model.utils.emf.talendfile;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.util",
+ org.talend.designer.core.model.utils.emf.talendfile;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
  org.talend.designer.core.model.utils.emf.talendfile.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -248,10 +218,7 @@ Export-Package: org.talend.core.model;
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl,
    org.eclipse.emf.ecore.util",
- org.talend.designer.joblet.model;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util,
-   org.talend.designer.core.model.utils.emf.talendfile",
+ org.talend.designer.joblet.model;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.talend.designer.core.model.utils.emf.talendfile",
  org.talend.designer.joblet.model.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -270,18 +237,14 @@ Export-Package: org.talend.core.model;
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl",
- org.talend.model.bridge;
-  uses:="org.talend.core.model.properties,
-   org.eclipse.core.resources",
+ org.talend.model.bridge;uses:="org.talend.core.model.properties,org.eclipse.core.resources",
  org.talend.model.emf;
   uses:="org.eclipse.emf.common.util,
    org.talend.commons.runtime.model.emf,
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecore.xmi.impl,
    org.eclipse.emf.ecore.xmi",
- org.talend.model.recyclebin;
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.util",
+ org.talend.model.recyclebin;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
  org.talend.model.recyclebin.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,

main/plugins/org.talend.model/model/metadata.ecore

@@ -725,7 +725,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Proxypassword" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="CustomEncode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="UseFileNameEncoding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Timeout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BRMSConnection" eSuperTypes="#//Connection">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlField" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

main/plugins/org.talend.model/model/metadata.genmodel

@@ -477,7 +477,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/Proxypassword"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/CustomEncode"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/UseFileNameEncoding"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/Timeout"/>
     </genClasses>
     <genClasses ecoreClass="metadata.ecore#//BRMSConnection">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//BRMSConnection/xmlField"/>

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/AbstractMetadataObject.java

@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties <em>Properties</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getId <em>Id</em>}</li>
@@ -30,6 +29,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isSynchronised <em>Synchronised</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isDivergency <em>Divergency</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject()
  * @model abstract="true"
@@ -37,198 +37,195 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface AbstractMetadataObject extends ModelElement {
 
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Properties</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @deprecated Use taggedValue instead
-	 * (map of general purpose key/value that is available to all classes of the metamodel.)
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Properties</em>' attribute.
-	 * @see #setProperties(HashMap)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Properties()
-	 * @model default="" dataType="org.talend.core.model.metadata.builder.connection.Map" required="true"
-	 * @generated
-	 */
-	@Deprecated
-	HashMap getProperties();
+    /**
+     * Returns the value of the '<em><b>Properties</b></em>' attribute.
+     * The default value is <code>""</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Properties</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * @deprecated Use taggedValue instead
+     * (map of general purpose key/value that is available to all classes of the metamodel.)
+     * 
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Properties</em>' attribute.
+     * @see #setProperties(HashMap)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Properties()
+     * @model default="" dataType="org.talend.core.model.metadata.builder.connection.Map" required="true"
+     * @generated
+     */
+    HashMap getProperties();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties <em>Properties</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Properties</em>' attribute.
-	 * @see #getProperties()
-	 * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
-	 * @generated
-	 */
-	@Deprecated
-	void setProperties(HashMap value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties <em>Properties</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Properties</em>' attribute.
+     * @see #getProperties()
+     * @generated
+     */
+    void setProperties(HashMap value);
 
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * logical identifier
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Id()
-	 * @model
-	 * @generated
-	 */
-	String getId();
+    /**
+     * Returns the value of the '<em><b>Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * logical identifier
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Id</em>' attribute.
+     * @see #setId(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Id()
+     * @model
+     * @generated
+     */
+    String getId();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getId <em>Id</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Id</em>' attribute.
+     * @see #getId()
+     * @generated
+     */
+    void setId(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute. The default value is <code>""</code>. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Comment()
-	 * @model default=""
-	 * @generated
-	 */
-	String getComment();
+    /**
+     * Returns the value of the '<em><b>Comment</b></em>' attribute. The default value is <code>""</code>. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Comment</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * 
+     * @return the value of the '<em>Comment</em>' attribute.
+     * @see #setComment(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Comment()
+     * @model default=""
+     * @generated
+     */
+    String getComment();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getComment <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getComment <em>Comment</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Comment</em>' attribute.
+     * @see #getComment()
+     * @generated
+     */
+    void setComment(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Label</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * name to be displayed for the current object
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Label</em>' attribute.
-	 * @see #setLabel(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Label()
-	 * @model
-	 * @generated
-	 */
-	String getLabel();
+    /**
+     * Returns the value of the '<em><b>Label</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Label</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * name to be displayed for the current object
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Label</em>' attribute.
+     * @see #setLabel(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Label()
+     * @model
+     * @generated
+     */
+    String getLabel();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getLabel <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Label</em>' attribute.
-	 * @see #getLabel()
-	 * @generated
-	 */
-	void setLabel(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getLabel <em>Label</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Label</em>' attribute.
+     * @see #getLabel()
+     * @generated
+     */
+    void setLabel(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Read Only</em>' attribute.
-	 * @see #setReadOnly(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_ReadOnly()
-	 * @model default="false" volatile="true"
-	 * @generated
-	 */
-	boolean isReadOnly();
+    /**
+     * Returns the value of the '<em><b>Read Only</b></em>' attribute.
+     * The default value is <code>"false"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Read Only</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Read Only</em>' attribute.
+     * @see #setReadOnly(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_ReadOnly()
+     * @model default="false" volatile="true"
+     * @generated
+     */
+    boolean isReadOnly();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isReadOnly <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Only</em>' attribute.
-	 * @see #isReadOnly()
-	 * @generated
-	 */
-	void setReadOnly(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isReadOnly <em>Read Only</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Read Only</em>' attribute.
+     * @see #isReadOnly()
+     * @generated
+     */
+    void setReadOnly(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Synchronised</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Synchronised</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Synchronised</em>' attribute.
-	 * @see #setSynchronised(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Synchronised()
-	 * @model
-	 * @generated
-	 */
-	boolean isSynchronised();
+    /**
+     * Returns the value of the '<em><b>Synchronised</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Synchronised</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Synchronised</em>' attribute.
+     * @see #setSynchronised(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Synchronised()
+     * @model
+     * @generated
+     */
+    boolean isSynchronised();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isSynchronised <em>Synchronised</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Synchronised</em>' attribute.
-	 * @see #isSynchronised()
-	 * @generated
-	 */
-	void setSynchronised(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isSynchronised <em>Synchronised</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Synchronised</em>' attribute.
+     * @see #isSynchronised()
+     * @generated
+     */
+    void setSynchronised(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Divergency</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Divergency</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Divergency</em>' attribute.
-	 * @see #setDivergency(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Divergency()
-	 * @model
-	 * @generated
-	 */
-	boolean isDivergency();
+    /**
+     * Returns the value of the '<em><b>Divergency</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Divergency</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Divergency</em>' attribute.
+     * @see #setDivergency(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject_Divergency()
+     * @model
+     * @generated
+     */
+    boolean isDivergency();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isDivergency <em>Divergency</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Divergency</em>' attribute.
-	 * @see #isDivergency()
-	 * @generated
-	 */
-	void setDivergency(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isDivergency <em>Divergency</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Divergency</em>' attribute.
+     * @see #isDivergency()
+     * @generated
+     */
+    void setDivergency(boolean value);
 
 } // AbstractMetadataObject

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/AdditionalConnectionProperty.java

@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getPropertyName <em>Property Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getValue <em>Value</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAdditionalConnectionProperty()
  * @model
@@ -23,56 +23,56 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface AdditionalConnectionProperty extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>Property Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property Name</em>' attribute.
-	 * @see #setPropertyName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAdditionalConnectionProperty_PropertyName()
-	 * @model
-	 * @generated
-	 */
-	String getPropertyName();
+    /**
+     * Returns the value of the '<em><b>Property Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Property Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Property Name</em>' attribute.
+     * @see #setPropertyName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAdditionalConnectionProperty_PropertyName()
+     * @model
+     * @generated
+     */
+    String getPropertyName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getPropertyName <em>Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Property Name</em>' attribute.
-	 * @see #getPropertyName()
-	 * @generated
-	 */
-	void setPropertyName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getPropertyName <em>Property Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Property Name</em>' attribute.
+     * @see #getPropertyName()
+     * @generated
+     */
+    void setPropertyName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAdditionalConnectionProperty_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAdditionalConnectionProperty_Value()
+     * @model
+     * @generated
+     */
+    String getValue();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(String value);
 
 } // AdditionalConnectionProperty

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/BRMSConnection.java

@@ -15,7 +15,6 @@ import java.util.ArrayList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getXmlField <em>Xml Field</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getUrlName <em>Url Name</em>}</li>
@@ -27,6 +26,7 @@ import java.util.ArrayList;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getLoop <em>Loop</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getPackage <em>Package</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection()
  * @model
@@ -34,208 +34,208 @@ import java.util.ArrayList;
  */
 public interface BRMSConnection extends Connection {
 
-	/**
-	 * Returns the value of the '<em><b>Xml Field</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Xml Field</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xml Field</em>' attribute.
-	 * @see #setXmlField(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_XmlField()
-	 * @model
-	 * @generated
-	 */
-	String getXmlField();
+    /**
+     * Returns the value of the '<em><b>Xml Field</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Xml Field</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Xml Field</em>' attribute.
+     * @see #setXmlField(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_XmlField()
+     * @model
+     * @generated
+     */
+    String getXmlField();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getXmlField <em>Xml Field</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xml Field</em>' attribute.
-	 * @see #getXmlField()
-	 * @generated
-	 */
-	void setXmlField(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getXmlField <em>Xml Field</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Xml Field</em>' attribute.
+     * @see #getXmlField()
+     * @generated
+     */
+    void setXmlField(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Url Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url Name</em>' attribute.
-	 * @see #setUrlName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_UrlName()
-	 * @model
-	 * @generated
-	 */
-	String getUrlName();
+    /**
+     * Returns the value of the '<em><b>Url Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Url Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Url Name</em>' attribute.
+     * @see #setUrlName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_UrlName()
+     * @model
+     * @generated
+     */
+    String getUrlName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getUrlName <em>Url Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Url Name</em>' attribute.
-	 * @see #getUrlName()
-	 * @generated
-	 */
-	void setUrlName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getUrlName <em>Url Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Url Name</em>' attribute.
+     * @see #getUrlName()
+     * @generated
+     */
+    void setUrlName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Tac Webapp Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tac Webapp Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tac Webapp Name</em>' attribute.
-	 * @see #setTacWebappName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_TacWebappName()
-	 * @model
-	 * @generated
-	 */
-	String getTacWebappName();
+    /**
+     * Returns the value of the '<em><b>Tac Webapp Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Tac Webapp Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Tac Webapp Name</em>' attribute.
+     * @see #setTacWebappName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_TacWebappName()
+     * @model
+     * @generated
+     */
+    String getTacWebappName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getTacWebappName <em>Tac Webapp Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tac Webapp Name</em>' attribute.
-	 * @see #getTacWebappName()
-	 * @generated
-	 */
-	void setTacWebappName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getTacWebappName <em>Tac Webapp Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Tac Webapp Name</em>' attribute.
+     * @see #getTacWebappName()
+     * @generated
+     */
+    void setTacWebappName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_ClassName()
-	 * @model
-	 * @generated
-	 */
-	String getClassName();
+    /**
+     * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Class Name</em>' attribute.
+     * @see #setClassName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_ClassName()
+     * @model
+     * @generated
+     */
+    String getClassName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	void setClassName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getClassName <em>Class Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Class Name</em>' attribute.
+     * @see #getClassName()
+     * @generated
+     */
+    void setClassName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Module Used</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Module Used</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Module Used</em>' attribute.
-	 * @see #setModuleUsed(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_ModuleUsed()
-	 * @model
-	 * @generated
-	 */
-	String getModuleUsed();
+    /**
+     * Returns the value of the '<em><b>Module Used</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Module Used</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Module Used</em>' attribute.
+     * @see #setModuleUsed(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_ModuleUsed()
+     * @model
+     * @generated
+     */
+    String getModuleUsed();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getModuleUsed <em>Module Used</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Module Used</em>' attribute.
-	 * @see #getModuleUsed()
-	 * @generated
-	 */
-	void setModuleUsed(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getModuleUsed <em>Module Used</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Module Used</em>' attribute.
+     * @see #getModuleUsed()
+     * @generated
+     */
+    void setModuleUsed(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Root</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Root</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Root</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Root()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<XMLFileNode> getRoot();
+    /**
+     * Returns the value of the '<em><b>Root</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Root</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Root</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Root()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<XMLFileNode> getRoot();
 
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Group()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<XMLFileNode> getGroup();
+    /**
+     * Returns the value of the '<em><b>Group</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Group</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Group</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Group()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<XMLFileNode> getGroup();
 
-	/**
-	 * Returns the value of the '<em><b>Loop</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Loop</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Loop</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Loop()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<XMLFileNode> getLoop();
+    /**
+     * Returns the value of the '<em><b>Loop</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Loop</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Loop</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Loop()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<XMLFileNode> getLoop();
 
-	/**
-	 * Returns the value of the '<em><b>Package</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Package</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Package</em>' attribute.
-	 * @see #setPackage(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Package()
-	 * @model
-	 * @generated
-	 */
-	String getPackage();
+    /**
+     * Returns the value of the '<em><b>Package</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Package</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Package</em>' attribute.
+     * @see #setPackage(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection_Package()
+     * @model
+     * @generated
+     */
+    String getPackage();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getPackage <em>Package</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Package</em>' attribute.
-	 * @see #getPackage()
-	 * @generated
-	 */
-	void setPackage(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getPackage <em>Package</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Package</em>' attribute.
+     * @see #getPackage()
+     * @generated
+     */
+    void setPackage(String value);
 
 } // BRMSConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/CDCConnection.java

@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCConnection#getConnection <em>Connection</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCConnection#getCdcTypes <em>Cdc Types</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCConnection()
  * @model
@@ -32,51 +32,51 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface CDCConnection extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>Connection</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.DatabaseConnection#getCdcConns <em>Cdc Conns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * the connection this CDC relates to
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection</em>' container reference.
-	 * @see #setConnection(DatabaseConnection)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCConnection_Connection()
-	 * @see org.talend.core.model.metadata.builder.connection.DatabaseConnection#getCdcConns
-	 * @model opposite="cdcConns" transient="false"
-	 * @generated
-	 */
-	DatabaseConnection getConnection();
+    /**
+     * Returns the value of the '<em><b>Connection</b></em>' container reference.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.DatabaseConnection#getCdcConns <em>Cdc Conns</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Connection</em>' container reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * the connection this CDC relates to
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Connection</em>' container reference.
+     * @see #setConnection(DatabaseConnection)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCConnection_Connection()
+     * @see org.talend.core.model.metadata.builder.connection.DatabaseConnection#getCdcConns
+     * @model opposite="cdcConns" transient="false"
+     * @generated
+     */
+    DatabaseConnection getConnection();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCConnection#getConnection <em>Connection</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection</em>' container reference.
-	 * @see #getConnection()
-	 * @generated
-	 */
-	void setConnection(DatabaseConnection value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCConnection#getConnection <em>Connection</em>}' container reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Connection</em>' container reference.
+     * @see #getConnection()
+     * @generated
+     */
+    void setConnection(DatabaseConnection value);
 
-	/**
-	 * Returns the value of the '<em><b>Cdc Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.CDCType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cdc Types</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cdc Types</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCConnection_CdcTypes()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<CDCType> getCdcTypes();
+    /**
+     * Returns the value of the '<em><b>Cdc Types</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.CDCType}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Cdc Types</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Cdc Types</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCConnection_CdcTypes()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<CDCType> getCdcTypes();
 
 } // CDCConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/CDCType.java

@@ -14,13 +14,13 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getLinkDB <em>Link DB</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getSubscribers <em>Subscribers</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getCdcConnection <em>Cdc Connection</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getJournalName <em>Journal Name</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType()
  * @model
@@ -28,100 +28,100 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface CDCType extends AbstractMetadataObject {
 
-	/**
-	 * Returns the value of the '<em><b>Link DB</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link DB</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * ID of the .properties file related to the CDC database
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Link DB</em>' attribute.
-	 * @see #setLinkDB(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_LinkDB()
-	 * @model
-	 * @generated
-	 */
-	String getLinkDB();
+    /**
+     * Returns the value of the '<em><b>Link DB</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Link DB</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * ID of the .properties file related to the CDC database
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Link DB</em>' attribute.
+     * @see #setLinkDB(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_LinkDB()
+     * @model
+     * @generated
+     */
+    String getLinkDB();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCType#getLinkDB <em>Link DB</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link DB</em>' attribute.
-	 * @see #getLinkDB()
-	 * @generated
-	 */
-	void setLinkDB(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCType#getLinkDB <em>Link DB</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Link DB</em>' attribute.
+     * @see #getLinkDB()
+     * @generated
+     */
+    void setLinkDB(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Subscribers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SubscriberTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Subscribers</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Subscribers</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_Subscribers()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SubscriberTable> getSubscribers();
+    /**
+     * Returns the value of the '<em><b>Subscribers</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SubscriberTable}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Subscribers</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Subscribers</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_Subscribers()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SubscriberTable> getSubscribers();
 
-	/**
-	 * Returns the value of the '<em><b>Cdc Connection</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cdc Connection</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cdc Connection</em>' reference.
-	 * @see #setCdcConnection(CDCConnection)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_CdcConnection()
-	 * @model
-	 * @generated
-	 */
-	CDCConnection getCdcConnection();
+    /**
+     * Returns the value of the '<em><b>Cdc Connection</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Cdc Connection</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Cdc Connection</em>' reference.
+     * @see #setCdcConnection(CDCConnection)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_CdcConnection()
+     * @model
+     * @generated
+     */
+    CDCConnection getCdcConnection();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCType#getCdcConnection <em>Cdc Connection</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cdc Connection</em>' reference.
-	 * @see #getCdcConnection()
-	 * @generated
-	 */
-	void setCdcConnection(CDCConnection value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCType#getCdcConnection <em>Cdc Connection</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Cdc Connection</em>' reference.
+     * @see #getCdcConnection()
+     * @generated
+     */
+    void setCdcConnection(CDCConnection value);
 
-	/**
-	 * Returns the value of the '<em><b>Journal Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Journal Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Journal Name</em>' attribute.
-	 * @see #setJournalName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_JournalName()
-	 * @model
-	 * @generated
-	 */
-	String getJournalName();
+    /**
+     * Returns the value of the '<em><b>Journal Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Journal Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Journal Name</em>' attribute.
+     * @see #setJournalName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType_JournalName()
+     * @model
+     * @generated
+     */
+    String getJournalName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCType#getJournalName <em>Journal Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Journal Name</em>' attribute.
-	 * @see #getJournalName()
-	 * @generated
-	 */
-	void setJournalName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.CDCType#getJournalName <em>Journal Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Journal Name</em>' attribute.
+     * @see #getJournalName()
+     * @generated
+     */
+    void setJournalName(String value);
 } // CDCType

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Concept.java

@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopExpression <em>Loop Expression</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopLimit <em>Loop Limit</em>}</li>
@@ -28,6 +27,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getConceptType <em>Concept Type</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getXPathPrefix <em>XPath Prefix</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept()
  * @model
@@ -35,204 +35,204 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface Concept extends TdTable {
 
-	/**
-	 * Returns the value of the '<em><b>Loop Expression</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Loop Expression</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Loop Expression</em>' attribute.
-	 * @see #setLoopExpression(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_LoopExpression()
-	 * @model
-	 * @generated
-	 */
-	String getLoopExpression();
+    /**
+     * Returns the value of the '<em><b>Loop Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Loop Expression</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Loop Expression</em>' attribute.
+     * @see #setLoopExpression(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_LoopExpression()
+     * @model
+     * @generated
+     */
+    String getLoopExpression();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopExpression <em>Loop Expression</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Loop Expression</em>' attribute.
-	 * @see #getLoopExpression()
-	 * @generated
-	 */
-	void setLoopExpression(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopExpression <em>Loop Expression</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Loop Expression</em>' attribute.
+     * @see #getLoopExpression()
+     * @generated
+     */
+    void setLoopExpression(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Loop Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Loop Limit</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Loop Limit</em>' attribute.
-	 * @see #setLoopLimit(Integer)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_LoopLimit()
-	 * @model
-	 * @generated
-	 */
-	Integer getLoopLimit();
+    /**
+     * Returns the value of the '<em><b>Loop Limit</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Loop Limit</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Loop Limit</em>' attribute.
+     * @see #setLoopLimit(Integer)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_LoopLimit()
+     * @model
+     * @generated
+     */
+    Integer getLoopLimit();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopLimit <em>Loop Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Loop Limit</em>' attribute.
-	 * @see #getLoopLimit()
-	 * @generated
-	 */
-	void setLoopLimit(Integer value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopLimit <em>Loop Limit</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Loop Limit</em>' attribute.
+     * @see #getLoopLimit()
+     * @generated
+     */
+    void setLoopLimit(Integer value);
 
-	/**
-	 * Returns the value of the '<em><b>Concept Targets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.ConceptTarget}.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema <em>Schema</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Concept Targets</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Concept Targets</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_ConceptTargets()
-	 * @see org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema
-	 * @model opposite="schema" containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<ConceptTarget> getConceptTargets();
+    /**
+     * Returns the value of the '<em><b>Concept Targets</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.ConceptTarget}.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema <em>Schema</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Concept Targets</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Concept Targets</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_ConceptTargets()
+     * @see org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema
+     * @model opposite="schema" containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<ConceptTarget> getConceptTargets();
 
-	/**
-	 * Returns the value of the '<em><b>Input Model</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Input Model</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Input Model</em>' attribute.
-	 * @see #setInputModel(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_InputModel()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isInputModel();
+    /**
+     * Returns the value of the '<em><b>Input Model</b></em>' attribute.
+     * The default value is <code>"true"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Input Model</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Input Model</em>' attribute.
+     * @see #setInputModel(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_InputModel()
+     * @model default="true"
+     * @generated
+     */
+    boolean isInputModel();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#isInputModel <em>Input Model</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Input Model</em>' attribute.
-	 * @see #isInputModel()
-	 * @generated
-	 */
-	void setInputModel(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#isInputModel <em>Input Model</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Input Model</em>' attribute.
+     * @see #isInputModel()
+     * @generated
+     */
+    void setInputModel(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Group</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Group</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Group</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_Group()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XMLFileNode> getGroup();
+    /**
+     * Returns the value of the '<em><b>Group</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Group</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Group</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_Group()
+     * @model containment="true"
+     * @generated
+     */
+    EList<XMLFileNode> getGroup();
 
-	/**
-	 * Returns the value of the '<em><b>Root</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Root</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Root</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_Root()
-	 * @model containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	EList<XMLFileNode> getRoot();
+    /**
+     * Returns the value of the '<em><b>Root</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Root</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Root</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_Root()
+     * @model containment="true" resolveProxies="true" ordered="false"
+     * @generated
+     */
+    EList<XMLFileNode> getRoot();
 
-	/**
-	 * Returns the value of the '<em><b>Loop</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Loop</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Loop</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_Loop()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XMLFileNode> getLoop();
+    /**
+     * Returns the value of the '<em><b>Loop</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.XMLFileNode}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Loop</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Loop</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_Loop()
+     * @model containment="true"
+     * @generated
+     */
+    EList<XMLFileNode> getLoop();
 
-	/**
-	 * Returns the value of the '<em><b>Concept Type</b></em>' attribute.
-	 * The default value is <code>"INPUT"</code>.
-	 * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.MdmConceptType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Concept Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Concept Type</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.MdmConceptType
-	 * @see #setConceptType(MdmConceptType)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_ConceptType()
-	 * @model default="INPUT" required="true"
-	 * @generated
-	 */
-	MdmConceptType getConceptType();
+    /**
+     * Returns the value of the '<em><b>Concept Type</b></em>' attribute.
+     * The default value is <code>"INPUT"</code>.
+     * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.MdmConceptType}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Concept Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Concept Type</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.MdmConceptType
+     * @see #setConceptType(MdmConceptType)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_ConceptType()
+     * @model default="INPUT" required="true"
+     * @generated
+     */
+    MdmConceptType getConceptType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getConceptType <em>Concept Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Concept Type</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.MdmConceptType
-	 * @see #getConceptType()
-	 * @generated
-	 */
-	void setConceptType(MdmConceptType value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getConceptType <em>Concept Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Concept Type</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.MdmConceptType
+     * @see #getConceptType()
+     * @generated
+     */
+    void setConceptType(MdmConceptType value);
 
-	/**
-	 * Returns the value of the '<em><b>XPath Prefix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>XPath Prefix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>XPath Prefix</em>' attribute.
-	 * @see #setXPathPrefix(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_XPathPrefix()
-	 * @model
-	 * @generated
-	 */
-	String getXPathPrefix();
+    /**
+     * Returns the value of the '<em><b>XPath Prefix</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>XPath Prefix</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>XPath Prefix</em>' attribute.
+     * @see #setXPathPrefix(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept_XPathPrefix()
+     * @model
+     * @generated
+     */
+    String getXPathPrefix();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getXPathPrefix <em>XPath Prefix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>XPath Prefix</em>' attribute.
-	 * @see #getXPathPrefix()
-	 * @generated
-	 */
-	void setXPathPrefix(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Concept#getXPathPrefix <em>XPath Prefix</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>XPath Prefix</em>' attribute.
+     * @see #getXPathPrefix()
+     * @generated
+     */
+    void setXPathPrefix(String value);
 } // Concept

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConceptTarget.java

@@ -14,12 +14,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema <em>Schema</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getTargetName <em>Target Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getRelativeLoopExpression <em>Relative Loop Expression</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget()
  * @model
@@ -27,84 +27,84 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface ConceptTarget extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.Concept#getConceptTargets <em>Concept Targets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schema</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schema</em>' container reference.
-	 * @see #setSchema(Concept)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget_Schema()
-	 * @see org.talend.core.model.metadata.builder.connection.Concept#getConceptTargets
-	 * @model opposite="conceptTargets" transient="false"
-	 * @generated
-	 */
-	Concept getSchema();
+    /**
+     * Returns the value of the '<em><b>Schema</b></em>' container reference.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.Concept#getConceptTargets <em>Concept Targets</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Schema</em>' container reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Schema</em>' container reference.
+     * @see #setSchema(Concept)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget_Schema()
+     * @see org.talend.core.model.metadata.builder.connection.Concept#getConceptTargets
+     * @model opposite="conceptTargets" transient="false"
+     * @generated
+     */
+    Concept getSchema();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema <em>Schema</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' container reference.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	void setSchema(Concept value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema <em>Schema</em>}' container reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Schema</em>' container reference.
+     * @see #getSchema()
+     * @generated
+     */
+    void setSchema(Concept value);
 
-	/**
-	 * Returns the value of the '<em><b>Target Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Name</em>' attribute.
-	 * @see #setTargetName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget_TargetName()
-	 * @model
-	 * @generated
-	 */
-	String getTargetName();
+    /**
+     * Returns the value of the '<em><b>Target Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Target Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Target Name</em>' attribute.
+     * @see #setTargetName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget_TargetName()
+     * @model
+     * @generated
+     */
+    String getTargetName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getTargetName <em>Target Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Name</em>' attribute.
-	 * @see #getTargetName()
-	 * @generated
-	 */
-	void setTargetName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getTargetName <em>Target Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Target Name</em>' attribute.
+     * @see #getTargetName()
+     * @generated
+     */
+    void setTargetName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Relative Loop Expression</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Relative Loop Expression</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Relative Loop Expression</em>' attribute.
-	 * @see #setRelativeLoopExpression(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget_RelativeLoopExpression()
-	 * @model
-	 * @generated
-	 */
-	String getRelativeLoopExpression();
+    /**
+     * Returns the value of the '<em><b>Relative Loop Expression</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Relative Loop Expression</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Relative Loop Expression</em>' attribute.
+     * @see #setRelativeLoopExpression(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget_RelativeLoopExpression()
+     * @model
+     * @generated
+     */
+    String getRelativeLoopExpression();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getRelativeLoopExpression <em>Relative Loop Expression</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Relative Loop Expression</em>' attribute.
-	 * @see #getRelativeLoopExpression()
-	 * @generated
-	 */
-	void setRelativeLoopExpression(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getRelativeLoopExpression <em>Relative Loop Expression</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Relative Loop Expression</em>' attribute.
+     * @see #getRelativeLoopExpression()
+     * @generated
+     */
+    void setRelativeLoopExpression(String value);
 
 } // ConceptTarget

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConditionType.java

@@ -14,13 +14,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getInputColumn <em>Input Column</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getFunction <em>Function</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getOperator <em>Operator</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getValue <em>Value</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType()
  * @model
@@ -28,114 +28,114 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface ConditionType extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>Input Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Input Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Input Column</em>' attribute.
-	 * @see #setInputColumn(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_InputColumn()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getInputColumn();
+    /**
+     * Returns the value of the '<em><b>Input Column</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Input Column</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Input Column</em>' attribute.
+     * @see #setInputColumn(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_InputColumn()
+     * @model required="true"
+     * @generated
+     */
+    String getInputColumn();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getInputColumn <em>Input Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Input Column</em>' attribute.
-	 * @see #getInputColumn()
-	 * @generated
-	 */
-	void setInputColumn(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getInputColumn <em>Input Column</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Input Column</em>' attribute.
+     * @see #getInputColumn()
+     * @generated
+     */
+    void setInputColumn(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Function</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.Function}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Function</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Function</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.Function
-	 * @see #setFunction(Function)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_Function()
-	 * @model required="true"
-	 * @generated
-	 */
-	Function getFunction();
+    /**
+     * Returns the value of the '<em><b>Function</b></em>' attribute.
+     * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.Function}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Function</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Function</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.Function
+     * @see #setFunction(Function)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_Function()
+     * @model required="true"
+     * @generated
+     */
+    Function getFunction();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getFunction <em>Function</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.Function
-	 * @see #getFunction()
-	 * @generated
-	 */
-	void setFunction(Function value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getFunction <em>Function</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Function</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.Function
+     * @see #getFunction()
+     * @generated
+     */
+    void setFunction(Function value);
 
-	/**
-	 * Returns the value of the '<em><b>Operator</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.Operator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Operator</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Operator</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.Operator
-	 * @see #setOperator(Operator)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_Operator()
-	 * @model required="true"
-	 * @generated
-	 */
-	Operator getOperator();
+    /**
+     * Returns the value of the '<em><b>Operator</b></em>' attribute.
+     * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.Operator}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Operator</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Operator</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.Operator
+     * @see #setOperator(Operator)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_Operator()
+     * @model required="true"
+     * @generated
+     */
+    Operator getOperator();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getOperator <em>Operator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Operator</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.Operator
-	 * @see #getOperator()
-	 * @generated
-	 */
-	void setOperator(Operator value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getOperator <em>Operator</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Operator</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.Operator
+     * @see #getOperator()
+     * @generated
+     */
+    void setOperator(Operator value);
 
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType_Value()
+     * @model
+     * @generated
+     */
+    String getValue();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.ConditionType#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(String value);
 
 } // ConditionType

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Connection.java

@@ -32,175 +32,189 @@ import orgomg.cwm.foundation.softwaredeployment.DataProvider;
  */
 public interface Connection extends AbstractMetadataObject, DataProvider {
 
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_Version()
-	 * @model
-	 * @generated
-	 */
-	String getVersion();
+    /**
+     * Returns the value of the '<em><b>Version</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Version</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Version</em>' attribute.
+     * @see #setVersion(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_Version()
+     * @model
+     * @generated
+     */
+    String getVersion();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getVersion <em>Version</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Version</em>' attribute.
+     * @see #getVersion()
+     * @generated
+     */
+    void setVersion(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Queries</b></em>' containment reference. It is bidirectional and its opposite is
-	 * '{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection <em>Connection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Queries</em>' containment reference list isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> This defines the SQL queries related to this connection <!--
-	 * end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Queries</em>' containment reference.
-	 * @see #setQueries(QueriesConnection)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_Queries()
-	 * @see org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection
-	 * @model opposite="connection" containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	QueriesConnection getQueries();
+    /**
+     * Returns the value of the '<em><b>Queries</b></em>' containment reference. It is bidirectional and its opposite is
+     * '{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection <em>Connection</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Queries</em>' containment reference list isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> This defines the SQL queries related to this connection <!--
+     * end-model-doc -->
+     * 
+     * @return the value of the '<em>Queries</em>' containment reference.
+     * @see #setQueries(QueriesConnection)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_Queries()
+     * @see org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection
+     * @model opposite="connection" containment="true" resolveProxies="true"
+     * @generated
+     */
+    QueriesConnection getQueries();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getQueries <em>Queries</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Queries</em>' containment reference.
-	 * @see #getQueries()
-	 * @generated
-	 */
-	void setQueries(QueriesConnection value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getQueries <em>Queries</em>}' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Queries</em>' containment reference.
+     * @see #getQueries()
+     * @generated
+     */
+    void setQueries(QueriesConnection value);
 
-	/**
-	 * Returns the value of the '<em><b>Context Mode</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Mode</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> whether this connection is defined using a context or is
-	 * standalone <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Context Mode</em>' attribute.
-	 * @see #setContextMode(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_ContextMode()
-	 * @model
-	 * @generated
-	 */
-	boolean isContextMode();
+    /**
+     * Returns the value of the '<em><b>Context Mode</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Context Mode</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> whether this connection is defined using a context or is
+     * standalone <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Context Mode</em>' attribute.
+     * @see #setContextMode(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_ContextMode()
+     * @model
+     * @generated
+     */
+    boolean isContextMode();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#isContextMode <em>Context Mode</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Mode</em>' attribute.
-	 * @see #isContextMode()
-	 * @generated
-	 */
-	void setContextMode(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#isContextMode <em>Context Mode</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Context Mode</em>' attribute.
+     * @see #isContextMode()
+     * @generated
+     */
+    void setContextMode(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Context Id</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Id</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> Id of the context this connection is linked to, only used when
-	 * ContextMode attribute is true <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Context Id</em>' attribute.
-	 * @see #setContextId(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_ContextId()
-	 * @model
-	 * @generated
-	 */
-	String getContextId();
+    /**
+     * Returns the value of the '<em><b>Context Id</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Context Id</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> Id of the context this connection is linked to, only used when
+     * ContextMode attribute is true <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Context Id</em>' attribute.
+     * @see #setContextId(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_ContextId()
+     * @model
+     * @generated
+     */
+    String getContextId();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getContextId <em>Context Id</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Id</em>' attribute.
-	 * @see #getContextId()
-	 * @generated
-	 */
-	void setContextId(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getContextId <em>Context Id</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Context Id</em>' attribute.
+     * @see #getContextId()
+     * @generated
+     */
+    void setContextId(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Context Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Name</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context Name</em>' attribute.
-	 * @see #setContextName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_ContextName()
-	 * @model
-	 * @generated
-	 */
-	String getContextName();
+    /**
+     * Returns the value of the '<em><b>Context Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Context Name</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Context Name</em>' attribute.
+     * @see #setContextName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_ContextName()
+     * @model
+     * @generated
+     */
+    String getContextName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getContextName <em>Context Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Name</em>' attribute.
-	 * @see #getContextName()
-	 * @generated
-	 */
-	void setContextName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getContextName <em>Context Name</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Context Name</em>' attribute.
+     * @see #getContextName()
+     * @generated
+     */
+    void setContextName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Comp Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comp Properties</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Comp Properties</em>' attribute.
-	 * @see #setCompProperties(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_CompProperties()
-	 * @model
-	 * @generated
-	 */
-	String getCompProperties();
+    /**
+     * Returns the value of the '<em><b>Comp Properties</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Comp Properties</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Comp Properties</em>' attribute.
+     * @see #setCompProperties(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConnection_CompProperties()
+     * @model
+     * @generated
+     */
+    String getCompProperties();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getCompProperties <em>Comp Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Comp Properties</em>' attribute.
-	 * @see #getCompProperties()
-	 * @generated
-	 */
-	void setCompProperties(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Connection#getCompProperties <em>Comp Properties</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Comp Properties</em>' attribute.
+     * @see #getCompProperties()
+     * @generated
+     */
+    void setCompProperties(String value);
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model kind="operation" dataType="orgomg.cwm.objectmodel.core.String"
-	 * @generated
-	 */
-	String getConnectionTypeName();
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @model kind="operation" dataType="orgomg.cwm.objectmodel.core.String"
+     * @generated
+     */
+    String getConnectionTypeName();
 
-	/**
-	 * encrypt is true, will try to encrypt the value, else, if false, will try to decrypt the value,
-	 * 
-	 * @generated NOT
-	 */
-	String getValue(String value, boolean encrypt);
+    /**
+     * encrypt is true, will try to encrypt the value, else, if false, will try to decrypt the value,
+     * 
+     * @generated NOT
+     */
+    String getValue(String value, boolean encrypt);
+    
+    
+    /**
+     * <p>
+     * Set encryption and decryption functions which will be used inside getValue
+     * </p>
+     * <p>
+     * By default, getValue depends on encrypt/decrypt of {@link org.talend.utils.StudioEncryption}.
+     * </p>
+     * 
+     * @generated NOT
+     */
+    void setEncryptAndDecryptFuncPair(java.util.function.Function<String, String> encrypt,
+            java.util.function.Function<String, String> decrypt);
 
 } // Connection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConnectionFactory.java

@@ -15,472 +15,472 @@ import org.eclipse.emf.ecore.EFactory;
  */
 public interface ConnectionFactory extends EFactory {
 
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	ConnectionFactory eINSTANCE = org.talend.core.model.metadata.builder.connection.impl.ConnectionFactoryImpl.init();
+    /**
+     * The singleton instance of the factory.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    ConnectionFactory eINSTANCE = org.talend.core.model.metadata.builder.connection.impl.ConnectionFactoryImpl.init();
 
-	/**
-	 * Returns a new object of class '<em>Metadata</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Metadata</em>'.
-	 * @generated
-	 */
-	Metadata createMetadata();
+    /**
+     * Returns a new object of class '<em>Metadata</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Metadata</em>'.
+     * @generated
+     */
+    Metadata createMetadata();
 
-	/**
-	 * Returns a new object of class '<em>Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Connection</em>'.
-	 * @generated
-	 */
-	Connection createConnection();
+    /**
+     * Returns a new object of class '<em>Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Connection</em>'.
+     * @generated
+     */
+    Connection createConnection();
 
-	/**
-	 * Returns a new object of class '<em>Metadata Column</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Metadata Column</em>'.
-	 * @generated
-	 */
-	MetadataColumn createMetadataColumn();
+    /**
+     * Returns a new object of class '<em>Metadata Column</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Metadata Column</em>'.
+     * @generated
+     */
+    MetadataColumn createMetadataColumn();
 
-	/**
-	 * Returns a new object of class '<em>Metadata Table</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Metadata Table</em>'.
-	 * @generated
-	 */
-	MetadataTable createMetadataTable();
+    /**
+     * Returns a new object of class '<em>Metadata Table</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Metadata Table</em>'.
+     * @generated
+     */
+    MetadataTable createMetadataTable();
 
-	/**
-	 * Returns a new object of class '<em>Delimited File Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Delimited File Connection</em>'.
-	 * @generated
-	 */
-	DelimitedFileConnection createDelimitedFileConnection();
+    /**
+     * Returns a new object of class '<em>Delimited File Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Delimited File Connection</em>'.
+     * @generated
+     */
+    DelimitedFileConnection createDelimitedFileConnection();
 
-	/**
-	 * Returns a new object of class '<em>Positional File Connection</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return a new object of class '<em>Positional File Connection</em>'.
-	 * @generated
-	 */
-	PositionalFileConnection createPositionalFileConnection();
+    /**
+     * Returns a new object of class '<em>Positional File Connection</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return a new object of class '<em>Positional File Connection</em>'.
+     * @generated
+     */
+    PositionalFileConnection createPositionalFileConnection();
 
-	/**
-	 * Returns a new object of class '<em>Ebcdic Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ebcdic Connection</em>'.
-	 * @generated
-	 */
-	EbcdicConnection createEbcdicConnection();
+    /**
+     * Returns a new object of class '<em>Ebcdic Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Ebcdic Connection</em>'.
+     * @generated
+     */
+    EbcdicConnection createEbcdicConnection();
 
-	/**
-	 * Returns a new object of class '<em>MDM Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>MDM Connection</em>'.
-	 * @generated
-	 */
-	MDMConnection createMDMConnection();
+    /**
+     * Returns a new object of class '<em>MDM Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>MDM Connection</em>'.
+     * @generated
+     */
+    MDMConnection createMDMConnection();
 
-	/**
-	 * Returns a new object of class '<em>Database Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Database Connection</em>'.
-	 * @generated
-	 */
-	DatabaseConnection createDatabaseConnection();
+    /**
+     * Returns a new object of class '<em>Database Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Database Connection</em>'.
+     * @generated
+     */
+    DatabaseConnection createDatabaseConnection();
 
-	/**
-	 * Returns a new object of class '<em>SAP Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAP Connection</em>'.
-	 * @generated
-	 */
-	SAPConnection createSAPConnection();
+    /**
+     * Returns a new object of class '<em>SAP Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>SAP Connection</em>'.
+     * @generated
+     */
+    SAPConnection createSAPConnection();
 
-	/**
-	 * Returns a new object of class '<em>SAP Function Unit</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAP Function Unit</em>'.
-	 * @generated
-	 */
-	SAPFunctionUnit createSAPFunctionUnit();
+    /**
+     * Returns a new object of class '<em>SAP Function Unit</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>SAP Function Unit</em>'.
+     * @generated
+     */
+    SAPFunctionUnit createSAPFunctionUnit();
 
-	/**
-	 * Returns a new object of class '<em>SAPI Doc Unit</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAPI Doc Unit</em>'.
-	 * @generated
-	 */
-	SAPIDocUnit createSAPIDocUnit();
+    /**
+     * Returns a new object of class '<em>SAPI Doc Unit</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>SAPI Doc Unit</em>'.
+     * @generated
+     */
+    SAPIDocUnit createSAPIDocUnit();
 
-	/**
-	 * Returns a new object of class '<em>SAP Function Parameter Column</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return a new object of class '<em>SAP Function Parameter Column</em>'.
-	 * @generated
-	 */
-	SAPFunctionParameterColumn createSAPFunctionParameterColumn();
+    /**
+     * Returns a new object of class '<em>SAP Function Parameter Column</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return a new object of class '<em>SAP Function Parameter Column</em>'.
+     * @generated
+     */
+    SAPFunctionParameterColumn createSAPFunctionParameterColumn();
 
-	/**
-	 * Returns a new object of class '<em>SAP Function Parameter Table</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return a new object of class '<em>SAP Function Parameter Table</em>'.
-	 * @generated
-	 */
-	SAPFunctionParameterTable createSAPFunctionParameterTable();
+    /**
+     * Returns a new object of class '<em>SAP Function Parameter Table</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return a new object of class '<em>SAP Function Parameter Table</em>'.
+     * @generated
+     */
+    SAPFunctionParameterTable createSAPFunctionParameterTable();
 
-	/**
-	 * Returns a new object of class '<em>Input SAP Function Parameter Table</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return a new object of class '<em>Input SAP Function Parameter Table</em>'.
-	 * @generated
-	 */
-	InputSAPFunctionParameterTable createInputSAPFunctionParameterTable();
+    /**
+     * Returns a new object of class '<em>Input SAP Function Parameter Table</em>'.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @return a new object of class '<em>Input SAP Function Parameter Table</em>'.
+     * @generated
+     */
+    InputSAPFunctionParameterTable createInputSAPFunctionParameterTable();
 
-	/**
-	 * Returns a new object of class '<em>Output SAP Function Parameter Table</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return a new object of class '<em>Output SAP Function Parameter Table</em>'.
-	 * @generated
-	 */
-	OutputSAPFunctionParameterTable createOutputSAPFunctionParameterTable();
+    /**
+     * Returns a new object of class '<em>Output SAP Function Parameter Table</em>'.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @return a new object of class '<em>Output SAP Function Parameter Table</em>'.
+     * @generated
+     */
+    OutputSAPFunctionParameterTable createOutputSAPFunctionParameterTable();
 
-	/**
-	 * Returns a new object of class '<em>Regexp File Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Regexp File Connection</em>'.
-	 * @generated
-	 */
-	RegexpFileConnection createRegexpFileConnection();
+    /**
+     * Returns a new object of class '<em>Regexp File Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Regexp File Connection</em>'.
+     * @generated
+     */
+    RegexpFileConnection createRegexpFileConnection();
 
-	/**
-	 * Returns a new object of class '<em>Xml File Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Xml File Connection</em>'.
-	 * @generated
-	 */
-	XmlFileConnection createXmlFileConnection();
+    /**
+     * Returns a new object of class '<em>Xml File Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Xml File Connection</em>'.
+     * @generated
+     */
+    XmlFileConnection createXmlFileConnection();
 
-	/**
-	 * Returns a new object of class '<em>Schema Target</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Schema Target</em>'.
-	 * @generated
-	 */
-	SchemaTarget createSchemaTarget();
+    /**
+     * Returns a new object of class '<em>Schema Target</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Schema Target</em>'.
+     * @generated
+     */
+    SchemaTarget createSchemaTarget();
 
-	/**
-	 * Returns a new object of class '<em>Queries Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Queries Connection</em>'.
-	 * @generated
-	 */
-	QueriesConnection createQueriesConnection();
+    /**
+     * Returns a new object of class '<em>Queries Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Queries Connection</em>'.
+     * @generated
+     */
+    QueriesConnection createQueriesConnection();
 
-	/**
-	 * Returns a new object of class '<em>Query</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Query</em>'.
-	 * @generated
-	 */
-	Query createQuery();
+    /**
+     * Returns a new object of class '<em>Query</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Query</em>'.
+     * @generated
+     */
+    Query createQuery();
 
-	/**
-	 * Returns a new object of class '<em>Ldif File Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ldif File Connection</em>'.
-	 * @generated
-	 */
-	LdifFileConnection createLdifFileConnection();
+    /**
+     * Returns a new object of class '<em>Ldif File Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Ldif File Connection</em>'.
+     * @generated
+     */
+    LdifFileConnection createLdifFileConnection();
 
-	/**
-	 * Returns a new object of class '<em>File Excel Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>File Excel Connection</em>'.
-	 * @generated
-	 */
-	FileExcelConnection createFileExcelConnection();
+    /**
+     * Returns a new object of class '<em>File Excel Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>File Excel Connection</em>'.
+     * @generated
+     */
+    FileExcelConnection createFileExcelConnection();
 
-	/**
-	 * Returns a new object of class '<em>Xml XPath Loop Descriptor</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Xml XPath Loop Descriptor</em>'.
-	 * @generated
-	 */
-	XmlXPathLoopDescriptor createXmlXPathLoopDescriptor();
+    /**
+     * Returns a new object of class '<em>Xml XPath Loop Descriptor</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Xml XPath Loop Descriptor</em>'.
+     * @generated
+     */
+    XmlXPathLoopDescriptor createXmlXPathLoopDescriptor();
 
-	/**
-	 * Returns a new object of class '<em>Generic Schema Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Generic Schema Connection</em>'.
-	 * @generated
-	 */
-	GenericSchemaConnection createGenericSchemaConnection();
+    /**
+     * Returns a new object of class '<em>Generic Schema Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Generic Schema Connection</em>'.
+     * @generated
+     */
+    GenericSchemaConnection createGenericSchemaConnection();
 
-	/**
-	 * Returns a new object of class '<em>LDAP Schema Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>LDAP Schema Connection</em>'.
-	 * @generated
-	 */
-	LDAPSchemaConnection createLDAPSchemaConnection();
+    /**
+     * Returns a new object of class '<em>LDAP Schema Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>LDAP Schema Connection</em>'.
+     * @generated
+     */
+    LDAPSchemaConnection createLDAPSchemaConnection();
 
-	/**
-	 * Returns a new object of class '<em>WSDL Schema Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Schema Connection</em>'.
-	 * @generated
-	 */
-	WSDLSchemaConnection createWSDLSchemaConnection();
+    /**
+     * Returns a new object of class '<em>WSDL Schema Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>WSDL Schema Connection</em>'.
+     * @generated
+     */
+    WSDLSchemaConnection createWSDLSchemaConnection();
 
-	/**
-	 * Returns a new object of class '<em>Salesforce Schema Connection</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return a new object of class '<em>Salesforce Schema Connection</em>'.
-	 * @generated
-	 */
-	SalesforceSchemaConnection createSalesforceSchemaConnection();
+    /**
+     * Returns a new object of class '<em>Salesforce Schema Connection</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return a new object of class '<em>Salesforce Schema Connection</em>'.
+     * @generated
+     */
+    SalesforceSchemaConnection createSalesforceSchemaConnection();
 
-	/**
-	 * Returns a new object of class '<em>CDC Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>CDC Connection</em>'.
-	 * @generated
-	 */
-	CDCConnection createCDCConnection();
+    /**
+     * Returns a new object of class '<em>CDC Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>CDC Connection</em>'.
+     * @generated
+     */
+    CDCConnection createCDCConnection();
 
-	/**
-	 * Returns a new object of class '<em>CDC Type</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>CDC Type</em>'.
-	 * @generated
-	 */
-	CDCType createCDCType();
+    /**
+     * Returns a new object of class '<em>CDC Type</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>CDC Type</em>'.
+     * @generated
+     */
+    CDCType createCDCType();
 
-	/**
-	 * Returns a new object of class '<em>Subscriber Table</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Subscriber Table</em>'.
-	 * @generated
-	 */
-	SubscriberTable createSubscriberTable();
+    /**
+     * Returns a new object of class '<em>Subscriber Table</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Subscriber Table</em>'.
+     * @generated
+     */
+    SubscriberTable createSubscriberTable();
 
-	/**
-	 * Returns a new object of class '<em>SAP Test Input Parameter Table</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return a new object of class '<em>SAP Test Input Parameter Table</em>'.
-	 * @generated
-	 */
-	SAPTestInputParameterTable createSAPTestInputParameterTable();
+    /**
+     * Returns a new object of class '<em>SAP Test Input Parameter Table</em>'.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @return a new object of class '<em>SAP Test Input Parameter Table</em>'.
+     * @generated
+     */
+    SAPTestInputParameterTable createSAPTestInputParameterTable();
 
-	/**
-	 * Returns a new object of class '<em>Concept</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Concept</em>'.
-	 * @generated
-	 */
-	Concept createConcept();
+    /**
+     * Returns a new object of class '<em>Concept</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Concept</em>'.
+     * @generated
+     */
+    Concept createConcept();
 
-	/**
-	 * Returns a new object of class '<em>Concept Target</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Concept Target</em>'.
-	 * @generated
-	 */
-	ConceptTarget createConceptTarget();
+    /**
+     * Returns a new object of class '<em>Concept Target</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Concept Target</em>'.
+     * @generated
+     */
+    ConceptTarget createConceptTarget();
 
-	/**
-	 * Returns a new object of class '<em>HL7 Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>HL7 Connection</em>'.
-	 * @generated
-	 */
-	HL7Connection createHL7Connection();
+    /**
+     * Returns a new object of class '<em>HL7 Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>HL7 Connection</em>'.
+     * @generated
+     */
+    HL7Connection createHL7Connection();
 
-	/**
-	 * Returns a new object of class '<em>Header Footer Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Header Footer Connection</em>'.
-	 * @generated
-	 */
-	HeaderFooterConnection createHeaderFooterConnection();
+    /**
+     * Returns a new object of class '<em>Header Footer Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Header Footer Connection</em>'.
+     * @generated
+     */
+    HeaderFooterConnection createHeaderFooterConnection();
 
-	/**
-	 * Returns a new object of class '<em>XML File Node</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>XML File Node</em>'.
-	 * @generated
-	 */
-	XMLFileNode createXMLFileNode();
+    /**
+     * Returns a new object of class '<em>XML File Node</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>XML File Node</em>'.
+     * @generated
+     */
+    XMLFileNode createXMLFileNode();
 
-	/**
-	 * Returns a new object of class '<em>WSDL Parameter</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Parameter</em>'.
-	 * @generated
-	 */
-	WSDLParameter createWSDLParameter();
+    /**
+     * Returns a new object of class '<em>WSDL Parameter</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>WSDL Parameter</em>'.
+     * @generated
+     */
+    WSDLParameter createWSDLParameter();
 
-	/**
-	 * Returns a new object of class '<em>Generic Package</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Generic Package</em>'.
-	 * @generated
-	 */
-	GenericPackage createGenericPackage();
+    /**
+     * Returns a new object of class '<em>Generic Package</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Generic Package</em>'.
+     * @generated
+     */
+    GenericPackage createGenericPackage();
 
-	/**
-	 * Returns a new object of class '<em>HL7 File Node</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>HL7 File Node</em>'.
-	 * @generated
-	 */
-	HL7FileNode createHL7FileNode();
+    /**
+     * Returns a new object of class '<em>HL7 File Node</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>HL7 File Node</em>'.
+     * @generated
+     */
+    HL7FileNode createHL7FileNode();
 
-	/**
-	 * Returns a new object of class '<em>FTP Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>FTP Connection</em>'.
-	 * @generated
-	 */
-	FTPConnection createFTPConnection();
+    /**
+     * Returns a new object of class '<em>FTP Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>FTP Connection</em>'.
+     * @generated
+     */
+    FTPConnection createFTPConnection();
 
-	/**
-	 * Returns a new object of class '<em>BRMS Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>BRMS Connection</em>'.
-	 * @generated
-	 */
-	BRMSConnection createBRMSConnection();
+    /**
+     * Returns a new object of class '<em>BRMS Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>BRMS Connection</em>'.
+     * @generated
+     */
+    BRMSConnection createBRMSConnection();
 
-	/**
-	 * Returns a new object of class '<em>Condition Type</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Condition Type</em>'.
-	 * @generated
-	 */
-	ConditionType createConditionType();
+    /**
+     * Returns a new object of class '<em>Condition Type</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Condition Type</em>'.
+     * @generated
+     */
+    ConditionType createConditionType();
 
-	/**
-	 * Returns a new object of class '<em>EDIFACT Connection</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>EDIFACT Connection</em>'.
-	 * @generated
-	 */
-	EDIFACTConnection createEDIFACTConnection();
+    /**
+     * Returns a new object of class '<em>EDIFACT Connection</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>EDIFACT Connection</em>'.
+     * @generated
+     */
+    EDIFACTConnection createEDIFACTConnection();
 
-	/**
-	 * Returns a new object of class '<em>Salesforce Module Unit</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>Salesforce Module Unit</em>'.
-	 * @generated
-	 */
-	SalesforceModuleUnit createSalesforceModuleUnit();
+    /**
+     * Returns a new object of class '<em>Salesforce Module Unit</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>Salesforce Module Unit</em>'.
+     * @generated
+     */
+    SalesforceModuleUnit createSalesforceModuleUnit();
 
-	/**
-	 * Returns a new object of class '<em>SAP Table Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAP Table Field</em>'.
-	 * @generated
-	 */
-	SAPTableField createSAPTableField();
+    /**
+     * Returns a new object of class '<em>SAP Table Field</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>SAP Table Field</em>'.
+     * @generated
+     */
+    SAPTableField createSAPTableField();
 
-	/**
-	 * Returns a new object of class '<em>SAP Function Parameter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAP Function Parameter</em>'.
-	 * @generated
-	 */
-	SAPFunctionParameter createSAPFunctionParameter();
+    /**
+     * Returns a new object of class '<em>SAP Function Parameter</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>SAP Function Parameter</em>'.
+     * @generated
+     */
+    SAPFunctionParameter createSAPFunctionParameter();
 
-	/**
-	 * Returns a new object of class '<em>SAP Function Param Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAP Function Param Data</em>'.
-	 * @generated
-	 */
-	SAPFunctionParamData createSAPFunctionParamData();
+    /**
+     * Returns a new object of class '<em>SAP Function Param Data</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>SAP Function Param Data</em>'.
+     * @generated
+     */
+    SAPFunctionParamData createSAPFunctionParamData();
 
-	/**
-	 * Returns a new object of class '<em>Additional Connection Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Additional Connection Property</em>'.
-	 * @generated
-	 */
-	AdditionalConnectionProperty createAdditionalConnectionProperty();
+    /**
+     * Returns a new object of class '<em>Additional Connection Property</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Additional Connection Property</em>'.
+     * @generated
+     */
+    AdditionalConnectionProperty createAdditionalConnectionProperty();
 
-	/**
-	 * Returns a new object of class '<em>SAPBW Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAPBW Table</em>'.
-	 * @generated
-	 */
-	SAPBWTable createSAPBWTable();
+    /**
+     * Returns a new object of class '<em>SAPBW Table</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>SAPBW Table</em>'.
+     * @generated
+     */
+    SAPBWTable createSAPBWTable();
 
-	/**
-	 * Returns a new object of class '<em>SAPBW Table Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAPBW Table Field</em>'.
-	 * @generated
-	 */
-	SAPBWTableField createSAPBWTableField();
+    /**
+     * Returns a new object of class '<em>SAPBW Table Field</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>SAPBW Table Field</em>'.
+     * @generated
+     */
+    SAPBWTableField createSAPBWTableField();
 
-	/**
-	 * Returns a new object of class '<em>SAP Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SAP Table</em>'.
-	 * @generated
-	 */
-	SAPTable createSAPTable();
+    /**
+     * Returns a new object of class '<em>SAP Table</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>SAP Table</em>'.
+     * @generated
+     */
+    SAPTable createSAPTable();
 
-	/**
-	 * Returns a new object of class '<em>EDIFACT Column</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return a new object of class '<em>EDIFACT Column</em>'.
-	 * @generated
-	 */
-	EDIFACTColumn createEDIFACTColumn();
+    /**
+     * Returns a new object of class '<em>EDIFACT Column</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return a new object of class '<em>EDIFACT Column</em>'.
+     * @generated
+     */
+    EDIFACTColumn createEDIFACTColumn();
 
-	/**
-	 * Returns a new object of class '<em>Validation Rules Connection</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @return a new object of class '<em>Validation Rules Connection</em>'.
-	 * @generated
-	 */
-	ValidationRulesConnection createValidationRulesConnection();
+    /**
+     * Returns a new object of class '<em>Validation Rules Connection</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @return a new object of class '<em>Validation Rules Connection</em>'.
+     * @generated
+     */
+    ValidationRulesConnection createValidationRulesConnection();
 
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ConnectionPackage getConnectionPackage();
+    /**
+     * Returns the package supported by this factory.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return the package supported by this factory.
+     * @generated
+     */
+    ConnectionPackage getConnectionPackage();
 
-	/**
-	 * copy this MetadataColumn.
-	 * 
-	 * @return
-	 */
-	MetadataColumn copy(MetadataColumn column, String newId);
+    /**
+     * copy this MetadataColumn.
+     * 
+     * @return
+     */
+    MetadataColumn copy(MetadataColumn column, String newId);
 } // ConnectionFactory

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/DelimitedFileConnection.java

@@ -12,11 +12,11 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#isSplitRecord <em>Split Record</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDelimitedFileConnection()
  * @model
@@ -24,61 +24,61 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface DelimitedFileConnection extends FileConnection {
 
-	/**
-	 * Returns the value of the '<em><b>Field Separator Type</b></em>' attribute.
-	 * The default value is <code>"Semicolon"</code>.
-	 * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.FieldSeparator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Field Separator Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Field Separator Type</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
-	 * @see #setFieldSeparatorType(FieldSeparator)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDelimitedFileConnection_FieldSeparatorType()
-	 * @model default="Semicolon" required="true"
-	 * @generated
-	 */
-	FieldSeparator getFieldSeparatorType();
+    /**
+     * Returns the value of the '<em><b>Field Separator Type</b></em>' attribute.
+     * The default value is <code>"Semicolon"</code>.
+     * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.FieldSeparator}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Field Separator Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Field Separator Type</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
+     * @see #setFieldSeparatorType(FieldSeparator)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDelimitedFileConnection_FieldSeparatorType()
+     * @model default="Semicolon" required="true"
+     * @generated
+     */
+    FieldSeparator getFieldSeparatorType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Separator Type</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
-	 * @see #getFieldSeparatorType()
-	 * @generated
-	 */
-	void setFieldSeparatorType(FieldSeparator value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Field Separator Type</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
+     * @see #getFieldSeparatorType()
+     * @generated
+     */
+    void setFieldSeparatorType(FieldSeparator value);
 
-	/**
-	 * Returns the value of the '<em><b>Split Record</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Split Record</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Split Record</em>' attribute.
-	 * @see #setSplitRecord(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDelimitedFileConnection_SplitRecord()
-	 * @model default="false"
-	 * @generated
-	 */
-	boolean isSplitRecord();
+    /**
+     * Returns the value of the '<em><b>Split Record</b></em>' attribute.
+     * The default value is <code>"false"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Split Record</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Split Record</em>' attribute.
+     * @see #setSplitRecord(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDelimitedFileConnection_SplitRecord()
+     * @model default="false"
+     * @generated
+     */
+    boolean isSplitRecord();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#isSplitRecord <em>Split Record</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Split Record</em>' attribute.
-	 * @see #isSplitRecord()
-	 * @generated
-	 */
-	void setSplitRecord(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#isSplitRecord <em>Split Record</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Split Record</em>' attribute.
+     * @see #isSplitRecord()
+     * @generated
+     */
+    void setSplitRecord(boolean value);
 
 } // DelimitedFileConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EDIFACTColumn.java

@@ -12,11 +12,11 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIColumnName <em>EDI Column Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIXpath <em>EDI Xpath</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTColumn()
  * @model
@@ -24,56 +24,56 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface EDIFACTColumn extends MetadataColumn {
 
-	/**
-	 * Returns the value of the '<em><b>EDI Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EDI Column Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EDI Column Name</em>' attribute.
-	 * @see #setEDIColumnName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTColumn_EDIColumnName()
-	 * @model
-	 * @generated
-	 */
-	String getEDIColumnName();
+    /**
+     * Returns the value of the '<em><b>EDI Column Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>EDI Column Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>EDI Column Name</em>' attribute.
+     * @see #setEDIColumnName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTColumn_EDIColumnName()
+     * @model
+     * @generated
+     */
+    String getEDIColumnName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIColumnName <em>EDI Column Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EDI Column Name</em>' attribute.
-	 * @see #getEDIColumnName()
-	 * @generated
-	 */
-	void setEDIColumnName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIColumnName <em>EDI Column Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>EDI Column Name</em>' attribute.
+     * @see #getEDIColumnName()
+     * @generated
+     */
+    void setEDIColumnName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>EDI Xpath</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EDI Xpath</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>EDI Xpath</em>' attribute.
-	 * @see #setEDIXpath(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTColumn_EDIXpath()
-	 * @model
-	 * @generated
-	 */
-	String getEDIXpath();
+    /**
+     * Returns the value of the '<em><b>EDI Xpath</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>EDI Xpath</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>EDI Xpath</em>' attribute.
+     * @see #setEDIXpath(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTColumn_EDIXpath()
+     * @model
+     * @generated
+     */
+    String getEDIXpath();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIXpath <em>EDI Xpath</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EDI Xpath</em>' attribute.
-	 * @see #getEDIXpath()
-	 * @generated
-	 */
-	void setEDIXpath(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIXpath <em>EDI Xpath</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>EDI Xpath</em>' attribute.
+     * @see #getEDIXpath()
+     * @generated
+     */
+    void setEDIXpath(String value);
 
 } // EDIFACTColumn

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EDIFACTConnection.java

@@ -14,12 +14,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlName <em>Xml Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getFileName <em>File Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlPath <em>Xml Path</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection()
  * @model
@@ -27,82 +27,82 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface EDIFACTConnection extends Connection {
 
-	/**
-	 * Returns the value of the '<em><b>Xml Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Xml Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xml Name</em>' attribute.
-	 * @see #setXmlName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection_XmlName()
-	 * @model
-	 * @generated
-	 */
-	String getXmlName();
+    /**
+     * Returns the value of the '<em><b>Xml Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Xml Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Xml Name</em>' attribute.
+     * @see #setXmlName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection_XmlName()
+     * @model
+     * @generated
+     */
+    String getXmlName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlName <em>Xml Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xml Name</em>' attribute.
-	 * @see #getXmlName()
-	 * @generated
-	 */
-	void setXmlName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlName <em>Xml Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Xml Name</em>' attribute.
+     * @see #getXmlName()
+     * @generated
+     */
+    void setXmlName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>File Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>File Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>File Name</em>' attribute.
-	 * @see #setFileName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection_FileName()
-	 * @model
-	 * @generated
-	 */
-	String getFileName();
+    /**
+     * Returns the value of the '<em><b>File Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>File Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>File Name</em>' attribute.
+     * @see #setFileName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection_FileName()
+     * @model
+     * @generated
+     */
+    String getFileName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getFileName <em>File Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>File Name</em>' attribute.
-	 * @see #getFileName()
-	 * @generated
-	 */
-	void setFileName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getFileName <em>File Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>File Name</em>' attribute.
+     * @see #getFileName()
+     * @generated
+     */
+    void setFileName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Xml Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xml Path</em>' attribute.
-	 * @see #setXmlPath(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection_XmlPath()
-	 * @model
-	 * @generated
-	 */
-	String getXmlPath();
+    /**
+     * Returns the value of the '<em><b>Xml Path</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Xml Path</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Xml Path</em>' attribute.
+     * @see #setXmlPath(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection_XmlPath()
+     * @model
+     * @generated
+     */
+    String getXmlPath();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlPath <em>Xml Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xml Path</em>' attribute.
-	 * @see #getXmlPath()
-	 * @generated
-	 */
-	void setXmlPath(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlPath <em>Xml Path</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Xml Path</em>' attribute.
+     * @see #getXmlPath()
+     * @generated
+     */
+    void setXmlPath(String value);
 
 } // EDIFACTConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EbcdicConnection.java

@@ -12,7 +12,6 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getMidFile <em>Mid File</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getDataFile <em>Data File</em>}</li>
@@ -20,6 +19,7 @@ package org.talend.core.model.metadata.builder.connection;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileStart <em>Source File Start</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileEnd <em>Source File End</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection()
  * @model
@@ -27,135 +27,135 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface EbcdicConnection extends FileConnection {
 
-	/**
-	 * Returns the value of the '<em><b>Mid File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mid File</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mid File</em>' attribute.
-	 * @see #setMidFile(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_MidFile()
-	 * @model
-	 * @generated
-	 */
-	String getMidFile();
+    /**
+     * Returns the value of the '<em><b>Mid File</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Mid File</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Mid File</em>' attribute.
+     * @see #setMidFile(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_MidFile()
+     * @model
+     * @generated
+     */
+    String getMidFile();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getMidFile <em>Mid File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mid File</em>' attribute.
-	 * @see #getMidFile()
-	 * @generated
-	 */
-	void setMidFile(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getMidFile <em>Mid File</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Mid File</em>' attribute.
+     * @see #getMidFile()
+     * @generated
+     */
+    void setMidFile(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Data File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Data File</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Data File</em>' attribute.
-	 * @see #setDataFile(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_DataFile()
-	 * @model
-	 * @generated
-	 */
-	String getDataFile();
+    /**
+     * Returns the value of the '<em><b>Data File</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Data File</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Data File</em>' attribute.
+     * @see #setDataFile(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_DataFile()
+     * @model
+     * @generated
+     */
+    String getDataFile();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getDataFile <em>Data File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data File</em>' attribute.
-	 * @see #getDataFile()
-	 * @generated
-	 */
-	void setDataFile(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getDataFile <em>Data File</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Data File</em>' attribute.
+     * @see #getDataFile()
+     * @generated
+     */
+    void setDataFile(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Code Page</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Code Page</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Code Page</em>' attribute.
-	 * @see #setCodePage(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_CodePage()
-	 * @model
-	 * @generated
-	 */
-	String getCodePage();
+    /**
+     * Returns the value of the '<em><b>Code Page</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Code Page</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Code Page</em>' attribute.
+     * @see #setCodePage(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_CodePage()
+     * @model
+     * @generated
+     */
+    String getCodePage();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getCodePage <em>Code Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Code Page</em>' attribute.
-	 * @see #getCodePage()
-	 * @generated
-	 */
-	void setCodePage(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getCodePage <em>Code Page</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Code Page</em>' attribute.
+     * @see #getCodePage()
+     * @generated
+     */
+    void setCodePage(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Source File Start</b></em>' attribute.
-	 * The default value is <code>"6"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source File Start</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source File Start</em>' attribute.
-	 * @see #setSourceFileStart(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_SourceFileStart()
-	 * @model default="6"
-	 * @generated
-	 */
-	String getSourceFileStart();
+    /**
+     * Returns the value of the '<em><b>Source File Start</b></em>' attribute.
+     * The default value is <code>"6"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Source File Start</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Source File Start</em>' attribute.
+     * @see #setSourceFileStart(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_SourceFileStart()
+     * @model default="6"
+     * @generated
+     */
+    String getSourceFileStart();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileStart <em>Source File Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source File Start</em>' attribute.
-	 * @see #getSourceFileStart()
-	 * @generated
-	 */
-	void setSourceFileStart(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileStart <em>Source File Start</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Source File Start</em>' attribute.
+     * @see #getSourceFileStart()
+     * @generated
+     */
+    void setSourceFileStart(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Source File End</b></em>' attribute.
-	 * The default value is <code>"72"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source File End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source File End</em>' attribute.
-	 * @see #setSourceFileEnd(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_SourceFileEnd()
-	 * @model default="72"
-	 * @generated
-	 */
-	String getSourceFileEnd();
+    /**
+     * Returns the value of the '<em><b>Source File End</b></em>' attribute.
+     * The default value is <code>"72"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Source File End</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Source File End</em>' attribute.
+     * @see #setSourceFileEnd(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection_SourceFileEnd()
+     * @model default="72"
+     * @generated
+     */
+    String getSourceFileEnd();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileEnd <em>Source File End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source File End</em>' attribute.
-	 * @see #getSourceFileEnd()
-	 * @generated
-	 */
-	void setSourceFileEnd(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileEnd <em>Source File End</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Source File End</em>' attribute.
+     * @see #getSourceFileEnd()
+     * @generated
+     */
+    void setSourceFileEnd(String value);
 } // EbcdicConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Escape.java

@@ -21,193 +21,187 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum Escape implements Enumerator {
-	/**
-	 * The '<em><b>Delimited</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DELIMITED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DELIMITED(1, "Delimited", "Delimited"),
-	/**
-	 * The '<em><b>CSV</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CSV_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CSV(0, "CSV", "CSV");
+    /**
+     * The '<em><b>Delimited</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #DELIMITED_VALUE
+     * @generated
+     * @ordered
+     */
+    DELIMITED(1, "Delimited", "Delimited"),
+    /**
+     * The '<em><b>CSV</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #CSV_VALUE
+     * @generated
+     * @ordered
+     */
+    CSV(0, "CSV", "CSV");
 
-	/**
-	 * The '<em><b>Delimited</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Delimited</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DELIMITED
-	 * @model name="Delimited"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DELIMITED_VALUE = 1;
+    /**
+     * The '<em><b>Delimited</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Delimited</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #DELIMITED
+     * @model name="Delimited"
+     * @generated
+     * @ordered
+     */
+    public static final int DELIMITED_VALUE = 1;
 
-	/**
-	 * The '<em><b>CSV</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CSV</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CSV
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CSV_VALUE = 0;
+    /**
+     * The '<em><b>CSV</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>CSV</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #CSV
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int CSV_VALUE = 0;
 
-	/**
-	 * An array of all the '<em><b>Escape</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Escape[] VALUES_ARRAY = new Escape[] { DELIMITED, CSV, };
+    /**
+     * An array of all the '<em><b>Escape</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final Escape[] VALUES_ARRAY = new Escape[] { DELIMITED, CSV, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Escape</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Escape> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Escape</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<Escape> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Escape</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Escape get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Escape result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Escape</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static Escape get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            Escape result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Escape</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Escape getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Escape result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Escape</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static Escape getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            Escape result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Escape</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Escape get(int value) {
-		switch (value) {
-		case DELIMITED_VALUE:
-			return DELIMITED;
-		case CSV_VALUE:
-			return CSV;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Escape</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static Escape get(int value) {
+        switch (value) {
+        case DELIMITED_VALUE:
+            return DELIMITED;
+        case CSV_VALUE:
+            return CSV;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Escape(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private Escape(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 }

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FieldSeparator.java

@@ -21,347 +21,340 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum FieldSeparator implements Enumerator {
-	/**
-	 * The '<em><b>Tabulation</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TABULATION
-	 * @generated
-	 * @ordered
-	 */
-	TABULATION_LITERAL(0, "Tabulation", "Tabulation"),
-	/**
-	 * The '<em><b>Semicolon</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SEMICOLON
-	 * @generated
-	 * @ordered
-	 */
-	SEMICOLON_LITERAL(1, "Semicolon", "Semicolon"),
-	/**
-	 * The '<em><b>Comma</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #COMMA
-	 * @generated
-	 * @ordered
-	 */
-	COMMA_LITERAL(2, "Comma", "Comma"),
-	/**
-	 * The '<em><b>Space</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SPACE
-	 * @generated
-	 * @ordered
-	 */
-	SPACE_LITERAL(3, "Space", "Space"),
-	/**
-	 * The '<em><b>Alt 65</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ALT_65
-	 * @ordered
-	 */
-	ALT_65_LITERAL(4, "''(Alt 65, #A4)", "''(Alt 65, #A4)"),
-	/**
-	 * The '<em><b>Custom ANSI</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_ANSI
-	 * @ordered
-	 */
-	CUSTOM_ANSI_LITERAL(5, "Custom ANSI", "Custom ANSI"),
-	/**
-	 * The '<em><b>Custom UTF8</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_UTF8
-	 * @ordered
-	 */
-	CUSTOM_UTF8_LITERAL(6, "Custom UTF8", "Custom UTF8"),
-	/**
-	 * The '<em><b>Custom Reg Exp</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_REG_EXP
-	 * @ordered
-	 */
-	CUSTOM_REG_EXP_LITERAL(7, "Custom RegExp", "Custom RegExp");
+    /**
+     * The '<em><b>Tabulation</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #TABULATION
+     * @generated
+     * @ordered
+     */
+    TABULATION_LITERAL(0, "Tabulation", "Tabulation"),
+    /**
+     * The '<em><b>Semicolon</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #SEMICOLON
+     * @generated
+     * @ordered
+     */
+    SEMICOLON_LITERAL(1, "Semicolon", "Semicolon"),
+    /**
+     * The '<em><b>Comma</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #COMMA
+     * @generated
+     * @ordered
+     */
+    COMMA_LITERAL(2, "Comma", "Comma"),
+    /**
+     * The '<em><b>Space</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #SPACE
+     * @generated
+     * @ordered
+     */
+    SPACE_LITERAL(3, "Space", "Space"),
+    /**
+     * The '<em><b>Alt 65</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #ALT_65
+     * @ordered
+     */
+    ALT_65_LITERAL(4, "''(Alt 65, #A4)", "''(Alt 65, #A4)"),
+    /**
+     * The '<em><b>Custom ANSI</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_ANSI
+     * @ordered
+     */
+    CUSTOM_ANSI_LITERAL(5, "Custom ANSI", "Custom ANSI"),
+    /**
+     * The '<em><b>Custom UTF8</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_UTF8
+     * @ordered
+     */
+    CUSTOM_UTF8_LITERAL(6, "Custom UTF8", "Custom UTF8"),
+    /**
+     * The '<em><b>Custom Reg Exp</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_REG_EXP
+     * @ordered
+     */
+    CUSTOM_REG_EXP_LITERAL(7, "Custom RegExp", "Custom RegExp");
 
-	/**
-	 * The '<em><b>Tabulation</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Tabulation</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TABULATION_LITERAL
-	 * @model name="Tabulation"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TABULATION = 0;
+    /**
+     * The '<em><b>Tabulation</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Tabulation</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #TABULATION_LITERAL
+     * @model name="Tabulation"
+     * @generated
+     * @ordered
+     */
+    public static final int TABULATION = 0;
 
-	/**
-	 * The '<em><b>Semicolon</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Semicolon</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SEMICOLON_LITERAL
-	 * @model name="Semicolon"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SEMICOLON = 1;
+    /**
+     * The '<em><b>Semicolon</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Semicolon</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #SEMICOLON_LITERAL
+     * @model name="Semicolon"
+     * @generated
+     * @ordered
+     */
+    public static final int SEMICOLON = 1;
 
-	/**
-	 * The '<em><b>Comma</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Comma</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #COMMA_LITERAL
-	 * @model name="Comma"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COMMA = 2;
+    /**
+     * The '<em><b>Comma</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Comma</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #COMMA_LITERAL
+     * @model name="Comma"
+     * @generated
+     * @ordered
+     */
+    public static final int COMMA = 2;
 
-	/**
-	 * The '<em><b>Space</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Space</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SPACE_LITERAL
-	 * @model name="Space"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SPACE = 3;
+    /**
+     * The '<em><b>Space</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Space</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #SPACE_LITERAL
+     * @model name="Space"
+     * @generated
+     * @ordered
+     */
+    public static final int SPACE = 3;
 
-	/**
-	 * The '<em><b>Alt 65</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Alt 65</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ALT_65_LITERAL
-	 * @model name="Alt_65" literal="\'\'(Alt 65, #A4)"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ALT_65 = 4;
+    /**
+     * The '<em><b>Alt 65</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Alt 65</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #ALT_65_LITERAL
+     * @model name="Alt_65" literal="\'\'(Alt 65, #A4)"
+     * @generated
+     * @ordered
+     */
+    public static final int ALT_65 = 4;
 
-	/**
-	 * The '<em><b>Custom ANSI</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Custom ANSI</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_ANSI_LITERAL
-	 * @model name="Custom_ANSI"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CUSTOM_ANSI = 5;
+    /**
+     * The '<em><b>Custom ANSI</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Custom ANSI</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_ANSI_LITERAL
+     * @model name="Custom_ANSI"
+     * @generated
+     * @ordered
+     */
+    public static final int CUSTOM_ANSI = 5;
 
-	/**
-	 * The '<em><b>Custom UTF8</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Custom UTF8</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_UTF8_LITERAL
-	 * @model name="Custom_UTF8"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CUSTOM_UTF8 = 6;
+    /**
+     * The '<em><b>Custom UTF8</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Custom UTF8</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_UTF8_LITERAL
+     * @model name="Custom_UTF8"
+     * @generated
+     * @ordered
+     */
+    public static final int CUSTOM_UTF8 = 6;
 
-	/**
-	 * The '<em><b>Custom Reg Exp</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Custom Reg Exp</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_REG_EXP_LITERAL
-	 * @model name="Custom_RegExp"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CUSTOM_REG_EXP = 7;
+    /**
+     * The '<em><b>Custom Reg Exp</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Custom Reg Exp</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_REG_EXP_LITERAL
+     * @model name="Custom_RegExp"
+     * @generated
+     * @ordered
+     */
+    public static final int CUSTOM_REG_EXP = 7;
 
-	/**
-	 * An array of all the '<em><b>Field Separator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final FieldSeparator[] VALUES_ARRAY = new FieldSeparator[] { TABULATION_LITERAL, SEMICOLON_LITERAL,
-			COMMA_LITERAL, SPACE_LITERAL, ALT_65_LITERAL, CUSTOM_ANSI_LITERAL, CUSTOM_UTF8_LITERAL,
-			CUSTOM_REG_EXP_LITERAL, };
+    /**
+     * An array of all the '<em><b>Field Separator</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final FieldSeparator[] VALUES_ARRAY = new FieldSeparator[] { TABULATION_LITERAL, SEMICOLON_LITERAL,
+            COMMA_LITERAL, SPACE_LITERAL, ALT_65_LITERAL, CUSTOM_ANSI_LITERAL, CUSTOM_UTF8_LITERAL, CUSTOM_REG_EXP_LITERAL, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Field Separator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<FieldSeparator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Field Separator</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<FieldSeparator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Field Separator</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FieldSeparator get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FieldSeparator result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Field Separator</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static FieldSeparator get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            FieldSeparator result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Field Separator</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FieldSeparator getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FieldSeparator result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Field Separator</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static FieldSeparator getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            FieldSeparator result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Field Separator</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FieldSeparator get(int value) {
-		switch (value) {
-		case TABULATION:
-			return TABULATION_LITERAL;
-		case SEMICOLON:
-			return SEMICOLON_LITERAL;
-		case COMMA:
-			return COMMA_LITERAL;
-		case SPACE:
-			return SPACE_LITERAL;
-		case ALT_65:
-			return ALT_65_LITERAL;
-		case CUSTOM_ANSI:
-			return CUSTOM_ANSI_LITERAL;
-		case CUSTOM_UTF8:
-			return CUSTOM_UTF8_LITERAL;
-		case CUSTOM_REG_EXP:
-			return CUSTOM_REG_EXP_LITERAL;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Field Separator</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static FieldSeparator get(int value) {
+        switch (value) {
+        case TABULATION:
+            return TABULATION_LITERAL;
+        case SEMICOLON:
+            return SEMICOLON_LITERAL;
+        case COMMA:
+            return COMMA_LITERAL;
+        case SPACE:
+            return SPACE_LITERAL;
+        case ALT_65:
+            return ALT_65_LITERAL;
+        case CUSTOM_ANSI:
+            return CUSTOM_ANSI_LITERAL;
+        case CUSTOM_UTF8:
+            return CUSTOM_UTF8_LITERAL;
+        case CUSTOM_REG_EXP:
+            return CUSTOM_REG_EXP_LITERAL;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private FieldSeparator(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private FieldSeparator(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 }

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileExcelConnection.java

@@ -15,7 +15,6 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetName <em>Sheet Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetColumns <em>Sheet Columns</em>}</li>
@@ -28,6 +27,7 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetList <em>Sheet List</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getGenerationMode <em>Generation Mode</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection()
  * @model
@@ -35,254 +35,254 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface FileExcelConnection extends FileConnection {
 
-	/**
-	 * Returns the value of the '<em><b>Sheet Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sheet Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sheet Name</em>' attribute.
-	 * @see #setSheetName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SheetName()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getSheetName();
+    /**
+     * Returns the value of the '<em><b>Sheet Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Sheet Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Sheet Name</em>' attribute.
+     * @see #setSheetName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SheetName()
+     * @model required="true"
+     * @generated
+     */
+    String getSheetName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetName <em>Sheet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sheet Name</em>' attribute.
-	 * @see #getSheetName()
-	 * @generated
-	 */
-	void setSheetName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetName <em>Sheet Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Sheet Name</em>' attribute.
+     * @see #getSheetName()
+     * @generated
+     */
+    void setSheetName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Sheet Columns</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sheet Columns</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sheet Columns</em>' attribute list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SheetColumns()
-	 * @model
-	 * @generated
-	 */
-	EList<String> getSheetColumns();
+    /**
+     * Returns the value of the '<em><b>Sheet Columns</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.String}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Sheet Columns</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Sheet Columns</em>' attribute list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SheetColumns()
+     * @model
+     * @generated
+     */
+    EList<String> getSheetColumns();
 
-	/**
-	 * Returns the value of the '<em><b>First Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First Column</em>' attribute.
-	 * @see #setFirstColumn(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_FirstColumn()
-	 * @model
-	 * @generated
-	 */
-	String getFirstColumn();
+    /**
+     * Returns the value of the '<em><b>First Column</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>First Column</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>First Column</em>' attribute.
+     * @see #setFirstColumn(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_FirstColumn()
+     * @model
+     * @generated
+     */
+    String getFirstColumn();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getFirstColumn <em>First Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First Column</em>' attribute.
-	 * @see #getFirstColumn()
-	 * @generated
-	 */
-	void setFirstColumn(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getFirstColumn <em>First Column</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>First Column</em>' attribute.
+     * @see #getFirstColumn()
+     * @generated
+     */
+    void setFirstColumn(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Last Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Last Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Last Column</em>' attribute.
-	 * @see #setLastColumn(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_LastColumn()
-	 * @model
-	 * @generated
-	 */
-	String getLastColumn();
+    /**
+     * Returns the value of the '<em><b>Last Column</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Last Column</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Last Column</em>' attribute.
+     * @see #setLastColumn(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_LastColumn()
+     * @model
+     * @generated
+     */
+    String getLastColumn();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getLastColumn <em>Last Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Last Column</em>' attribute.
-	 * @see #getLastColumn()
-	 * @generated
-	 */
-	void setLastColumn(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getLastColumn <em>Last Column</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Last Column</em>' attribute.
+     * @see #getLastColumn()
+     * @generated
+     */
+    void setLastColumn(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Thousand Separator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Thousand Separator</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Thousand Separator</em>' attribute.
-	 * @see #setThousandSeparator(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_ThousandSeparator()
-	 * @model
-	 * @generated
-	 */
-	String getThousandSeparator();
+    /**
+     * Returns the value of the '<em><b>Thousand Separator</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Thousand Separator</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Thousand Separator</em>' attribute.
+     * @see #setThousandSeparator(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_ThousandSeparator()
+     * @model
+     * @generated
+     */
+    String getThousandSeparator();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getThousandSeparator <em>Thousand Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Thousand Separator</em>' attribute.
-	 * @see #getThousandSeparator()
-	 * @generated
-	 */
-	void setThousandSeparator(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getThousandSeparator <em>Thousand Separator</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Thousand Separator</em>' attribute.
+     * @see #getThousandSeparator()
+     * @generated
+     */
+    void setThousandSeparator(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Decimal Separator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Decimal Separator</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Decimal Separator</em>' attribute.
-	 * @see #setDecimalSeparator(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_DecimalSeparator()
-	 * @model
-	 * @generated
-	 */
-	String getDecimalSeparator();
+    /**
+     * Returns the value of the '<em><b>Decimal Separator</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Decimal Separator</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Decimal Separator</em>' attribute.
+     * @see #setDecimalSeparator(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_DecimalSeparator()
+     * @model
+     * @generated
+     */
+    String getDecimalSeparator();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getDecimalSeparator <em>Decimal Separator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Decimal Separator</em>' attribute.
-	 * @see #getDecimalSeparator()
-	 * @generated
-	 */
-	void setDecimalSeparator(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getDecimalSeparator <em>Decimal Separator</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Decimal Separator</em>' attribute.
+     * @see #getDecimalSeparator()
+     * @generated
+     */
+    void setDecimalSeparator(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Advanced Spearator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Advanced Spearator</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Advanced Spearator</em>' attribute.
-	 * @see #setAdvancedSpearator(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_AdvancedSpearator()
-	 * @model
-	 * @generated
-	 */
-	boolean isAdvancedSpearator();
+    /**
+     * Returns the value of the '<em><b>Advanced Spearator</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Advanced Spearator</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Advanced Spearator</em>' attribute.
+     * @see #setAdvancedSpearator(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_AdvancedSpearator()
+     * @model
+     * @generated
+     */
+    boolean isAdvancedSpearator();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#isAdvancedSpearator <em>Advanced Spearator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Advanced Spearator</em>' attribute.
-	 * @see #isAdvancedSpearator()
-	 * @generated
-	 */
-	void setAdvancedSpearator(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#isAdvancedSpearator <em>Advanced Spearator</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Advanced Spearator</em>' attribute.
+     * @see #isAdvancedSpearator()
+     * @generated
+     */
+    void setAdvancedSpearator(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Select All Sheets</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Select All Sheets</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Select All Sheets</em>' attribute.
-	 * @see #setSelectAllSheets(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SelectAllSheets()
-	 * @model
-	 * @generated
-	 */
-	boolean isSelectAllSheets();
+    /**
+     * Returns the value of the '<em><b>Select All Sheets</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Select All Sheets</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Select All Sheets</em>' attribute.
+     * @see #setSelectAllSheets(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SelectAllSheets()
+     * @model
+     * @generated
+     */
+    boolean isSelectAllSheets();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#isSelectAllSheets <em>Select All Sheets</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Select All Sheets</em>' attribute.
-	 * @see #isSelectAllSheets()
-	 * @generated
-	 */
-	void setSelectAllSheets(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#isSelectAllSheets <em>Select All Sheets</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Select All Sheets</em>' attribute.
+     * @see #isSelectAllSheets()
+     * @generated
+     */
+    void setSelectAllSheets(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Sheet List</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sheet List</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sheet List</em>' attribute.
-	 * @see #setSheetList(ArrayList)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SheetList()
-	 * @model dataType="org.talend.core.model.metadata.builder.connection.List"
-	 * @generated
-	 */
-	ArrayList getSheetList();
+    /**
+     * Returns the value of the '<em><b>Sheet List</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Sheet List</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Sheet List</em>' attribute.
+     * @see #setSheetList(ArrayList)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_SheetList()
+     * @model dataType="org.talend.core.model.metadata.builder.connection.List"
+     * @generated
+     */
+    ArrayList getSheetList();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetList <em>Sheet List</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sheet List</em>' attribute.
-	 * @see #getSheetList()
-	 * @generated
-	 */
-	void setSheetList(ArrayList value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetList <em>Sheet List</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Sheet List</em>' attribute.
+     * @see #getSheetList()
+     * @generated
+     */
+    void setSheetList(ArrayList value);
 
-	/**
-	 * Returns the value of the '<em><b>Generation Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Generation Mode</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Generation Mode</em>' attribute.
-	 * @see #setGenerationMode(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_GenerationMode()
-	 * @model
-	 * @generated
-	 */
-	String getGenerationMode();
+    /**
+     * Returns the value of the '<em><b>Generation Mode</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Generation Mode</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Generation Mode</em>' attribute.
+     * @see #setGenerationMode(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection_GenerationMode()
+     * @model
+     * @generated
+     */
+    String getGenerationMode();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getGenerationMode <em>Generation Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generation Mode</em>' attribute.
-	 * @see #getGenerationMode()
-	 * @generated
-	 */
-	void setGenerationMode(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getGenerationMode <em>Generation Mode</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Generation Mode</em>' attribute.
+     * @see #getGenerationMode()
+     * @generated
+     */
+    void setGenerationMode(String value);
 
 } // FileExcelConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileFormat.java

@@ -21,219 +21,213 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum FileFormat implements Enumerator {
-	/**
-	 * The '<em><b>UNIX</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #UNIX
-	 * @generated
-	 * @ordered
-	 */
-	UNIX_LITERAL(0, "UNIX", "UNIX"),
-	/**
-	 * The '<em><b>MAC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MAC
-	 * @generated
-	 * @ordered
-	 */
-	MAC_LITERAL(1, "MAC", "MAC"),
-	/**
-	 * The '<em><b>WINDOWS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #WINDOWS
-	 * @generated
-	 * @ordered
-	 */
-	WINDOWS_LITERAL(2, "WINDOWS", "WINDOWS");
+    /**
+     * The '<em><b>UNIX</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #UNIX
+     * @generated
+     * @ordered
+     */
+    UNIX_LITERAL(0, "UNIX", "UNIX"),
+    /**
+     * The '<em><b>MAC</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #MAC
+     * @generated
+     * @ordered
+     */
+    MAC_LITERAL(1, "MAC", "MAC"),
+    /**
+     * The '<em><b>WINDOWS</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #WINDOWS
+     * @generated
+     * @ordered
+     */
+    WINDOWS_LITERAL(2, "WINDOWS", "WINDOWS");
 
-	/**
-	 * The '<em><b>UNIX</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>UNIX</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNIX_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int UNIX = 0;
+    /**
+     * The '<em><b>UNIX</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>UNIX</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #UNIX_LITERAL
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int UNIX = 0;
 
-	/**
-	 * The '<em><b>MAC</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MAC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MAC_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MAC = 1;
+    /**
+     * The '<em><b>MAC</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>MAC</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #MAC_LITERAL
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int MAC = 1;
 
-	/**
-	 * The '<em><b>WINDOWS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>WINDOWS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #WINDOWS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int WINDOWS = 2;
+    /**
+     * The '<em><b>WINDOWS</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>WINDOWS</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #WINDOWS_LITERAL
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int WINDOWS = 2;
 
-	/**
-	 * An array of all the '<em><b>File Format</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final FileFormat[] VALUES_ARRAY = new FileFormat[] { UNIX_LITERAL, MAC_LITERAL, WINDOWS_LITERAL, };
+    /**
+     * An array of all the '<em><b>File Format</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final FileFormat[] VALUES_ARRAY = new FileFormat[] { UNIX_LITERAL, MAC_LITERAL, WINDOWS_LITERAL, };
 
-	/**
-	 * A public read-only list of all the '<em><b>File Format</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<FileFormat> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>File Format</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<FileFormat> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>File Format</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FileFormat get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FileFormat result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>File Format</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static FileFormat get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            FileFormat result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>File Format</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FileFormat getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FileFormat result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>File Format</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static FileFormat getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            FileFormat result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>File Format</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FileFormat get(int value) {
-		switch (value) {
-		case UNIX:
-			return UNIX_LITERAL;
-		case MAC:
-			return MAC_LITERAL;
-		case WINDOWS:
-			return WINDOWS_LITERAL;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>File Format</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static FileFormat get(int value) {
+        switch (value) {
+        case UNIX:
+            return UNIX_LITERAL;
+        case MAC:
+            return MAC_LITERAL;
+        case WINDOWS:
+            return WINDOWS_LITERAL;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private FileFormat(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private FileFormat(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 }

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Function.java

@@ -19,316 +19,310 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum Function implements Enumerator {
-	/**
-	 * The '<em><b>Empty</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #EMPTY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EMPTY(0, "Empty", ""),
+    /**
+     * The '<em><b>Empty</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #EMPTY_VALUE
+     * @generated
+     * @ordered
+     */
+    EMPTY(0, "Empty", ""),
 
-	/**
-	 * The '<em><b>Lower case</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #LOWER_CASE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOWER_CASE(1, "Lower_case", "$source == null? false : $source.toLowerCase().compareTo($target) $operator 0"),
+    /**
+     * The '<em><b>Lower case</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #LOWER_CASE_VALUE
+     * @generated
+     * @ordered
+     */
+    LOWER_CASE(1, "Lower_case", "$source == null? false : $source.toLowerCase().compareTo($target) $operator 0"),
 
-	/**
-	 * The '<em><b>Upper case</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #UPPER_CASE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	UPPER_CASE(2, "Upper_case", "$source == null? false : $source.toUpperCase().compareTo($target) $operator 0"),
+    /**
+     * The '<em><b>Upper case</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #UPPER_CASE_VALUE
+     * @generated
+     * @ordered
+     */
+    UPPER_CASE(2, "Upper_case", "$source == null? false : $source.toUpperCase().compareTo($target) $operator 0"),
 
-	/**
-	 * The '<em><b>Lower case first</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #LOWER_CASE_FIRST_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOWER_CASE_FIRST(3, "Lower_case_first",
-			"$source == null? false : $source.toLowerCase().charAt(0) $operator $target"),
+    /**
+     * The '<em><b>Lower case first</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #LOWER_CASE_FIRST_VALUE
+     * @generated
+     * @ordered
+     */
+    LOWER_CASE_FIRST(3, "Lower_case_first", "$source == null? false : $source.toLowerCase().charAt(0) $operator $target"),
 
-	/**
-	 * The '<em><b>Upper case first</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #UPPER_CASE_FIRST_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	UPPER_CASE_FIRST(4, "Upper_case_first",
-			"$source == null? false : $source.toUpperCase().charAt(0) $operator $target"),
+    /**
+     * The '<em><b>Upper case first</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #UPPER_CASE_FIRST_VALUE
+     * @generated
+     * @ordered
+     */
+    UPPER_CASE_FIRST(4, "Upper_case_first", "$source == null? false : $source.toUpperCase().charAt(0) $operator $target"),
 
-	/**
-	 * The '<em><b>Length</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #LENGTH_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LENGTH(5, "Length", "$source == null? false : $source.length() $operator $target"),
+    /**
+     * The '<em><b>Length</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #LENGTH_VALUE
+     * @generated
+     * @ordered
+     */
+    LENGTH(5, "Length", "$source == null? false : $source.length() $operator $target"),
 
-	/**
-	 * The '<em><b>Match</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #MATCH_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MATCH(6, "Match", "$source == null? false : $source.matches($target) $operator true");
+    /**
+     * The '<em><b>Match</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #MATCH_VALUE
+     * @generated
+     * @ordered
+     */
+    MATCH(6, "Match", "$source == null? false : $source.matches($target) $operator true");
 
-	/**
-	 * The '<em><b>Empty</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Empty</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EMPTY
-	 * @model name="Empty" literal=""
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EMPTY_VALUE = 0;
+    /**
+     * The '<em><b>Empty</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Empty</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #EMPTY
+     * @model name="Empty" literal=""
+     * @generated
+     * @ordered
+     */
+    public static final int EMPTY_VALUE = 0;
 
-	/**
-	 * The '<em><b>Lower case</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Lower Case</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOWER_CASE
-	 * @model name="Lower_case" literal="$source == null? false : $source.toLowerCase().compareTo($target) $operator 0"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOWER_CASE_VALUE = 1;
+    /**
+     * The '<em><b>Lower case</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Lower Case</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #LOWER_CASE
+     * @model name="Lower_case" literal="$source == null? false : $source.toLowerCase().compareTo($target) $operator 0"
+     * @generated
+     * @ordered
+     */
+    public static final int LOWER_CASE_VALUE = 1;
 
-	/**
-	 * The '<em><b>Upper case</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Upper Case</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UPPER_CASE
-	 * @model name="Upper_case" literal="$source == null? false : $source.toUpperCase().compareTo($target) $operator 0"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int UPPER_CASE_VALUE = 2;
+    /**
+     * The '<em><b>Upper case</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Upper Case</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #UPPER_CASE
+     * @model name="Upper_case" literal="$source == null? false : $source.toUpperCase().compareTo($target) $operator 0"
+     * @generated
+     * @ordered
+     */
+    public static final int UPPER_CASE_VALUE = 2;
 
-	/**
-	 * The '<em><b>Lower case first</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Lower Case First</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOWER_CASE_FIRST
-	 * @model name="Lower_case_first" literal="$source == null? false : $source.toLowerCase().charAt(0) $operator $target"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOWER_CASE_FIRST_VALUE = 3;
+    /**
+     * The '<em><b>Lower case first</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Lower Case First</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #LOWER_CASE_FIRST
+     * @model name="Lower_case_first" literal="$source == null? false : $source.toLowerCase().charAt(0) $operator $target"
+     * @generated
+     * @ordered
+     */
+    public static final int LOWER_CASE_FIRST_VALUE = 3;
 
-	/**
-	 * The '<em><b>Upper case first</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Upper Case First</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UPPER_CASE_FIRST
-	 * @model name="Upper_case_first" literal="$source == null? false : $source.toUpperCase().charAt(0) $operator $target"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int UPPER_CASE_FIRST_VALUE = 4;
+    /**
+     * The '<em><b>Upper case first</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Upper Case First</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #UPPER_CASE_FIRST
+     * @model name="Upper_case_first" literal="$source == null? false : $source.toUpperCase().charAt(0) $operator $target"
+     * @generated
+     * @ordered
+     */
+    public static final int UPPER_CASE_FIRST_VALUE = 4;
 
-	/**
-	 * The '<em><b>Length</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Length</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LENGTH
-	 * @model name="Length" literal="$source == null? false : $source.length() $operator $target"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LENGTH_VALUE = 5;
+    /**
+     * The '<em><b>Length</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Length</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #LENGTH
+     * @model name="Length" literal="$source == null? false : $source.length() $operator $target"
+     * @generated
+     * @ordered
+     */
+    public static final int LENGTH_VALUE = 5;
 
-	/**
-	 * The '<em><b>Match</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Match</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MATCH
-	 * @model name="Match" literal="$source == null? false : $source.matches($target) $operator true"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MATCH_VALUE = 6;
+    /**
+     * The '<em><b>Match</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Match</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #MATCH
+     * @model name="Match" literal="$source == null? false : $source.matches($target) $operator true"
+     * @generated
+     * @ordered
+     */
+    public static final int MATCH_VALUE = 6;
 
-	/**
-	 * An array of all the '<em><b>Function</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Function[] VALUES_ARRAY = new Function[] { EMPTY, LOWER_CASE, UPPER_CASE, LOWER_CASE_FIRST,
-			UPPER_CASE_FIRST, LENGTH, MATCH, };
+    /**
+     * An array of all the '<em><b>Function</b></em>' enumerators.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private static final Function[] VALUES_ARRAY = new Function[] { EMPTY, LOWER_CASE, UPPER_CASE, LOWER_CASE_FIRST,
+            UPPER_CASE_FIRST, LENGTH, MATCH, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Function</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Function> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Function</b></em>' enumerators.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static final List<Function> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Function</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Function get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Function result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Function</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static Function get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            Function result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Function</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public static Function getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Function result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Function</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @generated
+     */
+    public static Function getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            Function result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Function</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Function get(int value) {
-		switch (value) {
-		case EMPTY_VALUE:
-			return EMPTY;
-		case LOWER_CASE_VALUE:
-			return LOWER_CASE;
-		case UPPER_CASE_VALUE:
-			return UPPER_CASE;
-		case LOWER_CASE_FIRST_VALUE:
-			return LOWER_CASE_FIRST;
-		case UPPER_CASE_FIRST_VALUE:
-			return UPPER_CASE_FIRST;
-		case LENGTH_VALUE:
-			return LENGTH;
-		case MATCH_VALUE:
-			return MATCH;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Function</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static Function get(int value) {
+        switch (value) {
+        case EMPTY_VALUE:
+            return EMPTY;
+        case LOWER_CASE_VALUE:
+            return LOWER_CASE;
+        case UPPER_CASE_VALUE:
+            return UPPER_CASE;
+        case LOWER_CASE_FIRST_VALUE:
+            return LOWER_CASE_FIRST;
+        case UPPER_CASE_FIRST_VALUE:
+            return UPPER_CASE_FIRST;
+        case LENGTH_VALUE:
+            return LENGTH;
+        case MATCH_VALUE:
+            return MATCH;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Function(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private Function(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 
 } // Function

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/GenericSchemaConnection.java

@@ -12,11 +12,11 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#isMappingTypeUsed <em>Mapping Type Used</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#getMappingTypeId <em>Mapping Type Id</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getGenericSchemaConnection()
  * @model
@@ -24,55 +24,55 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface GenericSchemaConnection extends Connection {
 
-	/**
-	 * Returns the value of the '<em><b>Mapping Type Used</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapping Type Used</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapping Type Used</em>' attribute.
-	 * @see #setMappingTypeUsed(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getGenericSchemaConnection_MappingTypeUsed()
-	 * @model
-	 * @generated
-	 */
-	boolean isMappingTypeUsed();
+    /**
+     * Returns the value of the '<em><b>Mapping Type Used</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Mapping Type Used</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Mapping Type Used</em>' attribute.
+     * @see #setMappingTypeUsed(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getGenericSchemaConnection_MappingTypeUsed()
+     * @model
+     * @generated
+     */
+    boolean isMappingTypeUsed();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#isMappingTypeUsed <em>Mapping Type Used</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapping Type Used</em>' attribute.
-	 * @see #isMappingTypeUsed()
-	 * @generated
-	 */
-	void setMappingTypeUsed(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#isMappingTypeUsed <em>Mapping Type Used</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Mapping Type Used</em>' attribute.
+     * @see #isMappingTypeUsed()
+     * @generated
+     */
+    void setMappingTypeUsed(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Mapping Type Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapping Type Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mapping Type Id</em>' attribute.
-	 * @see #setMappingTypeId(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getGenericSchemaConnection_MappingTypeId()
-	 * @model
-	 * @generated
-	 */
-	String getMappingTypeId();
+    /**
+     * Returns the value of the '<em><b>Mapping Type Id</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Mapping Type Id</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Mapping Type Id</em>' attribute.
+     * @see #setMappingTypeId(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getGenericSchemaConnection_MappingTypeId()
+     * @model
+     * @generated
+     */
+    String getMappingTypeId();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#getMappingTypeId <em>Mapping Type Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapping Type Id</em>' attribute.
-	 * @see #getMappingTypeId()
-	 * @generated
-	 */
-	void setMappingTypeId(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#getMappingTypeId <em>Mapping Type Id</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Mapping Type Id</em>' attribute.
+     * @see #getMappingTypeId()
+     * @generated
+     */
+    void setMappingTypeId(String value);
 } // GenericSchemaConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HL7Connection.java

@@ -14,13 +14,13 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getStartChar <em>Start Char</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getEndChar <em>End Char</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getRoot <em>Root</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getOutputFilePath <em>Output File Path</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection()
  * @model
@@ -28,98 +28,98 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface HL7Connection extends FileConnection {
 
-	/**
-	 * Returns the value of the '<em><b>Start Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Start Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Start Char</em>' attribute.
-	 * @see #setStartChar(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_StartChar()
-	 * @model
-	 * @generated
-	 */
-	String getStartChar();
+    /**
+     * Returns the value of the '<em><b>Start Char</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Start Char</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Start Char</em>' attribute.
+     * @see #setStartChar(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_StartChar()
+     * @model
+     * @generated
+     */
+    String getStartChar();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getStartChar <em>Start Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Char</em>' attribute.
-	 * @see #getStartChar()
-	 * @generated
-	 */
-	void setStartChar(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getStartChar <em>Start Char</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Start Char</em>' attribute.
+     * @see #getStartChar()
+     * @generated
+     */
+    void setStartChar(String value);
 
-	/**
-	 * Returns the value of the '<em><b>End Char</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>End Char</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>End Char</em>' attribute.
-	 * @see #setEndChar(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_EndChar()
-	 * @model
-	 * @generated
-	 */
-	String getEndChar();
+    /**
+     * Returns the value of the '<em><b>End Char</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>End Char</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>End Char</em>' attribute.
+     * @see #setEndChar(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_EndChar()
+     * @model
+     * @generated
+     */
+    String getEndChar();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getEndChar <em>End Char</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>End Char</em>' attribute.
-	 * @see #getEndChar()
-	 * @generated
-	 */
-	void setEndChar(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getEndChar <em>End Char</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>End Char</em>' attribute.
+     * @see #getEndChar()
+     * @generated
+     */
+    void setEndChar(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Root</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.HL7FileNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Root</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Root</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_Root()
-	 * @model containment="true" resolveProxies="true" ordered="false"
-	 * @generated
-	 */
-	EList<HL7FileNode> getRoot();
+    /**
+     * Returns the value of the '<em><b>Root</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.HL7FileNode}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Root</em>' reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Root</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_Root()
+     * @model containment="true" resolveProxies="true" ordered="false"
+     * @generated
+     */
+    EList<HL7FileNode> getRoot();
 
-	/**
-	 * Returns the value of the '<em><b>Output File Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Output File Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Output File Path</em>' attribute.
-	 * @see #setOutputFilePath(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_OutputFilePath()
-	 * @model
-	 * @generated
-	 */
-	String getOutputFilePath();
+    /**
+     * Returns the value of the '<em><b>Output File Path</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Output File Path</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Output File Path</em>' attribute.
+     * @see #setOutputFilePath(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection_OutputFilePath()
+     * @model
+     * @generated
+     */
+    String getOutputFilePath();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getOutputFilePath <em>Output File Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Output File Path</em>' attribute.
-	 * @see #getOutputFilePath()
-	 * @generated
-	 */
-	void setOutputFilePath(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getOutputFilePath <em>Output File Path</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Output File Path</em>' attribute.
+     * @see #getOutputFilePath()
+     * @generated
+     */
+    void setOutputFilePath(String value);
 
 } // HL7Connection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HL7FileNode.java

@@ -14,7 +14,6 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getFilePath <em>File Path</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getOrder <em>Order</em>}</li>
@@ -23,6 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getRelatedColumn <em>Related Column</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#isRepeatable <em>Repeatable</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode()
  * @model
@@ -30,160 +30,160 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface HL7FileNode extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>File Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>File Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>File Path</em>' attribute.
-	 * @see #setFilePath(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_FilePath()
-	 * @model
-	 * @generated
-	 */
-	String getFilePath();
+    /**
+     * Returns the value of the '<em><b>File Path</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>File Path</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>File Path</em>' attribute.
+     * @see #setFilePath(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_FilePath()
+     * @model
+     * @generated
+     */
+    String getFilePath();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getFilePath <em>File Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>File Path</em>' attribute.
-	 * @see #getFilePath()
-	 * @generated
-	 */
-	void setFilePath(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getFilePath <em>File Path</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>File Path</em>' attribute.
+     * @see #getFilePath()
+     * @generated
+     */
+    void setFilePath(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Order</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Order</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Order</em>' attribute.
-	 * @see #setOrder(int)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_Order()
-	 * @model
-	 * @generated
-	 */
-	int getOrder();
+    /**
+     * Returns the value of the '<em><b>Order</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Order</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Order</em>' attribute.
+     * @see #setOrder(int)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_Order()
+     * @model
+     * @generated
+     */
+    int getOrder();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getOrder <em>Order</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Order</em>' attribute.
-	 * @see #getOrder()
-	 * @generated
-	 */
-	void setOrder(int value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getOrder <em>Order</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Order</em>' attribute.
+     * @see #getOrder()
+     * @generated
+     */
+    void setOrder(int value);
 
-	/**
-	 * Returns the value of the '<em><b>Attribute</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute</em>' attribute.
-	 * @see #setAttribute(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_Attribute()
-	 * @model
-	 * @generated
-	 */
-	String getAttribute();
+    /**
+     * Returns the value of the '<em><b>Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Attribute</em>' attribute.
+     * @see #setAttribute(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_Attribute()
+     * @model
+     * @generated
+     */
+    String getAttribute();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getAttribute <em>Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute</em>' attribute.
-	 * @see #getAttribute()
-	 * @generated
-	 */
-	void setAttribute(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getAttribute <em>Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Attribute</em>' attribute.
+     * @see #getAttribute()
+     * @generated
+     */
+    void setAttribute(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Value</em>' attribute.
-	 * @see #setDefaultValue(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_DefaultValue()
-	 * @model
-	 * @generated
-	 */
-	String getDefaultValue();
+    /**
+     * Returns the value of the '<em><b>Default Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Default Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Default Value</em>' attribute.
+     * @see #setDefaultValue(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_DefaultValue()
+     * @model
+     * @generated
+     */
+    String getDefaultValue();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getDefaultValue <em>Default Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' attribute.
-	 * @see #getDefaultValue()
-	 * @generated
-	 */
-	void setDefaultValue(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getDefaultValue <em>Default Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Default Value</em>' attribute.
+     * @see #getDefaultValue()
+     * @generated
+     */
+    void setDefaultValue(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Related Column</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Related Column</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Related Column</em>' attribute.
-	 * @see #setRelatedColumn(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_RelatedColumn()
-	 * @model
-	 * @generated
-	 */
-	String getRelatedColumn();
+    /**
+     * Returns the value of the '<em><b>Related Column</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Related Column</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Related Column</em>' attribute.
+     * @see #setRelatedColumn(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_RelatedColumn()
+     * @model
+     * @generated
+     */
+    String getRelatedColumn();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getRelatedColumn <em>Related Column</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Related Column</em>' attribute.
-	 * @see #getRelatedColumn()
-	 * @generated
-	 */
-	void setRelatedColumn(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getRelatedColumn <em>Related Column</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Related Column</em>' attribute.
+     * @see #getRelatedColumn()
+     * @generated
+     */
+    void setRelatedColumn(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Repeatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Repeatable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Repeatable</em>' attribute.
-	 * @see #setRepeatable(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_Repeatable()
-	 * @model
-	 * @generated
-	 */
-	boolean isRepeatable();
+    /**
+     * Returns the value of the '<em><b>Repeatable</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Repeatable</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Repeatable</em>' attribute.
+     * @see #setRepeatable(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode_Repeatable()
+     * @model
+     * @generated
+     */
+    boolean isRepeatable();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#isRepeatable <em>Repeatable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Repeatable</em>' attribute.
-	 * @see #isRepeatable()
-	 * @generated
-	 */
-	void setRepeatable(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#isRepeatable <em>Repeatable</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Repeatable</em>' attribute.
+     * @see #isRepeatable()
+     * @generated
+     */
+    void setRepeatable(boolean value);
 
 } // HL7FileNode

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HeaderFooterConnection.java

@@ -12,13 +12,13 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#isIsHeader <em>Is Header</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getImports <em>Imports</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getMainCode <em>Main Code</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getLibraries <em>Libraries</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection()
  * @model
@@ -26,108 +26,108 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface HeaderFooterConnection extends Connection {
 
-	/**
-	 * Returns the value of the '<em><b>Is Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Header</em>' attribute.
-	 * @see #setIsHeader(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_IsHeader()
-	 * @model
-	 * @generated
-	 */
-	boolean isIsHeader();
+    /**
+     * Returns the value of the '<em><b>Is Header</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Is Header</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Is Header</em>' attribute.
+     * @see #setIsHeader(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_IsHeader()
+     * @model
+     * @generated
+     */
+    boolean isIsHeader();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#isIsHeader <em>Is Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Header</em>' attribute.
-	 * @see #isIsHeader()
-	 * @generated
-	 */
-	void setIsHeader(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#isIsHeader <em>Is Header</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Is Header</em>' attribute.
+     * @see #isIsHeader()
+     * @generated
+     */
+    void setIsHeader(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Imports</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Imports</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Imports</em>' attribute.
-	 * @see #setImports(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_Imports()
-	 * @model
-	 * @generated
-	 */
-	String getImports();
+    /**
+     * Returns the value of the '<em><b>Imports</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Imports</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Imports</em>' attribute.
+     * @see #setImports(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_Imports()
+     * @model
+     * @generated
+     */
+    String getImports();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getImports <em>Imports</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Imports</em>' attribute.
-	 * @see #getImports()
-	 * @generated
-	 */
-	void setImports(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getImports <em>Imports</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Imports</em>' attribute.
+     * @see #getImports()
+     * @generated
+     */
+    void setImports(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Main Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Main Code</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Main Code</em>' attribute.
-	 * @see #setMainCode(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_MainCode()
-	 * @model
-	 * @generated
-	 */
-	String getMainCode();
+    /**
+     * Returns the value of the '<em><b>Main Code</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Main Code</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Main Code</em>' attribute.
+     * @see #setMainCode(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_MainCode()
+     * @model
+     * @generated
+     */
+    String getMainCode();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getMainCode <em>Main Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Main Code</em>' attribute.
-	 * @see #getMainCode()
-	 * @generated
-	 */
-	void setMainCode(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getMainCode <em>Main Code</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Main Code</em>' attribute.
+     * @see #getMainCode()
+     * @generated
+     */
+    void setMainCode(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Libraries</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Libraries</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Libraries</em>' attribute.
-	 * @see #setLibraries(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_Libraries()
-	 * @model
-	 * @generated
-	 */
-	String getLibraries();
+    /**
+     * Returns the value of the '<em><b>Libraries</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Libraries</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Libraries</em>' attribute.
+     * @see #setLibraries(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection_Libraries()
+     * @model
+     * @generated
+     */
+    String getLibraries();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getLibraries <em>Libraries</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Libraries</em>' attribute.
-	 * @see #getLibraries()
-	 * @generated
-	 */
-	void setLibraries(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getLibraries <em>Libraries</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Libraries</em>' attribute.
+     * @see #getLibraries()
+     * @generated
+     */
+    void setLibraries(String value);
 
 } // HeaderFooterConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/InputSAPFunctionParameterTable.java

@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.InputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getInputSAPFunctionParameterTable()
  * @model
@@ -23,32 +23,32 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface InputSAPFunctionParameterTable extends SAPFunctionParameterTable {
 
-	/**
-	 * Returns the value of the '<em><b>Function Unit</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getInputParameterTable <em>Input Parameter Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Function Unit</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Function Unit</em>' container reference.
-	 * @see #setFunctionUnit(SAPFunctionUnit)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getInputSAPFunctionParameterTable_FunctionUnit()
-	 * @see org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getInputParameterTable
-	 * @model opposite="InputParameterTable" transient="false"
-	 * @generated
-	 */
-	SAPFunctionUnit getFunctionUnit();
+    /**
+     * Returns the value of the '<em><b>Function Unit</b></em>' container reference.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getInputParameterTable <em>Input Parameter Table</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Function Unit</em>' container reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Function Unit</em>' container reference.
+     * @see #setFunctionUnit(SAPFunctionUnit)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getInputSAPFunctionParameterTable_FunctionUnit()
+     * @see org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getInputParameterTable
+     * @model opposite="InputParameterTable" transient="false"
+     * @generated
+     */
+    SAPFunctionUnit getFunctionUnit();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.InputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function Unit</em>' container reference.
-	 * @see #getFunctionUnit()
-	 * @generated
-	 */
-	void setFunctionUnit(SAPFunctionUnit value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.InputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}' container reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Function Unit</em>' container reference.
+     * @see #getFunctionUnit()
+     * @generated
+     */
+    void setFunctionUnit(SAPFunctionUnit value);
 
 } // InputSAPFunctionParameterTable

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LdifFileConnection.java

@@ -14,7 +14,6 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getValue <em>Value</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getFilePath <em>File Path</em>}</li>
@@ -22,6 +21,7 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#isUseLimit <em>Use Limit</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getServer <em>Server</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection()
  * @model
@@ -29,124 +29,124 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface LdifFileConnection extends Connection {
 
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_Value()
-	 * @model
-	 * @generated
-	 */
-	EList<String> getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.String}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_Value()
+     * @model
+     * @generated
+     */
+    EList<String> getValue();
 
-	/**
-	 * Returns the value of the '<em><b>File Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>File Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>File Path</em>' attribute.
-	 * @see #setFilePath(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_FilePath()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getFilePath();
+    /**
+     * Returns the value of the '<em><b>File Path</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>File Path</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>File Path</em>' attribute.
+     * @see #setFilePath(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_FilePath()
+     * @model required="true"
+     * @generated
+     */
+    String getFilePath();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getFilePath <em>File Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>File Path</em>' attribute.
-	 * @see #getFilePath()
-	 * @generated
-	 */
-	void setFilePath(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getFilePath <em>File Path</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>File Path</em>' attribute.
+     * @see #getFilePath()
+     * @generated
+     */
+    void setFilePath(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Limit Entry</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Limit Entry</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Limit Entry</em>' attribute.
-	 * @see #setLimitEntry(int)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_LimitEntry()
-	 * @model
-	 * @generated
-	 */
-	int getLimitEntry();
+    /**
+     * Returns the value of the '<em><b>Limit Entry</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Limit Entry</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Limit Entry</em>' attribute.
+     * @see #setLimitEntry(int)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_LimitEntry()
+     * @model
+     * @generated
+     */
+    int getLimitEntry();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getLimitEntry <em>Limit Entry</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Limit Entry</em>' attribute.
-	 * @see #getLimitEntry()
-	 * @generated
-	 */
-	void setLimitEntry(int value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getLimitEntry <em>Limit Entry</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Limit Entry</em>' attribute.
+     * @see #getLimitEntry()
+     * @generated
+     */
+    void setLimitEntry(int value);
 
-	/**
-	 * Returns the value of the '<em><b>Use Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Use Limit</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Use Limit</em>' attribute.
-	 * @see #setUseLimit(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_UseLimit()
-	 * @model
-	 * @generated
-	 */
-	boolean isUseLimit();
+    /**
+     * Returns the value of the '<em><b>Use Limit</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Use Limit</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Use Limit</em>' attribute.
+     * @see #setUseLimit(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_UseLimit()
+     * @model
+     * @generated
+     */
+    boolean isUseLimit();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#isUseLimit <em>Use Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Use Limit</em>' attribute.
-	 * @see #isUseLimit()
-	 * @generated
-	 */
-	void setUseLimit(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#isUseLimit <em>Use Limit</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Use Limit</em>' attribute.
+     * @see #isUseLimit()
+     * @generated
+     */
+    void setUseLimit(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Server</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Server</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Server</em>' attribute.
-	 * @see #setServer(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_Server()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getServer();
+    /**
+     * Returns the value of the '<em><b>Server</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Server</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Server</em>' attribute.
+     * @see #setServer(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection_Server()
+     * @model required="true"
+     * @generated
+     */
+    String getServer();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getServer <em>Server</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Server</em>' attribute.
-	 * @see #getServer()
-	 * @generated
-	 */
-	void setServer(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getServer <em>Server</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Server</em>' attribute.
+     * @see #getServer()
+     * @generated
+     */
+    void setServer(String value);
 
 } // LdifFileConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LogicalOperator.java

@@ -19,185 +19,179 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum LogicalOperator implements Enumerator {
-	/**
-	 * The '<em><b>And</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #AND_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	AND(0, "And", "&amp;&amp;"),
+    /**
+     * The '<em><b>And</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #AND_VALUE
+     * @generated
+     * @ordered
+     */
+    AND(0, "And", "&amp;&amp;"),
 
-	/**
-	 * The '<em><b>Or</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #OR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OR(1, "Or", "||");
+    /**
+     * The '<em><b>Or</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #OR_VALUE
+     * @generated
+     * @ordered
+     */
+    OR(1, "Or", "||");
 
-	/**
-	 * The '<em><b>And</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AND</b></em>' literal object isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AND
-	 * @model name="And" literal="&amp;amp;&amp;amp;"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int AND_VALUE = 0;
+    /**
+     * The '<em><b>And</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>AND</b></em>' literal object isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #AND
+     * @model name="And" literal="&amp;&amp;"
+     * @generated
+     * @ordered
+     */
+    public static final int AND_VALUE = 0;
 
-	/**
-	 * The '<em><b>Or</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OR</b></em>' literal object isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OR
-	 * @model name="Or" literal="||"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OR_VALUE = 1;
+    /**
+     * The '<em><b>Or</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>OR</b></em>' literal object isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #OR
+     * @model name="Or" literal="||"
+     * @generated
+     * @ordered
+     */
+    public static final int OR_VALUE = 1;
 
-	/**
-	 * An array of all the '<em><b>Logical Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final LogicalOperator[] VALUES_ARRAY = new LogicalOperator[] { AND, OR, };
+    /**
+     * An array of all the '<em><b>Logical Operator</b></em>' enumerators.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private static final LogicalOperator[] VALUES_ARRAY = new LogicalOperator[] { AND, OR, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Logical Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	public static final List<LogicalOperator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Logical Operator</b></em>' enumerators.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static final List<LogicalOperator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Logical Operator</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static LogicalOperator get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LogicalOperator result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Logical Operator</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static LogicalOperator get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            LogicalOperator result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Logical Operator</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static LogicalOperator getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LogicalOperator result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Logical Operator</b></em>' literal with the specified name.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static LogicalOperator getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            LogicalOperator result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Logical Operator</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static LogicalOperator get(int value) {
-		switch (value) {
-		case AND_VALUE:
-			return AND;
-		case OR_VALUE:
-			return OR;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Logical Operator</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static LogicalOperator get(int value) {
+        switch (value) {
+        case AND_VALUE:
+            return AND;
+        case OR_VALUE:
+            return OR;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private LogicalOperator(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private LogicalOperator(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 
 } // LogicalOperator

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MDMConnection.java

@@ -14,7 +14,6 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getUsername <em>Username</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getPassword <em>Password</em>}</li>
@@ -28,6 +27,7 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getContext <em>Context</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getServerUrl <em>Server Url</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection()
  * @model
@@ -35,302 +35,302 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface MDMConnection extends Connection {
 
-	/**
-	 * Returns the value of the '<em><b>Username</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Username</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Username</em>' attribute.
-	 * @see #setUsername(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Username()
-	 * @model
-	 * @generated
-	 */
-	String getUsername();
+    /**
+     * Returns the value of the '<em><b>Username</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Username</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Username</em>' attribute.
+     * @see #setUsername(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Username()
+     * @model
+     * @generated
+     */
+    String getUsername();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getUsername <em>Username</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Username</em>' attribute.
-	 * @see #getUsername()
-	 * @generated
-	 */
-	void setUsername(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getUsername <em>Username</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Username</em>' attribute.
+     * @see #getUsername()
+     * @generated
+     */
+    void setUsername(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Password</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Password</em>' attribute.
-	 * @see #setPassword(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Password()
-	 * @model
-	 * @generated
-	 */
-	String getPassword();
+    /**
+     * Returns the value of the '<em><b>Password</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Password</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Password</em>' attribute.
+     * @see #setPassword(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Password()
+     * @model
+     * @generated
+     */
+    String getPassword();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getPassword <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Password</em>' attribute.
-	 * @see #getPassword()
-	 * @generated
-	 */
-	void setPassword(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getPassword <em>Password</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Password</em>' attribute.
+     * @see #getPassword()
+     * @generated
+     */
+    void setPassword(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Port</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port</em>' attribute.
-	 * @see #setPort(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Port()
-	 * @model
-	 * @generated
-	 */
-	String getPort();
+    /**
+     * Returns the value of the '<em><b>Port</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Port</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Port</em>' attribute.
+     * @see #setPort(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Port()
+     * @model
+     * @generated
+     */
+    String getPort();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getPort <em>Port</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port</em>' attribute.
-	 * @see #getPort()
-	 * @generated
-	 */
-	void setPort(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getPort <em>Port</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Port</em>' attribute.
+     * @see #getPort()
+     * @generated
+     */
+    void setPort(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Server</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Server</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Server</em>' attribute.
-	 * @see #setServer(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Server()
-	 * @model
-	 * @generated
-	 */
-	String getServer();
+    /**
+     * Returns the value of the '<em><b>Server</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Server</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Server</em>' attribute.
+     * @see #setServer(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Server()
+     * @model
+     * @generated
+     */
+    String getServer();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getServer <em>Server</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Server</em>' attribute.
-	 * @see #getServer()
-	 * @generated
-	 */
-	void setServer(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getServer <em>Server</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Server</em>' attribute.
+     * @see #getServer()
+     * @generated
+     */
+    void setServer(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Universe</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Universe</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Universe</em>' attribute.
-	 * @see #setUniverse(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Universe()
-	 * @model
-	 * @generated
-	 */
-	String getUniverse();
+    /**
+     * Returns the value of the '<em><b>Universe</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Universe</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Universe</em>' attribute.
+     * @see #setUniverse(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Universe()
+     * @model
+     * @generated
+     */
+    String getUniverse();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getUniverse <em>Universe</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Universe</em>' attribute.
-	 * @see #getUniverse()
-	 * @generated
-	 */
-	void setUniverse(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getUniverse <em>Universe</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Universe</em>' attribute.
+     * @see #getUniverse()
+     * @generated
+     */
+    void setUniverse(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Datamodel</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Datamodel</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Datamodel</em>' attribute.
-	 * @see #setDatamodel(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Datamodel()
-	 * @model
-	 * @generated
-	 */
-	String getDatamodel();
+    /**
+     * Returns the value of the '<em><b>Datamodel</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Datamodel</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Datamodel</em>' attribute.
+     * @see #setDatamodel(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Datamodel()
+     * @model
+     * @generated
+     */
+    String getDatamodel();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getDatamodel <em>Datamodel</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Datamodel</em>' attribute.
-	 * @see #getDatamodel()
-	 * @generated
-	 */
-	void setDatamodel(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getDatamodel <em>Datamodel</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Datamodel</em>' attribute.
+     * @see #getDatamodel()
+     * @generated
+     */
+    void setDatamodel(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Datacluster</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Datacluster</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Datacluster</em>' attribute.
-	 * @see #setDatacluster(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Datacluster()
-	 * @model
-	 * @generated
-	 */
-	String getDatacluster();
+    /**
+     * Returns the value of the '<em><b>Datacluster</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Datacluster</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Datacluster</em>' attribute.
+     * @see #setDatacluster(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Datacluster()
+     * @model
+     * @generated
+     */
+    String getDatacluster();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getDatacluster <em>Datacluster</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Datacluster</em>' attribute.
-	 * @see #getDatacluster()
-	 * @generated
-	 */
-	void setDatacluster(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getDatacluster <em>Datacluster</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Datacluster</em>' attribute.
+     * @see #getDatacluster()
+     * @generated
+     */
+    void setDatacluster(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Schemas</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.Concept}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Schemas</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schemas</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Schemas()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<Concept> getSchemas();
+    /**
+     * Returns the value of the '<em><b>Schemas</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.Concept}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Schemas</em>' reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Schemas</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Schemas()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<Concept> getSchemas();
 
-	/**
-	 * Returns the value of the '<em><b>Protocol</b></em>' attribute.
-	 * The default value is <code>"http"</code>.
-	 * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.MDMConnectionProtocol}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * protocol used for connecting to MDM server, initial protocol is HTTP
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Protocol</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.MDMConnectionProtocol
-	 * @see #setProtocol(MDMConnectionProtocol)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Protocol()
-	 * @model default="http" required="true"
-	 * @generated
-	 */
-	MDMConnectionProtocol getProtocol();
+    /**
+     * Returns the value of the '<em><b>Protocol</b></em>' attribute.
+     * The default value is <code>"http"</code>.
+     * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.MDMConnectionProtocol}.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * protocol used for connecting to MDM server, initial protocol is HTTP
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Protocol</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.MDMConnectionProtocol
+     * @see #setProtocol(MDMConnectionProtocol)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Protocol()
+     * @model default="http" required="true"
+     * @generated
+     */
+    MDMConnectionProtocol getProtocol();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getProtocol <em>Protocol</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Protocol</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.MDMConnectionProtocol
-	 * @see #getProtocol()
-	 * @generated
-	 */
-	void setProtocol(MDMConnectionProtocol value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getProtocol <em>Protocol</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Protocol</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.MDMConnectionProtocol
+     * @see #getProtocol()
+     * @generated
+     */
+    void setProtocol(MDMConnectionProtocol value);
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection String</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * return the connection string to connect to the MDM server,
-	 * it is a concatenation of protocol, server, port and context.
-	 * the connection string returned may not be a valid URL if some of the concatenated elements are not properly set.
-	 * No checking is done.
-	 * <!-- end-model-doc -->
-	 * @model kind="operation" dataType="orgomg.cwm.objectmodel.core.String"
-	 * @generated
-	 */
-	String getConnectionString();
+    /**
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Connection String</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * return the connection string to connect to the MDM server,
+     * it is a concatenation of protocol, server, port and context.
+     * the connection string returned may not be a valid URL if some of the concatenated elements are not properly set.
+     * No checking is done.
+     * <!-- end-model-doc -->
+     * @model kind="operation" dataType="orgomg.cwm.objectmodel.core.String"
+     * @generated
+     */
+    String getConnectionString();
 
-	/**
-	 * Returns the value of the '<em><b>Context</b></em>' attribute.
-	 * The default value is <code>"talend/TalendPort"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * part of the url for connecting to the server, 
-	 * the last part that defined the MDM web app context
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Context</em>' attribute.
-	 * @see #setContext(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Context()
-	 * @model default="talend/TalendPort" dataType="orgomg.cwm.objectmodel.core.String" required="true"
-	 * @generated
-	 */
-	String getContext();
+    /**
+     * Returns the value of the '<em><b>Context</b></em>' attribute.
+     * The default value is <code>"talend/TalendPort"</code>.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * part of the url for connecting to the server, 
+     * the last part that defined the MDM web app context
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Context</em>' attribute.
+     * @see #setContext(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_Context()
+     * @model default="talend/TalendPort" dataType="orgomg.cwm.objectmodel.core.String" required="true"
+     * @generated
+     */
+    String getContext();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getContext <em>Context</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context</em>' attribute.
-	 * @see #getContext()
-	 * @generated
-	 */
-	void setContext(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getContext <em>Context</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Context</em>' attribute.
+     * @see #getContext()
+     * @generated
+     */
+    void setContext(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Server Url</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Server Url</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Server Url</em>' attribute.
-	 * @see #setServerUrl(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_ServerUrl()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getServerUrl();
+    /**
+     * Returns the value of the '<em><b>Server Url</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Server Url</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Server Url</em>' attribute.
+     * @see #setServerUrl(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection_ServerUrl()
+     * @model required="true"
+     * @generated
+     */
+    String getServerUrl();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getServerUrl <em>Server Url</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Server Url</em>' attribute.
-	 * @see #getServerUrl()
-	 * @generated
-	 */
-	void setServerUrl(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getServerUrl <em>Server Url</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Server Url</em>' attribute.
+     * @see #getServerUrl()
+     * @generated
+     */
+    void setServerUrl(String value);
 
 } // MDMConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MDMConnectionProtocol.java

@@ -21,168 +21,162 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum MDMConnectionProtocol implements Enumerator {
-	/**
-	 * The '<em><b>HTTP</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #HTTP_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	HTTP(0, "HTTP", "http");
+    /**
+     * The '<em><b>HTTP</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #HTTP_VALUE
+     * @generated
+     * @ordered
+     */
+    HTTP(0, "HTTP", "http");
 
-	/**
-	 * The '<em><b>HTTP</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>HTTP</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HTTP
-	 * @model literal="http"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int HTTP_VALUE = 0;
+    /**
+     * The '<em><b>HTTP</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>HTTP</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #HTTP
+     * @model literal="http"
+     * @generated
+     * @ordered
+     */
+    public static final int HTTP_VALUE = 0;
 
-	/**
-	 * An array of all the '<em><b>MDM Connection Protocol</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MDMConnectionProtocol[] VALUES_ARRAY = new MDMConnectionProtocol[] { HTTP, };
+    /**
+     * An array of all the '<em><b>MDM Connection Protocol</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final MDMConnectionProtocol[] VALUES_ARRAY = new MDMConnectionProtocol[] { HTTP, };
 
-	/**
-	 * A public read-only list of all the '<em><b>MDM Connection Protocol</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<MDMConnectionProtocol> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>MDM Connection Protocol</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<MDMConnectionProtocol> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static MDMConnectionProtocol get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MDMConnectionProtocol result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static MDMConnectionProtocol get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            MDMConnectionProtocol result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static MDMConnectionProtocol getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MDMConnectionProtocol result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static MDMConnectionProtocol getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            MDMConnectionProtocol result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static MDMConnectionProtocol get(int value) {
-		switch (value) {
-		case HTTP_VALUE:
-			return HTTP;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static MDMConnectionProtocol get(int value) {
+        switch (value) {
+        case HTTP_VALUE:
+            return HTTP;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MDMConnectionProtocol(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private MDMConnectionProtocol(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 
 } //MDMConnectionProtocol

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MdmConceptType.java

@@ -21,222 +21,216 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum MdmConceptType implements Enumerator {
-	/**
-	 * The '<em><b>INPUT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INPUT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INPUT(0, "INPUT", "INPUT"),
+    /**
+     * The '<em><b>INPUT</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #INPUT_VALUE
+     * @generated
+     * @ordered
+     */
+    INPUT(0, "INPUT", "INPUT"),
 
-	/**
-	 * The '<em><b>OUTPUT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OUTPUT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OUTPUT(1, "OUTPUT", "OUTPUT"),
+    /**
+     * The '<em><b>OUTPUT</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #OUTPUT_VALUE
+     * @generated
+     * @ordered
+     */
+    OUTPUT(1, "OUTPUT", "OUTPUT"),
 
-	/**
-	 * The '<em><b>RECEIVE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RECEIVE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	RECEIVE(2, "RECEIVE", "RECEIVE");
+    /**
+     * The '<em><b>RECEIVE</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #RECEIVE_VALUE
+     * @generated
+     * @ordered
+     */
+    RECEIVE(2, "RECEIVE", "RECEIVE");
 
-	/**
-	 * The '<em><b>INPUT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INPUT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INPUT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INPUT_VALUE = 0;
+    /**
+     * The '<em><b>INPUT</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>INPUT</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #INPUT
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int INPUT_VALUE = 0;
 
-	/**
-	 * The '<em><b>OUTPUT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OUTPUT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OUTPUT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OUTPUT_VALUE = 1;
+    /**
+     * The '<em><b>OUTPUT</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>OUTPUT</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #OUTPUT
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int OUTPUT_VALUE = 1;
 
-	/**
-	 * The '<em><b>RECEIVE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>RECEIVE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #RECEIVE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RECEIVE_VALUE = 2;
+    /**
+     * The '<em><b>RECEIVE</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>RECEIVE</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #RECEIVE
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int RECEIVE_VALUE = 2;
 
-	/**
-	 * An array of all the '<em><b>Mdm Concept Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MdmConceptType[] VALUES_ARRAY = new MdmConceptType[] { INPUT, OUTPUT, RECEIVE, };
+    /**
+     * An array of all the '<em><b>Mdm Concept Type</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final MdmConceptType[] VALUES_ARRAY = new MdmConceptType[] { INPUT, OUTPUT, RECEIVE, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Mdm Concept Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<MdmConceptType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Mdm Concept Type</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<MdmConceptType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static MdmConceptType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MdmConceptType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static MdmConceptType get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            MdmConceptType result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static MdmConceptType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MdmConceptType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static MdmConceptType getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            MdmConceptType result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static MdmConceptType get(int value) {
-		switch (value) {
-		case INPUT_VALUE:
-			return INPUT;
-		case OUTPUT_VALUE:
-			return OUTPUT;
-		case RECEIVE_VALUE:
-			return RECEIVE;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static MdmConceptType get(int value) {
+        switch (value) {
+        case INPUT_VALUE:
+            return INPUT;
+        case OUTPUT_VALUE:
+            return OUTPUT;
+        case RECEIVE_VALUE:
+            return RECEIVE;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MdmConceptType(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private MdmConceptType(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 
 } //MdmConceptType

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Metadata.java

@@ -14,10 +14,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Metadata#getConnections <em>Connections</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadata()
  * @model
@@ -25,20 +25,20 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface Metadata extends AbstractMetadataObject {
 
-	/**
-	 * Returns the value of the '<em><b>Connections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.Connection}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connections</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Connections</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadata_Connections()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<Connection> getConnections();
+    /**
+     * Returns the value of the '<em><b>Connections</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.Connection}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Connections</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Connections</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadata_Connections()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<Connection> getConnections();
 
 } // Metadata

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MetadataColumn.java

@@ -18,7 +18,6 @@ import orgomg.cwm.resource.record.Field;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getSourceType <em>Source Type</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue <em>Default Value</em>}</li>
@@ -33,6 +32,7 @@ import orgomg.cwm.resource.record.Field;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelatedEntity <em>Related Entity</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelationshipType <em>Relationship Type</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn()
  * @model
@@ -40,334 +40,328 @@ import orgomg.cwm.resource.record.Field;
  */
 public interface MetadataColumn extends AbstractMetadataObject, Field {
 
-	/**
-	 * Returns the value of the '<em><b>Source Type</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source Type</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> Schema DB type (VARCHAR for example ), can be initialised from DB
-	 * column type and modified by the user.) This is maintained in synch with the TalendType (at least in the Table
-	 * schema editor).
-	 * 
-	 * <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Source Type</em>' attribute.
-	 * @see #setSourceType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_SourceType()
-	 * @model
-	 * @generated
-	 */
-	String getSourceType();
+    /**
+     * Returns the value of the '<em><b>Source Type</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Source Type</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> Schema DB type (VARCHAR for example ), can be initialised from DB
+     * column type and modified by the user.) This is maintained in synch with the TalendType (at least in the Table
+     * schema editor).
+     * 
+     * <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Source Type</em>' attribute.
+     * @see #setSourceType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_SourceType()
+     * @model
+     * @generated
+     */
+    String getSourceType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getSourceType <em>Source Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Type</em>' attribute.
-	 * @see #getSourceType()
-	 * @generated
-	 */
-	void setSourceType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getSourceType <em>Source Type</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Source Type</em>' attribute.
+     * @see #getSourceType()
+     * @generated
+     */
+    void setSourceType(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' attribute. The default value is <code>""</code>. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc -->
-	 * 
-	 * @deprecated Use initialValue instead (This represents the default value for column. This may be changed by the
-	 * user.)
-	 * 
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Default Value</em>' attribute.
-	 * @see #setDefaultValue(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_DefaultValue()
-	 * @model default="" transient="true" volatile="true"
-	 * @generated
-	 */
-	@Deprecated
-	String getDefaultValue();
+    /**
+     * Returns the value of the '<em><b>Default Value</b></em>' attribute. The default value is <code>""</code>. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Default Value</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc -->
+     * 
+     * @deprecated Use initialValue instead (This represents the default value for column. This may be changed by the
+     * user.)
+     * 
+     * 
+     * <!-- end-model-doc -->
+     * @return the value of the '<em>Default Value</em>' attribute.
+     * @see #setDefaultValue(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_DefaultValue()
+     * @model default="" transient="true" volatile="true"
+     * @generated
+     */
+    String getDefaultValue();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue <em>Default Value</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' attribute.
-	 * @see #getDefaultValue()
-	 * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
-	 * @generated
-	 */
-	@Deprecated
-	void setDefaultValue(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue <em>Default Value</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Default Value</em>' attribute.
+     * @see #getDefaultValue()
+     * @generated
+     */
+    void setDefaultValue(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Talend Type</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Talend Type</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> java type used by Talend for handling this column elements; This
-	 * seems to be synched with the sourceType. This must be the case for schema used for Table creation. <!--
-	 * end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Talend Type</em>' attribute.
-	 * @see #setTalendType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_TalendType()
-	 * @model
-	 * @generated
-	 */
-	String getTalendType();
+    /**
+     * Returns the value of the '<em><b>Talend Type</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Talend Type</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> java type used by Talend for handling this column elements; This
+     * seems to be synched with the sourceType. This must be the case for schema used for Table creation. <!--
+     * end-model-doc -->
+     * 
+     * @return the value of the '<em>Talend Type</em>' attribute.
+     * @see #setTalendType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_TalendType()
+     * @model
+     * @generated
+     */
+    String getTalendType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getTalendType <em>Talend Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Talend Type</em>' attribute.
-	 * @see #getTalendType()
-	 * @generated
-	 */
-	void setTalendType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getTalendType <em>Talend Type</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Talend Type</em>' attribute.
+     * @see #getTalendType()
+     * @generated
+     */
+    void setTalendType(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Key</b></em>' attribute. The default value is <code>"false"</code>. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Key</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> Whether this column is a considered a key, in a business meaning
-	 * (This is not technical). This may apply to file, xml or dB columns. May be changed by the user. When retrieving
-	 * Metadata from DB this will be set to true if the column belong to the primary key. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Key</em>' attribute.
-	 * @see #setKey(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Key()
-	 * @model default="false"
-	 * @generated
-	 */
-	boolean isKey();
+    /**
+     * Returns the value of the '<em><b>Key</b></em>' attribute. The default value is <code>"false"</code>. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Key</em>' attribute isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> Whether this column is a considered a key, in a business meaning
+     * (This is not technical). This may apply to file, xml or dB columns. May be changed by the user. When retrieving
+     * Metadata from DB this will be set to true if the column belong to the primary key. <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Key</em>' attribute.
+     * @see #setKey(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Key()
+     * @model default="false"
+     * @generated
+     */
+    boolean isKey();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#isKey <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Key</em>' attribute.
-	 * @see #isKey()
-	 * @generated
-	 */
-	void setKey(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#isKey <em>Key</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Key</em>' attribute.
+     * @see #isKey()
+     * @generated
+     */
+    void setKey(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Nullable</b></em>' attribute. The default value is <code>"true"</code>. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nullable</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> whether this column supports null values. May be changed by the
-	 * user. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Nullable</em>' attribute.
-	 * @see #setNullable(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Nullable()
-	 * @model default="true" dataType="orgomg.cwm.objectmodel.core.Boolean"
-	 * @generated
-	 */
-	boolean isNullable();
+    /**
+     * Returns the value of the '<em><b>Nullable</b></em>' attribute. The default value is <code>"true"</code>. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Nullable</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> whether this column supports null values. May be changed by the
+     * user. <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Nullable</em>' attribute.
+     * @see #setNullable(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Nullable()
+     * @model default="true" dataType="orgomg.cwm.objectmodel.core.Boolean"
+     * @generated
+     */
+    boolean isNullable();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#isNullable <em>Nullable</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Nullable</em>' attribute.
-	 * @see #isNullable()
-	 * @generated
-	 */
-	void setNullable(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#isNullable <em>Nullable</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Nullable</em>' attribute.
+     * @see #isNullable()
+     * @generated
+     */
+    void setNullable(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' reference. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' container reference isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> reference to the containing table or view <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Table</em>' reference.
-	 * @see #setTable(MetadataTable)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Table()
-	 * @model resolveProxies="false" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	MetadataTable getTable();
+    /**
+     * Returns the value of the '<em><b>Table</b></em>' reference. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Table</em>' container reference isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> reference to the containing table or view <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Table</em>' reference.
+     * @see #setTable(MetadataTable)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Table()
+     * @model resolveProxies="false" transient="true" volatile="true" derived="true"
+     * @generated
+     */
+    MetadataTable getTable();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getTable <em>Table</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' reference.
-	 * @see #getTable()
-	 * @generated
-	 */
-	void setTable(MetadataTable value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getTable <em>Table</em>}' reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Table</em>' reference.
+     * @see #getTable()
+     * @generated
+     */
+    void setTable(MetadataTable value);
 
-	/**
-	 * Returns the value of the '<em><b>Original Field</b></em>' attribute. The default value is <code>""</code>. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Original Field</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc -->
-	 * 
-	 * @deprecated use g(s)etName Logical name of the column <!-- end-model-doc -->
-	 * @return the value of the '<em>Original Field</em>' attribute.
-	 * @see #setOriginalField(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_OriginalField()
-	 * @model default="" transient="true" volatile="true"
-	 * @generated
-	 */
-	@Deprecated
-	String getOriginalField();
+    /**
+     * Returns the value of the '<em><b>Original Field</b></em>' attribute. The default value is <code>""</code>. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Original Field</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc -->
+     * 
+     * @deprecated use g(s)etName Logical name of the column <!-- end-model-doc -->
+     * @return the value of the '<em>Original Field</em>' attribute.
+     * @see #setOriginalField(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_OriginalField()
+     * @model default="" transient="true" volatile="true"
+     * @generated
+     */
+    String getOriginalField();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField <em>Original Field</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Original Field</em>' attribute.
-	 * @see #getOriginalField()
-	 * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
-	 * @generated
-	 */
-	@Deprecated
-	void setOriginalField(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField <em>Original Field</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Original Field</em>' attribute.
+     * @see #getOriginalField()
+     * @generated
+     */
+    void setOriginalField(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Pattern</b></em>' attribute. The default value is <code>""</code>. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pattern</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> pattern mainly used for date parsing <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Pattern</em>' attribute.
-	 * @see #setPattern(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Pattern()
-	 * @model default=""
-	 * @generated
-	 */
-	String getPattern();
+    /**
+     * Returns the value of the '<em><b>Pattern</b></em>' attribute. The default value is <code>""</code>. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Pattern</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> pattern mainly used for date parsing <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Pattern</em>' attribute.
+     * @see #setPattern(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_Pattern()
+     * @model default=""
+     * @generated
+     */
+    String getPattern();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getPattern <em>Pattern</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pattern</em>' attribute.
-	 * @see #getPattern()
-	 * @generated
-	 */
-	void setPattern(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getPattern <em>Pattern</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Pattern</em>' attribute.
+     * @see #getPattern()
+     * @generated
+     */
+    void setPattern(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Display Field</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Field</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Field</em>' attribute.
-	 * @see #setDisplayField(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_DisplayField()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayField();
+    /**
+     * Returns the value of the '<em><b>Display Field</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Display Field</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Display Field</em>' attribute.
+     * @see #setDisplayField(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_DisplayField()
+     * @model
+     * @generated
+     */
+    String getDisplayField();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDisplayField <em>Display Field</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Field</em>' attribute.
-	 * @see #getDisplayField()
-	 * @generated
-	 */
-	void setDisplayField(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDisplayField <em>Display Field</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Display Field</em>' attribute.
+     * @see #getDisplayField()
+     * @generated
+     */
+    void setDisplayField(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Original Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Original Length</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Original Length</em>' attribute.
-	 * @see #setOriginalLength(long)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_OriginalLength()
-	 * @model dataType="orgomg.cwm.objectmodel.core.Integer"
-	 * @generated
-	 */
-	long getOriginalLength();
+    /**
+     * Returns the value of the '<em><b>Original Length</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Original Length</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Original Length</em>' attribute.
+     * @see #setOriginalLength(long)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_OriginalLength()
+     * @model dataType="orgomg.cwm.objectmodel.core.Integer"
+     * @generated
+     */
+    long getOriginalLength();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalLength <em>Original Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Original Length</em>' attribute.
-	 * @see #getOriginalLength()
-	 * @generated
-	 */
-	void setOriginalLength(long value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalLength <em>Original Length</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Original Length</em>' attribute.
+     * @see #getOriginalLength()
+     * @generated
+     */
+    void setOriginalLength(long value);
 
-	/**
-	 * Returns the value of the '<em><b>Related Entity</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Related Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Related Entity</em>' attribute.
-	 * @see #setRelatedEntity(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_RelatedEntity()
-	 * @model default=""
-	 * @generated
-	 */
-	String getRelatedEntity();
+    /**
+     * Returns the value of the '<em><b>Related Entity</b></em>' attribute.
+     * The default value is <code>""</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Related Entity</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Related Entity</em>' attribute.
+     * @see #setRelatedEntity(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_RelatedEntity()
+     * @model default=""
+     * @generated
+     */
+    String getRelatedEntity();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelatedEntity <em>Related Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Related Entity</em>' attribute.
-	 * @see #getRelatedEntity()
-	 * @generated
-	 */
-	void setRelatedEntity(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelatedEntity <em>Related Entity</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Related Entity</em>' attribute.
+     * @see #getRelatedEntity()
+     * @generated
+     */
+    void setRelatedEntity(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Relationship Type</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Relationship Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Relationship Type</em>' attribute.
-	 * @see #setRelationshipType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_RelationshipType()
-	 * @model default=""
-	 * @generated
-	 */
-	String getRelationshipType();
+    /**
+     * Returns the value of the '<em><b>Relationship Type</b></em>' attribute.
+     * The default value is <code>""</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Relationship Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Relationship Type</em>' attribute.
+     * @see #setRelationshipType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn_RelationshipType()
+     * @model default=""
+     * @generated
+     */
+    String getRelationshipType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelationshipType <em>Relationship Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Relationship Type</em>' attribute.
-	 * @see #getRelationshipType()
-	 * @generated
-	 */
-	void setRelationshipType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelationshipType <em>Relationship Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Relationship Type</em>' attribute.
+     * @see #getRelationshipType()
+     * @generated
+     */
+    void setRelationshipType(String value);
 
 } // MetadataColumn

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MetadataTable.java

@@ -17,7 +17,6 @@ import org.eclipse.emf.common.util.EMap;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName <em>Source Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getTableType <em>Table Type</em>}</li>
@@ -27,6 +26,7 @@ import org.eclipse.emf.common.util.EMap;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection <em>Connection</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getAdditionalProperties <em>Additional Properties</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable()
  * @model
@@ -34,162 +34,158 @@ import org.eclipse.emf.common.util.EMap;
  */
 public interface MetadataTable extends AbstractMetadataObject, orgomg.cwm.objectmodel.core.Class {
 
-	/**
-	 * Returns the value of the '<em><b>Source Name</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source Name</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc -->
-	 * 
-	 * @deprecated use g(s)etName() name of the table, that is actual DB table name for DB tables <!-- end-model-doc -->
-	 * @return the value of the '<em>Source Name</em>' attribute.
-	 * @see #setSourceName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_SourceName()
-	 * @model transient="true" volatile="true"
-	 * @generated
-	 */
-	@Deprecated
-	String getSourceName();
+    /**
+     * Returns the value of the '<em><b>Source Name</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Source Name</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc -->
+     * 
+     * @deprecated use g(s)etName() name of the table, that is actual DB table name for DB tables <!-- end-model-doc -->
+     * @return the value of the '<em>Source Name</em>' attribute.
+     * @see #setSourceName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_SourceName()
+     * @model transient="true" volatile="true"
+     * @generated
+     */
+    String getSourceName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName <em>Source Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Name</em>' attribute.
-	 * @see #getSourceName()
-	 * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
-	 * @generated
-	 */
-	@Deprecated
-	void setSourceName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName <em>Source Name</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Source Name</em>' attribute.
+     * @see #getSourceName()
+     * @generated
+     */
+    void setSourceName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Columns</b></em>' reference list. The list contents are of type
-	 * {@link org.talend.core.model.metadata.builder.connection.MetadataColumn}. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> List of columns related to this table <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Columns</em>' reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_Columns()
-	 * @model transient="true" volatile="true"
-	 * @generated
-	 */
-	EList<MetadataColumn> getColumns();
+    /**
+     * Returns the value of the '<em><b>Columns</b></em>' reference list. The list contents are of type
+     * {@link org.talend.core.model.metadata.builder.connection.MetadataColumn}. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Columns</em>' containment reference list isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> List of columns related to this table <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Columns</em>' reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_Columns()
+     * @model transient="true" volatile="true"
+     * @generated
+     */
+    EList<MetadataColumn> getColumns();
 
-	/**
-	 * Returns the value of the '<em><b>Connection</b></em>' reference. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection</em>' container reference isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc -->
-	 * 
-	 * @deprecated use MetadataTableHelper.getFirstconnection() ref to the connection that contains this table <!--
-	 * end-model-doc -->
-	 * @return the value of the '<em>Connection</em>' reference.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_Connection()
-	 * @model transient="true" changeable="false" volatile="true"
-	 * @generated
-	 */
-	@Deprecated
-	Connection getConnection();
+    /**
+     * Returns the value of the '<em><b>Connection</b></em>' reference. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Connection</em>' container reference isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc -->
+     * 
+     * @deprecated use MetadataTableHelper.getFirstconnection() ref to the connection that contains this table <!--
+     * end-model-doc -->
+     * @return the value of the '<em>Connection</em>' reference.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_Connection()
+     * @model transient="true" changeable="false" volatile="true"
+     * @generated
+     */
+    Connection getConnection();
 
-	/**
-	 * Returns the value of the '<em><b>Additional Properties</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additional Properties</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Additional Properties</em>' map.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_AdditionalProperties()
-	 * @model mapType="org.talend.core.model.metadata.builder.connection.AdditionalProperties&lt;org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString&gt;"
-	 * @generated
-	 */
-	EMap<String, String> getAdditionalProperties();
+    /**
+     * Returns the value of the '<em><b>Additional Properties</b></em>' map.
+     * The key is of type {@link java.lang.String},
+     * and the value is of type {@link java.lang.String},
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Additional Properties</em>' map isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Additional Properties</em>' map.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_AdditionalProperties()
+     * @model mapType="org.talend.core.model.metadata.builder.connection.AdditionalProperties<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+     * @generated
+     */
+    EMap<String, String> getAdditionalProperties();
 
-	/**
-	 * Returns the value of the '<em><b>Table Type</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table Type</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> of value of TABLE, VIEW, SYNONYM, ALL_SYNONYM <!-- end-model-doc
-	 * -->
-	 * 
-	 * @return the value of the '<em>Table Type</em>' attribute.
-	 * @see #setTableType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_TableType()
-	 * @model
-	 * @generated
-	 */
-	String getTableType();
+    /**
+     * Returns the value of the '<em><b>Table Type</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Table Type</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> of value of TABLE, VIEW, SYNONYM, ALL_SYNONYM <!-- end-model-doc
+     * -->
+     * 
+     * @return the value of the '<em>Table Type</em>' attribute.
+     * @see #setTableType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_TableType()
+     * @model
+     * @generated
+     */
+    String getTableType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getTableType <em>Table Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table Type</em>' attribute.
-	 * @see #getTableType()
-	 * @generated
-	 */
-	void setTableType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getTableType <em>Table Type</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Table Type</em>' attribute.
+     * @see #getTableType()
+     * @generated
+     */
+    void setTableType(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Attached CDC</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attached CDC</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> whether a CDC table is attached to this table <!-- end-model-doc
-	 * -->
-	 * 
-	 * @return the value of the '<em>Attached CDC</em>' attribute.
-	 * @see #setAttachedCDC(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_AttachedCDC()
-	 * @model
-	 * @generated
-	 */
-	boolean isAttachedCDC();
+    /**
+     * Returns the value of the '<em><b>Attached CDC</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Attached CDC</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> whether a CDC table is attached to this table <!-- end-model-doc
+     * -->
+     * 
+     * @return the value of the '<em>Attached CDC</em>' attribute.
+     * @see #setAttachedCDC(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_AttachedCDC()
+     * @model
+     * @generated
+     */
+    boolean isAttachedCDC();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#isAttachedCDC <em>Attached CDC</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attached CDC</em>' attribute.
-	 * @see #isAttachedCDC()
-	 * @generated
-	 */
-	void setAttachedCDC(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#isAttachedCDC <em>Attached CDC</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Attached CDC</em>' attribute.
+     * @see #isAttachedCDC()
+     * @generated
+     */
+    void setAttachedCDC(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Activated CDC</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activated CDC</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc --> <!-- begin-model-doc --> whether CDC is activated, that is the trigger are set to record
-	 * the changes <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Activated CDC</em>' attribute.
-	 * @see #setActivatedCDC(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_ActivatedCDC()
-	 * @model
-	 * @generated
-	 */
-	boolean isActivatedCDC();
+    /**
+     * Returns the value of the '<em><b>Activated CDC</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Activated CDC</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc --> <!-- begin-model-doc --> whether CDC is activated, that is the trigger are set to record
+     * the changes <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Activated CDC</em>' attribute.
+     * @see #setActivatedCDC(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_ActivatedCDC()
+     * @model
+     * @generated
+     */
+    boolean isActivatedCDC();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#isActivatedCDC <em>Activated CDC</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activated CDC</em>' attribute.
-	 * @see #isActivatedCDC()
-	 * @generated
-	 */
-	void setActivatedCDC(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.MetadataTable#isActivatedCDC <em>Activated CDC</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Activated CDC</em>' attribute.
+     * @see #isActivatedCDC()
+     * @generated
+     */
+    void setActivatedCDC(boolean value);
 
 } // MetadataTable

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Operator.java

@@ -19,284 +19,280 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum Operator implements Enumerator {
-	/**
-	 * The '<em><b>Equals</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #EQUALS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EQUALS(0, "Equals", "=="),
+    /**
+     * The '<em><b>Equals</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #EQUALS_VALUE
+     * @generated
+     * @ordered
+     */
+    EQUALS(0, "Equals", "=="),
 
-	/**
-	 * The '<em><b>Not equals</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #NOT_EQUALS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NOT_EQUALS(1, "Not_equals", "!="),
-	/**
-	 * The '<em><b>Greater</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #GREATER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	GREATER(2, "Greater", ">"),
-	/**
-	 * The '<em><b>Lower</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #LOWER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOWER(3, "Lower", "<"),
-	/**
-	 * The '<em><b>Greater or equals</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #GREATER_OR_EQUALS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	GREATER_OR_EQUALS(4, "Greater_or_equals", ">="),
-	/**
-	 * The '<em><b>Lower or equals</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #LOWER_OR_EQUALS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOWER_OR_EQUALS(5, "Lower_or_equals", "<=");
+    /**
+     * The '<em><b>Not equals</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #NOT_EQUALS_VALUE
+     * @generated
+     * @ordered
+     */
+    NOT_EQUALS(1, "Not_equals", "!="),
+    /**
+     * The '<em><b>Greater</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #GREATER_VALUE
+     * @generated
+     * @ordered
+     */
+    GREATER(2, "Greater", ">"),
+    /**
+     * The '<em><b>Lower</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #LOWER_VALUE
+     * @generated
+     * @ordered
+     */
+    LOWER(3, "Lower", "<"),
+    /**
+     * The '<em><b>Greater or equals</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #GREATER_OR_EQUALS_VALUE
+     * @generated
+     * @ordered
+     */
+    GREATER_OR_EQUALS(4, "Greater_or_equals", ">="),
+    /**
+     * The '<em><b>Lower or equals</b></em>' literal object.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @see #LOWER_OR_EQUALS_VALUE
+     * @generated
+     * @ordered
+     */
+    LOWER_OR_EQUALS(5, "Lower_or_equals", "<=");
 
-	/**
-	 * The '<em><b>Equals</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Equals</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EQUALS
-	 * @model name="Equals" literal="=="
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EQUALS_VALUE = 0;
+    /**
+     * The '<em><b>Equals</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Equals</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #EQUALS
+     * @model name="Equals" literal="=="
+     * @generated
+     * @ordered
+     */
+    public static final int EQUALS_VALUE = 0;
 
-	/**
-	 * The '<em><b>Not equals</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Not equals</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT_EQUALS
-	 * @model name="Not_equals" literal="!="
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_EQUALS_VALUE = 1;
+    /**
+     * The '<em><b>Not equals</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Not equals</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #NOT_EQUALS
+     * @model name="Not_equals" literal="!="
+     * @generated
+     * @ordered
+     */
+    public static final int NOT_EQUALS_VALUE = 1;
 
-	/**
-	 * The '<em><b>Greater</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Greater</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #GREATER
-	 * @model name="Greater" literal="&gt;"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GREATER_VALUE = 2;
+    /**
+     * The '<em><b>Greater</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Greater</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #GREATER
+     * @model name="Greater" literal=">"
+     * @generated
+     * @ordered
+     */
+    public static final int GREATER_VALUE = 2;
 
-	/**
-	 * The '<em><b>Lower</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Lower</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOWER
-	 * @model name="Lower" literal="&lt;"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOWER_VALUE = 3;
+    /**
+     * The '<em><b>Lower</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Lower</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #LOWER
+     * @model name="Lower" literal="<"
+     * @generated
+     * @ordered
+     */
+    public static final int LOWER_VALUE = 3;
 
-	/**
-	 * The '<em><b>Greater or equals</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Greater or equals</b></em>' literal object isn't clear, there really should be more of
-	 * a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #GREATER_OR_EQUALS
-	 * @model name="Greater_or_equals" literal="&gt;="
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GREATER_OR_EQUALS_VALUE = 4;
+    /**
+     * The '<em><b>Greater or equals</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Greater or equals</b></em>' literal object isn't clear, there really should be more of
+     * a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #GREATER_OR_EQUALS
+     * @model name="Greater_or_equals" literal=">="
+     * @generated
+     * @ordered
+     */
+    public static final int GREATER_OR_EQUALS_VALUE = 4;
 
-	/**
-	 * The '<em><b>Lower or equals</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Lower or equals</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOWER_OR_EQUALS
-	 * @model name="Lower_or_equals" literal="&lt;="
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOWER_OR_EQUALS_VALUE = 5;
+    /**
+     * The '<em><b>Lower or equals</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Lower or equals</b></em>' literal object isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #LOWER_OR_EQUALS
+     * @model name="Lower_or_equals" literal="<="
+     * @generated
+     * @ordered
+     */
+    public static final int LOWER_OR_EQUALS_VALUE = 5;
 
-	/**
-	 * An array of all the '<em><b>Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Operator[] VALUES_ARRAY = new Operator[] { EQUALS, NOT_EQUALS, GREATER, LOWER,
-			GREATER_OR_EQUALS, LOWER_OR_EQUALS, };
+    /**
+     * An array of all the '<em><b>Operator</b></em>' enumerators.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private static final Operator[] VALUES_ARRAY = new Operator[] { EQUALS, NOT_EQUALS, GREATER, LOWER, GREATER_OR_EQUALS,
+            LOWER_OR_EQUALS, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Operator</b></em>' enumerators.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Operator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Operator</b></em>' enumerators.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static final List<Operator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Operator</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Operator get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Operator result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Operator</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static Operator get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            Operator result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Operator</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 */
-	public static Operator getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Operator result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Operator</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
+     * @generated
+     */
+    public static Operator getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            Operator result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Operator</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Operator get(int value) {
-		switch (value) {
-		case EQUALS_VALUE:
-			return EQUALS;
-		case NOT_EQUALS_VALUE:
-			return NOT_EQUALS;
-		case GREATER_VALUE:
-			return GREATER;
-		case LOWER_VALUE:
-			return LOWER;
-		case GREATER_OR_EQUALS_VALUE:
-			return GREATER_OR_EQUALS;
-		case LOWER_OR_EQUALS_VALUE:
-			return LOWER_OR_EQUALS;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Operator</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    public static Operator get(int value) {
+        switch (value) {
+        case EQUALS_VALUE:
+            return EQUALS;
+        case NOT_EQUALS_VALUE:
+            return NOT_EQUALS;
+        case GREATER_VALUE:
+            return GREATER;
+        case LOWER_VALUE:
+            return LOWER;
+        case GREATER_OR_EQUALS_VALUE:
+            return GREATER_OR_EQUALS;
+        case LOWER_OR_EQUALS_VALUE:
+            return LOWER_OR_EQUALS;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Operator(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    private Operator(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 
 } // Operator

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/OutputSAPFunctionParameterTable.java

@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.OutputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getOutputSAPFunctionParameterTable()
  * @model
@@ -23,32 +23,32 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface OutputSAPFunctionParameterTable extends SAPFunctionParameterTable {
 
-	/**
-	 * Returns the value of the '<em><b>Function Unit</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getOutputParameterTable <em>Output Parameter Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Function Unit</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Function Unit</em>' container reference.
-	 * @see #setFunctionUnit(SAPFunctionUnit)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getOutputSAPFunctionParameterTable_FunctionUnit()
-	 * @see org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getOutputParameterTable
-	 * @model opposite="OutputParameterTable" transient="false"
-	 * @generated
-	 */
-	SAPFunctionUnit getFunctionUnit();
+    /**
+     * Returns the value of the '<em><b>Function Unit</b></em>' container reference.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getOutputParameterTable <em>Output Parameter Table</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Function Unit</em>' container reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Function Unit</em>' container reference.
+     * @see #setFunctionUnit(SAPFunctionUnit)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getOutputSAPFunctionParameterTable_FunctionUnit()
+     * @see org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getOutputParameterTable
+     * @model opposite="OutputParameterTable" transient="false"
+     * @generated
+     */
+    SAPFunctionUnit getFunctionUnit();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.OutputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function Unit</em>' container reference.
-	 * @see #getFunctionUnit()
-	 * @generated
-	 */
-	void setFunctionUnit(SAPFunctionUnit value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.OutputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}' container reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Function Unit</em>' container reference.
+     * @see #getFunctionUnit()
+     * @generated
+     */
+    void setFunctionUnit(SAPFunctionUnit value);
 
 } // OutputSAPFunctionParameterTable

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/QueriesConnection.java

@@ -15,11 +15,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection <em>Connection</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getQuery <em>Query</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQueriesConnection()
  * @model
@@ -27,50 +27,50 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface QueriesConnection extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>Connection</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.Connection#getQueries <em>Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Connection</em>' container reference.
-	 * @see #setConnection(Connection)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQueriesConnection_Connection()
-	 * @see org.talend.core.model.metadata.builder.connection.Connection#getQueries
-	 * @model opposite="queries" resolveProxies="false" transient="false"
-	 * @generated
-	 */
-	Connection getConnection();
+    /**
+     * Returns the value of the '<em><b>Connection</b></em>' container reference.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.Connection#getQueries <em>Queries</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Connection</em>' container reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Connection</em>' container reference.
+     * @see #setConnection(Connection)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQueriesConnection_Connection()
+     * @see org.talend.core.model.metadata.builder.connection.Connection#getQueries
+     * @model opposite="queries" resolveProxies="false" transient="false"
+     * @generated
+     */
+    Connection getConnection();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection <em>Connection</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection</em>' container reference.
-	 * @see #getConnection()
-	 * @generated
-	 */
-	void setConnection(Connection value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection <em>Connection</em>}' container reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Connection</em>' container reference.
+     * @see #getConnection()
+     * @generated
+     */
+    void setConnection(Connection value);
 
-	/**
-	 * Returns the value of the '<em><b>Query</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.Query}.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.Query#getQueries <em>Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQueriesConnection_Query()
-	 * @see org.talend.core.model.metadata.builder.connection.Query#getQueries
-	 * @model opposite="queries" containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<Query> getQuery();
+    /**
+     * Returns the value of the '<em><b>Query</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.Query}.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.Query#getQueries <em>Queries</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Query</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Query</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQueriesConnection_Query()
+     * @see org.talend.core.model.metadata.builder.connection.Query#getQueries
+     * @model opposite="queries" containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<Query> getQuery();
 
 } // QueriesConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Query.java

@@ -14,12 +14,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Query#getValue <em>Value</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Query#getQueries <em>Queries</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Query#isContextMode <em>Context Mode</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery()
  * @model
@@ -27,84 +27,84 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface Query extends AbstractMetadataObject {
 
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery_Value()
+     * @model
+     * @generated
+     */
+    String getValue();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Query#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Query#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Queries</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getQuery <em>Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Queries</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Queries</em>' container reference.
-	 * @see #setQueries(QueriesConnection)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery_Queries()
-	 * @see org.talend.core.model.metadata.builder.connection.QueriesConnection#getQuery
-	 * @model opposite="query" transient="false"
-	 * @generated
-	 */
-	QueriesConnection getQueries();
+    /**
+     * Returns the value of the '<em><b>Queries</b></em>' container reference.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getQuery <em>Query</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Queries</em>' container reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Queries</em>' container reference.
+     * @see #setQueries(QueriesConnection)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery_Queries()
+     * @see org.talend.core.model.metadata.builder.connection.QueriesConnection#getQuery
+     * @model opposite="query" transient="false"
+     * @generated
+     */
+    QueriesConnection getQueries();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Query#getQueries <em>Queries</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Queries</em>' container reference.
-	 * @see #getQueries()
-	 * @generated
-	 */
-	void setQueries(QueriesConnection value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Query#getQueries <em>Queries</em>}' container reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Queries</em>' container reference.
+     * @see #getQueries()
+     * @generated
+     */
+    void setQueries(QueriesConnection value);
 
-	/**
-	 * Returns the value of the '<em><b>Context Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Mode</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context Mode</em>' attribute.
-	 * @see #setContextMode(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery_ContextMode()
-	 * @model
-	 * @generated
-	 */
-	boolean isContextMode();
+    /**
+     * Returns the value of the '<em><b>Context Mode</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Context Mode</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Context Mode</em>' attribute.
+     * @see #setContextMode(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery_ContextMode()
+     * @model
+     * @generated
+     */
+    boolean isContextMode();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Query#isContextMode <em>Context Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Mode</em>' attribute.
-	 * @see #isContextMode()
-	 * @generated
-	 */
-	void setContextMode(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.Query#isContextMode <em>Context Mode</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Context Mode</em>' attribute.
+     * @see #isContextMode()
+     * @generated
+     */
+    void setContextMode(boolean value);
 
 } // Query

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RegexpFileConnection.java

@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.RegexpFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getRegexpFileConnection()
  * @model
@@ -23,33 +23,33 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface RegexpFileConnection extends FileConnection {
 
-	/**
-	 * Returns the value of the '<em><b>Field Separator Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.FieldSeparator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Field Separator Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Field Separator Type</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
-	 * @see #setFieldSeparatorType(FieldSeparator)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getRegexpFileConnection_FieldSeparatorType()
-	 * @model required="true"
-	 * @generated
-	 */
-	FieldSeparator getFieldSeparatorType();
+    /**
+     * Returns the value of the '<em><b>Field Separator Type</b></em>' attribute.
+     * The literals are from the enumeration {@link org.talend.core.model.metadata.builder.connection.FieldSeparator}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Field Separator Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Field Separator Type</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
+     * @see #setFieldSeparatorType(FieldSeparator)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getRegexpFileConnection_FieldSeparatorType()
+     * @model required="true"
+     * @generated
+     */
+    FieldSeparator getFieldSeparatorType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.RegexpFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Separator Type</em>' attribute.
-	 * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
-	 * @see #getFieldSeparatorType()
-	 * @generated
-	 */
-	void setFieldSeparatorType(FieldSeparator value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.RegexpFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Field Separator Type</em>' attribute.
+     * @see org.talend.core.model.metadata.builder.connection.FieldSeparator
+     * @see #getFieldSeparatorType()
+     * @generated
+     */
+    void setFieldSeparatorType(FieldSeparator value);
 
 } // RegexpFileConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RowSeparator.java

@@ -21,192 +21,185 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum RowSeparator implements Enumerator {
-	/**
-	 * The '<em><b>Custom String</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_STRING
-	 * @ordered
-	 */
-	CUSTOM_STRING_LITERAL(0, "Custom String", "Custom String"),
-	/**
-	 * The '<em><b>Standart EOL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STANDART_EOL
-	 * @ordered
-	 */
-	STANDART_EOL_LITERAL(1, "Standart EOL", "Standard EOL");
+    /**
+     * The '<em><b>Custom String</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_STRING
+     * @ordered
+     */
+    CUSTOM_STRING_LITERAL(0, "Custom String", "Custom String"),
+    /**
+     * The '<em><b>Standart EOL</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #STANDART_EOL
+     * @ordered
+     */
+    STANDART_EOL_LITERAL(1, "Standart EOL", "Standard EOL");
 
-	/**
-	 * The '<em><b>Custom String</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Custom String</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_STRING_LITERAL
-	 * @model name="Custom_String" literal="Custom String"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CUSTOM_STRING = 0;
+    /**
+     * The '<em><b>Custom String</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Custom String</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_STRING_LITERAL
+     * @model name="Custom_String" literal="Custom String"
+     * @generated
+     * @ordered
+     */
+    public static final int CUSTOM_STRING = 0;
 
-	/**
-	 * The '<em><b>Standart EOL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Standart EOL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STANDART_EOL_LITERAL
-	 * @model name="Standart_EOL" literal="Standart EOL"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STANDART_EOL = 1;
+    /**
+     * The '<em><b>Standart EOL</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Standart EOL</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #STANDART_EOL_LITERAL
+     * @model name="Standart_EOL" literal="Standart EOL"
+     * @generated
+     * @ordered
+     */
+    public static final int STANDART_EOL = 1;
 
-	/**
-	 * An array of all the '<em><b>Row Separator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final RowSeparator[] VALUES_ARRAY = new RowSeparator[] { CUSTOM_STRING_LITERAL,
-			STANDART_EOL_LITERAL, };
+    /**
+     * An array of all the '<em><b>Row Separator</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final RowSeparator[] VALUES_ARRAY = new RowSeparator[] { CUSTOM_STRING_LITERAL, STANDART_EOL_LITERAL, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Row Separator</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<RowSeparator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Row Separator</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<RowSeparator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Row Separator</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RowSeparator get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RowSeparator result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Row Separator</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static RowSeparator get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            RowSeparator result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Row Separator</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RowSeparator getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RowSeparator result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Row Separator</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static RowSeparator getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            RowSeparator result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Row Separator</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RowSeparator get(int value) {
-		switch (value) {
-		case CUSTOM_STRING:
-			return CUSTOM_STRING_LITERAL;
-		case STANDART_EOL:
-			return STANDART_EOL_LITERAL;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Row Separator</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static RowSeparator get(int value) {
+        switch (value) {
+        case CUSTOM_STRING:
+            return CUSTOM_STRING_LITERAL;
+        case STANDART_EOL:
+            return STANDART_EOL_LITERAL;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private RowSeparator(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private RowSeparator(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 }

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RuleType.java

@@ -21,222 +21,216 @@ import org.eclipse.emf.common.util.Enumerator;
  * @generated
  */
 public enum RuleType implements Enumerator {
-	/**
-	 * The '<em><b>REFERENCE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REFERENCE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	REFERENCE(0, "REFERENCE", "REFERENCE"),
+    /**
+     * The '<em><b>REFERENCE</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #REFERENCE_VALUE
+     * @generated
+     * @ordered
+     */
+    REFERENCE(0, "REFERENCE", "REFERENCE"),
 
-	/**
-	 * The '<em><b>BASIC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BASIC_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	BASIC(1, "BASIC", "BASIC"),
+    /**
+     * The '<em><b>BASIC</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #BASIC_VALUE
+     * @generated
+     * @ordered
+     */
+    BASIC(1, "BASIC", "BASIC"),
 
-	/**
-	 * The '<em><b>CUSTOM</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CUSTOM(2, "CUSTOM", "CUSTOM");
+    /**
+     * The '<em><b>CUSTOM</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #CUSTOM_VALUE
+     * @generated
+     * @ordered
+     */
+    CUSTOM(2, "CUSTOM", "CUSTOM");
 
-	/**
-	 * The '<em><b>REFERENCE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>REFERENCE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REFERENCE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REFERENCE_VALUE = 0;
+    /**
+     * The '<em><b>REFERENCE</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>REFERENCE</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #REFERENCE
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int REFERENCE_VALUE = 0;
 
-	/**
-	 * The '<em><b>BASIC</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>BASIC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BASIC
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BASIC_VALUE = 1;
+    /**
+     * The '<em><b>BASIC</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>BASIC</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #BASIC
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int BASIC_VALUE = 1;
 
-	/**
-	 * The '<em><b>CUSTOM</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CUSTOM</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CUSTOM_VALUE = 2;
+    /**
+     * The '<em><b>CUSTOM</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>CUSTOM</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #CUSTOM
+     * @model
+     * @generated
+     * @ordered
+     */
+    public static final int CUSTOM_VALUE = 2;
 
-	/**
-	 * An array of all the '<em><b>Rule Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final RuleType[] VALUES_ARRAY = new RuleType[] { REFERENCE, BASIC, CUSTOM, };
+    /**
+     * An array of all the '<em><b>Rule Type</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final RuleType[] VALUES_ARRAY = new RuleType[] { REFERENCE, BASIC, CUSTOM, };
 
-	/**
-	 * A public read-only list of all the '<em><b>Rule Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<RuleType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Rule Type</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<RuleType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Rule Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RuleType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RuleType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Rule Type</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static RuleType get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            RuleType result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Rule Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RuleType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RuleType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Rule Type</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static RuleType getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            RuleType result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Rule Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RuleType get(int value) {
-		switch (value) {
-		case REFERENCE_VALUE:
-			return REFERENCE;
-		case BASIC_VALUE:
-			return BASIC;
-		case CUSTOM_VALUE:
-			return CUSTOM;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Rule Type</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static RuleType get(int value) {
+        switch (value) {
+        case REFERENCE_VALUE:
+            return REFERENCE;
+        case BASIC_VALUE:
+            return BASIC;
+        case CUSTOM_VALUE:
+            return CUSTOM;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private RuleType(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private RuleType(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+        return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
 
 } //RuleType

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPBWTable.java

@@ -11,7 +11,6 @@ import java.util.Date;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getModelType <em>Model Type</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#isActive <em>Active</em>}</li>
@@ -19,6 +18,7 @@ import java.util.Date;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInfoAreaName <em>Info Area Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInnerIOType <em>Inner IO Type</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable()
  * @model
@@ -26,134 +26,134 @@ import java.util.Date;
  */
 public interface SAPBWTable extends SAPTable {
 
-	/**
-	 * Returns the value of the '<em><b>Model Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Model Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Model Type</em>' attribute.
-	 * @see #setModelType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_ModelType()
-	 * @model
-	 * @generated
-	 */
-	String getModelType();
+    /**
+     * Returns the value of the '<em><b>Model Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Model Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Model Type</em>' attribute.
+     * @see #setModelType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_ModelType()
+     * @model
+     * @generated
+     */
+    String getModelType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getModelType <em>Model Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Model Type</em>' attribute.
-	 * @see #getModelType()
-	 * @generated
-	 */
-	void setModelType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getModelType <em>Model Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Model Type</em>' attribute.
+     * @see #getModelType()
+     * @generated
+     */
+    void setModelType(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Active</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Active</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Active</em>' attribute.
-	 * @see #setActive(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_Active()
-	 * @model
-	 * @generated
-	 */
-	boolean isActive();
+    /**
+     * Returns the value of the '<em><b>Active</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Active</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Active</em>' attribute.
+     * @see #setActive(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_Active()
+     * @model
+     * @generated
+     */
+    boolean isActive();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#isActive <em>Active</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Active</em>' attribute.
-	 * @see #isActive()
-	 * @generated
-	 */
-	void setActive(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#isActive <em>Active</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Active</em>' attribute.
+     * @see #isActive()
+     * @generated
+     */
+    void setActive(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Source System Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source System Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source System Name</em>' attribute.
-	 * @see #setSourceSystemName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_SourceSystemName()
-	 * @model
-	 * @generated
-	 */
-	String getSourceSystemName();
+    /**
+     * Returns the value of the '<em><b>Source System Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Source System Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Source System Name</em>' attribute.
+     * @see #setSourceSystemName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_SourceSystemName()
+     * @model
+     * @generated
+     */
+    String getSourceSystemName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getSourceSystemName <em>Source System Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source System Name</em>' attribute.
-	 * @see #getSourceSystemName()
-	 * @generated
-	 */
-	void setSourceSystemName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getSourceSystemName <em>Source System Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Source System Name</em>' attribute.
+     * @see #getSourceSystemName()
+     * @generated
+     */
+    void setSourceSystemName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Info Area Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Info Area Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Info Area Name</em>' attribute.
-	 * @see #setInfoAreaName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_InfoAreaName()
-	 * @model
-	 * @generated
-	 */
-	String getInfoAreaName();
+    /**
+     * Returns the value of the '<em><b>Info Area Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Info Area Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Info Area Name</em>' attribute.
+     * @see #setInfoAreaName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_InfoAreaName()
+     * @model
+     * @generated
+     */
+    String getInfoAreaName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInfoAreaName <em>Info Area Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Info Area Name</em>' attribute.
-	 * @see #getInfoAreaName()
-	 * @generated
-	 */
-	void setInfoAreaName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInfoAreaName <em>Info Area Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Info Area Name</em>' attribute.
+     * @see #getInfoAreaName()
+     * @generated
+     */
+    void setInfoAreaName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Inner IO Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inner IO Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Inner IO Type</em>' attribute.
-	 * @see #setInnerIOType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_InnerIOType()
-	 * @model
-	 * @generated
-	 */
-	String getInnerIOType();
+    /**
+     * Returns the value of the '<em><b>Inner IO Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Inner IO Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Inner IO Type</em>' attribute.
+     * @see #setInnerIOType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable_InnerIOType()
+     * @model
+     * @generated
+     */
+    String getInnerIOType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInnerIOType <em>Inner IO Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inner IO Type</em>' attribute.
-	 * @see #getInnerIOType()
-	 * @generated
-	 */
-	void setInnerIOType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInnerIOType <em>Inner IO Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Inner IO Type</em>' attribute.
+     * @see #getInnerIOType()
+     * @generated
+     */
+    void setInnerIOType(String value);
 
 } // SAPBWTable

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPBWTableField.java

@@ -9,10 +9,10 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTableField#getLogicalName <em>Logical Name</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTableField()
  * @model
@@ -20,30 +20,30 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface SAPBWTableField extends SAPTableField {
 
-	/**
-	 * Returns the value of the '<em><b>Logical Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Logical Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Logical Name</em>' attribute.
-	 * @see #setLogicalName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTableField_LogicalName()
-	 * @model
-	 * @generated
-	 */
-	String getLogicalName();
+    /**
+     * Returns the value of the '<em><b>Logical Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Logical Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Logical Name</em>' attribute.
+     * @see #setLogicalName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTableField_LogicalName()
+     * @model
+     * @generated
+     */
+    String getLogicalName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTableField#getLogicalName <em>Logical Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Logical Name</em>' attribute.
-	 * @see #getLogicalName()
-	 * @generated
-	 */
-	void setLogicalName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPBWTableField#getLogicalName <em>Logical Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Logical Name</em>' attribute.
+     * @see #getLogicalName()
+     * @generated
+     */
+    void setLogicalName(String value);
 
 } // SAPBWTableField

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPConnection.java

@@ -14,7 +14,6 @@ import org.eclipse.emf.common.util.EMap;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getHost <em>Host</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getUsername <em>Username</em>}</li>
@@ -33,6 +32,7 @@ import org.eclipse.emf.common.util.EMap;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWInfoCubes <em>BW Info Cubes</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWInfoObjects <em>BW Info Objects</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection()
  * @model
@@ -40,336 +40,336 @@ import org.eclipse.emf.common.util.EMap;
  */
 public interface SAPConnection extends Connection {
 
-	/**
-	 * Returns the value of the '<em><b>Host</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Host</em>' attribute.
-	 * @see #setHost(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Host()
-	 * @model
-	 * @generated
-	 */
-	String getHost();
+    /**
+     * Returns the value of the '<em><b>Host</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Host</em>' attribute.
+     * @see #setHost(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Host()
+     * @model
+     * @generated
+     */
+    String getHost();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getHost <em>Host</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Host</em>' attribute.
-	 * @see #getHost()
-	 * @generated
-	 */
-	void setHost(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getHost <em>Host</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Host</em>' attribute.
+     * @see #getHost()
+     * @generated
+     */
+    void setHost(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Username</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Username</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Username</em>' attribute.
-	 * @see #setUsername(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Username()
-	 * @model
-	 * @generated
-	 */
-	String getUsername();
+    /**
+     * Returns the value of the '<em><b>Username</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Username</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Username</em>' attribute.
+     * @see #setUsername(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Username()
+     * @model
+     * @generated
+     */
+    String getUsername();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getUsername <em>Username</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Username</em>' attribute.
-	 * @see #getUsername()
-	 * @generated
-	 */
-	void setUsername(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getUsername <em>Username</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Username</em>' attribute.
+     * @see #getUsername()
+     * @generated
+     */
+    void setUsername(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Password</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Password</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Password</em>' attribute.
-	 * @see #setPassword(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Password()
-	 * @model
-	 * @generated
-	 */
-	String getPassword();
+    /**
+     * Returns the value of the '<em><b>Password</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Password</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Password</em>' attribute.
+     * @see #setPassword(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Password()
+     * @model
+     * @generated
+     */
+    String getPassword();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getPassword <em>Password</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Password</em>' attribute.
-	 * @see #getPassword()
-	 * @generated
-	 */
-	void setPassword(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getPassword <em>Password</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Password</em>' attribute.
+     * @see #getPassword()
+     * @generated
+     */
+    void setPassword(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Client</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Client</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Client</em>' attribute.
-	 * @see #setClient(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Client()
-	 * @model
-	 * @generated
-	 */
-	String getClient();
+    /**
+     * Returns the value of the '<em><b>Client</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Client</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Client</em>' attribute.
+     * @see #setClient(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Client()
+     * @model
+     * @generated
+     */
+    String getClient();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getClient <em>Client</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Client</em>' attribute.
-	 * @see #getClient()
-	 * @generated
-	 */
-	void setClient(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getClient <em>Client</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Client</em>' attribute.
+     * @see #getClient()
+     * @generated
+     */
+    void setClient(String value);
 
-	/**
-	 * Returns the value of the '<em><b>System Number</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>System Number</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>System Number</em>' attribute.
-	 * @see #setSystemNumber(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_SystemNumber()
-	 * @model
-	 * @generated
-	 */
-	String getSystemNumber();
+    /**
+     * Returns the value of the '<em><b>System Number</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>System Number</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>System Number</em>' attribute.
+     * @see #setSystemNumber(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_SystemNumber()
+     * @model
+     * @generated
+     */
+    String getSystemNumber();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getSystemNumber <em>System Number</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>System Number</em>' attribute.
-	 * @see #getSystemNumber()
-	 * @generated
-	 */
-	void setSystemNumber(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getSystemNumber <em>System Number</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>System Number</em>' attribute.
+     * @see #getSystemNumber()
+     * @generated
+     */
+    void setSystemNumber(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Language</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Language</em>' attribute isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Language</em>' attribute.
-	 * @see #setLanguage(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Language()
-	 * @model
-	 * @generated
-	 */
-	String getLanguage();
+    /**
+     * Returns the value of the '<em><b>Language</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Language</em>' attribute isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Language</em>' attribute.
+     * @see #setLanguage(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Language()
+     * @model
+     * @generated
+     */
+    String getLanguage();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getLanguage <em>Language</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Language</em>' attribute.
-	 * @see #getLanguage()
-	 * @generated
-	 */
-	void setLanguage(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getLanguage <em>Language</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Language</em>' attribute.
+     * @see #getLanguage()
+     * @generated
+     */
+    void setLanguage(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Funtions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Funtions</em>' containment reference list isn't clear, there really should be more of
-	 * a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Funtions</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Funtions()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SAPFunctionUnit> getFuntions();
+    /**
+     * Returns the value of the '<em><b>Funtions</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Funtions</em>' containment reference list isn't clear, there really should be more of
+     * a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Funtions</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_Funtions()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPFunctionUnit> getFuntions();
 
-	/**
-	 * Returns the value of the '<em><b>Current Fucntion</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Current Fucntion</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Current Fucntion</em>' attribute.
-	 * @see #setCurrentFucntion(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_CurrentFucntion()
-	 * @model
-	 * @generated
-	 */
-	String getCurrentFucntion();
+    /**
+     * Returns the value of the '<em><b>Current Fucntion</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Current Fucntion</em>' attribute isn't clear, there really should be more of a
+     * description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Current Fucntion</em>' attribute.
+     * @see #setCurrentFucntion(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_CurrentFucntion()
+     * @model
+     * @generated
+     */
+    String getCurrentFucntion();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getCurrentFucntion <em>Current Fucntion</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Current Fucntion</em>' attribute.
-	 * @see #getCurrentFucntion()
-	 * @generated
-	 */
-	void setCurrentFucntion(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getCurrentFucntion <em>Current Fucntion</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the new value of the '<em>Current Fucntion</em>' attribute.
+     * @see #getCurrentFucntion()
+     * @generated
+     */
+    void setCurrentFucntion(String value);
 
-	/**
-	 * Returns the value of the '<em><b>IDocs</b></em>' containment reference list. The list contents are of type
-	 * {@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit}. It is bidirectional and its opposite is '
-	 * {@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit#getConnection <em>Connection</em>}'. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>IDocs</em>' reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>IDocs</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_IDocs()
-	 * @see org.talend.core.model.metadata.builder.connection.SAPIDocUnit#getConnection
-	 * @model type="org.talend.core.model.metadata.builder.connection.SAPIDocUnit" opposite="connection"
-	 * containment="true"
-	 * @generated
-	 */
-	EList<SAPIDocUnit> getIDocs();
+    /**
+     * Returns the value of the '<em><b>IDocs</b></em>' containment reference list. The list contents are of type
+     * {@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit}. It is bidirectional and its opposite is '
+     * {@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit#getConnection <em>Connection</em>}'. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>IDocs</em>' reference isn't clear, there really should be more of a description
+     * here...
+     * </p>
+     * <!-- end-user-doc -->
+     * 
+     * @return the value of the '<em>IDocs</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_IDocs()
+     * @see org.talend.core.model.metadata.builder.connection.SAPIDocUnit#getConnection
+     * @model type="org.talend.core.model.metadata.builder.connection.SAPIDocUnit" opposite="connection"
+     * containment="true"
+     * @generated
+     */
+    EList<SAPIDocUnit> getIDocs();
 
-	/**
-	 * Returns the value of the '<em><b>Jco Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jco Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jco Version</em>' attribute.
-	 * @see #setJcoVersion(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_JcoVersion()
-	 * @model
-	 * @generated
-	 */
-	String getJcoVersion();
+    /**
+     * Returns the value of the '<em><b>Jco Version</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Jco Version</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Jco Version</em>' attribute.
+     * @see #setJcoVersion(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_JcoVersion()
+     * @model
+     * @generated
+     */
+    String getJcoVersion();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getJcoVersion <em>Jco Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jco Version</em>' attribute.
-	 * @see #getJcoVersion()
-	 * @generated
-	 */
-	void setJcoVersion(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getJcoVersion <em>Jco Version</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Jco Version</em>' attribute.
+     * @see #getJcoVersion()
+     * @generated
+     */
+    void setJcoVersion(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Additional Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additional Properties</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Additional Properties</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_AdditionalProperties()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<AdditionalConnectionProperty> getAdditionalProperties();
+    /**
+     * Returns the value of the '<em><b>Additional Properties</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Additional Properties</em>' map isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Additional Properties</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_AdditionalProperties()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<AdditionalConnectionProperty> getAdditionalProperties();
 
-	/**
-	 * Returns the value of the '<em><b>BW Advanced Data Store Objects</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>BW Advanced Data Store Objects</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>BW Advanced Data Store Objects</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWAdvancedDataStoreObjects()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SAPBWTable> getBWAdvancedDataStoreObjects();
+    /**
+     * Returns the value of the '<em><b>BW Advanced Data Store Objects</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>BW Advanced Data Store Objects</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>BW Advanced Data Store Objects</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWAdvancedDataStoreObjects()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPBWTable> getBWAdvancedDataStoreObjects();
 
-	/**
-	 * Returns the value of the '<em><b>BW Data Sources</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>BW Data Sources</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>BW Data Sources</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWDataSources()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SAPBWTable> getBWDataSources();
+    /**
+     * Returns the value of the '<em><b>BW Data Sources</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>BW Data Sources</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>BW Data Sources</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWDataSources()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPBWTable> getBWDataSources();
 
-	/**
-	 * Returns the value of the '<em><b>BW Data Store Objects</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>BW Data Store Objects</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>BW Data Store Objects</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWDataStoreObjects()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SAPBWTable> getBWDataStoreObjects();
+    /**
+     * Returns the value of the '<em><b>BW Data Store Objects</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>BW Data Store Objects</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>BW Data Store Objects</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWDataStoreObjects()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPBWTable> getBWDataStoreObjects();
 
-	/**
-	 * Returns the value of the '<em><b>BW Info Cubes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>BW Info Cubes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>BW Info Cubes</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWInfoCubes()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SAPBWTable> getBWInfoCubes();
+    /**
+     * Returns the value of the '<em><b>BW Info Cubes</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>BW Info Cubes</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>BW Info Cubes</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWInfoCubes()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPBWTable> getBWInfoCubes();
 
-	/**
-	 * Returns the value of the '<em><b>BW Info Objects</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>BW Info Objects</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>BW Info Objects</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWInfoObjects()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SAPBWTable> getBWInfoObjects();
+    /**
+     * Returns the value of the '<em><b>BW Info Objects</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPBWTable}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>BW Info Objects</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>BW Info Objects</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection_BWInfoObjects()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPBWTable> getBWInfoObjects();
 
 } // SAPConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParamData.java

@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParamData#getInputRoot <em>Input Root</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParamData#getOutputRoot <em>Output Root</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParamData()
  * @model
@@ -23,56 +23,56 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface SAPFunctionParamData extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>Input Root</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Input Root</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Input Root</em>' containment reference.
-	 * @see #setInputRoot(SAPFunctionParameter)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParamData_InputRoot()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	SAPFunctionParameter getInputRoot();
+    /**
+     * Returns the value of the '<em><b>Input Root</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Input Root</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Input Root</em>' containment reference.
+     * @see #setInputRoot(SAPFunctionParameter)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParamData_InputRoot()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    SAPFunctionParameter getInputRoot();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParamData#getInputRoot <em>Input Root</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Input Root</em>' containment reference.
-	 * @see #getInputRoot()
-	 * @generated
-	 */
-	void setInputRoot(SAPFunctionParameter value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParamData#getInputRoot <em>Input Root</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Input Root</em>' containment reference.
+     * @see #getInputRoot()
+     * @generated
+     */
+    void setInputRoot(SAPFunctionParameter value);
 
-	/**
-	 * Returns the value of the '<em><b>Output Root</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Output Root</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Output Root</em>' containment reference.
-	 * @see #setOutputRoot(SAPFunctionParameter)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParamData_OutputRoot()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	SAPFunctionParameter getOutputRoot();
+    /**
+     * Returns the value of the '<em><b>Output Root</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Output Root</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Output Root</em>' containment reference.
+     * @see #setOutputRoot(SAPFunctionParameter)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParamData_OutputRoot()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    SAPFunctionParameter getOutputRoot();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParamData#getOutputRoot <em>Output Root</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Output Root</em>' containment reference.
-	 * @see #getOutputRoot()
-	 * @generated
-	 */
-	void setOutputRoot(SAPFunctionParameter value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParamData#getOutputRoot <em>Output Root</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Output Root</em>' containment reference.
+     * @see #getOutputRoot()
+     * @generated
+     */
+    void setOutputRoot(SAPFunctionParameter value);
 
 } // SAPFunctionParamData

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameter.java

@@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getName <em>Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getType <em>Type</em>}</li>
@@ -24,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getChildren <em>Children</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#isTableResideInTables <em>Table Reside In Tables</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter()
  * @model
@@ -31,203 +31,203 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface SAPFunctionParameter extends EObject {
 
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
+    /**
+     * Returns the value of the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Name</em>' attribute.
+     * @see #setName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Name()
+     * @model
+     * @generated
+     */
+    String getName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getName <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Name</em>' attribute.
+     * @see #getName()
+     * @generated
+     */
+    void setName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Type()
-	 * @model
-	 * @generated
-	 */
-	String getType();
+    /**
+     * Returns the value of the '<em><b>Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Type</em>' attribute.
+     * @see #setType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Type()
+     * @model
+     * @generated
+     */
+    String getType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getType <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Type</em>' attribute.
+     * @see #getType()
+     * @generated
+     */
+    void setType(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
+    /**
+     * Returns the value of the '<em><b>Description</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Description</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Description</em>' attribute.
+     * @see #setDescription(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Description()
+     * @model
+     * @generated
+     */
+    String getDescription();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getDescription <em>Description</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Description</em>' attribute.
+     * @see #getDescription()
+     * @generated
+     */
+    void setDescription(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Length</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Length</em>' attribute.
-	 * @see #setLength(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Length()
-	 * @model
-	 * @generated
-	 */
-	String getLength();
+    /**
+     * Returns the value of the '<em><b>Length</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Length</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Length</em>' attribute.
+     * @see #setLength(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Length()
+     * @model
+     * @generated
+     */
+    String getLength();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getLength <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Length</em>' attribute.
-	 * @see #getLength()
-	 * @generated
-	 */
-	void setLength(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getLength <em>Length</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Length</em>' attribute.
+     * @see #getLength()
+     * @generated
+     */
+    void setLength(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Changing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Changing</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Changing</em>' attribute.
-	 * @see #setChanging(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Changing()
-	 * @model
-	 * @generated
-	 */
-	boolean isChanging();
+    /**
+     * Returns the value of the '<em><b>Changing</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Changing</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Changing</em>' attribute.
+     * @see #setChanging(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Changing()
+     * @model
+     * @generated
+     */
+    boolean isChanging();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#isChanging <em>Changing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Changing</em>' attribute.
-	 * @see #isChanging()
-	 * @generated
-	 */
-	void setChanging(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#isChanging <em>Changing</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Changing</em>' attribute.
+     * @see #isChanging()
+     * @generated
+     */
+    void setChanging(boolean value);
 
-	/**
-	 * Returns the value of the '<em><b>Test Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Test Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Test Value</em>' attribute.
-	 * @see #setTestValue(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_TestValue()
-	 * @model
-	 * @generated
-	 */
-	String getTestValue();
+    /**
+     * Returns the value of the '<em><b>Test Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Test Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Test Value</em>' attribute.
+     * @see #setTestValue(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_TestValue()
+     * @model
+     * @generated
+     */
+    String getTestValue();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getTestValue <em>Test Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Test Value</em>' attribute.
-	 * @see #getTestValue()
-	 * @generated
-	 */
-	void setTestValue(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getTestValue <em>Test Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Test Value</em>' attribute.
+     * @see #getTestValue()
+     * @generated
+     */
+    void setTestValue(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Children</em>' containment reference list.
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Children()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<SAPFunctionParameter> getChildren();
+    /**
+     * Returns the value of the '<em><b>Children</b></em>' containment reference list.
+     * The list contents are of type {@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Children</em>' containment reference list.
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_Children()
+     * @model containment="true" resolveProxies="true"
+     * @generated
+     */
+    EList<SAPFunctionParameter> getChildren();
 
-	/**
-	 * Returns the value of the '<em><b>Table Reside In Tables</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table Reside In Tables</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table Reside In Tables</em>' attribute.
-	 * @see #setTableResideInTables(boolean)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_TableResideInTables()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isTableResideInTables();
+    /**
+     * Returns the value of the '<em><b>Table Reside In Tables</b></em>' attribute.
+     * The default value is <code>"true"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Table Reside In Tables</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Table Reside In Tables</em>' attribute.
+     * @see #setTableResideInTables(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter_TableResideInTables()
+     * @model default="true"
+     * @generated
+     */
+    boolean isTableResideInTables();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#isTableResideInTables <em>Table Reside In Tables</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table Reside In Tables</em>' attribute.
-	 * @see #isTableResideInTables()
-	 * @generated
-	 */
-	void setTableResideInTables(boolean value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#isTableResideInTables <em>Table Reside In Tables</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Table Reside In Tables</em>' attribute.
+     * @see #isTableResideInTables()
+     * @generated
+     */
+    void setTableResideInTables(boolean value);
 
 } // SAPFunctionParameter

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameterColumn.java

@@ -12,7 +12,6 @@ package org.talend.core.model.metadata.builder.connection;
  *
  * <p>
  * The following features are supported:
- * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterType <em>Parameter Type</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getStructureOrTableName <em>Structure Or Table Name</em>}</li>
@@ -21,6 +20,7 @@ package org.talend.core.model.metadata.builder.connection;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getValue <em>Value</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterTable <em>Parameter Table</em>}</li>
  * </ul>
+ * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn()
  * @model
@@ -28,174 +28,173 @@ package org.talend.core.model.metadata.builder.connection;
  */
 public interface SAPFunctionParameterColumn extends AbstractMetadataObject {
 
-	/**
-	 * Returns the value of the '<em><b>Parameter Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parameter Type</em>' attribute.
-	 * @see #setParameterType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_ParameterType()
-	 * @model
-	 * @generated
-	 */
-	String getParameterType();
+    /**
+     * Returns the value of the '<em><b>Parameter Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Parameter Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Parameter Type</em>' attribute.
+     * @see #setParameterType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_ParameterType()
+     * @model
+     * @generated
+     */
+    String getParameterType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterType <em>Parameter Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter Type</em>' attribute.
-	 * @see #getParameterType()
-	 * @generated
-	 */
-	void setParameterType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterType <em>Parameter Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Parameter Type</em>' attribute.
+     * @see #getParameterType()
+     * @generated
+     */
+    void setParameterType(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Structure Or Table Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Structure Or Table Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Structure Or Table Name</em>' attribute.
-	 * @see #setStructureOrTableName(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_StructureOrTableName()
-	 * @model
-	 * @generated
-	 */
-	String getStructureOrTableName();
+    /**
+     * Returns the value of the '<em><b>Structure Or Table Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Structure Or Table Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Structure Or Table Name</em>' attribute.
+     * @see #setStructureOrTableName(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_StructureOrTableName()
+     * @model
+     * @generated
+     */
+    String getStructureOrTableName();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getStructureOrTableName <em>Structure Or Table Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Structure Or Table Name</em>' attribute.
-	 * @see #getStructureOrTableName()
-	 * @generated
-	 */
-	void setStructureOrTableName(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getStructureOrTableName <em>Structure Or Table Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Structure Or Table Name</em>' attribute.
+     * @see #getStructureOrTableName()
+     * @generated
+     */
+    void setStructureOrTableName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Data Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Data Type</em>' attribute.
-	 * @see #setDataType(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_DataType()
-	 * @model
-	 * @generated
-	 */
-	String getDataType();
+    /**
+     * Returns the value of the '<em><b>Data Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Data Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Data Type</em>' attribute.
+     * @see #setDataType(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_DataType()
+     * @model
+     * @generated
+     */
+    String getDataType();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getDataType <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data Type</em>' attribute.
-	 * @see #getDataType()
-	 * @generated
-	 */
-	void setDataType(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getDataType <em>Data Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Data Type</em>' attribute.
+     * @see #getDataType()
+     * @generated
+     */
+    void setDataType(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Length</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Length</em>' attribute.
-	 * @see #setLength(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_Length()
-	 * @model
-	 * @generated
-	 */
-	String getLength();
+    /**
+     * Returns the value of the '<em><b>Length</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Length</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Length</em>' attribute.
+     * @see #setLength(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_Length()
+     * @model
+     * @generated
+     */
+    String getLength();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getLength <em>Length</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Length</em>' attribute.
-	 * @see #getLength()
-	 * @generated
-	 */
-	void setLength(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getLength <em>Length</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Length</em>' attribute.
+     * @see #getLength()
+     * @generated
+     */
+    void setLength(String value);
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @deprecated use ModelElementHelper.getFirstDescription().setBody()
-	 * <!-- end-model-doc -->
-	 * @model descriptionDataType="orgomg.cwm.objectmodel.core.String"
-	 * @generated
-	 */
-	@Deprecated
-	void setDescription(String description);
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * <!-- begin-model-doc -->
+     * @deprecated use ModelElementHelper.getFirstDescription().setBody()
+     * <!-- end-model-doc -->
+     * @model descriptionDataType="orgomg.cwm.objectmodel.core.String"
+     * @generated
+     */
+    void setDescription(String description);
 
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(String)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_Value()
+     * @model
+     * @generated
+     */
+    String getValue();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Parameter Table</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterTable#getColumns <em>Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter Table</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parameter Table</em>' container reference.
-	 * @see #setParameterTable(SAPFunctionParameterTable)
-	 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_ParameterTable()
-	 * @see org.talend.core.model.metadata.builder.connection.SAPFunctionParameterTable#getColumns
-	 * @model opposite="columns" transient="false"
-	 * @generated
-	 */
-	SAPFunctionParameterTable getParameterTable();
+    /**
+     * Returns the value of the '<em><b>Parameter Table</b></em>' container reference.
+     * It is bidirectional and its opposite is '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterTable#getColumns <em>Columns</em>}'.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Parameter Table</em>' container reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Parameter Table</em>' container reference.
+     * @see #setParameterTable(SAPFunctionParameterTable)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn_ParameterTable()
+     * @see org.talend.core.model.metadata.builder.connection.SAPFunctionParameterTable#getColumns
+     * @model opposite="columns" transient="false"
+     * @generated
+     */
+    SAPFunctionParameterTable getParameterTable();
 
-	/**
-	 * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterTable <em>Parameter Table</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter Table</em>' container reference.
-	 * @see #getParameterTable()
-	 * @generated
-	 */
-	void setParameterTable(SAPFunctionParameterTable value);
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterTable <em>Parameter Table</em>}' container reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Parameter Table</em>' container reference.
+     * @see #getParameterTable()
+     * @generated
+     */
+    void setParameterTable(SAPFunctionParameterTable value);
 
 } // SAPFunctionParameterColumn