From d750e21df80eab39ac99da25ec2c63d3f28b517e Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Thu, 27 Mar 2003 19:32:04 +0000 Subject: [PATCH] ICElement.getResource() no longer throw an exception. --- .../cdt/internal/core/index/IndexManager.java | 7 ++--- .../launch/ui/CLaunchConfigurationTab.java | 14 ++++------ .../org/eclipse/cdt/launch/ui/CMainTab.java | 27 +++++++------------ 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IndexManager.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IndexManager.java index c279031f92a..0acdf55031a 100644 --- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IndexManager.java +++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IndexManager.java @@ -267,11 +267,8 @@ public class IndexManager implements IElementChangedListener { } if (kind == ICElementDelta.REMOVED) { - try { - IResource resource = element.getResource(); - removeResource(resource); - } catch (CModelException e) { - } + IResource resource = element.getResource(); + removeResource(resource); } // if (kind == ICElementDelta.ADDED) { diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java index 34f18c0d249..1f08713b379 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java @@ -93,15 +93,11 @@ public abstract class CLaunchConfigurationTab extends AbstractLaunchConfiguratio } ICElement ce = (ICElement) obj; IProject project; - try { - project = (IProject) ce.getCProject().getResource(); - IPath programFile = project.getFile(programName).getLocation(); - ce = CCorePlugin.getDefault().getCoreModel().create(programFile); - if (ce != null && ce.exists()) { - return ce; - } - } - catch (CModelException e) { + project = (IProject) ce.getCProject().getResource(); + IPath programFile = project.getFile(programName).getLocation(); + ce = CCorePlugin.getDefault().getCoreModel().create(programFile); + if (ce != null && ce.exists()) { + return ce; } return (ICElement) obj; } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index 62fed857b22..e1a26ecf229 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -204,11 +204,7 @@ public class CMainTab extends CLaunchConfigurationTab { dialog.setTitle("Program Selection"); if (dialog.open() == ElementListSelectionDialog.OK) { IBinary binary = (IBinary) dialog.getFirstResult(); - try { - fProgText.setText(binary.getResource().getProjectRelativePath().toString()); - } - catch (CModelException e) { - } + fProgText.setText(binary.getResource().getProjectRelativePath().toString()); } } @@ -369,20 +365,15 @@ public class CMainTab extends CLaunchConfigurationTab { if (binary != null) { String path; - try { - path = binary.getResource().getProjectRelativePath().toOSString(); - config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, path); - String name = binary.getElementName(); - int index = name.lastIndexOf('.'); - if (index > 0) { - name = name.substring(index + 1); - } - name = getLaunchConfigurationDialog().generateName(name); - config.rename(name); + path = binary.getResource().getProjectRelativePath().toOSString(); + config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, path); + String name = binary.getElementName(); + int index = name.lastIndexOf('.'); + if (index > 0) { + name = name.substring(index + 1); } - catch (CModelException e) { - } - + name = getLaunchConfigurationDialog().generateName(name); + config.rename(name); } } /**