diff options
| author | Alain Magloire | 2004-02-29 00:39:24 +0000 |
|---|---|---|
| committer | Alain Magloire | 2004-02-29 00:39:24 +0000 |
| commit | a010158135be8352a4b3bc6a06114831f1897679 (patch) | |
| tree | d50f4af6089c5e4d87837f444f1c119d7505944f /core | |
| parent | f97749059017fbc6a33f8027ab854532a32821ff (diff) | |
| download | org.eclipse.cdt-a010158135be8352a4b3bc6a06114831f1897679.tar.gz org.eclipse.cdt-a010158135be8352a4b3bc6a06114831f1897679.tar.xz org.eclipse.cdt-a010158135be8352a4b3bc6a06114831f1897679.zip | |
Fixin NPE in BaseCElementContentProvider
Diffstat (limited to 'core')
| -rw-r--r-- | core/org.eclipse.cdt.ui/ChangeLog | 10 | ||||
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index bd0e54a6e6e..9c74970aaf2 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,13 @@ +2004-02-28 Alain Magloire + + Fixing a NPE. + java.lang.NullPointerException + at org.eclipse.cdt.internal.core.model.Parent.getChildren(Parent.java:47) + at org.eclipse.cdt.internal.ui.BaseCElementContentProvider.getChildren(BaseCElementContentProvider.java:139) + at org.eclipse.jface.viewers.AbstractTreeViewer.getRawChildren(AbstractTreeViewer.java:729) + + * src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java + 2004-02-27 Hoda Amer Fixed [Bug 53074] The CView to update with each reconcile Added the ability for CView to update based on the translation unit working copy diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java index 687b92ef2e8..68fb7520ff0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java @@ -134,9 +134,11 @@ public class BaseCElementContentProvider implements ITreeContentProvider { // if it is not already a working copy if(!(celement instanceof IWorkingCopy)){ // if it has a valid working copy - IWorkingCopy copy = CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy((ITranslationUnit)celement); - if(copy != null) + ITranslationUnit tu = (ITranslationUnit)celement; + IWorkingCopy copy = tu.findSharedWorkingCopy(CUIPlugin.getBufferFactory()); + if(copy != null) { return ((IParent)copy).getChildren(); + } } } return ((IParent)celement).getChildren(); |