Adjusting contrib/javahints to recent changes in Java Hints proper.
authorJan Lahoda <jlahoda@netbeans.org>
Sat, 27 Apr 2013 21:07:30 +0200
changeset 179809ad290a81371
parent 17979 e1ed0ee58ad1
child 17981 77495f50781f
Adjusting contrib/javahints to recent changes in Java Hints proper.
javahints/manifest.mf
javahints/nbproject/project.properties
javahints/src/org/netbeans/modules/javahints/tasklist/ComputeTasks.java
     1.1 --- a/javahints/manifest.mf	Thu Apr 18 15:12:05 2013 +0200
     1.2 +++ b/javahints/manifest.mf	Sat Apr 27 21:07:30 2013 +0200
     1.3 @@ -1,4 +1,5 @@
     1.4  Manifest-version: 1.0
     1.5  OpenIDE-Module: org.netbeans.modules.javahints/2
     1.6 +OpenIDE-Module-Implementation-Version: 1
     1.7  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javahints/resources/Bundle.properties
     1.8  OpenIDE-Module-Layer: org/netbeans/modules/javahints/resources/layer.xml
     2.1 --- a/javahints/nbproject/project.properties	Thu Apr 18 15:12:05 2013 +0200
     2.2 +++ b/javahints/nbproject/project.properties	Sat Apr 27 21:07:30 2013 +0200
     2.3 @@ -50,7 +50,7 @@
     2.4  auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width=80
     2.5  javac.compilerargs=-Xlint:unchecked
     2.6  javac.source=1.6
     2.7 -spec.version.base=2.60.0
     2.8 +spec.version.base=2.61.0
     2.9  
    2.10  nbm.needs.restart=true
    2.11  requires.nb.javac=true
     3.1 --- a/javahints/src/org/netbeans/modules/javahints/tasklist/ComputeTasks.java	Thu Apr 18 15:12:05 2013 +0200
     3.2 +++ b/javahints/src/org/netbeans/modules/javahints/tasklist/ComputeTasks.java	Sat Apr 27 21:07:30 2013 +0200
     3.3 @@ -53,14 +53,15 @@
     3.4  
     3.5      public static List<? extends Task> computeTasks(CompilationInfo info, AtomicBoolean cancel) throws IOException {
     3.6          //TODO: move the hint computation to TaskResolver?
     3.7 +        HintsSettings settings = HintsSettings.getSettingsFor(info.getFileObject());
     3.8          Collection<HintDescription> hints = new LinkedList<HintDescription>();
     3.9          for ( Entry<HintMetadata, ? extends Collection<? extends HintDescription>> e : RulesManager.getInstance().readHints(info, Collections.<ClassPath>emptyList(), new AtomicBoolean()).entrySet()) {
    3.10 -            if (!HintsSettings.isEnabled(e.getKey()) || !HintsSettings.isShowInTaskList(e.getKey())) continue;
    3.11 +            if (!settings.isEnabled(e.getKey())) continue;
    3.12  
    3.13              hints.addAll(e.getValue());
    3.14          }
    3.15  
    3.16 -        List<ErrorDescription> errors = new HintsInvoker(info, cancel).computeHints(info, hints);
    3.17 +        List<ErrorDescription> errors = new HintsInvoker(settings, cancel).computeHints(info, hints);
    3.18          
    3.19          if (errors == null || cancel.get()) return null;
    3.20