diff options
Diffstat (limited to 'org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java')
-rw-r--r-- | org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java | 516 |
1 files changed, 258 insertions, 258 deletions
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java index c9afb5626..33c9f94af 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java @@ -73,32 +73,32 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { protected IWorkingSet workingSet; protected ILaunchConfiguration fConfiguration; - private boolean fCreateBuildScheduleComponent= true; - - // Console Output widgets - private Button fConsoleOutput; - private Button fFileOutput; - private Button fFileBrowse; - private Text fFileText; - private Button fVariables; - private Button fAppend; - private Button fWorkspaceBrowse; - - /** - * Constructor - */ - public ExternalToolsBuilderTab() { - setHelpContextId(IExternalToolsHelpContextIds.EXTERNAL_TOOLS_LAUNCH_CONFIGURATION_DIALOG_BUILDER_TAB); - } - - /** - * Constructor - * @param createBuildScheduleComponent - */ - public ExternalToolsBuilderTab(boolean createBuildScheduleComponent) { - fCreateBuildScheduleComponent= createBuildScheduleComponent; - setHelpContextId(IExternalToolsHelpContextIds.EXTERNAL_TOOLS_LAUNCH_CONFIGURATION_DIALOG_BUILDER_TAB); - } + private boolean fCreateBuildScheduleComponent= true; + + // Console Output widgets + private Button fConsoleOutput; + private Button fFileOutput; + private Button fFileBrowse; + private Text fFileText; + private Button fVariables; + private Button fAppend; + private Button fWorkspaceBrowse; + + /** + * Constructor + */ + public ExternalToolsBuilderTab() { + setHelpContextId(IExternalToolsHelpContextIds.EXTERNAL_TOOLS_LAUNCH_CONFIGURATION_DIALOG_BUILDER_TAB); + } + + /** + * Constructor + * @param createBuildScheduleComponent + */ + public ExternalToolsBuilderTab(boolean createBuildScheduleComponent) { + fCreateBuildScheduleComponent= createBuildScheduleComponent; + setHelpContextId(IExternalToolsHelpContextIds.EXTERNAL_TOOLS_LAUNCH_CONFIGURATION_DIALOG_BUILDER_TAB); + } protected SelectionListener selectionListener= new SelectionAdapter() { @Override @@ -124,7 +124,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { mainComposite.setLayout(layout); mainComposite.setLayoutData(gridData); mainComposite.setFont(parent.getFont()); - createOutputCaptureComponent(mainComposite); + createOutputCaptureComponent(mainComposite); createLaunchInBackgroundComposite(mainComposite); createBuildScheduleComponent(mainComposite); } @@ -149,17 +149,17 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { } protected void createBuildScheduleComponent(Composite parent) { - if (fCreateBuildScheduleComponent) { - Label label= new Label(parent, SWT.NONE); - label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Run_this_builder_for__1); - label.setFont(parent.getFont()); - afterClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Full_builds_2, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Full, 2); - manualBuild= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Incremental_builds_4, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Inc, 2); - autoBuildButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Auto_builds__Not_recommended__6, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Auto, 2); - fDuringClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_0, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_1, 2); - - createVerticalSpacer(parent, 2); - } + if (fCreateBuildScheduleComponent) { + Label label= new Label(parent, SWT.NONE); + label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Run_this_builder_for__1); + label.setFont(parent.getFont()); + afterClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Full_builds_2, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Full, 2); + manualBuild= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Incremental_builds_4, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Inc, 2); + autoBuildButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Auto_builds__Not_recommended__6, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Auto, 2); + fDuringClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_0, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_1, 2); + + createVerticalSpacer(parent, 2); + } workingSetButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_workingSet_label, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_workingSet_tooltip, 1); specifyResources= createPushButton(parent, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_13, null); @@ -171,130 +171,130 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { selectResources(); } }); - Label label= new Label(parent, SWT.NONE); - label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_2); - label.setFont(parent.getFont()); + Label label= new Label(parent, SWT.NONE); + label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_2); + label.setFont(parent.getFont()); } - private void createOutputCaptureComponent(Composite parent) { - Group group = new Group(parent, SWT.NONE); - group.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_17); - GridData gd = new GridData(SWT.FILL, SWT.NONE, true, false); - gd.horizontalSpan = 2; - group.setLayoutData(gd); - GridLayout layout = new GridLayout(5, false); - group.setLayout(layout); - group.setFont(parent.getFont()); - - fConsoleOutput = createCheckButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_18); - gd = new GridData(SWT.BEGINNING, SWT.NORMAL, true, false); - gd.horizontalSpan = 5; - fConsoleOutput.setLayoutData(gd); - - fConsoleOutput.addSelectionListener(new SelectionAdapter() { - @Override + private void createOutputCaptureComponent(Composite parent) { + Group group = new Group(parent, SWT.NONE); + group.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_17); + GridData gd = new GridData(SWT.FILL, SWT.NONE, true, false); + gd.horizontalSpan = 2; + group.setLayoutData(gd); + GridLayout layout = new GridLayout(5, false); + group.setLayout(layout); + group.setFont(parent.getFont()); + + fConsoleOutput = createCheckButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_18); + gd = new GridData(SWT.BEGINNING, SWT.NORMAL, true, false); + gd.horizontalSpan = 5; + fConsoleOutput.setLayoutData(gd); + + fConsoleOutput.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { - updateLaunchConfigurationDialog(); - } - }); - - fFileOutput = createCheckButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_19); - fFileOutput.setLayoutData(new GridData(SWT.BEGINNING, SWT.NORMAL, false, false)); - - fFileText = new Text(group, SWT.SINGLE | SWT.BORDER); - gd = new GridData(SWT.FILL, SWT.NORMAL, true, false); - gd.horizontalSpan = 4; - fFileText.setLayoutData(gd); - fFileText.setFont(parent.getFont()); - - Label spacer = new Label(group,SWT.NONE); - gd = new GridData(SWT.FILL, SWT.NORMAL, true, false); - gd.horizontalSpan=2; - spacer.setLayoutData(gd); - fWorkspaceBrowse = createPushButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_20, null); - fFileBrowse = createPushButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_21, null); - fVariables = createPushButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_22, null); - - spacer = new Label(group,SWT.NONE); - spacer.setLayoutData(new GridData(SWT.FILL, SWT.NORMAL, false, false)); - fAppend = createCheckButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_23); - gd = new GridData(SWT.LEFT, SWT.TOP, true, false); - gd.horizontalSpan = 4; - fAppend.setLayoutData(gd); - - fFileOutput.addSelectionListener(new SelectionAdapter() { - @Override + updateLaunchConfigurationDialog(); + } + }); + + fFileOutput = createCheckButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_19); + fFileOutput.setLayoutData(new GridData(SWT.BEGINNING, SWT.NORMAL, false, false)); + + fFileText = new Text(group, SWT.SINGLE | SWT.BORDER); + gd = new GridData(SWT.FILL, SWT.NORMAL, true, false); + gd.horizontalSpan = 4; + fFileText.setLayoutData(gd); + fFileText.setFont(parent.getFont()); + + Label spacer = new Label(group,SWT.NONE); + gd = new GridData(SWT.FILL, SWT.NORMAL, true, false); + gd.horizontalSpan=2; + spacer.setLayoutData(gd); + fWorkspaceBrowse = createPushButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_20, null); + fFileBrowse = createPushButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_21, null); + fVariables = createPushButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_22, null); + + spacer = new Label(group,SWT.NONE); + spacer.setLayoutData(new GridData(SWT.FILL, SWT.NORMAL, false, false)); + fAppend = createCheckButton(group, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_23); + gd = new GridData(SWT.LEFT, SWT.TOP, true, false); + gd.horizontalSpan = 4; + fAppend.setLayoutData(gd); + + fFileOutput.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { - boolean enabled = fFileOutput.getSelection(); - fFileText.setEnabled(enabled); - fFileBrowse.setEnabled(enabled); - fWorkspaceBrowse.setEnabled(enabled); - fVariables.setEnabled(enabled); - fAppend.setEnabled(enabled); - updateLaunchConfigurationDialog(); - } - }); - - fAppend.addSelectionListener(new SelectionAdapter() { - @Override + boolean enabled = fFileOutput.getSelection(); + fFileText.setEnabled(enabled); + fFileBrowse.setEnabled(enabled); + fWorkspaceBrowse.setEnabled(enabled); + fVariables.setEnabled(enabled); + fAppend.setEnabled(enabled); + updateLaunchConfigurationDialog(); + } + }); + + fAppend.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { - updateLaunchConfigurationDialog(); - } - }); + updateLaunchConfigurationDialog(); + } + }); - fWorkspaceBrowse.addSelectionListener(new SelectionAdapter() { - @Override + fWorkspaceBrowse.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { - ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider()); - dialog.setTitle(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_24); - dialog.setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_25); - dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); - dialog.setComparator(new ResourceComparator(ResourceComparator.NAME)); - int buttonId = dialog.open(); - if (buttonId == IDialogConstants.OK_ID) { - IResource resource = (IResource) dialog.getFirstResult(); - String arg = resource.getFullPath().toString(); - String fileLoc = VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", arg); //$NON-NLS-1$ - fFileText.setText(fileLoc); - } - } - }); - - fFileBrowse.addSelectionListener(new SelectionAdapter() { - @Override + ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider()); + dialog.setTitle(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_24); + dialog.setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_25); + dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); + dialog.setComparator(new ResourceComparator(ResourceComparator.NAME)); + int buttonId = dialog.open(); + if (buttonId == IDialogConstants.OK_ID) { + IResource resource = (IResource) dialog.getFirstResult(); + String arg = resource.getFullPath().toString(); + String fileLoc = VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", arg); //$NON-NLS-1$ + fFileText.setText(fileLoc); + } + } + }); + + fFileBrowse.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { - String filePath = fFileText.getText(); + String filePath = fFileText.getText(); FileDialog dialog = new FileDialog(getShell(), SWT.SAVE | SWT.SHEET); - filePath = dialog.open(); - if (filePath != null) { - fFileText.setText(filePath); - } - } - }); + filePath = dialog.open(); + if (filePath != null) { + fFileText.setText(filePath); + } + } + }); - fFileText.addModifyListener(new ModifyListener() { - @Override + fFileText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { - updateLaunchConfigurationDialog(); - } - }); + updateLaunchConfigurationDialog(); + } + }); - fVariables.addSelectionListener(new SelectionListener() { - @Override + fVariables.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { - StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell()); - dialog.open(); - String variable = dialog.getVariableExpression(); - if (variable != null) { - fFileText.insert(variable); - } - } - @Override + StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell()); + dialog.open(); + String variable = dialog.getVariableExpression(); + if (variable != null) { + fFileText.insert(variable); + } + } + @Override public void widgetDefaultSelected(SelectionEvent e) { - } - }); - } + } + }); + } /* * Creates a check button in the given composite with the given text @@ -303,7 +303,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { Button button= createCheckButton(parent, text); button.setToolTipText(tooltipText); button.addSelectionListener(listener); - GridData gd= new GridData(GridData.FILL_HORIZONTAL); + GridData gd= new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = columns; button.setLayoutData(gd); return button; @@ -323,12 +323,12 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { @Override public void initializeFrom(ILaunchConfiguration configuration) { fConfiguration= configuration; - if (fCreateBuildScheduleComponent) { - afterClean.setSelection(false); - manualBuild.setSelection(false); - autoBuildButton.setSelection(false); - fDuringClean.setSelection(false); - } + if (fCreateBuildScheduleComponent) { + afterClean.setSelection(false); + manualBuild.setSelection(false); + autoBuildButton.setSelection(false); + fDuringClean.setSelection(false); + } String buildKindString= null; String buildScope= null; @@ -345,27 +345,27 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { workingSet = RefreshTab.getWorkingSet(buildScope); } - if (fCreateBuildScheduleComponent) { - int buildTypes[]= BuilderUtils.buildTypesToArray(buildKindString); - for (int i = 0; i < buildTypes.length; i++) { - switch (buildTypes[i]) { - case IncrementalProjectBuilder.FULL_BUILD: - afterClean.setSelection(true); - break; - case IncrementalProjectBuilder.INCREMENTAL_BUILD: - manualBuild.setSelection(true); - break; - case IncrementalProjectBuilder.AUTO_BUILD: - autoBuildButton.setSelection(true); - break; - case IncrementalProjectBuilder.CLEAN_BUILD: - fDuringClean.setSelection(true); - break; + if (fCreateBuildScheduleComponent) { + int buildTypes[]= BuilderUtils.buildTypesToArray(buildKindString); + for (int i = 0; i < buildTypes.length; i++) { + switch (buildTypes[i]) { + case IncrementalProjectBuilder.FULL_BUILD: + afterClean.setSelection(true); + break; + case IncrementalProjectBuilder.INCREMENTAL_BUILD: + manualBuild.setSelection(true); + break; + case IncrementalProjectBuilder.AUTO_BUILD: + autoBuildButton.setSelection(true); + break; + case IncrementalProjectBuilder.CLEAN_BUILD: + fDuringClean.setSelection(true); + break; default: break; - } - } - } + } + } + } boolean enabled= true; if (fCreateBuildScheduleComponent) { @@ -374,58 +374,58 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { workingSetButton.setEnabled(enabled); specifyResources.setEnabled(enabled && workingSetButton.getSelection()); updateRunInBackground(configuration); - updateConsoleOutput(configuration); + updateConsoleOutput(configuration); } protected void updateRunInBackground(ILaunchConfiguration configuration) { fLaunchInBackgroundButton.setSelection(ExternalToolsCoreUtil.isAsynchronousBuild(configuration)); } - private void updateConsoleOutput(ILaunchConfiguration configuration) { - boolean outputToConsole = true; - String outputFile = null; - boolean append = false; - - try { - outputToConsole = configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, true); - outputFile = configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, (String)null); - append = configuration.getAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, false); - } catch (CoreException e) { - } - - fConsoleOutput.setSelection(outputToConsole); - fAppend.setSelection(append); - boolean haveOutputFile= outputFile != null; - if (haveOutputFile) { - fFileText.setText(outputFile); - } - fFileOutput.setSelection(haveOutputFile); - fFileText.setEnabled(haveOutputFile); - fFileBrowse.setEnabled(haveOutputFile); - fWorkspaceBrowse.setEnabled(haveOutputFile); - fVariables.setEnabled(haveOutputFile); - fAppend.setEnabled(haveOutputFile); - } + private void updateConsoleOutput(ILaunchConfiguration configuration) { + boolean outputToConsole = true; + String outputFile = null; + boolean append = false; + + try { + outputToConsole = configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, true); + outputFile = configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, (String)null); + append = configuration.getAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, false); + } catch (CoreException e) { + } + + fConsoleOutput.setSelection(outputToConsole); + fAppend.setSelection(append); + boolean haveOutputFile= outputFile != null; + if (haveOutputFile) { + fFileText.setText(outputFile); + } + fFileOutput.setSelection(haveOutputFile); + fFileText.setEnabled(haveOutputFile); + fFileBrowse.setEnabled(haveOutputFile); + fWorkspaceBrowse.setEnabled(haveOutputFile); + fVariables.setEnabled(haveOutputFile); + fAppend.setEnabled(haveOutputFile); + } @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { - if (fCreateBuildScheduleComponent) { - StringBuilder buffer= new StringBuilder(); - if (afterClean.getSelection()) { - buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(','); - } - if (manualBuild.getSelection()){ - buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(','); - } - if (autoBuildButton.getSelection()) { - buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(','); - } - - if (fDuringClean.getSelection()) { - buffer.append(IExternalToolConstants.BUILD_TYPE_CLEAN); - } - configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString()); - } + if (fCreateBuildScheduleComponent) { + StringBuilder buffer= new StringBuilder(); + if (afterClean.getSelection()) { + buffer.append(IExternalToolConstants.BUILD_TYPE_FULL).append(','); + } + if (manualBuild.getSelection()){ + buffer.append(IExternalToolConstants.BUILD_TYPE_INCREMENTAL).append(','); + } + if (autoBuildButton.getSelection()) { + buffer.append(IExternalToolConstants.BUILD_TYPE_AUTO).append(','); + } + + if (fDuringClean.getSelection()) { + buffer.append(IExternalToolConstants.BUILD_TYPE_CLEAN); + } + configuration.setAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, buffer.toString()); + } if (workingSetButton.getSelection()) { String scope = RefreshTab.getRefreshAttribute(workingSet); configuration.setAttribute(IExternalToolConstants.ATTR_BUILDER_SCOPE, scope); @@ -434,31 +434,31 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { } configuration.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, fLaunchInBackgroundButton.getSelection()); - boolean captureOutput = false; - if (fConsoleOutput.getSelection()) { - captureOutput = true; - configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, (String)null); - } else { - configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, false); - } - if (fFileOutput.getSelection()) { - captureOutput = true; - String file = fFileText.getText(); - configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, file); - if(fAppend.getSelection()) { - configuration.setAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, true); - } else { - configuration.setAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, (String)null); - } - } else { - configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, (String)null); - } - - if (!captureOutput) { - configuration.setAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, false); - } else { - configuration.setAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, (String)null); - } + boolean captureOutput = false; + if (fConsoleOutput.getSelection()) { + captureOutput = true; + configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, (String)null); + } else { + configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, false); + } + if (fFileOutput.getSelection()) { + captureOutput = true; + String file = fFileText.getText(); + configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, file); + if(fAppend.getSelection()) { + configuration.setAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, true); + } else { + configuration.setAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, (String)null); + } + } else { + configuration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, (String)null); + } + + if (!captureOutput) { + configuration.setAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, false); + } else { + configuration.setAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, (String)null); + } } @Override @@ -476,15 +476,15 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { setErrorMessage(null); setMessage(null); if (fCreateBuildScheduleComponent) { - boolean buildKindSelected= afterClean.getSelection() || manualBuild.getSelection() || autoBuildButton.getSelection() || fDuringClean.getSelection(); - if (!buildKindSelected) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_buildKindError); - return false; - } - } + boolean buildKindSelected= afterClean.getSelection() || manualBuild.getSelection() || autoBuildButton.getSelection() || fDuringClean.getSelection(); + if (!buildKindSelected) { + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_buildKindError); + return false; + } + } if (workingSetButton.getSelection() && (workingSet == null || workingSet.getElements().length == 0)) { setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_16); - return false; + return false; } return validateRedirectFile(); @@ -525,14 +525,14 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { // do nothing on deactivation } - private boolean validateRedirectFile() { - if(fFileOutput.getSelection()) { - int len = fFileText.getText().trim().length(); - if (len == 0) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_26); - return false; - } - } - return true; - } + private boolean validateRedirectFile() { + if(fFileOutput.getSelection()) { + int len = fFileText.getText().trim().length(); + if (len == 0) { + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_26); + return false; + } + } + return true; + } }
\ No newline at end of file |