From 0dfb3bd0ef43bfc557a6cad2ec5dbbb12f6226e3 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Thu, 27 Mar 2003 17:40:15 +0000 Subject: [PATCH] The method ICElement.getResource() do not throw an Exception. --- .../internal/ui/cview/CViewDragAdapter.java | 5 +-- .../internal/ui/editor/CDocumentProvider.java | 44 +++++++++---------- .../cdt/internal/ui/util/EditorUtility.java | 5 +-- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java index 494d5360b1a..e7ac29e229c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java @@ -102,10 +102,7 @@ class CViewDragAdapter extends DragSourceAdapter { IResource res = null; if (next instanceof ICElement) { ICElement celement = (ICElement)next; - try { - res = celement.getResource(); - } catch (CModelException e) { - } + res = celement.getResource(); } if (res == null) { event.doit = false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index d5073672194..e6902d48466 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -112,34 +112,30 @@ public class CDocumentProvider extends FileDocumentProvider implements IWorkingC } public IBuffer createBuffer(IOpenable owner) { - try { - if (owner instanceof IWorkingCopy) { + if (owner instanceof IWorkingCopy) { - IWorkingCopy unit= (IWorkingCopy) owner; - ITranslationUnit original= (ITranslationUnit) unit.getOriginalElement(); - IResource resource= original.getResource(); - if (resource instanceof IFile) { - IFileEditorInput providerKey= new FileEditorInput((IFile) resource); - - IDocument document= null; - IStatus status= null; - - try { - document= internalGetDocument(providerKey); - } catch (CoreException x) { - status= x.getStatus(); - document= new Document(); - initializeDocument(document); - } - - DocumentAdapter adapter= new DocumentAdapter(unit, document, new DefaultLineTracker(), CDocumentProvider.this, providerKey); - adapter.setStatus(status); - return adapter; + IWorkingCopy unit= (IWorkingCopy) owner; + ITranslationUnit original= (ITranslationUnit) unit.getOriginalElement(); + IResource resource= original.getResource(); + if (resource instanceof IFile) { + IFileEditorInput providerKey= new FileEditorInput((IFile) resource); + + IDocument document= null; + IStatus status= null; + + try { + document= internalGetDocument(providerKey); + } catch (CoreException x) { + status= x.getStatus(); + document= new Document(); + initializeDocument(document); } + DocumentAdapter adapter= new DocumentAdapter(unit, document, new DefaultLineTracker(), CDocumentProvider.this, providerKey); + adapter.setStatus(status); + return adapter; } - } catch (CModelException e) { - return DocumentAdapter.NULL; + } return DocumentAdapter.NULL; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index 5c07b4de80c..e06b32f3409 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -125,10 +125,7 @@ public class EditorUtility { Process objdump = null; IPath path; IResource file = null; - try { - file = bin.getResource(); - } catch (CModelException e1) { - } + file = bin.getResource(); if (file == null) return store; path = file.getLocation();