Commits

Anonymous committed 8cc7e0c

update

Comments (0)

Files changed (1)

per-project-hint-settings

 # HG changeset patch
-# Parent fba9b8d24cf9fd645fdfc43997157e1dab3df071
+# Parent 3f3c983b73faa2c4409ad74acf23bc9941fef3de
 
-diff -r fba9b8d24cf9 editor.tools.storage/arch.xml
+diff -r 3f3c983b73fa editor.tools.storage/arch.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/arch.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/arch.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,1078 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
 + </answer>
 +
 +</api-answers>
-diff -r fba9b8d24cf9 editor.tools.storage/build.xml
+diff -r 3f3c983b73fa editor.tools.storage/build.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/build.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/build.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,5 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project basedir="." default="netbeans" name="editor.tools.storage">
 +    <description>Builds, tests, and runs the project org.netbeans.modules.editor.tools.storage</description>
 +    <import file="../nbbuild/templates/projectized.xml"/>
 +</project>
-diff -r fba9b8d24cf9 editor.tools.storage/manifest.mf
+diff -r 3f3c983b73fa editor.tools.storage/manifest.mf
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/manifest.mf	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/manifest.mf	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,6 @@
 +Manifest-Version: 1.0
 +OpenIDE-Module: org.netbeans.modules.editor.tools.storage
 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/tools/storage/Bundle.properties
 +OpenIDE-Module-Specification-Version: 1.0
 +
-diff -r fba9b8d24cf9 editor.tools.storage/nbproject/project.properties
+diff -r 3f3c983b73fa editor.tools.storage/nbproject/project.properties
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/nbproject/project.properties	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/nbproject/project.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,3 @@
 +javac.source=1.7
 +javac.compilerargs=-Xlint -Xlint:-serial
 +javadoc.arch=${basedir}/arch.xml
-diff -r fba9b8d24cf9 editor.tools.storage/nbproject/project.xml
+diff -r 3f3c983b73fa editor.tools.storage/nbproject/project.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/nbproject/project.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/nbproject/project.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,183 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project xmlns="http://www.netbeans.org/ns/project/1">
 +        </data>
 +    </configuration>
 +</project>
-diff -r fba9b8d24cf9 editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties
+diff -r 3f3c983b73fa editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,1 @@
 +OpenIDE-Module-Name=Editor Tools Storage
-diff -r fba9b8d24cf9 editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd
+diff -r 3f3c983b73fa editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,71 @@
 +<!--
 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +     name CDATA #REQUIRED
 +     value CDATA #REQUIRED
 +>
-diff -r fba9b8d24cf9 editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java
+diff -r 3f3c983b73fa editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,89 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +        prefs.save();
 +    }
 +}
-diff -r fba9b8d24cf9 editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java
+diff -r 3f3c983b73fa editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java	Tue Apr 16 11:31:53 2013 +0200
-@@ -0,0 +1,295 @@
++++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java	Tue Apr 16 14:17:30 2013 +0200
+@@ -0,0 +1,330 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 + *
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
++import java.lang.ref.Reference;
++import java.lang.ref.SoftReference;
 +import java.net.URI;
 +import java.util.ArrayList;
++import java.util.HashMap;
 +import java.util.List;
-+import java.util.concurrent.atomic.AtomicLong;
++import java.util.Map;
 +import java.util.logging.Level;
 +import java.util.logging.Logger;
 +import java.util.prefs.AbstractPreferences;
 +
 +    @Override
 +    protected String[] childrenNamesSpi() throws BackingStoreException {
-+        List<String> names = new ArrayList<String>();
++        List<String> names = new ArrayList<>();
 +        NodeList nl = node.getElementsByTagName("node");
 +        
 +        for (int i = 0; i < nl.getLength(); i++) {
 +        return what.replace("__d", "$").replace("___", "__");
 +    }
 +
++    private static final Map<URI, Reference<HintPreferencesProviderImpl>> uri2Cache = new HashMap<>();
++    
 +    public static HintPreferencesProviderImpl from(@NonNull URI settings) {
++        Reference<HintPreferencesProviderImpl> ref = uri2Cache.get(settings);
++        HintPreferencesProviderImpl cachedResult = ref != null ? ref.get() : null;
++        
++        if (cachedResult != null) return cachedResult;
++        
 +        Document doc = null;
 +        File file = Utilities.toFile(settings); //XXX: non-file:// scheme
 +        
 +            doc = XMLUtil.createDocument("configuration", null, "-//NetBeans//DTD Tool Configuration 1.0//EN", "http://www.netbeans.org/dtds/ToolConfiguration-1_0.dtd");
 +        }
 +        
-+        return new HintPreferencesProviderImpl(settings, doc);
++        synchronized (uri2Cache) {
++            ref = uri2Cache.get(settings);
++            cachedResult = ref != null ? ref.get() : null;
++
++            if (cachedResult != null) return cachedResult;
++            
++            uri2Cache.put(settings, new CleaneableSoftReference(cachedResult = new HintPreferencesProviderImpl(settings, doc), settings));
++        }
++        
++        return cachedResult;
 +    }
 +    
 +    private static final Logger LOG = Logger.getLogger(XMLHintPreferences.class.getName());
 +        private static final int SAVE_DELAY = 30000;
 +    }
 +
++    private static final class CleaneableSoftReference extends SoftReference<HintPreferencesProviderImpl> implements Runnable {
++
++        private static URI settings;
++        public CleaneableSoftReference(HintPreferencesProviderImpl referent, URI settings) {
++            super(referent, Utilities.activeReferenceQueue());
++        }
++
++        @Override
++        public void run() {
++            synchronized (uri2Cache) {
++                if (uri2Cache.get(settings) == this)
++                    uri2Cache.remove(settings);
++            }
++        }
++        
++    }
 +}
-diff -r fba9b8d24cf9 editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml
+diff -r 3f3c983b73fa editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,13 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
 +        </folder>
 +    </folder>
 +</filesystem>
-diff -r fba9b8d24cf9 editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java
+diff -r 3f3c983b73fa editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,74 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +        assertGC("Must not hold onto the ToolPreferences", ref);
 +    }
 +}
-diff -r fba9b8d24cf9 java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java
---- a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java
+--- a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -77,6 +77,7 @@
  import org.netbeans.modules.java.hints.declarative.conditionapi.Matcher;
  import org.netbeans.modules.java.hints.declarative.test.TestTokenId;
              String pattern = d.spec.substring(d.desc.textStart, d.desc.textEnd);
              Context context = new Context(ctx);
  
-diff -r fba9b8d24cf9 java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
---- a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
+--- a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -39,6 +39,7 @@
  
  package org.netbeans.modules.java.hints.declarative.test;
  
                      if (computedHints == null || cancel.get()) return;
                      
-diff -r fba9b8d24cf9 java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java
---- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java
+--- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -45,6 +45,12 @@
  import org.netbeans.api.lexer.TokenSequence;
  
 +    }
  
  }
-diff -r fba9b8d24cf9 java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java
---- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java
+--- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -48,7 +48,7 @@
  import java.util.regex.Pattern;
  import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;
  
          assertEquals(Arrays.asList("test.Test.X", "test.Test"), ctx.enclosingClasses(new Variable("$1")));
          assertEquals(Arrays.asList("test.Test.X", "test.Test"), ctx.enclosingClasses(new Variable("$2")));
-diff -r fba9b8d24cf9 java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java
---- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java
+--- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -44,7 +44,7 @@
  import java.util.regex.Pattern;
  import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;
          DefaultRuleUtilities utils = new DefaultRuleUtilities(ctx, new Matcher(ctx));
  
          assertTrue(utils.inClass("test.Test.X"));
-diff -r fba9b8d24cf9 java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java
---- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java
+--- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -47,6 +47,7 @@
  import java.util.regex.Pattern;
  import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;
  
          new Matcher(ctx).referencedIn(new Variable("$1"), new Variable("$2$"));
      }
-diff -r fba9b8d24cf9 java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java
---- a/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java
+--- a/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -389,6 +389,8 @@
          }
      }
  
              if (result == null) return result;
  
-diff -r fba9b8d24cf9 java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java
---- a/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java
+--- a/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -84,7 +84,8 @@
       * @return Preferences node for given hint.
       */
      }
      
      /** Severity of hint
-diff -r fba9b8d24cf9 java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java
---- a/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java	Tue Apr 16 11:31:53 2013 +0200
-@@ -124,6 +124,7 @@
+diff -r 3f3c983b73fa java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java
+--- a/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java	Tue Apr 16 14:17:30 2013 +0200
+@@ -125,6 +125,7 @@
  import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation;
  import org.netbeans.spi.editor.hints.ErrorDescription;
  import org.netbeans.spi.editor.hints.Fix;
  import org.netbeans.spi.java.classpath.ClassPathProvider;
  import org.netbeans.spi.java.classpath.support.ClassPathSupport;
  import org.netbeans.spi.java.hints.Hint.Kind;
-@@ -189,6 +190,7 @@
+@@ -190,6 +191,7 @@
      private final FileObject buildRoot;
      private final FileObject cache;
      private final Preferences testPreferences;
      private final List<FileObject> checkCompilable = new ArrayList<FileObject>();
      private String sourceLevel = "1.5";
      private Character caretMarker;
-@@ -242,44 +244,23 @@
+@@ -243,44 +245,23 @@
  
          TreeLoader.DISABLE_CONFINEMENT_TEST = true;
          testPreferences = new TempPreferences();
  
          workDir = getWorkDir();
          deleteSubFiles(workDir);
-@@ -594,7 +575,7 @@
+@@ -597,7 +578,7 @@
      }
  
      private Map<HintDescription, List<ErrorDescription>> computeErrors(CompilationInfo info, Iterable<? extends HintDescription> hints, AtomicBoolean cancel) {
      }
  
      FileObject getSourceRoot() {
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -41,19 +41,15 @@
   */
  package org.netbeans.modules.java.hints.analysis;
                              return prev;
                          }
                          return new HintsPanel(context.getSettings(), context.getData());
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -28,5 +28,17 @@
            </folder>
        </folder>
 +    
  
  </filesystem>
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -47,15 +47,20 @@
  import java.beans.PropertyChangeSupport;
  import java.util.logging.Level;
          }
          return panel;
      }
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -116,6 +116,7 @@
  import org.netbeans.modules.java.hints.spiimpl.refactoring.Utilities.ClassPathBasedHintWrapper;
  import org.netbeans.modules.options.editor.spi.OptionsFilter;
  
              Object data = ((DefaultMutableTreeNode) value).getUserObject();
              if (data instanceof HintCategory) {
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -58,6 +58,7 @@
  import java.util.EnumMap;
  import java.util.HashMap;
 +    }
  
  }
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -74,6 +74,7 @@
  import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper.ProgressHandleAbstraction;
  import org.netbeans.spi.java.hints.HintContext.MessageKind;
          Collection<RefactoringElementImplementation> fileChanges = new ArrayList<RefactoringElementImplementation>();
          Collection<MessageImpl> problems = new LinkedList<MessageImpl>(candidates.problems);
          Map<JavaFix, ModificationResult> changesPerFix = new IdentityHashMap<JavaFix, ModificationResult>();
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -41,15 +41,12 @@
   */
  package org.netbeans.modules.java.hints.spiimpl.refactoring;
 +        }
      }
  }
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -49,6 +49,7 @@
  import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch;
  import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult;
          List<MessageImpl> problems = new LinkedList<MessageImpl>(candidates.problems);
  
          if (queries.iterator().hasNext()) {
-diff -r fba9b8d24cf9 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java
---- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java
+--- a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -67,6 +67,7 @@
  import java.util.LinkedList;
  import java.util.List;
                      hintsToApply.add(hd);
                  }
              }
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParam.java
---- a/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParam.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParam.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParam.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParam.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParam.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -94,8 +94,8 @@
      private static final String ERROR = "<error>"; //TODO: there should ideally be an API method for this
      private static final String FINAL_FIELDS = "final-fields";
                              modifiers.add(Modifier.FINAL);
                          }
                          VariableTree field = make.Variable(make.Modifiers(modifiers), vt.getName(), vt.getType(), null);
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParamCustomizer.java
---- a/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParamCustomizer.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParamCustomizer.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParamCustomizer.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParamCustomizer.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParamCustomizer.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -44,7 +44,7 @@
      public FieldForUnusedParamCustomizer(Preferences p) {
          initComponents();
      }
  
      /** This method is called from within the constructor to
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java
---- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -97,25 +97,30 @@
  
              @Override
                      }
                  });
              }
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java
---- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -93,13 +93,13 @@
      private final Lookup context;
      private final AtomicBoolean cancel;
      }
      
      public static Lookup normalizeLookup(Lookup l) {
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/analyzer/OverridePreferences.java
---- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/OverridePreferences.java	Thu Apr 11 10:13:03 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/analyzer/OverridePreferences.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/OverridePreferences.java	Tue Apr 16 05:35:09 2013 +0000
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,120 +0,0 @@
 -/*
 -        throw new UnsupportedOperationException("Not supported yet.");
 -    }
 -}
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java
---- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -60,6 +60,7 @@
  import org.netbeans.api.progress.ProgressRunnable;
  import org.netbeans.api.progress.ProgressUtils;
      }
  
      /**
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFix.java
---- a/java.hints/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFix.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFix.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFix.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFix.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFix.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -77,6 +77,7 @@
  import org.netbeans.api.java.source.TreeUtilities;
  import org.netbeans.api.java.source.TypeMirrorHandle;
                          resolveLocalVariable(working, tp, make, proposedType);
                      } else {
                          resolveLocalVariable55(working, tp, make, proposedType);
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java
---- a/java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -94,6 +94,7 @@
  import org.openide.util.NbBundle;
  
                              modifiers.add(Modifier.FINAL);
                          }
                          if (ErrorFixesFakeHint.enabled(ErrorFixesFakeHint.FixKind.CREATE_FINAL_FIELD_CTOR)) {
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/errors/ErrorFixesFakeHint.java
---- a/java.hints/src/org/netbeans/modules/java/hints/errors/ErrorFixesFakeHint.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/ErrorFixesFakeHint.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/errors/ErrorFixesFakeHint.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/errors/ErrorFixesFakeHint.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/errors/ErrorFixesFakeHint.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -52,7 +52,9 @@
  import java.util.prefs.Preferences;
  import javax.swing.JComponent;
      }
      
      public static void setUseLogger(Preferences p, boolean v) {
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.java
---- a/java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -55,7 +55,7 @@
      public FinalFieldsFromCtorCustomiser(Preferences preferences) {
          initComponents();
      }
  
      /** This method is called from within the constructor to
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/errors/LocalVariableFixCustomizer.java
---- a/java.hints/src/org/netbeans/modules/java/hints/errors/LocalVariableFixCustomizer.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/LocalVariableFixCustomizer.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/errors/LocalVariableFixCustomizer.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/errors/LocalVariableFixCustomizer.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/errors/LocalVariableFixCustomizer.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -55,7 +55,7 @@
      public LocalVariableFixCustomizer(Preferences p) {
          initComponents();
      }
  
      /** This method is called from within the constructor to
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFix.java
---- a/java.hints/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFix.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFix.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFix.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFix.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFix.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -91,6 +91,7 @@
  import org.netbeans.api.java.source.TypeMirrorHandle;
  import org.netbeans.api.java.source.WorkingCopy;
              return null;
          }
  
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/errors/SurroundWithTryCatchLog.java
---- a/java.hints/src/org/netbeans/modules/java/hints/errors/SurroundWithTryCatchLog.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/SurroundWithTryCatchLog.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/errors/SurroundWithTryCatchLog.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/errors/SurroundWithTryCatchLog.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/errors/SurroundWithTryCatchLog.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -56,10 +56,10 @@
      public SurroundWithTryCatchLog(Preferences p) {
          initComponents();
      }
  
      /** This method is called from within the constructor to
-diff -r fba9b8d24cf9 java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToDiamondBulkHint.java
---- a/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToDiamondBulkHint.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToDiamondBulkHint.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToDiamondBulkHint.java
+--- a/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToDiamondBulkHint.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToDiamondBulkHint.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -87,11 +87,11 @@
  
      //XXX: hack:
  
          return true;
      }
-diff -r fba9b8d24cf9 java.hints/test/unit/src/org/netbeans/modules/java/hints/HideFieldTest.java
---- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/HideFieldTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/HideFieldTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/test/unit/src/org/netbeans/modules/java/hints/HideFieldTest.java
+--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/HideFieldTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/HideFieldTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -46,9 +46,11 @@
  import com.sun.source.util.TreePath;
  import java.util.List;
              }
          }
      }
-diff -r fba9b8d24cf9 java.hints/test/unit/src/org/netbeans/modules/java/hints/WrongPackageSuggestionTest.java
---- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/WrongPackageSuggestionTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/WrongPackageSuggestionTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/test/unit/src/org/netbeans/modules/java/hints/WrongPackageSuggestionTest.java
+--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/WrongPackageSuggestionTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/WrongPackageSuggestionTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -67,20 +67,19 @@
      
      protected void setUp() throws Exception {
      }
      
      @Override
-diff -r fba9b8d24cf9 java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java
---- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java
+--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -34,7 +34,9 @@
  import java.io.IOException;
  import java.util.LinkedList;
          }
      }
  
-diff -r fba9b8d24cf9 java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFixTest.java
---- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFixTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFixTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFixTest.java
+--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFixTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFixTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -33,7 +33,9 @@
  import com.sun.source.util.TreePath;
  import java.util.List;
          }
      }
  
-diff -r fba9b8d24cf9 java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/OrigSurroundWithTryCatchFixTest.java
---- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/OrigSurroundWithTryCatchFixTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/OrigSurroundWithTryCatchFixTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/OrigSurroundWithTryCatchFixTest.java
+--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/OrigSurroundWithTryCatchFixTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/OrigSurroundWithTryCatchFixTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -44,7 +44,9 @@
  
  import com.sun.source.util.TreePath;
          
          super.tearDown();
      }
-diff -r fba9b8d24cf9 java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
---- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
+--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -49,8 +49,11 @@
  import java.util.Collections;
  import java.util.LinkedList;
 +        }
 +    }
  }
-diff -r fba9b8d24cf9 java.source/src/org/netbeans/modules/java/source/indexing/OnePassCompileWorker.java
---- a/java.source/src/org/netbeans/modules/java/source/indexing/OnePassCompileWorker.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/java.source/src/org/netbeans/modules/java/source/indexing/OnePassCompileWorker.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa java.source/src/org/netbeans/modules/java/source/indexing/OnePassCompileWorker.java
+--- a/java.source/src/org/netbeans/modules/java/source/indexing/OnePassCompileWorker.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/java.source/src/org/netbeans/modules/java/source/indexing/OnePassCompileWorker.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -109,6 +109,9 @@
          final HashMap<JavaFileObject, Pair<CompilationUnitTree, CompileTuple>> jfo2units = new HashMap<JavaFileObject, Pair<CompilationUnitTree, CompileTuple>>();
          LinkedList<Pair<CompilationUnitTree, CompileTuple>> units = new LinkedList<Pair<CompilationUnitTree, CompileTuple>>();
              return ParsingOutput.success(file2FQNs, addedTypes, createdFiles, finished, modifiedTypes, aptGenerated);
          } catch (CouplingAbort ca) {
              //Coupling error
-diff -r fba9b8d24cf9 nbbuild/cluster.properties
---- a/nbbuild/cluster.properties	Thu Apr 11 10:13:03 2013 +0200
-+++ b/nbbuild/cluster.properties	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa nbbuild/cluster.properties
+--- a/nbbuild/cluster.properties	Tue Apr 16 05:35:09 2013 +0000
++++ b/nbbuild/cluster.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -293,6 +293,7 @@
          editor.settings,\
          editor.settings.storage,\
          spi.navigator,\
          spi.palette,\
          spi.tasklist,\
-diff -r fba9b8d24cf9 nbbuild/javadoctools/links.xml
---- a/nbbuild/javadoctools/links.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/nbbuild/javadoctools/links.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa nbbuild/javadoctools/links.xml
+--- a/nbbuild/javadoctools/links.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/nbbuild/javadoctools/links.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -216,3 +216,4 @@
  <link href="${javadoc.docs.org-netbeans-api-search}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-api-search"/>
  <link href="${javadoc.docs.org-netbeans-modules-code-analysis}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-code-analysis"/>
  <link href="${javadoc.docs.org-netbeans-modules-glassfish-cloud}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-glassfish-cloud"/>
 +<link href="${javadoc.docs.org-netbeans-spi-editor-hints-projects}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-spi-editor-hints-projects"/>
-diff -r fba9b8d24cf9 nbbuild/javadoctools/properties.xml
---- a/nbbuild/javadoctools/properties.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/nbbuild/javadoctools/properties.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa nbbuild/javadoctools/properties.xml
+--- a/nbbuild/javadoctools/properties.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/nbbuild/javadoctools/properties.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -214,3 +214,4 @@
  <property name="javadoc.docs.org-netbeans-api-search" value="${javadoc.web.root}/org-netbeans-api-search"/>
  <property name="javadoc.docs.org-netbeans-modules-code-analysis" value="${javadoc.web.root}/org-netbeans-modules-code-analysis"/>
  <property name="javadoc.docs.org-netbeans-modules-glassfish-cloud" value="${javadoc.web.root}/org-netbeans-modules-glassfish-cloud"/>
 +<property name="javadoc.docs.org-netbeans-spi-editor-hints-projects" value="${javadoc.web.root}/org-netbeans-spi-editor-hints-projects"/>
-diff -r fba9b8d24cf9 nbbuild/javadoctools/replaces.xml
---- a/nbbuild/javadoctools/replaces.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/nbbuild/javadoctools/replaces.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa nbbuild/javadoctools/replaces.xml
+--- a/nbbuild/javadoctools/replaces.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/nbbuild/javadoctools/replaces.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -214,3 +214,4 @@
  <replacefilter token="@org-netbeans-api-search@" value="${javadoc.docs.org-netbeans-api-search}"/>
  <replacefilter token="@org-netbeans-modules-code-analysis@" value="${javadoc.docs.org-netbeans-modules-code-analysis}"/>
  <replacefilter token="@org-netbeans-modules-glassfish-cloud@" value="${javadoc.docs.org-netbeans-modules-glassfish-cloud}"/>
 +<replacefilter token="@org-netbeans-spi-editor-hints-projects@" value="${javadoc.docs.org-netbeans-spi-editor-hints-projects}"/>
-diff -r fba9b8d24cf9 options.editor/nbproject/project.xml
---- a/options.editor/nbproject/project.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/options.editor/nbproject/project.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa options.editor/nbproject/project.xml
+--- a/options.editor/nbproject/project.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/options.editor/nbproject/project.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -358,6 +358,7 @@
                  <friend>org.netbeans.modules.j2ee.ejbjarproject</friend>
                  <friend>org.netbeans.modules.java.editor</friend>
                  <friend>org.netbeans.modules.java.hints.ui</friend>
                  <friend>org.netbeans.modules.java.source</friend>
                  <friend>org.netbeans.modules.javafx.editor</friend>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/arch.xml
+diff -r 3f3c983b73fa spi.editor.hints.projects/arch.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/arch.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/arch.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,1110 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
 + </answer>
 +
 +</api-answers>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/build.xml
+diff -r 3f3c983b73fa spi.editor.hints.projects/build.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/build.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/build.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,5 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project basedir="." default="netbeans" name="spi.editor.hints.projects">
 +    <description>Builds, tests, and runs the project org.netbeans.spi.editor.hints.projects</description>
 +    <import file="../nbbuild/templates/projectized.xml"/>
 +</project>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/manifest.mf
+diff -r 3f3c983b73fa spi.editor.hints.projects/manifest.mf
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/manifest.mf	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/manifest.mf	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,6 @@
 +Manifest-Version: 1.0
 +OpenIDE-Module: org.netbeans.spi.editor.hints.projects
 +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/hints/projects/Bundle.properties
 +OpenIDE-Module-Specification-Version: 1.0
 +
-diff -r fba9b8d24cf9 spi.editor.hints.projects/nbproject/project.properties
+diff -r 3f3c983b73fa spi.editor.hints.projects/nbproject/project.properties
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/nbproject/project.properties	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/nbproject/project.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,4 @@
 +javac.source=1.7
 +javac.compilerargs=-Xlint -Xlint:-serial
 +javadoc.arch=${basedir}/arch.xml
 +spec.version.base.fatal.warning=false
-diff -r fba9b8d24cf9 spi.editor.hints.projects/nbproject/project.xml
+diff -r 3f3c983b73fa spi.editor.hints.projects/nbproject/project.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/nbproject/project.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/nbproject/project.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,193 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project xmlns="http://www.netbeans.org/ns/project/1">
 +        </data>
 +    </configuration>
 +</project>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/Bundle.properties
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/Bundle.properties
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/Bundle.properties	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/Bundle.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,1 @@
 +OpenIDE-Module-Name=Editor Hints Projects Bridge
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/layer.xml
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/layer.xml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/layer.xml	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/layer.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,22 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
 +        </folder>
 +    </folder>
 +</filesystem>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/Bundle.properties
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/Bundle.properties
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/Bundle.properties	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/Bundle.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,5 @@
 +OpenIDE-Module-Name=Editor Hints to Projects Bridge
 +ProjectHintSettingPanel.settingsFileLocation.text=
 +ProjectHintSettingPanel.browseSettingsFileLocation.text=Browse
 +ProjectHintSettingPanel.useProjectSettings.text=Read Project Specific Settings From:
 +ProjectHintSettingPanel.useGlobalSettings.text=Use Global Settings
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/FileHintPreferencesProviderImpl.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/FileHintPreferencesProviderImpl.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/FileHintPreferencesProviderImpl.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/FileHintPreferencesProviderImpl.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,72 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +    }
 +
 +}
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/Bundle.properties
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/Bundle.properties
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/Bundle.properties	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/Bundle.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,43 @@
 +
 +PerProjectHintsPanelUI.jLabel2.text=&Search:
 +
 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
 +PerProjectHintsPanelUI.jLabel1.text=&Language:
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanel.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanel.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanel.java	Tue Apr 16 11:31:53 2013 +0200
-@@ -0,0 +1,98 @@
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanel.java	Tue Apr 16 14:17:30 2013 +0200
+@@ -0,0 +1,123 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 + *
 + */
 +package org.netbeans.spi.editor.hints.projects;
 +
++import java.util.prefs.Preferences;
 +import javax.swing.JComponent;
 +import org.netbeans.modules.editor.tools.storage.api.ToolPreferences;
 +import org.openide.filesystems.FileObject;
 +     * @param preferencesProvider settings to use
 +     */
 +    public void setPerProjectSettings(final ToolPreferences preferencesProvider) {
-+        panel.setPerProjectSettings(preferencesProvider);
++        setPerProjectSettings(new MimeType2Preferences() {
++            @Override public Preferences getPreferences(String mimeType) {
++                return preferencesProvider.getPreferences(ProjectSettings.HINTS_TOOL_ID, mimeType);
++            }
++        });
++    }
++    
++    /**Set that per-project settings should be shown by the customizers. Read settings
++     * from the given {@link MimeType2Preferences}.
++     * 
++     * @param preferences settings to use
++     */
++    public void setPerProjectSettings(final MimeType2Preferences preferences) {
++        panel.setPerProjectSettings(preferences);
 +    }
 +    
 +    /**Set that global setting should be shown by the customizers.
 +        panel.applyChanges();
 +    }
 +
++    /**Retrieve hint settings for the given mime type.
++     * 
++     */
++    public interface MimeType2Preferences {
++        /**Settings for the given mime type.
++         * 
++         * @param mimeType for which the settings should be retrieved
++         * @return the settings
++         */
++        public Preferences getPreferences(String mimeType);
++    }
 +}
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.form
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.form
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.form	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.form	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,100 @@
 +<?xml version="1.0" encoding="UTF-8" ?>
 +
 +    </Container>
 +  </SubComponents>
 +</Form>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.java	Tue Apr 16 11:31:53 2013 +0200
-@@ -0,0 +1,240 @@
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.java	Tue Apr 16 14:17:30 2013 +0200
+@@ -0,0 +1,233 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 + *
 +import javax.swing.DefaultComboBoxModel;
 +import javax.swing.JComponent;
 +import org.netbeans.api.editor.mimelookup.MimeLookup;
++import org.netbeans.spi.editor.hints.projects.PerProjectHintsPanel.MimeType2Preferences;
 +import org.netbeans.spi.editor.hints.settings.FileHintPreferences.GlobalHintPreferencesProvider;
 +import org.netbeans.spi.options.OptionsPanelController;
 +import org.openide.cookies.InstanceCookie;
 +class PerProjectHintsPanelUI extends javax.swing.JPanel {
 +
 +    private static final Logger LOG = Logger.getLogger(PerProjectHintsPanelUI.class.getName());
-+    private HintPreferencesProvider globalPreferencesProvider;
-+    private HintPreferencesProvider preferencesProvider;
++    private MimeType2Preferences globalPreferencesProvider;
++    private MimeType2Preferences preferencesProvider;
 +    private final Map<String, OptionsPanelController> mimeType2OptionsController = new HashMap<>();
 +    
 +    public PerProjectHintsPanelUI(FileObject customizersFolder) {
-+        this.globalPreferencesProvider = new HintPreferencesProvider() {
++        this.globalPreferencesProvider = new MimeType2Preferences() {
 +            @Override public Preferences getPreferences(String mimeType) {
 +                for (GlobalHintPreferencesProvider p : MimeLookup.getLookup(mimeType).lookupAll(GlobalHintPreferencesProvider.class)) {
 +                    Preferences prefs = p.getGlobalPreferences();
 +        });
 +    }
 +
-+    public void setPerProjectSettings(final ToolPreferences preferencesProvider) {
-+        this.preferencesProvider = new HintPreferencesProvider() {
-+            @Override public Preferences getPreferences(String mimeType) {
-+                return preferencesProvider.getPreferences("hints", mimeType);
-+            }
-+        };
-+
++    public void setPerProjectSettings(final MimeType2Preferences preferences) {
++        this.preferencesProvider = preferences;
 +        change();
 +    }
 +    
 +        }
 +    }
 +
-+    interface HintPreferencesProvider {
-+        public Preferences getPreferences(String mimeType);
-+    }
 +}
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/ProjectSettings.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/ProjectSettings.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/ProjectSettings.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/ProjectSettings.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,76 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +    public Preferences getProjectSettings(String mimeType);
 +    
 +}
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.form
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.form
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.form	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.form	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,78 @@
 +<?xml version="1.0" encoding="UTF-8" ?>
 +
 +    </Component>
 +  </SubComponents>
 +</Form>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,160 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +    private javax.swing.JButton toDefault;
 +    // End of variables declaration//GEN-END:variables
 +}
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/Bundle.properties
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/Bundle.properties
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/Bundle.properties	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/Bundle.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,47 @@
 +ProjectHintSettingPanel.useGlobalSettings.text_1=Use IDE-wide options
 +ProjectHintSettingPanel.useProjectSettings.text_1=Use project-specific options
 +
 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
 +ProjectHintSettingPanel.globalSettings.text=Edit IDE-wide options...
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectCustomizer.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectCustomizer.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectCustomizer.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectCustomizer.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,104 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +    }
 +    
 +}
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.form
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.form
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.form	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.form	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,123 @@
 +<?xml version="1.0" encoding="UTF-8" ?>
 +
 +    </Component>
 +  </SubComponents>
 +</Form>
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,243 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +    private javax.swing.JRadioButton useProjectSettings;
 +    // End of variables declaration//GEN-END:variables
 +}
-diff -r fba9b8d24cf9 spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/StandardProjectSettings.java
+diff -r 3f3c983b73fa spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/StandardProjectSettings.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/StandardProjectSettings.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/StandardProjectSettings.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,216 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +        
 +    }
 +}
-diff -r fba9b8d24cf9 spi.editor.hints/apichanges.xml
---- a/spi.editor.hints/apichanges.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.editor.hints/apichanges.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.editor.hints/apichanges.xml
+--- a/spi.editor.hints/apichanges.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.editor.hints/apichanges.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -108,6 +108,19 @@
  
      <changes>
          <change id="error-description-from-position-bounds">
               <api name="EditorHintsSPI"/>
               <summary>Added a new overload for ErrorDescriptionFactory.createErrorDescription taking PositionBounds</summary>
-diff -r fba9b8d24cf9 spi.editor.hints/arch.xml
---- a/spi.editor.hints/arch.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.editor.hints/arch.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.editor.hints/arch.xml
+--- a/spi.editor.hints/arch.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.editor.hints/arch.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -73,7 +73,7 @@
  -->
   <answer id="arch-overall">
            allows to show errors in the editor, with possible fixes.
        </api>
    </p>
-diff -r fba9b8d24cf9 spi.editor.hints/nbproject/project.properties
---- a/spi.editor.hints/nbproject/project.properties	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.editor.hints/nbproject/project.properties	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.editor.hints/nbproject/project.properties
+--- a/spi.editor.hints/nbproject/project.properties	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.editor.hints/nbproject/project.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -43,6 +43,6 @@
  javac.source=1.7
  javadoc.arch=${basedir}/arch.xml
 +spec.version.base=1.31.0
  
  test.config.stableBTD.includes=**/*Test.class
-diff -r fba9b8d24cf9 spi.editor.hints/nbproject/project.xml
---- a/spi.editor.hints/nbproject/project.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.editor.hints/nbproject/project.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.editor.hints/nbproject/project.xml
+--- a/spi.editor.hints/nbproject/project.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.editor.hints/nbproject/project.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -221,6 +221,7 @@
              </test-dependencies>
              <public-packages>
              </public-packages>
          </data>
      </configuration>
-diff -r fba9b8d24cf9 spi.editor.hints/src/org/netbeans/modules/editor/hints/settings/friend/FileHintPreferencesProvider.java
+diff -r 3f3c983b73fa spi.editor.hints/src/org/netbeans/modules/editor/hints/settings/friend/FileHintPreferencesProvider.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints/src/org/netbeans/modules/editor/hints/settings/friend/FileHintPreferencesProvider.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints/src/org/netbeans/modules/editor/hints/settings/friend/FileHintPreferencesProvider.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,56 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +    public Preferences getFilePreferences(FileObject file, String mimeType);
 +    
 +}
-diff -r fba9b8d24cf9 spi.editor.hints/src/org/netbeans/spi/editor/hints/settings/FileHintPreferences.java
+diff -r 3f3c983b73fa spi.editor.hints/src/org/netbeans/spi/editor/hints/settings/FileHintPreferences.java
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spi.editor.hints/src/org/netbeans/spi/editor/hints/settings/FileHintPreferences.java	Tue Apr 16 11:31:53 2013 +0200
++++ b/spi.editor.hints/src/org/netbeans/spi/editor/hints/settings/FileHintPreferences.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -0,0 +1,193 @@
 +/*
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 +    }
 +    
 +}
-diff -r fba9b8d24cf9 spi.java.hints/apichanges.xml
---- a/spi.java.hints/apichanges.xml	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/apichanges.xml	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/apichanges.xml
+--- a/spi.java.hints/apichanges.xml	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/apichanges.xml	Tue Apr 16 14:17:30 2013 +0200
 @@ -46,6 +46,21 @@
          <apidef name="JavaHintsSPI">Java Hints SPI</apidef>
      </apidefs>
          <change id="IntegerOption">
              <api name="JavaHintsSPI"/>
              <summary>Added support for integer options. Hints can be declared to appear only in inspect &amp; transform</summary>
-diff -r fba9b8d24cf9 spi.java.hints/nbproject/project.properties
---- a/spi.java.hints/nbproject/project.properties	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/nbproject/project.properties	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/nbproject/project.properties
+--- a/spi.java.hints/nbproject/project.properties	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/nbproject/project.properties	Tue Apr 16 14:17:30 2013 +0200
 @@ -1,7 +1,7 @@
  is.autoload=true
  javac.source=1.7
  requires.nb.javac=true
  javadoc.arch=${basedir}/arch.xml
  javadoc.apichanges=${basedir}/apichanges.xml
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java
---- a/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java
+--- a/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -52,9 +52,10 @@
  import org.netbeans.api.java.source.CompilationInfo;
  import org.netbeans.modules.java.hints.spiimpl.MessageImpl;
      }
  
  }
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java
---- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java
+--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -48,6 +48,7 @@
  import javax.lang.model.type.TypeMirror;
  import org.netbeans.api.java.source.CompilationInfo;
 +    public abstract HintsSettings getHintSettings(HintContext ctx);
  
  }
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java
---- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java
+--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -87,6 +87,7 @@
  import org.netbeans.spi.editor.hints.ErrorDescription;
  import org.netbeans.api.java.source.matching.Matcher;
                          }
                      }
                  } catch (IOException ex) {
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java
---- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java
+--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -112,31 +112,31 @@
  
      private final Map<String, Long> timeLog = new HashMap<String, Long>();
                      Collection<? extends ErrorDescription> errors = runHint(hd, c);
  
                      if (errors != null) {
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java
---- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java
+--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -53,7 +53,6 @@
  import javax.swing.text.Document;
  import org.netbeans.api.editor.mimelookup.MimeLookup;
          }
  
          private static void setVersion(Document doc, int caret) {
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java
---- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java
+--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -43,15 +43,13 @@
   */
  package org.netbeans.modules.java.hints.spiimpl.options;
 +        
      }
  }
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java
---- a/spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java
+--- a/spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -244,8 +244,8 @@
              }
  
          }
  
          @Override
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java
---- a/spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java
+--- a/spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -66,6 +66,7 @@
  public class HintContext {
  
          });
      }
  }
-diff -r fba9b8d24cf9 spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java
---- a/spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java
+--- a/spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -67,6 +67,7 @@
  import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper;
  import org.netbeans.modules.java.hints.spiimpl.batch.Scopes;
          Map<HintDescription, List<ErrorDescription>> computeHints = inv.computeHints(workingCopy, on, false, hints, new ArrayList<MessageImpl>());
          
          if (computeHints == null || cancel.get()) return ;
-diff -r fba9b8d24cf9 spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java
---- a/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java
+--- a/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -65,6 +65,7 @@
  import org.netbeans.modules.java.hints.providers.spi.HintMetadata.Options;
  import org.netbeans.modules.java.hints.providers.spi.Trigger.Kinds;
      }
  
  //    @Override
-diff -r fba9b8d24cf9 spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java
---- a/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java
+--- a/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -62,6 +62,7 @@
  import org.netbeans.modules.java.hints.spiimpl.TestBase;
  import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker;
  
          assertEquals(computeHints.toString(), 1, computeHints.size());
  
-diff -r fba9b8d24cf9 spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java
---- a/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java	Thu Apr 11 10:13:03 2013 +0200
-+++ b/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java	Tue Apr 16 11:31:53 2013 +0200
+diff -r 3f3c983b73fa spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java
+--- a/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java	Tue Apr 16 05:35:09 2013 +0000
++++ b/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java	Tue Apr 16 14:17:30 2013 +0200
 @@ -50,6 +50,7 @@
  import java.util.regex.Pattern;
  import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;