diff options
author | Anton Gorenkov | 2012-04-02 19:23:36 +0000 |
---|---|---|
committer | Sergey Prigogin | 2012-04-02 19:23:36 +0000 |
commit | 9ecafd83cd411748283c6ce5de912436cdcfd9fa (patch) | |
tree | 9bbab2ff195a55e010759688a3cf495d5e099736 | |
parent | 850063c25dce4ac9d3ccaafaff79e62bdc434c26 (diff) | |
download | org.eclipse.cdt-9ecafd83cd411748283c6ce5de912436cdcfd9fa.tar.gz org.eclipse.cdt-9ecafd83cd411748283c6ce5de912436cdcfd9fa.tar.xz org.eclipse.cdt-9ecafd83cd411748283c6ce5de912436cdcfd9fa.zip |
Bug 180256 - Launch configurations should support build variables
6 files changed, 21 insertions, 20 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryPage.java index 2846939e8f6..048e90d7037 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryPage.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2004, 2010 IBM Corporation and others. + * Copyright (c) 2004, 2012 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 - Initial API and implementation + * IBM - Initial API and implementation *******************************************************************************/ package org.eclipse.cdt.make.ui.dialogs; @@ -108,7 +108,7 @@ public abstract class AbstractDiscoveryPage extends DialogPage { private void handleVariablesButtonSelected(Text textField) { String variable = getVariable(); if (variable != null) { - textField.append(variable); + textField.insert(variable); } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java index 9886c9ccf7b..a4bcbceb9b1 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. + * Copyright (c) 2000, 2012 QNX Software Systems 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 @@ -407,7 +407,7 @@ public class SettingsBlock extends AbstractCOptionPage { private void handleVariablesButtonSelected(Text textField) { String variable = getVariable(); if (variable != null) { - textField.append(variable); + textField.insert(variable); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CArgumentsTab.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CArgumentsTab.java index bb653b04059..84fded9fdb8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CArgumentsTab.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CArgumentsTab.java @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 QNX Software Systems and others. + * Copyright (c) 2005, 2012 QNX Software Systems 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: - * QNX Software Systems - Initial API and implementation - * IBM Corporation - * Ericsson - Updated for DSF + * QNX Software Systems - Initial API and implementation + * IBM Corporation + * Ericsson - Updated for DSF *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.internal.ui.launching; @@ -142,7 +142,8 @@ public class CArgumentsTab extends CLaunchConfigurationTab { protected void handleVariablesButtonSelected(Text textField) { String variable = getVariable(); if (variable != null) { - textField.append(variable); + // We should use insert() but not append() to be consistent with the Platform behavior (e.g. Common tab) + textField.insert(variable); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/WorkingDirectoryBlock.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/WorkingDirectoryBlock.java index 77adc2ef96e..50cdce58464 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/WorkingDirectoryBlock.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/WorkingDirectoryBlock.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation - * Ericsson - Updated for DSF + * IBM Corporation - initial API and implementation + * Ericsson - Updated for DSF *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.internal.ui.launching; @@ -239,7 +239,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab { protected void handleWorkingDirVariablesButtonSelected() { String variableText = getVariable(); if (variableText != null) { - fWorkingDirText.append(variableText); + fWorkingDirText.insert(variableText); } } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java index de1caeffb7d..d313f5515eb 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 - 2010 QNX Software Systems and others. + * Copyright (c) 2007, 2012 QNX Software Systems 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 @@ -8,11 +8,11 @@ * Contributors: * QNX Software Systems - Initial API and implementation * Andy Jin - Hardware debugging UI improvements, bug 229946 - * Anna Dushistova(MontaVista) - bug 241279 + * Anna Dushistova (MontaVista) - bug 241279 * - Hardware Debugging: Host name or ip address not saving in * the debug configuration * Andy Jin (QNX) - Added DSF debugging, bug 248593 - * Bruce Griffith,Sage Electronic Engineering, LLC - bug 305943 + * Bruce Griffith, Sage Electronic Engineering, LLC - bug 305943 * - API generalization to become transport-independent (e.g. to * allow connections via serial ports and pipes). *******************************************************************************/ @@ -141,7 +141,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { private void variablesButtonSelected(Text text) { StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell()); if (dialog.open() == StringVariableSelectionDialog.OK) { - text.append(dialog.getVariableExpression()); + text.insert(dialog.getVariableExpression()); } } diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java index 3e2820d58ce..cc439468a48 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 - 2010 QNX Software Systems and others. + * Copyright (c) 2007, 2012 QNX Software Systems 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 @@ -8,7 +8,7 @@ * Contributors: * QNX Software Systems - Initial API and implementation * Andy Jin - Hardware debugging UI improvements, bug 229946 - * Anna Dushistova(MontaVista) - bug 241279 + * Anna Dushistova (MontaVista) - bug 241279 * - Hardware Debugging: Host name or ip address not saving in * the debug configuration * Andy Jin (QNX) - Added DSF debugging, bug 248593 @@ -139,7 +139,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { StringVariableSelectionDialog dialog = new StringVariableSelectionDialog( getShell()); if (dialog.open() == StringVariableSelectionDialog.OK) { - text.append(dialog.getVariableExpression()); + text.insert(dialog.getVariableExpression()); } } |