Merge branch 'master' into feature/master/TESB-28330

TESB-28330:cConfig/Beans - Support customer groupid and artifact name
(additional to custom version)
2020-11-12 15:37:35 +08:00 · 2020-11-03 11:16:45 +08:00 · 2020-11-02 10:35:30 +08:00 · 2020-10-30 18:47:35 +08:00 · 2020-10-23 17:58:21 +08:00
2 changed files with 1 additions and 22 deletions
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/EParameterFieldType.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/EParameterFieldType.java
@@ -113,8 +113,6 @@ public enum EParameterFieldType {

    GROUPING_CAMPAIGN_CHOOSER, // htyin added for DQ Matching components
    MULTI_PATTERN, // yyin added TDQ-13437
-    SYNC_NEXUS_BUTTON,
-    CHECK_NEXUS_BUTTON,
    PATTERN_PROPERTY, // yyin, added TDQ-13437

    UNIFIED_COMPONENTS,
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/celleditor/ModuleListCellEditor.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/celleditor/ModuleListCellEditor.java
@@ -36,8 +36,6 @@ import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess2;
-import org.talend.core.runtime.maven.MavenArtifact;
-import org.talend.core.runtime.maven.MavenUrlHelper;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.process.IGEFProcess;
 import org.talend.core.ui.services.IDesignerCoreUIService;
@@ -192,33 +190,16 @@ public class ModuleListCellEditor extends DialogCellEditor {
        }
        // enable to refresh component setting after change modules.
        IElement element = this.tableParam.getElement();
-        boolean isNotCConfig = element.getElementParameter("COMPONENT_NAME") == null ?
-                true : !"cConfig".equals(element.getElementParameter("COMPONENT_NAME").getValue());
-        if (element != null && isNotCConfig) {
+        if (element != null) {
            IElementParameter updateComponentsParam = element.getElementParameter("UPDATE_COMPONENTS"); //$NON-NLS-1$
            if (updateComponentsParam != null) {
                updateComponentsParam.setValue(Boolean.TRUE);
            }
        }

-        // cConfig
-        if (!isNotCConfig) {
-            if (newValue.startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
-                MavenArtifact art = MavenUrlHelper.parseMvnUrl(newValue);
-                newValue = art.getFileName();
-            }
-        }
-
        //
        executeCommand(new ModelChangeCommand(tableParam, param.getName(), newValue, index));

-        if (newVal != null) {
-            executeCommand(new ModelChangeCommand(tableParam, "JAR_PATH", newVal, index));
-        }
-        if (nexusVersion != null) {
-            executeCommand(new ModelChangeCommand(tableParam, "JAR_NEXUS_VERSION", nexusVersion, index));
-        }
-
        oldValue = newValue;
        if (getTableViewer() != null) {
            getTableViewer().refresh(true);
Author	SHA1	Message	Date
SunChaoqun	08505284c7	Merge branch 'master' into feature/master/TESB-28330	2020-11-12 15:37:35 +08:00
SunChaoqun	ba3708fa97	TESB-28330:cConfig/Beans - Support customer groupid and artifact name (additional to custom version)	2020-11-03 11:16:45 +08:00
SunChaoqun	9e3fa73f2f	Merge branch 'master' into feature/master/TESB-28330	2020-11-02 10:35:30 +08:00
SunChaoqun	dbee8af3e6	TESB-28330:cConfig/Beans - Support customer groupid and artifact name (additional to custom version)	2020-10-30 18:47:35 +08:00
bhe-talendbj	b17cc125a3	feat(TESB-28330): remove workaround for cConfig	2020-10-23 17:58:21 +08:00