[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] cdt.core ICElement.getResource()
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/ChangeLog,v
retrieving revision 1.76
diff -u -r1.76 ChangeLog
--- ChangeLog 27 Mar 2003 16:07:43 -0000 1.76
+++ ChangeLog 27 Mar 2003 17:32:12 -0000
@@ -1,5 +1,10 @@
2003-03-27 Alain Magloire
+ The ICElement.getResource() should not throw a CModelException, it returns null or the the resource.
+ This makes us consistent with JDT/IJavaElement.getResource();
+
+2003-03-27 Alain Magloire
+
Some changes in the Core Model to make it closer to JDT, the hierarchy is now:
ICModel
ICProject
Index: model/org/eclipse/cdt/core/model/ICElement.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java,v
retrieving revision 1.4
diff -u -r1.4 ICElement.java
--- model/org/eclipse/cdt/core/model/ICElement.java 27 Mar 2003 16:04:19 -0000 1.4
+++ model/org/eclipse/cdt/core/model/ICElement.java 27 Mar 2003 17:32:12 -0000
@@ -255,7 +255,7 @@
* @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.
Index: model/org/eclipse/cdt/internal/core/model/BufferManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java,v
retrieving revision 1.2
diff -u -r1.2 BufferManager.java
--- model/org/eclipse/cdt/internal/core/model/BufferManager.java 27 Mar 2003 16:05:18 -0000 1.2
+++ model/org/eclipse/cdt/internal/core/model/BufferManager.java 27 Mar 2003 17:32:12 -0000
@@ -13,8 +13,7 @@
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 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());
}
/**
Index: model/org/eclipse/cdt/internal/core/model/CElement.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java,v
retrieving revision 1.6
diff -u -r1.6 CElement.java
--- model/org/eclipse/cdt/internal/core/model/CElement.java 27 Mar 2003 16:05:18 -0000 1.6
+++ model/org/eclipse/cdt/internal/core/model/CElement.java 27 Mar 2003 17:32:12 -0000
@@ -6,10 +6,10 @@
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICModel;
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.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 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 IResource getUnderlyingResource() throws CModelException;
- public abstract IResource getResource() throws CModelException;
+ public abstract IResource getResource() ;
protected abstract CElementInfo createElementInfo();
Index: model/org/eclipse/cdt/internal/core/model/CFile.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CFile.java,v
retrieving revision 1.3
diff -u -r1.3 CFile.java
--- model/org/eclipse/cdt/internal/core/model/CFile.java 27 Mar 2003 16:05:18 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/CFile.java 27 Mar 2003 17:32:12 -0000
@@ -64,7 +64,7 @@
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.ICElement#getResource()
*/
- public IResource getResource() throws CModelException {
+ public IResource getResource() {
return file;
}
Index: model/org/eclipse/cdt/internal/core/model/CModelManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java,v
retrieving revision 1.17
diff -u -r1.17 CModelManager.java
--- model/org/eclipse/cdt/internal/core/model/CModelManager.java 27 Mar 2003 16:05:18 -0000 1.17
+++ model/org/eclipse/cdt/internal/core/model/CModelManager.java 27 Mar 2003 17:32:12 -0000
@@ -223,13 +223,10 @@
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;
}
}
}
Index: model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java,v
retrieving revision 1.2
diff -u -r1.2 CommitWorkingCopyOperation.java
--- model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java 27 Mar 2003 16:05:18 -0000 1.2
+++ model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java 27 Mar 2003 17:32:12 -0000
@@ -127,16 +127,12 @@
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;
Index: model/org/eclipse/cdt/internal/core/model/Openable.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java,v
retrieving revision 1.1
diff -u -r1.1 Openable.java
--- model/org/eclipse/cdt/internal/core/model/Openable.java 27 Mar 2003 16:05:18 -0000 1.1
+++ model/org/eclipse/cdt/internal/core/model/Openable.java 27 Mar 2003 17:32:13 -0000
@@ -49,7 +49,7 @@
return res;
}
- public IResource getResource() throws CModelException {
+ public IResource getResource() {
return resource;
}
Index: model/org/eclipse/cdt/internal/core/model/Parent.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java,v
retrieving revision 1.4
diff -u -r1.4 Parent.java
--- model/org/eclipse/cdt/internal/core/model/Parent.java 27 Mar 2003 16:05:18 -0000 1.4
+++ model/org/eclipse/cdt/internal/core/model/Parent.java 27 Mar 2003 17:32:13 -0000
@@ -100,7 +100,7 @@
return resource;
}
- public IResource getResource() throws CModelException {
+ public IResource getResource() {
return resource;
}
Index: model/org/eclipse/cdt/internal/core/model/SourceManipulation.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java,v
retrieving revision 1.4
diff -u -r1.4 SourceManipulation.java
--- model/org/eclipse/cdt/internal/core/model/SourceManipulation.java 27 Mar 2003 16:05:18 -0000 1.4
+++ model/org/eclipse/cdt/internal/core/model/SourceManipulation.java 27 Mar 2003 17:32:13 -0000
@@ -141,7 +141,7 @@
return getParent().getUnderlyingResource();
}
- public IResource getResource() throws CModelException {
+ public IResource getResource() {
return null;
}
Index: model/org/eclipse/cdt/internal/core/model/TranslationUnit.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/TranslationUnit.java,v
retrieving revision 1.3
diff -u -r1.3 TranslationUnit.java
--- model/org/eclipse/cdt/internal/core/model/TranslationUnit.java 27 Mar 2003 16:05:18 -0000 1.3
+++ model/org/eclipse/cdt/internal/core/model/TranslationUnit.java 27 Mar 2003 17:32:13 -0000
@@ -141,12 +141,9 @@
}
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;
}
