Attachment #167065 for bug #310304

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import java.util.List;

import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.cdi.ICDISession;
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;

import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
import org.eclipse.cdt.debug.mi.core.command.MIGDBSetNewConsole;
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;

			if (submonitor.isCanceled()) {
				throw new OperationCanceledException();
			}
			
			// execute symbol load
			boolean doLoadSymbols = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
			if (doLoadSymbols) {
				String symbolsFileName = null;
				if (config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS)) {
					IPath programFile = getProgramFile(config);
					if (programFile != null) {
						symbolsFileName = programFile.toOSString();
					}
				}
				else {
					symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
					if (symbolsFileName.length() > 0) {
						monitor.beginTask(Messages.getString("GDBJtagDebugger.5"), 1); //$NON-NLS-1$
						symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName);
					}
				}
				if (symbolsFileName == null) {
					throw new CoreException(new Status( IStatus.ERROR,
							Activator.getUniqueIdentifier(),
							-1, "symbols file not specified", null));
				}

				symbolsFileName = symbolsFileName.replace("\\", "\\\\");

				String symbolsOffset = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
				if (symbolsOffset.length() > 0) {
					symbolsOffset = "0x" + symbolsOffset;					
				}
				commands.clear();
				gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
				executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
			}
			
			boolean useRemote = config.getAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, IGDBJtagConstants.DEFAULT_USE_REMOTE_TARGET);
			if (useRemote) {
				submonitor.subTask(Messages.getString("GDBJtagDebugger.2")); //$NON-NLS-1$

			// execute load
			boolean doLoad = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);
			if (doLoad) {
				String imageFileName = null;
				if (config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE)) {
					IPath programFile = getProgramFile(config);
					if (programFile != null) {
						imageFileName = programFile.toOSString();
					}
					commands.clear();
					gdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
					executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
				}
				else {
					imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
					if (imageFileName.length() > 0) {
						monitor.beginTask(Messages.getString("GDBJtagDebugger.5"), 1); //$NON-NLS-1$
						imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName);
					}
				}
				if (imageFileName == null) {
					throw new CoreException(new Status( IStatus.ERROR,
							Activator.getUniqueIdentifier(),
							-1, "image file not specified", null));
				}
				
				imageFileName = imageFileName.replace("\\", "\\\\");
				
				String imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, ""); //$NON-NLS-2$ //$NON-NLS-4$
				commands.clear();
				gdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
				executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
			}
			submonitor.setWorkRemaining(15); // compensate for optional work above

			// execute symbol load
			boolean doLoadSymbols = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
			if (doLoadSymbols) {
				String symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, ""); //$NON-NLS-1$
				if (symbolsFileName.length() > 0) {
					symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName).replace("\\", "\\\\");
					String symbolsOffset = "0x" + config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, ""); //$NON-NLS-2$
					commands.clear();
					gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
					executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
				}
			}
		} catch (OperationCanceledException e) {
			if (launch != null && launch.canTerminate()) {
				launch.terminate();

		}
		return sb.toString();
	}
	
	private static IPath getProgramFile(ILaunchConfiguration config) throws CoreException {

		IPath programPath = CDebugUtils.getProgramPath(config);
		if (programPath != null & programPath.isEmpty()) {
			return null;
		}

		if (!programPath.isAbsolute()) {
			ICProject cproject = CDebugUtils.getCProject(config);
			if (cproject == null) {
				return null;
			}
		
			IPath location = cproject.getProject().getLocation();
			if (location != null) {
				programPath = location.append(programPath);
				if (!programPath.toFile().exists()) {
					// Try the old way, which is required to support linked resources.
					IFile projFile = null;
					try {
						projFile = cproject.getProject().getFile(CDebugUtils.getProgramPath(config));
					}
					catch (IllegalArgumentException exc) {}	// thrown if relative path that resolves to a root file (e.g., "..\somefile")
					if (projFile != null && projFile.exists()) {
						programPath = projFile.getLocation();
					}
				}
			}
		}
		return programPath;
	}
}

Lines 51-57 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagLaunchConfigurationDelegate.java (-1 / +1 lines)
51	ICProject project = verifyCProject(configuration);	51	ICProject project = verifyCProject(configuration);
52	IPath exePath = verifyProgramPath(configuration);	52	IPath exePath = verifyProgramPath(configuration);
53	File exeFile = exePath != null ? exePath.toFile() : null;	53	File exeFile = exePath != null ? exePath.toFile() : null;
54	ICDISession session = debugger.createSession(launch, exeFile, submonitor.newChild(1));	54	ICDISession session = debugger.createSession(launch, null, submonitor.newChild(1));
55	IBinaryObject exeBinary = null;	55	IBinaryObject exeBinary = null;
56	if ( exePath != null ) {	56	if ( exePath != null ) {
57	exeBinary = verifyBinary(project, exePath);	57	exeBinary = verifyBinary(project, exePath);




	public static final String ATTR_STOP_AT = Activator.PLUGIN_ID + ".stopAt"; //$NON-NLS-1$
	public static final String ATTR_SET_RESUME = Activator.PLUGIN_ID + ".setResume"; //$NON-NLS-1$
	public static final String ATTR_RUN_COMMANDS = Activator.PLUGIN_ID + ".runCommands"; //$NON-NLS-1$
	/** @since 7.0 */ public static final String ATTR_USE_PROJ_BINARY_FOR_IMAGE = Activator.PLUGIN_ID + ".useProjBinaryForImage"; //$NON-NLS-1$
	/** @since 7.0 */ public static final String ATTR_USE_FILE_FOR_IMAGE = Activator.PLUGIN_ID + ".useFileForImage"; //$NON-NLS-1$
	/** @since 7.0 */ public static final String ATTR_USE_PROJ_BINARY_FOR_SYMBOLS = Activator.PLUGIN_ID + ".useProjBinaryForSymbols"; //$NON-NLS-1$
	/** @since 7.0 */ public static final String ATTR_USE_FILE_FOR_SYMBOLS = Activator.PLUGIN_ID + ".useFileForSymbols"; //$NON-NLS-1$

	public static final boolean DEFAULT_DO_RESET = true;
	public static final boolean DEFAULT_DO_HALT = true;
	public static final int DEFAULT_DELAY = 3;
	public static final boolean DEFAULT_LOAD_IMAGE = true;
	public static final boolean DEFAULT_LOAD_SYMBOLS = true;
	public static final boolean DEFAULT_SET_PC_REGISTER = false;
	public static final boolean DEFAULT_SET_STOP_AT = false;
	public static final boolean DEFAULT_SET_RESUME = false;
	public static final boolean DEFAULT_USE_DEFAULT_RUN = true;

	/** @since 7.0 */ public static final String DEFAULT_INIT_COMMANDS = ""; //$NON-NLS-1$
	/** @since 7.0 */ public static final String DEFAULT_IMAGE_FILE_NAME = ""; //$NON-NLS-1$
	/** @since 7.0 */ public static final String DEFAULT_SYMBOLS_FILE_NAME = ""; //$NON-NLS-1$
	/** @since 7.0 */ public static final String DEFAULT_RUN_COMMANDS = ""; //$NON-NLS-1$
	/** @since 7.0 */ public static final boolean DEFAULT_USE_PROJ_BINARY_FOR_IMAGE = true;
	/** @since 7.0 */ public static final boolean DEFAULT_USE_FILE_FOR_IMAGE = false;
	/** @since 7.0 */ public static final boolean DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS = true;
	/** @since 7.0 */ public static final boolean DEFAULT_USE_FILE_FOR_SYMBOLS = false;
	/** @since 7.0 */ public static final String DEFAULT_IMAGE_OFFSET = ""; //$NON-NLS-1$
	/** @since 7.0 */ public static final String DEFAULT_SYMBOLS_OFFSET = ""; //$NON-NLS-1$
	/** @since 7.0 */ public static final String DEFAULT_PC_REGISTER = ""; //$NON-NLS-1$
	/** @since 7.0 */ public static final String DEFAULT_STOP_AT = ""; //$NON-NLS-1$
	
}

Lines 72-79 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java (-2 / +13 lines)
72	*/	72	*/
73	public void doLoadImage(String imageFileName, String imageOffset, Collection commands) {	73	public void doLoadImage(String imageFileName, String imageOffset, Collection commands) {
74	String file = escapeScpaces(imageFileName);	74	String file = escapeScpaces(imageFileName);
		75
		76	// 'restore' simply puts the program into memory.
75	String cmd = "restore " + file + " " + imageOffset;	77	String cmd = "restore " + file + " " + imageOffset;
76	addCmd(commands, cmd);	78	addCmd(commands, cmd);
		79
		80	// 'exec-file' specifies the program as the context for getting memory.
		81	// Basically, it tells gdb "this is the program we'll be debugging"
		82	cmd = "exec-file " + file;
		83	addCmd(commands, cmd);
77	}	84	}
78		85
79	/* (non-Javadoc)	86	/* (non-Javadoc)
Lines 81-88 Link Here
81	*/	88	*/
82	public void doLoadSymbol(String symbolFileName, String symbolOffset, Collection commands) {	89	public void doLoadSymbol(String symbolFileName, String symbolOffset, Collection commands) {
83	String file = escapeScpaces(symbolFileName);	90	String file = escapeScpaces(symbolFileName);
84	String cmd = "add-sym " + file + " " + symbolOffset;	91	if (symbolOffset == null \|\| (symbolOffset.length() == 0)) {
85	addCmd(commands, cmd);	92	addCmd(commands, "symbol-file " + file);
		93	}
		94	else {
		95	addCmd(commands, "add-sym " + file + " " + symbolOffset);
		96	}
86	}	97	}
87		98
88	protected String escapeScpaces(String file) {	99	protected String escapeScpaces(String file) {




		gdbCommand.setLayoutData(gd);
		gdbCommand.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});


		jtagDevice.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				updateDeviceIpPort(jtagDevice.getText());
				scheduleUpdateJob();
			}
		});


		ipAddress.setLayoutData(gd);
		ipAddress.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});


		});
		portNumber.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
	}




		gdbCommand.setLayoutData(gd);
		gdbCommand.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});


		commandFactory.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				commandFactoryChanged();
				scheduleUpdateJob();
			}
		});
	}

		miProtocol = new Combo(comp, SWT.READ_ONLY | SWT.DROP_DOWN);
		miProtocol.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
	}

		jtagDevice.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				updateDeviceIpPort(jtagDevice.getText());
				scheduleUpdateJob();
			}
		});
		

		ipAddress.setLayoutData(gd);
		ipAddress.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		

		});
		portNumber.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
	}





import java.io.File;

import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.gdbjtag.core.IGDBJtagConstants;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;

import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.graphics.Image;

	boolean resume = false;
	
	Text runCommands;
	
	private Button fUseProjectBinaryForImage;
	private Button fUseFileForImage;
	private Button fUseProjectBinaryForSymbols;
	private Button fUseFileForSymbols;
	private Label fImageOffsetLabel;
	private Label fSymbolsOffsetLabel;
	private Label fProjBinaryLabel1;
	private Label fProjBinaryLabel2;

	public String getName() {
		return TAB_NAME;

		});
		delay.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		

		initCommands.setLayoutData(gd);
		initCommands.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent evt) {
				scheduleUpdateJob();
			}
		});
		

		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		comp.setLayout(layout);
		
		SelectionListener radioButtonListener = new SelectionListener() {
			public void widgetSelected(SelectionEvent e) {
				updateLaunchConfigurationDialog();
				updateUseFileEnablement();
			}
			public void widgetDefaultSelected(SelectionEvent e) {
			}
		};
		
		fUseProjectBinaryForImage = new Button(comp, SWT.RADIO);
		fUseProjectBinaryForImage.setText("Use project binary:");
		gd = new GridData();
		gd.horizontalSpan = 1;
		fUseProjectBinaryForImage.setLayoutData(gd);
		fUseProjectBinaryForImage.addSelectionListener(radioButtonListener);
		
		fProjBinaryLabel1 = new Label(comp, SWT.NONE);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 3;
		fProjBinaryLabel1.setLayoutData(gd);
		
		fUseFileForImage = new Button(comp, SWT.RADIO);
		fUseFileForImage.setText("Use file:");
		gd = new GridData();
		gd.horizontalSpan = 1;
		fUseFileForImage.setLayoutData(gd);
		fUseFileForImage.addSelectionListener(radioButtonListener);		

		imageFileName = new Text(comp, SWT.BORDER);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 1;
		imageFileName.setLayoutData(gd);
		imageFileName.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		

			}
		});	
		
		fImageOffsetLabel = new Label(comp, SWT.NONE);
		fImageOffsetLabel.setText(Messages.getString("GDBJtagStartupTab.imageOffsetLabel_Text"));
		imageOffset = new Text(comp, SWT.BORDER);
		gd = new GridData();
		gd.horizontalSpan = 1;

		});
		imageOffset.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		
		
		loadSymbols = new Button(group, SWT.CHECK);
		loadSymbols.setText(Messages.getString("GDBJtagStartupTab.loadSymbols_Text"));
		gd = new GridData();

		layout.numColumns = 4;
		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		comp.setLayout(layout);

		fUseProjectBinaryForSymbols = new Button(comp, SWT.RADIO);
		fUseProjectBinaryForSymbols.setText("Use project binary");
		gd = new GridData();
		gd.horizontalSpan = 1;
		fUseProjectBinaryForSymbols.setLayoutData(gd);
		fUseProjectBinaryForSymbols.addSelectionListener(radioButtonListener);
		
		fProjBinaryLabel2 = new Label(comp, SWT.NONE);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 3;
		fProjBinaryLabel2.setLayoutData(gd);
		
		fUseFileForSymbols = new Button(comp, SWT.RADIO);
		fUseFileForSymbols.setText("Use file:");
		gd = new GridData();
		gd.horizontalSpan = 1;
		fUseFileForSymbols.setLayoutData(gd);
		fUseFileForSymbols.addSelectionListener(radioButtonListener);
		
		Label symbolLabel = new Label(comp, SWT.NONE);
		symbolLabel.setText(Messages.getString("GDBJtagStartupTab.symbolsLabel_Text"));	
		symbolsFileName = new Text(comp, SWT.BORDER);
		gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 1;
		symbolsFileName.setLayoutData(gd);
		symbolsFileName.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});	
		

			}
		});
		
		fSymbolsOffsetLabel = new Label(comp, SWT.NONE);
		fSymbolsOffsetLabel.setText(Messages.getString("GDBJtagStartupTab.symbolsOffsetLabel_Text"));
		symbolsOffset = new Text(comp, SWT.BORDER);
		gd = new GridData();
		gd.horizontalSpan = 1;

		});
		symbolsOffset.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		
	}
	
	private void updateUseFileEnablement() {
		boolean enabled = loadImage.getSelection() && fUseFileForImage.getSelection();
		imageFileName.setEnabled(enabled);
		imageFileBrowseWs.setEnabled(enabled);
		imageFileBrowse.setEnabled(enabled);
		
		enabled = loadSymbols.getSelection() && fUseFileForSymbols.getSelection();
		symbolsFileName.setEnabled(enabled);
		symbolsFileBrowseWs.setEnabled(enabled);
		symbolsFileBrowse.setEnabled(enabled);
	}

	public void createRunOptionGroup(Composite parent) {
		Group group = new Group(parent, SWT.NONE);
		GridLayout layout = new GridLayout();

		});
		pcRegister.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});
		

		stopAt.setLayoutData(gd);
		stopAt.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				scheduleUpdateJob();
			}
		});



	private void loadImageChanged() {
		boolean enabled = loadImage.getSelection();
		fUseProjectBinaryForImage.setEnabled(enabled);
		fUseFileForImage.setEnabled(enabled);
		imageFileBrowse.setEnabled(enabled);
		imageOffset.setEnabled(enabled);
		fImageOffsetLabel.setEnabled(enabled);
		updateUseFileEnablement();
	}
	
	private void loadSymbolsChanged() {
		boolean enabled = loadSymbols.getSelection();
		fUseProjectBinaryForSymbols.setEnabled(enabled);
		fUseFileForSymbols.setEnabled(enabled);
		symbolsFileBrowse.setEnabled(enabled);
		symbolsOffset.setEnabled(enabled);
		fSymbolsOffsetLabel.setEnabled(enabled);
		updateUseFileEnablement();		
	}
	
	private void pcRegisterChanged() {

		runCommands.setLayoutData(gd);
		runCommands.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent evt) {
				scheduleUpdateJob();
			}
		});
	}

		setMessage(null);

		if (loadImage.getSelection()) {
			if (!fUseProjectBinaryForImage.getSelection()) {
				if (imageFileName.getText().trim().length() == 0) {
					setErrorMessage(Messages.getString("GDBJtagStartupTab.imageFileName_not_specified"));
					return false;
				}
	
				try {
					String path = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName.getText().trim());
					IPath filePath = new Path(path);
					if (!filePath.toFile().exists()) {
						setErrorMessage(Messages.getString("GDBJtagStartupTab.imageFileName_does_not_exist"));
						return false;
					}
				} catch (CoreException e) { // string substitution throws this if expression doesn't resolve 
					setErrorMessage(Messages.getString("GDBJtagStartupTab.imageFileName_does_not_exist"));
					return false;
				}
			} catch (CoreException e) {
				Activator.getDefault().getLog().log(e.getStatus());
			}
		} else {
			setErrorMessage(null);
		}
		if (loadSymbols.getSelection()) {
			if (!fUseProjectBinaryForSymbols.getSelection()) {
				if (symbolsFileName.getText().trim().length() == 0) {
					setErrorMessage(Messages.getString("GDBJtagStartupTab.symbolsFileName_not_specified"));
					return false;
				}
			
				try {
					String path = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName.getText().trim());
					IPath filePath = new Path(path);
					if (!filePath.toFile().exists()) {
						setErrorMessage(Messages.getString("GDBJtagStartupTab.symbolsFileName_does_not_exist"));
						return false;
					}
				} catch (CoreException e) { // string substitution throws this if expression doesn't resolve 
					setErrorMessage(Messages.getString("GDBJtagStartupTab.symbolsFileName_does_not_exist"));
					return false;
				}
			} catch (CoreException e) {
				Activator.getDefault().getLog().log(e.getStatus());
			}
		} else {
			setErrorMessage(null);

	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
	 */
//	protected void updateLaunchConfigurationDialog() {
//		super.updateLaunchConfigurationDialog();
//		isValid(getLaunchConfigurationDialog());
//	}
	
	public void initializeFrom(ILaunchConfiguration configuration) {
		try {
			// Initialization Commands
			doReset.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET));
			doResetChanged();
			doHalt.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT));
			delay.setText(String.valueOf(configuration.getAttribute(IGDBJtagConstants.ATTR_DELAY, IGDBJtagConstants.DEFAULT_DELAY)));
			doHalt.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT));
			initCommands.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, IGDBJtagConstants.DEFAULT_INIT_COMMANDS));
			
			// Load Image...
			loadImage.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE));
			fUseProjectBinaryForImage.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE));
			fUseFileForImage.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_IMAGE));
			imageFileName.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME));
			imageOffset.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET));
			
			//.. and Symbols
			imageOffset.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, "")); //$NON-NLS-1$
			loadSymbols.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS));
			fUseProjectBinaryForSymbols.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS));
			fUseFileForSymbols.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_SYMBOLS));
			symbolsFileName.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME));
			symbolsOffset.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET));
			
			// Runtime Options
			setPcRegister.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER));
			pcRegister.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, IGDBJtagConstants.DEFAULT_PC_REGISTER));
			pcRegister.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, "")); //$NON-NLS-1$
			setStopAt.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT));
			stopAt.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT));
			stopAt.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_STOP_AT, "")); //$NON-NLS-1$
			setResume.setSelection(configuration.getAttribute(IGDBJtagConstants.ATTR_SET_RESUME, IGDBJtagConstants.DEFAULT_SET_RESUME));
			
			// Run Commands
			runCommands.setText(configuration.getAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS));

			String programName = CDebugUtils.getProgramName(configuration);
			if (programName != null) {
				int lastSlash = programName.indexOf('\\');
				if (lastSlash >= 0) {
					programName = programName.substring(lastSlash + 1);
				}
				lastSlash = programName.indexOf('/');
				if (lastSlash >= 0) {
					programName = programName.substring(lastSlash + 1);
				}
				fProjBinaryLabel1.setText(programName);
				fProjBinaryLabel2.setText(programName);
			}
		
			doResetChanged();
			loadImageChanged();
			loadSymbolsChanged();
			pcRegisterChanged();
			stopAtChanged();
			resumeChanged();
			updateUseFileEnablement();
			
		} catch (CoreException e) {
			Activator.getDefault().getLog().log(e.getStatus());
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
	 */
	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
		
		// Initialization Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_RESET, doReset.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_DELAY, Integer.parseInt(delay.getText()));
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_HALT, doHalt.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, initCommands.getText());
		
		// Load Image...
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, loadImage.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, fUseProjectBinaryForImage.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_IMAGE, fUseFileForImage.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, imageFileName.getText().trim());
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, imageOffset.getText());
		
		//.. and Symbols
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, loadSymbols.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, fUseProjectBinaryForSymbols.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_SYMBOLS, fUseFileForSymbols.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, symbolsFileName.getText().trim());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, symbolsOffset.getText());
		
		// Runtime Options
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, setPcRegister.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, pcRegister.getText());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, setStopAt.getSelection());
		configuration.setAttribute(IGDBJtagConstants.ATTR_STOP_AT, stopAt.getText());
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_RESUME, setResume.getSelection());
		
		// Run Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, runCommands.getText());
	}

	/* (non-Javadoc)
	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
	 */
	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
		// Initialization Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_RESET, IGDBJtagConstants.DEFAULT_DO_RESET);
		configuration.setAttribute(IGDBJtagConstants.ATTR_DELAY, IGDBJtagConstants.DEFAULT_DELAY);
		configuration.setAttribute(IGDBJtagConstants.ATTR_DO_HALT, IGDBJtagConstants.DEFAULT_DO_HALT);
		configuration.setAttribute(IGDBJtagConstants.ATTR_INIT_COMMANDS, IGDBJtagConstants.DEFAULT_INIT_COMMANDS);

		// Load Image...
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_IMAGE);
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
		configuration.setAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, IGDBJtagConstants.DEFAULT_IMAGE_OFFSET);

		//.. and Symbols
		configuration.setAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS);
		configuration.setAttribute(IGDBJtagConstants.ATTR_USE_FILE_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_FILE_FOR_SYMBOLS);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, IGDBJtagConstants.DEFAULT_SYMBOLS_FILE_NAME);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
		
		// Runtime Options
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_PC_REGISTER, IGDBJtagConstants.DEFAULT_SET_PC_REGISTER);
		configuration.setAttribute(IGDBJtagConstants.ATTR_PC_REGISTER, IGDBJtagConstants.DEFAULT_PC_REGISTER);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_STOP_AT, IGDBJtagConstants.DEFAULT_SET_STOP_AT);
		configuration.setAttribute(IGDBJtagConstants.ATTR_STOP_AT, IGDBJtagConstants.DEFAULT_STOP_AT);
		configuration.setAttribute(IGDBJtagConstants.ATTR_SET_RESUME, IGDBJtagConstants.DEFAULT_SET_RESUME);

		// Run Commands
		configuration.setAttribute(IGDBJtagConstants.ATTR_RUN_COMMANDS, IGDBJtagConstants.DEFAULT_RUN_COMMANDS); 
	}
}

Return to bug 310304

Lines 18-24 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDebugger.java (-21 / +96 lines)
18	import java.util.List;	18	import java.util.List;
19		19
20	import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;	20	import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
		21	import org.eclipse.cdt.core.model.ICProject;
21	import org.eclipse.cdt.debug.core.CDebugCorePlugin;	22	import org.eclipse.cdt.debug.core.CDebugCorePlugin;
		23	import org.eclipse.cdt.debug.core.CDebugUtils;
22	import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;	24	import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
23	import org.eclipse.cdt.debug.core.cdi.ICDISession;	25	import org.eclipse.cdt.debug.core.cdi.ICDISession;
24	import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;	26	import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
Lines 35-41 Link Here
35	import org.eclipse.cdt.debug.mi.core.command.CommandFactory;	37	import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
36	import org.eclipse.cdt.debug.mi.core.command.MIGDBSetNewConsole;	38	import org.eclipse.cdt.debug.mi.core.command.MIGDBSetNewConsole;
37	import org.eclipse.cdt.debug.mi.core.output.MIInfo;	39	import org.eclipse.cdt.debug.mi.core.output.MIInfo;
		40	import org.eclipse.core.resources.IFile;
38	import org.eclipse.core.runtime.CoreException;	41	import org.eclipse.core.runtime.CoreException;
		42	import org.eclipse.core.runtime.IPath;
39	import org.eclipse.core.runtime.IProgressMonitor;	43	import org.eclipse.core.runtime.IProgressMonitor;
40	import org.eclipse.core.runtime.IStatus;	44	import org.eclipse.core.runtime.IStatus;
41	import org.eclipse.core.runtime.MultiStatus;	45	import org.eclipse.core.runtime.MultiStatus;
Lines 115-120 Link Here
115	if (submonitor.isCanceled()) {	119	if (submonitor.isCanceled()) {
116	throw new OperationCanceledException();	120	throw new OperationCanceledException();
117	}	121	}
		122
		123	// execute symbol load
		124	boolean doLoadSymbols = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
		125	if (doLoadSymbols) {
		126	String symbolsFileName = null;
		127	if (config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_SYMBOLS, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS)) {
		128	IPath programFile = getProgramFile(config);
		129	if (programFile != null) {
		130	symbolsFileName = programFile.toOSString();
		131	}
		132	}
		133	else {
		134	symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
		135	if (symbolsFileName.length() > 0) {
		136	monitor.beginTask(Messages.getString("GDBJtagDebugger.5"), 1); //$NON-NLS-1$
		137	symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName);
		138	}
		139	}
		140	if (symbolsFileName == null) {
		141	throw new CoreException(new Status( IStatus.ERROR,
		142	Activator.getUniqueIdentifier(),
		143	-1, "symbols file not specified", null));
		144	}
		145
		146	symbolsFileName = symbolsFileName.replace("\\", "\\\\");
		147
		148	String symbolsOffset = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, IGDBJtagConstants.DEFAULT_SYMBOLS_OFFSET);
		149	if (symbolsOffset.length() > 0) {
		150	symbolsOffset = "0x" + symbolsOffset;
		151	}
		152	commands.clear();
		153	gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
		154	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
		155	}
		156
118	boolean useRemote = config.getAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, IGDBJtagConstants.DEFAULT_USE_REMOTE_TARGET);	157	boolean useRemote = config.getAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, IGDBJtagConstants.DEFAULT_USE_REMOTE_TARGET);
119	if (useRemote) {	158	if (useRemote) {
120	submonitor.subTask(Messages.getString("GDBJtagDebugger.2")); //$NON-NLS-1$	159	submonitor.subTask(Messages.getString("GDBJtagDebugger.2")); //$NON-NLS-1$
Lines 155-185 Link Here
155	// execute load	194	// execute load
156	boolean doLoad = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);	195	boolean doLoad = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_IMAGE, IGDBJtagConstants.DEFAULT_LOAD_IMAGE);
157	if (doLoad) {	196	if (doLoad) {
158	// Escape windows path separator characters TWICE, once for Java and once for GDB.	197	String imageFileName = null;
159	String imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, ""); //$NON-NLS-1$	198	if (config.getAttribute(IGDBJtagConstants.ATTR_USE_PROJ_BINARY_FOR_IMAGE, IGDBJtagConstants.DEFAULT_USE_PROJ_BINARY_FOR_IMAGE)) {
160	if (imageFileName.length() > 0) {	199	IPath programFile = getProgramFile(config);
161	monitor.beginTask(Messages.getString("GDBJtagDebugger.5"), 1); //$NON-NLS-1$	200	if (programFile != null) {
162	imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName).replace("\\", "\\\\");	201	imageFileName = programFile.toOSString();
163	String imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, ""); //$NON-NLS-2$ //$NON-NLS-4$	202	}
164	commands.clear();
165	gdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
166	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
167	}	203	}
		204	else {
		205	imageFileName = config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_FILE_NAME, IGDBJtagConstants.DEFAULT_IMAGE_FILE_NAME);
		206	if (imageFileName.length() > 0) {
		207	monitor.beginTask(Messages.getString("GDBJtagDebugger.5"), 1); //$NON-NLS-1$
		208	imageFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(imageFileName);
		209	}
		210	}
		211	if (imageFileName == null) {
		212	throw new CoreException(new Status( IStatus.ERROR,
		213	Activator.getUniqueIdentifier(),
		214	-1, "image file not specified", null));
		215	}
		216
		217	imageFileName = imageFileName.replace("\\", "\\\\");
		218
		219	String imageOffset = (imageFileName.endsWith(".elf")) ? "" : "0x" + config.getAttribute(IGDBJtagConstants.ATTR_IMAGE_OFFSET, ""); //$NON-NLS-2$ //$NON-NLS-4$
		220	commands.clear();
		221	gdbJtagDevice.doLoadImage(imageFileName, imageOffset, commands);
		222	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(20));
168	}	223	}
169	submonitor.setWorkRemaining(15); // compensate for optional work above	224	submonitor.setWorkRemaining(15); // compensate for optional work above
170		225
171	// execute symbol load
172	boolean doLoadSymbols = config.getAttribute(IGDBJtagConstants.ATTR_LOAD_SYMBOLS, IGDBJtagConstants.DEFAULT_LOAD_SYMBOLS);
173	if (doLoadSymbols) {
174	String symbolsFileName = config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_FILE_NAME, ""); //$NON-NLS-1$
175	if (symbolsFileName.length() > 0) {
176	symbolsFileName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(symbolsFileName).replace("\\", "\\\\");
177	String symbolsOffset = "0x" + config.getAttribute(IGDBJtagConstants.ATTR_SYMBOLS_OFFSET, ""); //$NON-NLS-2$
178	commands.clear();
179	gdbJtagDevice.doLoadSymbol(symbolsFileName, symbolsOffset, commands);
180	executeGDBScript(getGDBScript(commands), miSession, submonitor.newChild(15));
181	}
182	}
183	} catch (OperationCanceledException e) {	226	} catch (OperationCanceledException e) {
184	if (launch != null && launch.canTerminate()) {	227	if (launch != null && launch.canTerminate()) {
185	launch.terminate();	228	launch.terminate();
Lines 313-316 Link Here
313	}	356	}
314	return sb.toString();	357	return sb.toString();
315	}	358	}
		359
		360	private static IPath getProgramFile(ILaunchConfiguration config) throws CoreException {
		361
		362	IPath programPath = CDebugUtils.getProgramPath(config);
		363	if (programPath != null & programPath.isEmpty()) {
		364	return null;
		365	}
		366
		367	if (!programPath.isAbsolute()) {
		368	ICProject cproject = CDebugUtils.getCProject(config);
		369	if (cproject == null) {
		370	return null;
		371	}
		372
		373	IPath location = cproject.getProject().getLocation();
		374	if (location != null) {
		375	programPath = location.append(programPath);
		376	if (!programPath.toFile().exists()) {
		377	// Try the old way, which is required to support linked resources.
		378	IFile projFile = null;
		379	try {
		380	projFile = cproject.getProject().getFile(CDebugUtils.getProgramPath(config));
		381	}
		382	catch (IllegalArgumentException exc) {} // thrown if relative path that resolves to a root file (e.g., "..\somefile")
		383	if (projFile != null && projFile.exists()) {
		384	programPath = projFile.getLocation();
		385	}
		386	}
		387	}
		388	}
		389	return programPath;
		390	}
316	}	391	}

Lines 141-147 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java (-4 / +4 lines)
141	gdbCommand.setLayoutData(gd);	141	gdbCommand.setLayoutData(gd);
142	gdbCommand.addModifyListener(new ModifyListener() {	142	gdbCommand.addModifyListener(new ModifyListener() {
143	public void modifyText(ModifyEvent e) {	143	public void modifyText(ModifyEvent e) {
144	updateLaunchConfigurationDialog();	144	scheduleUpdateJob();
145	}	145	}
146	});	146	});
147		147
Lines 199-205 Link Here
199	jtagDevice.addModifyListener(new ModifyListener() {	199	jtagDevice.addModifyListener(new ModifyListener() {
200	public void modifyText(ModifyEvent e) {	200	public void modifyText(ModifyEvent e) {
201	updateDeviceIpPort(jtagDevice.getText());	201	updateDeviceIpPort(jtagDevice.getText());
202	updateLaunchConfigurationDialog();	202	scheduleUpdateJob();
203	}	203	}
204	});	204	});
205		205
Lines 211-217 Link Here
211	ipAddress.setLayoutData(gd);	211	ipAddress.setLayoutData(gd);
212	ipAddress.addModifyListener(new ModifyListener() {	212	ipAddress.addModifyListener(new ModifyListener() {
213	public void modifyText(ModifyEvent e) {	213	public void modifyText(ModifyEvent e) {
214	updateLaunchConfigurationDialog();	214	scheduleUpdateJob();
215	}	215	}
216	});	216	});
217		217
Lines 228-234 Link Here
228	});	228	});
229	portNumber.addModifyListener(new ModifyListener() {	229	portNumber.addModifyListener(new ModifyListener() {
230	public void modifyText(ModifyEvent e) {	230	public void modifyText(ModifyEvent e) {
231	updateLaunchConfigurationDialog();	231	scheduleUpdateJob();
232	}	232	}
233	});	233	});
234	}	234	}

Lines 146-152 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java (-6 / +6 lines)
146	gdbCommand.setLayoutData(gd);	146	gdbCommand.setLayoutData(gd);
147	gdbCommand.addModifyListener(new ModifyListener() {	147	gdbCommand.addModifyListener(new ModifyListener() {
148	public void modifyText(ModifyEvent e) {	148	public void modifyText(ModifyEvent e) {
149	updateLaunchConfigurationDialog();	149	scheduleUpdateJob();
150	}	150	}
151	});	151	});
152		152
Lines 186-192 Link Here
186	commandFactory.addModifyListener(new ModifyListener() {	186	commandFactory.addModifyListener(new ModifyListener() {
187	public void modifyText(ModifyEvent e) {	187	public void modifyText(ModifyEvent e) {
188	commandFactoryChanged();	188	commandFactoryChanged();
189	updateLaunchConfigurationDialog();	189	scheduleUpdateJob();
190	}	190	}
191	});	191	});
192	}	192	}
Lines 201-207 Link Here
201	miProtocol = new Combo(comp, SWT.READ_ONLY \| SWT.DROP_DOWN);	201	miProtocol = new Combo(comp, SWT.READ_ONLY \| SWT.DROP_DOWN);
202	miProtocol.addModifyListener(new ModifyListener() {	202	miProtocol.addModifyListener(new ModifyListener() {
203	public void modifyText(ModifyEvent e) {	203	public void modifyText(ModifyEvent e) {
204	updateLaunchConfigurationDialog();	204	scheduleUpdateJob();
205	}	205	}
206	});	206	});
207	}	207	}
Lines 272-278 Link Here
272	jtagDevice.addModifyListener(new ModifyListener() {	272	jtagDevice.addModifyListener(new ModifyListener() {
273	public void modifyText(ModifyEvent e) {	273	public void modifyText(ModifyEvent e) {
274	updateDeviceIpPort(jtagDevice.getText());	274	updateDeviceIpPort(jtagDevice.getText());
275	updateLaunchConfigurationDialog();	275	scheduleUpdateJob();
276	}	276	}
277	});	277	});
278		278
Lines 284-290 Link Here
284	ipAddress.setLayoutData(gd);	284	ipAddress.setLayoutData(gd);
285	ipAddress.addModifyListener(new ModifyListener() {	285	ipAddress.addModifyListener(new ModifyListener() {
286	public void modifyText(ModifyEvent e) {	286	public void modifyText(ModifyEvent e) {
287	updateLaunchConfigurationDialog();	287	scheduleUpdateJob();
288	}	288	}
289	});	289	});
290		290
Lines 301-307 Link Here
301	});	301	});
302	portNumber.addModifyListener(new ModifyListener() {	302	portNumber.addModifyListener(new ModifyListener() {
303	public void modifyText(ModifyEvent e) {	303	public void modifyText(ModifyEvent e) {
304	updateLaunchConfigurationDialog();	304	scheduleUpdateJob();
305	}	305	}
306	});	306	});
307	}	307	}

Lines 47-61 Link Here

(-)src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java (-4 / +21 lines)
47	public static final String ATTR_STOP_AT = Activator.PLUGIN_ID + ".stopAt"; //$NON-NLS-1$	47	public static final String ATTR_STOP_AT = Activator.PLUGIN_ID + ".stopAt"; //$NON-NLS-1$
48	public static final String ATTR_SET_RESUME = Activator.PLUGIN_ID + ".setResume"; //$NON-NLS-1$	48	public static final String ATTR_SET_RESUME = Activator.PLUGIN_ID + ".setResume"; //$NON-NLS-1$
49	public static final String ATTR_RUN_COMMANDS = Activator.PLUGIN_ID + ".runCommands"; //$NON-NLS-1$	49	public static final String ATTR_RUN_COMMANDS = Activator.PLUGIN_ID + ".runCommands"; //$NON-NLS-1$
50		50	/** @since 7.0 */ public static final String ATTR_USE_PROJ_BINARY_FOR_IMAGE = Activator.PLUGIN_ID + ".useProjBinaryForImage"; //$NON-NLS-1$
		51	/** @since 7.0 */ public static final String ATTR_USE_FILE_FOR_IMAGE = Activator.PLUGIN_ID + ".useFileForImage"; //$NON-NLS-1$
		52	/** @since 7.0 */ public static final String ATTR_USE_PROJ_BINARY_FOR_SYMBOLS = Activator.PLUGIN_ID + ".useProjBinaryForSymbols"; //$NON-NLS-1$
		53	/** @since 7.0 */ public static final String ATTR_USE_FILE_FOR_SYMBOLS = Activator.PLUGIN_ID + ".useFileForSymbols"; //$NON-NLS-1$
		54
51	public static final boolean DEFAULT_DO_RESET = true;	55	public static final boolean DEFAULT_DO_RESET = true;
52	public static final boolean DEFAULT_DO_HALT = true;	56	public static final boolean DEFAULT_DO_HALT = true;
53	public static final int DEFAULT_DELAY = 3;	57	public static final int DEFAULT_DELAY = 3;
54	public static final boolean DEFAULT_LOAD_IMAGE = false;	58	public static final boolean DEFAULT_LOAD_IMAGE = true;
55	public static final boolean DEFAULT_LOAD_SYMBOLS = false;	59	public static final boolean DEFAULT_LOAD_SYMBOLS = true;
56	public static final boolean DEFAULT_SET_PC_REGISTER = false;	60	public static final boolean DEFAULT_SET_PC_REGISTER = false;
57	public static final boolean DEFAULT_SET_STOP_AT = false;	61	public static final boolean DEFAULT_SET_STOP_AT = false;
58	public static final boolean DEFAULT_SET_RESUME = false;	62	public static final boolean DEFAULT_SET_RESUME = false;
59	public static final boolean DEFAULT_USE_DEFAULT_RUN = true;	63	public static final boolean DEFAULT_USE_DEFAULT_RUN = true;
60		64
		65	/** @since 7.0 */ public static final String DEFAULT_INIT_COMMANDS = ""; //$NON-NLS-1$
		66	/** @since 7.0 */ public static final String DEFAULT_IMAGE_FILE_NAME = ""; //$NON-NLS-1$
		67	/** @since 7.0 */ public static final String DEFAULT_SYMBOLS_FILE_NAME = ""; //$NON-NLS-1$
		68	/** @since 7.0 */ public static final String DEFAULT_RUN_COMMANDS = ""; //$NON-NLS-1$
		69	/** @since 7.0 */ public static final boolean DEFAULT_USE_PROJ_BINARY_FOR_IMAGE = true;
		70	/** @since 7.0 */ public static final boolean DEFAULT_USE_FILE_FOR_IMAGE = false;
		71	/** @since 7.0 */ public static final boolean DEFAULT_USE_PROJ_BINARY_FOR_SYMBOLS = true;
		72	/** @since 7.0 */ public static final boolean DEFAULT_USE_FILE_FOR_SYMBOLS = false;
		73	/** @since 7.0 */ public static final String DEFAULT_IMAGE_OFFSET = ""; //$NON-NLS-1$
		74	/** @since 7.0 */ public static final String DEFAULT_SYMBOLS_OFFSET = ""; //$NON-NLS-1$
		75	/** @since 7.0 */ public static final String DEFAULT_PC_REGISTER = ""; //$NON-NLS-1$
		76	/** @since 7.0 */ public static final String DEFAULT_STOP_AT = ""; //$NON-NLS-1$
		77
61	}	78	}