1.1 --- a/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java	Wed Apr 27 17:14:27 2016 +0000
     1.2 +++ b/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java	Thu Apr 28 11:16:19 2016 +0200
     1.3 @@ -238,6 +238,9 @@
     1.4                  if (!uniq.add(fqn)) {
     1.5                      continue;
     1.6                  }
     1.7 +                if (org.netbeans.modules.java.completion.Utilities.isExcluded(fqn)) {
     1.8 +                    continue;
     1.9 +                }
    1.10                  StringBuilder sort = new StringBuilder();
    1.11                  
    1.12                  sort.append("0001#");

     2.1 --- a/java.hints/src/org/netbeans/modules/java/hints/jdk/mapreduce/PreconditionsChecker.java	Wed Apr 27 17:14:27 2016 +0000
     2.2 +++ b/java.hints/src/org/netbeans/modules/java/hints/jdk/mapreduce/PreconditionsChecker.java	Thu Apr 28 11:16:19 2016 +0200
     2.3 @@ -226,13 +226,10 @@
     2.4          public Set<Name> getAllLocalVariablesUsed() {
     2.5              return this.allLocalVariables;
     2.6          }
     2.7 -        private HashMap<Name, TypeMirror> varToType = new HashMap<Name, TypeMirror>();
     2.8 -
     2.9          @Override
    2.10          public Tree visitVariable(VariableTree that, Trees trees) {
    2.11              this.innerVariables.add(that.getName());
    2.12              this.allLocalVariables.add(that.getName());
    2.13 -            this.varToType.put(that.getName(), trees.getTypeMirror(TreePath.getPath(treePath, that.getType())));
    2.14              return super.visitVariable(that, trees);
    2.15          }
    2.16