diff options
Diffstat (limited to 'org.eclipse.debug.ui/ui')
4 files changed, 186 insertions, 2 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java index d7884c06e..45a43f20a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java @@ -143,6 +143,9 @@ public class LaunchConfigurationTabGroupViewer { private Button fApplyButton; private Button fRevertButton; + Composite buttonComp; + private Button fShowCommandLineButton; + /** * Whether tabs are currently being disposed or initialized */ @@ -306,9 +309,20 @@ public class LaunchConfigurationTabGroupViewer { }); fOptionsLink.setVisible(false); - Composite buttonComp = SWTFactory.createComposite(blComp, 2, 1, GridData.HORIZONTAL_ALIGN_END); + buttonComp = SWTFactory.createComposite(blComp, 3, 1, GridData.HORIZONTAL_ALIGN_END); + + fShowCommandLineButton = SWTFactory.createPushButton(buttonComp, + LaunchConfigurationsMessages.LaunchConfigurationDialog_ShowCommandLine, null, + GridData.HORIZONTAL_ALIGN_BEGINNING); + fShowCommandLineButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent evt) { + handleShowCommandLinePressed(); + } + }); - fRevertButton = SWTFactory.createPushButton(buttonComp, LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2, null, GridData.HORIZONTAL_ALIGN_END); + fRevertButton = SWTFactory.createPushButton(buttonComp, + LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2, null, GridData.HORIZONTAL_ALIGN_END); fRevertButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent evt) { @@ -801,6 +815,11 @@ public class LaunchConfigurationTabGroupViewer { fTabPlaceHolder.layout(true, true); } + private void updateShowCommandLineVisibility(boolean visible) { + if (fShowCommandLineButton != null) { + fShowCommandLineButton.setVisible(visible); + } + } /** * sets the current widget focus to the 'Name' widget */ @@ -829,6 +848,12 @@ public class LaunchConfigurationTabGroupViewer { } // show the name area updateVisibleControls(true); + if (type.supportsCommandLine()) { + updateShowCommandLineVisibility(true); + } + else { + updateShowCommandLineVisibility(false); + } // Retrieve the current tab group. If there is none, clean up and leave ILaunchConfigurationTabGroup tabGroup = getTabGroup(); @@ -1525,6 +1550,19 @@ public class LaunchConfigurationTabGroupViewer { } /** + * Dialog to Show the Command line + */ + protected void handleShowCommandLinePressed() { + ShowCommandLineDialog dialog = new ShowCommandLineDialog(getShell(), + LaunchConfigurationsMessages.LaunchConfigurationDialog_ShowCommandLine_Title, null, null, 0, + new String[] { LaunchConfigurationsMessages.LaunchConfigurationDialog_ShowCommandLine_Copy, + IDialogConstants.CANCEL_LABEL }, + 0, + fOriginal); + dialog.open(); + } + + /** * Show an error dialog on the given exception. * * @param exception the exception to display diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java index a64e0bd0f..3414bbbbc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java @@ -104,6 +104,9 @@ public class LaunchConfigurationsMessages extends NLS { public static String LaunchConfigurationsDialog_Error_1; public static String LaunchConfigurationsDialog_Warning_2; public static String LaunchConfigurationsDialog_Information_3; + public static String LaunchConfigurationDialog_ShowCommandLine; + public static String LaunchConfigurationDialog_ShowCommandLine_Title; + public static String LaunchConfigurationDialog_ShowCommandLine_Copy; public static String LaunchConfigurationSelectionDialog_0; public static String LaunchConfigurationSelectionDialog_1; public static String LaunchConfigurationSelectionDialog_deleteButtonLabel; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties index 887c4a180..b48e01d71 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties @@ -115,6 +115,9 @@ LaunchConfigurationDialog_Revert_2=Re&vert LaunchConfigurationsDialog_Error_1=Error LaunchConfigurationsDialog_Warning_2=Warning LaunchConfigurationsDialog_Information_3=Information +LaunchConfigurationDialog_ShowCommandLine=Sho&w Command Line +LaunchConfigurationDialog_ShowCommandLine_Title=Command Line +LaunchConfigurationDialog_ShowCommandLine_Copy=C&opy LaunchConfigurationsDialog_0=New launch configuration LaunchConfigurationsDialog_1=Delete selected launch configuration(s) LaunchConfigurationsDialog_2=New launch configuration prototype diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java new file mode 100644 index 000000000..fc3a3b462 --- /dev/null +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java @@ -0,0 +1,140 @@ +/******************************************************************************* + * Copyright (c) 2018 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.debug.internal.ui.launchConfigurations; + +import java.util.Set; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.ILaunch; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchDelegate; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.core.Launch; +import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; +import org.eclipse.debug.core.model.ILaunchConfigurationDelegate2; +import org.eclipse.debug.internal.core.DebugCoreMessages; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.dnd.Clipboard; +import org.eclipse.swt.dnd.TextTransfer; +import org.eclipse.swt.dnd.Transfer; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +import com.ibm.icu.text.MessageFormat; + +/** + * Allows the user to specify to see and copy the command line to be executed + * for the launch. + * + * @since 3.13 + */ +public class ShowCommandLineDialog extends MessageDialog { + Text fModuleArgumentsText; + ILaunchConfiguration flaunchConfiguration; + + + public ShowCommandLineDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, int dialogImageType, String[] dialogButtonLabels, int defaultIndex, ILaunchConfiguration config) { + super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex); + flaunchConfiguration = config; + } + + @Override + protected Control createCustomArea(Composite parent) { + Composite comp = new Composite(parent, SWT.NONE); + comp.setLayout(new GridLayout()); + Font font = parent.getFont(); + + Group group = new Group(comp, SWT.NONE); + GridLayout topLayout = new GridLayout(); + group.setLayout(topLayout); + GridData gd = new GridData(GridData.FILL_BOTH); + gd.heightHint = convertHeightInCharsToPixels(15); + gd.widthHint = convertWidthInCharsToPixels(50); + group.setLayoutData(gd); + group.setFont(font); + + + // Label description = new Label(group, SWT.WRAP); + // description.setText(ActionMessages.Override_Dependencies_label1); + fModuleArgumentsText = new Text(group, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL); + gd = new GridData(GridData.FILL_BOTH); + gd.heightHint = convertHeightInCharsToPixels(10); + gd.widthHint = convertWidthInCharsToPixels(60); + fModuleArgumentsText.setLayoutData(gd); + + String command = "Could not retrieve the command"; //$NON-NLS-1$ + try { + Set<String> modes = flaunchConfiguration.getModes(); + modes.add(ILaunchManager.RUN_MODE); + ILaunchDelegate[] delegates = flaunchConfiguration.getType().getDelegates(modes); + if (delegates.length ==1) { + ILaunchConfigurationDelegate delegate = delegates[0].getDelegate(); + ILaunchConfigurationDelegate2 delegate2; + ILaunch launch = null; + if (delegate instanceof ILaunchConfigurationDelegate2) { + delegate2 = (ILaunchConfigurationDelegate2) delegate; + if (delegate2 != null) { + launch = delegate2.getLaunch(flaunchConfiguration, ILaunchManager.RUN_MODE); + } + if (launch == null) { + launch = new Launch(flaunchConfiguration, ILaunchManager.RUN_MODE, null); + } else { + // ensure the launch mode is valid + if (!ILaunchManager.RUN_MODE.equals(launch.getLaunchMode())) { + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), + DebugPlugin.ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfiguration_14, + ILaunchManager.RUN_MODE, launch.getLaunchMode()), + null); + throw new CoreException(status); + } + } + } + command = delegate.showCommandLine(flaunchConfiguration, ILaunchManager.RUN_MODE, launch, null); + } + } catch (CoreException e) { + e.printStackTrace(); + } + fModuleArgumentsText.setText(command); + fModuleArgumentsText.setEditable(false); + + return comp; + } + + @Override + protected void buttonPressed(int buttonId) { + if (buttonId == OK) { + Clipboard clipboard = new Clipboard(null); + try { + TextTransfer textTransfer = TextTransfer.getInstance(); + Transfer[] transfers = new Transfer[] { textTransfer }; + Object[] data = new Object[] { fModuleArgumentsText.getText() }; + clipboard.setContents(data, transfers); + } finally { + clipboard.dispose(); + } + } + super.buttonPressed(buttonId); + } + + + +} |