TESB-26993 Loading library selecttion window with default value

TESB-26993 Fixing cConfig doesn't use a standard Maven file system structure when publishing dependencies
2020-01-30 18:57:10 +02:00 · 2019-12-09 17:16:49 +02:00
1 changed files with 8 additions and 21 deletions
--- 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
@@ -166,30 +166,17 @@ public class ModuleListCellEditor extends DialogCellEditor {
    @Override
    protected Object openDialogBox(Control cellEditorWindow) {
        String value = (String) getValue();
-        // TODO for cConfig , keep the same dialog as before ,need esb team help to check latter
-        IElementParameter componentName = param.getElement().getElementParameter("COMPONENT_NAME");
-        if (componentName != null && "cConfig".equals(componentName.getValue())) {
-            ModuleListDialog dialog = new ModuleListDialog(cellEditorWindow.getShell(), value, this.param, false);
-            if (dialog.open() == Window.OK) {
-                String selecteModule = dialog.getSelecteModule();
-                if (selecteModule != null && (value == null || !value.equals(selecteModule) || dialog.isSelectChanged())) {
-                    setModuleValue(selecteModule, dialog.getSelectedJarPath(), dialog.getSelectedJarVersion());
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerUIService.class)) {
+            ILibraryManagerUIService libUiService = (ILibraryManagerUIService) GlobalServiceRegister.getDefault().getService(
+                   ILibraryManagerUIService.class);
+            IConfigModuleDialog dialog = libUiService.getConfigModuleDialog(cellEditorWindow.getShell(), "\"newLine\"".equals(value) ? "" : value);
+            if (dialog.open() == IDialogConstants.OK_ID) {
+                String selecteModule = dialog.getModuleName();
+                if (selecteModule != null && (value == null || !value.equals(selecteModule))) {
+                    setModuleValue(selecteModule, null, null);
                    return selecteModule;
                }
            }
-        } else {
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerUIService.class)) {
-                ILibraryManagerUIService libUiService = (ILibraryManagerUIService) GlobalServiceRegister.getDefault().getService(
-                        ILibraryManagerUIService.class);
-                IConfigModuleDialog dialog = libUiService.getConfigModuleDialog(cellEditorWindow.getShell(), value);
-                if (dialog.open() == IDialogConstants.OK_ID) {
-                    String selecteModule = dialog.getModuleName();
-                    if (selecteModule != null && (value == null || !value.equals(selecteModule))) {
-                        setModuleValue(selecteModule, null, null);
-                        return selecteModule;
-                    }
-                }
-            }
        }
        return null;
    }
Author	SHA1	Message	Date
Maksym Sheverda	c0bfdb2411	TESB-26993 Loading library selecttion window with default value	2020-01-30 18:57:10 +02:00
Maksym Sheverda	bf92bc83ec	TESB-26993 Fixing cConfig doesn't use a standard Maven file system structure when publishing dependencies	2019-12-09 17:16:49 +02:00