#223387: preventing NPE.
authorJan Lahoda <jlahoda@netbeans.org>
Mon, 10 Dec 2012 08:07:41 +0100
changeset 17899f387fe7876d6
parent 17898 ce4e2d7861f5
child 17900 d74a085670e5
#223387: preventing NPE.
javahints/nbproject/project.properties
javahints/src/org/netbeans/modules/javahints/Excluded.java
     1.1 --- a/javahints/nbproject/project.properties	Wed Nov 28 17:34:01 2012 +0100
     1.2 +++ b/javahints/nbproject/project.properties	Mon Dec 10 08:07:41 2012 +0100
     1.3 @@ -50,7 +50,7 @@
     1.4  auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width=80
     1.5  javac.compilerargs=-Xlint:unchecked
     1.6  javac.source=1.6
     1.7 -spec.version.base=2.57.0
     1.8 +spec.version.base=2.58.0
     1.9  
    1.10  nbm.needs.restart=true
    1.11  requires.nb.javac=true
     2.1 --- a/javahints/src/org/netbeans/modules/javahints/Excluded.java	Wed Nov 28 17:34:01 2012 +0100
     2.2 +++ b/javahints/src/org/netbeans/modules/javahints/Excluded.java	Mon Dec 10 08:07:41 2012 +0100
     2.3 @@ -93,11 +93,16 @@
     2.4          Trees trees = ci.getTrees();
     2.5          switch (t.getKind()) {
     2.6              case METHOD_INVOCATION:
     2.7 +                Element e = trees.getElement(tp);
     2.8 +                if (e == null) {
     2.9 +                    fqn = null;
    2.10 +                    break;
    2.11 +                }
    2.12 +                Element encl = e.getEnclosingElement();
    2.13                  if (isExcludeMethods()) {
    2.14 -                    Element e = trees.getElement(tp);
    2.15 -                    fqn = Utilities.getElementName(e.getEnclosingElement(), true) + "." + e.getSimpleName(); //NOI18N
    2.16 +                    fqn = Utilities.getElementName(encl, true) + "." + e.getSimpleName(); //NOI18N
    2.17                  } else {
    2.18 -                    fqn = Utilities.getElementName(trees.getElement(tp).getEnclosingElement(), true);
    2.19 +                    fqn = Utilities.getElementName(encl, true);
    2.20                  }
    2.21                  break;
    2.22              case NEW_CLASS: