From 74bcb8a566db7d129d939ade56641515e1eafaef Mon Sep 17 00:00:00 2001 From: Adam Knapp Date: Tue, 8 Jun 2021 14:01:55 +0200 Subject: [PATCH] Fixing incorrect parsing of hostname and port parameters (issue #420) Some improvements of HostController tab's UI is also included --- .../executors/mctr/cli/CliExecutor.java | 4 ++-- .../hostcontrollers/HostControllersTab.java | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/org.eclipse.titan.executor/src/org/eclipse/titan/executor/executors/mctr/cli/CliExecutor.java b/org.eclipse.titan.executor/src/org/eclipse/titan/executor/executors/mctr/cli/CliExecutor.java index d9472dac1..b239308b6 100644 --- a/org.eclipse.titan.executor/src/org/eclipse/titan/executor/executors/mctr/cli/CliExecutor.java +++ b/org.eclipse.titan.executor/src/org/eclipse/titan/executor/executors/mctr/cli/CliExecutor.java @@ -1005,8 +1005,8 @@ public final class CliExecutor extends BaseExecutor { } else if (MTC_TERMINATED.equals(shortversion)) { suspectedLastState = mcStateEnum.MC_ACTIVE; } else if (successfulStartUpMatcher.reset(fastLine).matches()) { - mcHost = successfulStartUpMatcher.group(2); - mcPort = successfulStartUpMatcher.group(3); + mcHost = successfulStartUpMatcher.group(3); + mcPort = successfulStartUpMatcher.group(4); suspectedLastState = mcStateEnum.MC_LISTENING; } else if (fullSuccessfulStartUpMatcher.reset(shortversion).matches()) { mcHost = fullSuccessfulStartUpMatcher.group(1); diff --git a/org.eclipse.titan.executor/src/org/eclipse/titan/executor/tabpages/hostcontrollers/HostControllersTab.java b/org.eclipse.titan.executor/src/org/eclipse/titan/executor/tabpages/hostcontrollers/HostControllersTab.java index 4c3e980eb..6a28b0e3b 100644 --- a/org.eclipse.titan.executor/src/org/eclipse/titan/executor/tabpages/hostcontrollers/HostControllersTab.java +++ b/org.eclipse.titan.executor/src/org/eclipse/titan/executor/tabpages/hostcontrollers/HostControllersTab.java @@ -37,7 +37,9 @@ import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.window.Window; @@ -186,6 +188,23 @@ public final class HostControllersTab extends AbstractLaunchConfigurationTab { } }); + + hostViewer.addSelectionChangedListener(new ISelectionChangedListener() { + + @Override + public void selectionChanged(SelectionChangedEvent event) { + if (!event.getSelection().isEmpty()) { + editHostButton.setEnabled(true); + copyHostButton.setEnabled(true); + removeHostButton.setEnabled(true); + } else { + editHostButton.setEnabled(false); + copyHostButton.setEnabled(false); + removeHostButton.setEnabled(false); + } + } + }); + for (int i = 0; i < HOST_TABLE_COLUMN_HEADERS.length; i++) { tableLayout.addColumnData(hostTableColumnLayouts[i]); final TableColumn tc = new TableColumn(table, SWT.NONE, i); @@ -217,6 +236,7 @@ public final class HostControllersTab extends AbstractLaunchConfigurationTab { } }); editHostButton = createPushButton(buttonComposite, "Edit...", null); + editHostButton.setEnabled(false); editHostButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(final SelectionEvent event) { @@ -224,6 +244,7 @@ public final class HostControllersTab extends AbstractLaunchConfigurationTab { } }); copyHostButton = createPushButton(buttonComposite, "Copy...", null); + copyHostButton.setEnabled(false); copyHostButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(final SelectionEvent event) { @@ -231,6 +252,7 @@ public final class HostControllersTab extends AbstractLaunchConfigurationTab { } }); removeHostButton = createPushButton(buttonComposite, "Remove...", null); + removeHostButton.setEnabled(false); removeHostButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(final SelectionEvent event) { -- GitLab