1.1 --- a/clazz/src/org/netbeans/modules/clazz/SourceElementImpl.java	Sat Oct 30 11:04:31 2004 +0000
     1.2 +++ b/clazz/src/org/netbeans/modules/clazz/SourceElementImpl.java	Sat Oct 30 12:53:35 2004 +0000
     1.3 @@ -99,7 +99,7 @@
     1.4          repo.beginTrans(false);
     1.5          try {
     1.6              Resource resource = model.getResource(fo);
     1.7 -            if (!resource.isValid()) {
     1.8 +            if (resource == null || !resource.isValid()) {
     1.9                  return;
    1.10              }
    1.11              data = resource;
    1.12 @@ -239,19 +239,21 @@
    1.13      */
    1.14      public ClassElement getClass (Identifier name) {
    1.15          ClassElement el = getClassElement();
    1.16 -        String srcName = name.getSourceName();
    1.17 -        String fullName = name.getFullName();
    1.18 -        Identifier idEl = el.getName();
    1.19 -        String srcEl = idEl.getSourceName();
    1.20 -        String fullEl = idEl.getFullName();
    1.21 -        
    1.22 -        if (srcEl.equals(srcName)) {
    1.23 -            if (srcName.equals(fullName) || fullEl.equals(fullName))
    1.24 +        if (el != null) {
    1.25 +            String srcName = name.getSourceName();
    1.26 +            String fullName = name.getFullName();
    1.27 +            Identifier idEl = el.getName();
    1.28 +            String srcEl = idEl.getSourceName();
    1.29 +            String fullEl = idEl.getFullName();
    1.30 +
    1.31 +            if (srcEl.equals(srcName)) {
    1.32 +                if (srcName.equals(fullName) || fullEl.equals(fullName))
    1.33 +                    return el;
    1.34 +                else
    1.35 +                    return null;
    1.36 +            } else if (fullEl.equals(fullName)) {
    1.37                  return el;
    1.38 -            else
    1.39 -                return null;
    1.40 -        } else if (fullEl.equals(fullName)) {
    1.41 -            return el;
    1.42 +            }
    1.43          }
    1.44          return null;
    1.45      }