diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java index 46fe5194dfb..45affa0f216 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java @@ -255,7 +255,7 @@ public interface ICElement extends IAdaptable { * @exception CModelException if this element does not exist or if an * exception occurs while accessing its resource */ - IResource getResource() throws CModelException; + IResource getResource() ; /** * Returns whether this C element is read-only. An element is read-only * if its structure cannot be modified by the C model. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java index 1d7c2a14efc..786835b347e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java @@ -13,8 +13,7 @@ package org.eclipse.cdt.internal.core.model; import java.util.Enumeration; -import org.eclipse.cdt.core.model.*; -import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.IBuffer; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IOpenable; import org.eclipse.cdt.internal.core.util.LRUCache; @@ -95,17 +94,13 @@ public class BufferManager implements IBufferFactory { */ public IBuffer createBuffer(IOpenable owner) { ICElement element = (ICElement)owner; - try{ - IResource resource = element.getResource(); - return - new Buffer( - resource instanceof IFile ? (IFile)resource : null, - owner, - element.isReadOnly()); - } - catch (CModelException e) { - return null; - } + + IResource resource = element.getResource(); + return + new Buffer( + resource instanceof IFile ? (IFile)resource : null, + owner, + element.isReadOnly()); } /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java index 43f4fbefd23..842b989cf72 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java @@ -6,10 +6,10 @@ package org.eclipse.cdt.internal.core.model; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ICModelStatusConstants; -import org.eclipse.cdt.core.model.IOpenable; -import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICModel; +import org.eclipse.cdt.core.model.ICModelStatusConstants; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.IOpenable; import org.eclipse.cdt.core.model.IParent; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; @@ -79,12 +79,7 @@ public abstract class CElement extends PlatformObject implements ICElement { } public boolean exists() { - try { - return getResource() != null; - } catch (CModelException e) { - e.printStackTrace(); - } - return false; + return getResource() != null; } public boolean isReadOnly () { @@ -163,7 +158,7 @@ public abstract class CElement extends PlatformObject implements ICElement { public abstract IResource getUnderlyingResource() throws CModelException; - public abstract IResource getResource() throws CModelException; + public abstract IResource getResource() ; protected abstract CElementInfo createElementInfo(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CFile.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CFile.java index d090593081f..48c8de23272 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CFile.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CFile.java @@ -64,7 +64,7 @@ public class CFile extends CElement implements ICFile { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getResource() */ - public IResource getResource() throws CModelException { + public IResource getResource() { return file; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java index ad8152d6c14..6743a77efd2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java @@ -223,13 +223,10 @@ public class CModelManager implements IResourceChangeListener { if (parent instanceof CElement) { ICElement[] children = ((CElement)parent).getElementInfo().getChildren(); for (int i = 0; i < children.length; i++) { - try { - IResource res = children[i].getResource(); - if (res != null && res.equals(file)) { - cfile = children[i]; - break; - } - } catch (CModelException e) { + IResource res = children[i].getResource(); + if (res != null && res.equals(file)) { + cfile = children[i]; + break; } } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java index 2efa2795c75..062ae92d507 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java @@ -127,16 +127,12 @@ public class CommitWorkingCopyOperation extends CModelOperation { return new CModelStatus(ICModelStatusConstants.INVALID_ELEMENT_TYPES, wc); } - try { - ITranslationUnit original= (ITranslationUnit)wc.getOriginalElement(); - IResource resource = original.getResource(); - if (!wc.isBasedOn(resource) && !fForce) { - return new CModelStatus(ICModelStatusConstants.UPDATE_CONFLICT); - } - } catch (CModelException e){ - // unable to get the underlying resource - return new CModelStatus(ICModelStatusConstants.INVALID_RESOURCE); + ITranslationUnit original= (ITranslationUnit)wc.getOriginalElement(); + IResource resource = original.getResource(); + if (!wc.isBasedOn(resource) && !fForce) { + return new CModelStatus(ICModelStatusConstants.UPDATE_CONFLICT); } + // no read-only check, since some repository adapters can change the flag on save // operation. return CModelStatus.VERIFIED_OK; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java index 39d90f5ab65..6a81b8a30c2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java @@ -49,7 +49,7 @@ public abstract class Openable extends Parent implements IOpenable, IBufferChang return res; } - public IResource getResource() throws CModelException { + public IResource getResource() { return resource; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java index 49491a6650c..c42b202e73b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java @@ -100,7 +100,7 @@ public abstract class Parent extends CElement implements IParent { return resource; } - public IResource getResource() throws CModelException { + public IResource getResource() { return resource; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java index 0479486ae72..c97e537db55 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java @@ -141,7 +141,7 @@ public class SourceManipulation extends Parent implements ISourceManipulation, I return getParent().getUnderlyingResource(); } - public IResource getResource() throws CModelException { + public IResource getResource() { return null; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java index 7dc51c70fd3..32b97a7137b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java @@ -141,12 +141,9 @@ public class TranslationUnit extends Openable implements ITranslationUnit { } protected IFile getFile() { - try { - IResource res = getResource(); - if (res instanceof IFile) { - return (IFile)res; - } - } catch (CModelException e) { + IResource res = getResource(); + if (res instanceof IFile) { + return (IFile)res; } return null; }