[hg] main-silver: #181726: ability to specify hints settings per...

  • From: Jan Lahoda < >
  • To: , , ,
  • Subject: [hg] main-silver: #181726: ability to specify hints settings per...
  • Date: Fri, 26 Apr 2013 11:11:06 -0700

changeset 136f671ea6b7 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/136f671ea6b7
description:
        #181726: ability to specify hints settings per project

diffstat:

 editor.tools.storage/arch.xml                                                
                                               |  1078 +++++++++
 editor.tools.storage/build.xml                                               
                                               |     5 +
 editor.tools.storage/manifest.mf                                             
                                               |     6 +
 editor.tools.storage/nbproject/project.properties                            
                                               |     3 +
 editor.tools.storage/nbproject/project.xml                                   
                                               |   183 +
 
editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties
                                        |     1 +
 
editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd
                                |    71 +
 
editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java
                                 |    89 +
 
editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java
                              |   330 ++
 editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml 
                                               |    13 +
 
editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java
                   |    87 +
 
java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java
                    |     3 +-
 
java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
                              |     7 +-
 
java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java
                             |    21 +
 
java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java
              |     4 +-
 
java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java
 |     4 +-
 
java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java
              |     3 +-
 
java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java
                                      |     4 +
 
java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java
                                             |     9 +-
 java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java   
                                               |    47 +-
 java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java 
                                               |    30 +-
 java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml          
                                               |    12 +
 
java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java
                          |    17 +-
 
java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
                                           |    53 +-
 
java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java
                                      |   185 +-
 
java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java
              |     3 +-
 
java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java
                                    |    29 +-
 
java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java
                  |     3 +-
 
java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java
                          |     8 +-
 java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParam.java      
                                               |    12 +-
 
java.hints/src/org/netbeans/modules/java/hints/FieldForUnusedParamCustomizer.java
                                           |     2 +-
 java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java   
                                               |    29 +-
 java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java        
                                               |    16 +-
 
java.hints/src/org/netbeans/modules/java/hints/analyzer/OverridePreferences.java
                                            |   120 -
 
java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java
                                        |    12 +-
 
java.hints/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFix.java
                                           |     3 +-
 java.hints/src/org/netbeans/modules/java/hints/errors/CreateElement.java     
                                               |     3 +-
 
java.hints/src/org/netbeans/modules/java/hints/errors/ErrorFixesFakeHint.java 
                                              |    46 +-
 
java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.java
                                    |     2 +-
 
java.hints/src/org/netbeans/modules/java/hints/errors/LocalVariableFixCustomizer.java
                                       |     2 +-
 
java.hints/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFix.java
                                     |     9 +-
 
java.hints/src/org/netbeans/modules/java/hints/errors/SurroundWithTryCatchLog.java
                                          |     8 +-
 
java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToDiamondBulkHint.java
                                            |    10 +-
 java.hints/test/unit/src/org/netbeans/modules/java/hints/HideFieldTest.java  
                                               |    12 +-
 
java.hints/test/unit/src/org/netbeans/modules/java/hints/WrongPackageSuggestionTest.java
                                    |    19 +-
 
java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/AddParameterOrLocalFixTest.java
                             |    24 +-
 
java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/MagicSurroundWithTryCatchFixTest.java
                       |    16 +-
 
java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/OrigSurroundWithTryCatchFixTest.java
                        |    10 +-
 
java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
                               |    79 +
 
java.source/src/org/netbeans/modules/java/source/indexing/OnePassCompileWorker.java
                                         |    15 +-
 nbbuild/cluster.properties                                                   
                                               |     2 +
 nbbuild/javadoctools/links.xml                                               
                                               |     1 +
 nbbuild/javadoctools/properties.xml                                          
                                               |     1 +
 nbbuild/javadoctools/replaces.xml                                            
                                               |     1 +
 options.editor/apichanges.xml                                                
                                               |    13 +
 options.editor/manifest.mf                                                   
                                               |     2 +-
 options.editor/nbproject/project.xml                                         
                                               |     2 +
 
options.editor/src/org/netbeans/modules/options/editor/FolderBasedController.java
                                           |    25 +-
 
options.editor/src/org/netbeans/modules/options/editor/spi/OptionsFilter.java 
                                              |    18 +-
 spi.editor.hints.projects/arch.xml                                           
                                               |  1110 ++++++++++
 spi.editor.hints.projects/build.xml                                          
                                               |     5 +
 spi.editor.hints.projects/manifest.mf                                        
                                               |     6 +
 spi.editor.hints.projects/nbproject/project.properties                       
                                               |     4 +
 spi.editor.hints.projects/nbproject/project.xml                              
                                               |   202 +
 
spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/Bundle.properties
                                  |     1 +
 
spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/layer.xml
                                          |    22 +
 
spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/Bundle.properties
                         |     5 +
 
spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/FileHintPreferencesProviderImpl.java
      |    72 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/Bundle.properties
                                      |    43 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanel.java
                              |   123 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.form
                            |   100 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/PerProjectHintsPanelUI.java
                            |   291 ++
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/ProjectSettings.java
                                   |    76 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.form
                     |    85 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/AdvancedLocationPanel.java
                     |   163 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/Bundle.properties
                              |    47 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectCustomizer.java
                         |   116 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.form
                   |   123 +
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/ProjectHintSettingPanel.java
                   |   242 ++
 
spi.editor.hints.projects/src/org/netbeans/spi/editor/hints/projects/support/StandardProjectSettings.java
                   |   217 +
 spi.editor.hints/apichanges.xml                                              
                                               |    13 +
 spi.editor.hints/arch.xml                                                    
                                               |     2 +-
 spi.editor.hints/nbproject/project.properties                                
                                               |     2 +-
 spi.editor.hints/nbproject/project.xml                                       
                                               |     1 +
 
spi.editor.hints/src/org/netbeans/modules/editor/hints/settings/friend/FileHintPreferencesProvider.java
                     |    56 +
 
spi.editor.hints/src/org/netbeans/spi/editor/hints/settings/FileHintPreferences.java
                                        |   193 +
 spi.java.hints/apichanges.xml                                                
                                               |    15 +
 spi.java.hints/nbproject/project.properties                                  
                                               |     2 +-
 
spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java
                                             |     5 +-
 spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java  
                                               |     6 +-
 
spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java
                                           |    51 +-
 
spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java
                                          |    34 +-
 
spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java
                                             |    13 +-
 
spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java
                                       |   171 +-
 spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java  
                                               |    12 +-
 spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java              
                                               |    19 +-
 
spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java
                                           |     3 +-
 
spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearchTest.java
                             |    11 +-
 
spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java
                            |     3 +-
 
spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java
                                          |     5 +-
 
spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java
                                          |     7 +-
 101 files changed, 5891 insertions(+), 608 deletions(-)

diffs (truncated from 8564 to 3000 lines):

diff --git a/editor.tools.storage/arch.xml b/editor.tools.storage/arch.xml
new file mode 100644
--- /dev/null
+++ b/editor.tools.storage/arch.xml
@@ -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" [
+  <!ENTITY api-questions SYSTEM 
"../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+  question-version="1.29"
+  
author=" "
+>
+
+  &api-questions;
+
+
+<!--
+        <question id="arch-overall" when="init">
+            Describe the overall architecture. 
+            <hint>
+            What will be API for 
+            <a 
href="http://wiki.netbeans.org/API_Design#Separate_API_for_clients_from_support_API";>
+                clients and what support API</a>? 
+            What parts will be pluggable?
+            How will plug-ins be registered? Please use <code>&lt;api 
type="export"/&gt;</code>
+            to describe your general APIs and specify their
+            <a href="http://wiki.netbeans.org/API_Stability#Private";>
+            stability categories</a>.
+            If possible please provide simple diagrams.
+            </hint>
+        </question>
+-->
+ <answer id="arch-overall">
+  <p>
+      <api name="ToolsStorage" category="devel" group="java" type="export" 
url="@TOP@/org/netbeans/modules/editor/tools/storage/api/package-summary.html">
+          tools storage API.
+      </api>
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="arch-quality" when="init">
+            How will the <a 
href="http://www.netbeans.org/community/guidelines/q-evangelism.html";>quality</a>
+            of your code be tested and 
+            how are future regressions going to be prevented?
+            <hint>
+            What kind of testing do
+            you want to use? How much functionality, in which areas,
+            should be covered by the tests? How you find out that your
+            project was successful?
+            </hint>
+        </question>
+-->
+ <answer id="arch-quality">
+  <p>
+   XXX no answer for arch-quality
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="arch-time" when="init">
+            What are the time estimates of the work?
+            <hint>
+            Please express your estimates of how long the design, 
implementation,
+            stabilization are likely to last. How many people will be needed 
to
+            implement this and what is the expected milestone by which the 
work should be 
+            ready?
+            </hint>
+        </question>
+-->
+ <answer id="arch-time">
+  <p>
+   XXX no answer for arch-time
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="arch-usecases" when="init">
+            <hint>
+                Content of this answer will be displayed as part of page at
+                http://www.netbeans.org/download/dev/javadoc/usecases.html ;
+                You can use tags &lt;usecase name="name&gt; regular html 
description &lt;/usecase&gt;
+                and if you want to use an URL you can prefix if with @TOP@ 
to begin
+                at the root of your javadoc
+            </hint>
+        
+            Describe the main <a 
href="http://wiki.netbeans.org/API_Design#The_Importance_of_Being_Use_Case_Oriented";>
+            use cases</a> of the new API. Who will use it under
+            what circumstances? What kind of code would typically need to be 
written
+            to use the module?
+        </question>
+-->
+ <answer id="arch-usecases">
+  <p>
+   XXX no answer for arch-usecases
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="arch-what" when="init">
+            What is this project good for?
+            <hint>
+            Please provide here a few lines describing the project, 
+            what problem it should solve, provide links to documentation, 
+            specifications, etc.
+            </hint>
+        </question>
+-->
+ <answer id="arch-what">
+  <p>
+   XXX no answer for arch-what
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="arch-where" when="impl">
+            Where one can find sources for your module?
+            <hint>
+                Please provide link to the Hg web client at
+                http://hg.netbeans.org/
+                or just use tag defaultanswer generate='here'
+            </hint>
+        </question>
+-->
+ <answer id="arch-where">
+  <defaultanswer generate='here' />
+ </answer>
+
+
+
+<!--
+        <question id="compat-deprecation" when="init">
+            How the introduction of your project influences functionality
+            provided by previous version of the product?
+            <hint>
+            If you are planning to deprecate/remove/change any existing APIs,
+            list them here accompanied with the reason explaining why you
+            are doing so.
+            </hint>
+        </question>
+-->
+ <answer id="compat-deprecation">
+  <p>
+   XXX no answer for compat-deprecation
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="compat-i18n" when="impl">
+            Is your module correctly internationalized?
+            <hint>
+            Correct internationalization means that it obeys instructions 
+            at <a 
href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html";>
+            NetBeans I18N pages</a>.
+            </hint>
+        </question>
+-->
+ <answer id="compat-i18n">
+  <p>
+   XXX no answer for compat-i18n
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="compat-standards" when="init">
+            Does the module implement or define any standards? Is the 
+            implementation exact or does it deviate somehow?
+        </question>
+-->
+ <answer id="compat-standards">
+  <p>
+   XXX no answer for compat-standards
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="compat-version" when="impl">
+            Can your module coexist with earlier and future
+            versions of itself? Can you correctly read all old settings? 
Will future
+            versions be able to read your current settings? Can you read
+            or politely ignore settings stored by a future version?
+            
+            <hint>
+            Very helpful for reading settings is to store version number
+            there, so future versions can decide whether how to read/convert
+            the settings and older versions can ignore the new ones.
+            </hint>
+        </question>
+-->
+ <answer id="compat-version">
+  <p>
+   XXX no answer for compat-version
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="dep-jre" when="final">
+            Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+            <hint>
+            It is expected that if your module runs on 1.x that it will run 
+            on 1.x+1 if no, state that please. Also describe here cases where
+            you run different code on different versions of JRE and why.
+            </hint>
+        </question>
+-->
+ <answer id="dep-jre">
+  <p>
+   XXX no answer for dep-jre
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="dep-jrejdk" when="final">
+            Do you require the JDK or is the JRE enough?
+        </question>
+-->
+ <answer id="dep-jrejdk">
+  <p>
+   XXX no answer for dep-jrejdk
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="dep-nb" when="init">
+            What other NetBeans projects and modules does this one depend on?
+            <hint>
+            Depending on other NetBeans projects influnces the ability of
+            users of your work to customize their own branded version of
+            NetBeans by enabling and disabling some modules. Too
+            much dependencies restrict this kind of customization. If that
+            is your case, then you may want to split your functionality into
+            pieces of autoload, eager and regular modules which can be
+            enabled independently. Usually the answer to this question
+            is generated from your <code>project.xml</code> file, but
+            if it is not guessed correctly, you can suppress it by
+            specifying &lt;defaultanswer generate="none"/&gt; and
+            write here your own. Please describe such projects as imported 
APIs using
+            the <code>&lt;api name="identification" type="import or export" 
category="stable" url="where is the description" /&gt;</code>.
+            By doing this information gets listed in the summary page of your
+            javadoc.
+            </hint>
+        </question>
+-->
+ <answer id="dep-nb">
+  <defaultanswer generate='here' />
+ </answer>
+
+
+
+<!--
+        <question id="dep-non-nb" when="init">
+            What other projects outside NetBeans does this one depend on?
+            
+            <hint>
+            Depending on 3rd party libraries is always problematic,
+            especially if they are not open source, as that complicates
+            the licensing scheme of NetBeans. Please enumerate your
+            external dependencies here, so it is correctly understood since
+            the begining what are the legal implications of your project.
+            Also please note that
+            some non-NetBeans projects are packaged as NetBeans modules
+            (see <a href="http://libs.netbeans.org/";>libraries</a>) and
+            it is preferred to use this approach when more modules may
+            depend and share such third-party libraries.
+            </hint>
+        </question>
+-->
+ <answer id="dep-non-nb">
+  <p>
+   XXX no answer for dep-non-nb
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="dep-platform" when="init">
+            On which platforms does your module run? Does it run in the same
+            way on each?
+            <hint>
+            If you plan any dependency on OS or any usage of native code,
+            please describe why you are doing so and describe how you 
envision
+            to enforce the portability of your code.
+            Please note that there is a support for <a 
href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html#how-os-specific";>OS
 conditionally
+            enabled modules</a> which together with autoload/eager modules
+            can allow you to enable to provide the best OS aware support
+            on certain OSes while providing compatibility bridge on the not
+            supported ones.
+            Also please list the supported
+            OSes/HW platforms and mentioned the lovest version of JDK 
required
+            for your project to run on. Also state whether JRE is enough or
+            you really need JDK.
+            </hint>
+        </question>
+-->
+ <answer id="dep-platform">
+  <p>
+   XXX no answer for dep-platform
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="deploy-dependencies" when="final">
+            What do other modules need to do to declare a dependency on this 
one,
+            in addition to or instead of the normal module dependency 
declaration
+            (e.g. tokens to require)?
+            <hint>
+                Provide a sample of the actual lines you would add to a 
module manifest
+                to declare a dependency, for example 
OpenIDE-Module-Requires: some.token.
+                If other modules should not depend on this module, or should 
just use a
+                simple regular module dependency, you can just answer 
"nothing". If you
+                intentionally expose a semistable API to clients using 
implementation
+                dependencies, you should mention that here (but there is no 
need to give
+                an example of usage).
+            </hint>
+        </question>
+-->
+ <answer id="deploy-dependencies">
+  <p>
+   XXX no answer for deploy-dependencies
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="deploy-jar" when="impl">
+            Do you deploy just module JAR file(s) or other files as well?
+            <hint>
+            Usually a module consist of one JAR file (perhaps with Class-Path
+            extensions) and also a configuration file that enables it. If you
+            have any other files, use
+            &lt;api group="java.io.File" name="yourname" type="export" 
category="friend"&gt;...&lt;/api&gt;
+            to define the location, name and stability of your files (of 
course
+            changing "yourname" and "friend" to suit your needs).
+            
+            If it uses more than one JAR, describe where they are located, 
how
+            they refer to each other. 
+            If it consist of module JAR(s) and other files, please describe
+            what is their purpose, why other files are necessary. Please 
+            make sure that installation/uninstallation leaves the system 
+            in state as it was before installation.
+            </hint>
+        </question>
+-->
+ <answer id="deploy-jar">
+  <p>
+   XXX no answer for deploy-jar
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="deploy-nbm" when="impl">
+            Can you deploy an NBM via the Update Center?
+            <hint>
+            If not why?
+            </hint>
+        </question>
+-->
+ <answer id="deploy-nbm">
+  <p>
+   XXX no answer for deploy-nbm
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="deploy-packages" when="init">
+            Are packages of your module made inaccessible by not declaring 
them
+            public?
+            
+            <hint>
+            By default NetBeans build harness treats all packages are 
private.
+            If you export some of them - either as public or friend packages,
+            you should have a reason. If the reason is described elsewhere
+            in this document, you can ignore this question.
+            </hint>
+        </question>
+-->
+ <answer id="deploy-packages">
+  <p>
+   XXX no answer for deploy-packages
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="deploy-shared" when="final">
+            Do you need to be installed in the shared location only, or in 
the user directory only,
+            or can your module be installed anywhere?
+            <hint>
+            Installation location shall not matter, if it does explain why.
+            Consider also whether <code>InstalledFileLocator</code> can help.
+            </hint>
+        </question>
+-->
+ <answer id="deploy-shared">
+  <p>
+   XXX no answer for deploy-shared
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-ant-tasks" when="impl">
+            Do you define or register any ant tasks that other can use?
+            
+            <hint>
+            If you provide an ant task that users can use, you need to be 
very
+            careful about its syntax and behaviour, as it most likely forms 
an
+                 API for end users and as there is a lot of end users, their 
reaction
+            when such API gets broken can be pretty strong.
+            </hint>
+        </question>
+-->
+ <answer id="exec-ant-tasks">
+  <p>
+   XXX no answer for exec-ant-tasks
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-classloader" when="impl">
+            Does your code create its own class loader(s)?
+            <hint>
+            A bit unusual. Please explain why and what for.
+            </hint>
+        </question>
+-->
+ <answer id="exec-classloader">
+  <p>
+   XXX no answer for exec-classloader
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-component" when="impl">
+            Is execution of your code influenced by any (string) property
+            of any of your components?
+            
+            <hint>
+            Often <code>JComponent.getClientProperty</code>, 
<code>Action.getValue</code>
+            or <code>PropertyDescriptor.getValue</code>, etc. are used to 
influence
+            a behavior of some code. This of course forms an interface that 
should
+            be documented. Also if one depends on some interface that an 
object
+            implements (<code>component instanceof Runnable</code>) that 
forms an
+            API as well.
+            </hint>
+        </question>
+-->
+ <answer id="exec-component">
+  <p>
+   XXX no answer for exec-component
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-introspection" when="impl">
+            Does your module use any kind of runtime type information 
(<code>instanceof</code>,
+            work with <code>java.lang.Class</code>, etc.)?
+            <hint>
+            Check for cases when you have an object of type A and you also
+            expect it to (possibly) be of type B and do some special action. 
That
+            should be documented. The same applies on operations in 
meta-level
+            (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+            </hint>
+        </question>
+-->
+ <answer id="exec-introspection">
+  <p>
+   XXX no answer for exec-introspection
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-privateaccess" when="final">
+            Are you aware of any other parts of the system calling some of 
+            your methods by reflection?
+            <hint>
+            If so, describe the "contract" as an API. Likely private or 
friend one, but
+            still API and consider rewrite of it.
+            </hint>
+        </question>
+-->
+ <answer id="exec-privateaccess">
+  <p>
+   XXX no answer for exec-privateaccess
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-process" when="impl">
+            Do you execute an external process from your module? How do you 
ensure
+            that the result is the same on different platforms? Do you parse 
output?
+            Do you depend on result code?
+            <hint>
+            If you feed an input, parse the output please declare that as an 
API.
+            </hint>
+        </question>
+-->
+ <answer id="exec-process">
+  <p>
+   XXX no answer for exec-process
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-property" when="impl">
+            Is execution of your code influenced by any environment or
+            Java system (<code>System.getProperty</code>) property?
+            On a similar note, is there something interesting that you
+            pass to <code>java.util.logging.Logger</code>? Or do you observe
+            what others log?
+            <hint>
+            If there is a property that can change the behavior of your 
+            code, somebody will likely use it. You should describe what it 
does 
+            and the <a 
href="http://wiki.netbeans.org/API_Stability";>stability category</a>
+            of this API. You may use
+            <pre>
+                &lt;api type="export" group="property" name="id" 
category="private" url="http://..."&gt;
+                    description of the property, where it is used, what it 
influence, etc.
+                &lt;/api&gt;            
+            </pre>
+            </hint>
+        </question>
+-->
+ <answer id="exec-property">
+  <p>
+   XXX no answer for exec-property
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-reflection" when="impl">
+            Does your code use Java Reflection to execute other code?
+            <hint>
+            This usually indicates a missing or insufficient API in the other
+            part of the system. If the other side is not aware of your 
dependency
+            this contract can be easily broken.
+            </hint>
+        </question>
+-->
+ <answer id="exec-reflection">
+  <p>
+   XXX no answer for exec-reflection
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="exec-threading" when="init">
+            What threading models, if any, does your module adhere to? How 
the
+            project behaves with respect to threading?
+            <hint>
+                Is your API threadsafe? Can it be accessed from any threads 
or
+                just from some dedicated ones? Any special relation to AWT 
and
+                its Event Dispatch thread? Also
+                if your module calls foreign APIs which have a specific 
threading model,
+                indicate how you comply with the requirements for 
multithreaded access
+                (synchronization, mutexes, etc.) applicable to those APIs.
+                If your module defines any APIs, or has complex internal 
structures
+                that might be used from multiple threads, declare how you 
protect
+                data against concurrent access, race conditions, deadlocks, 
etc.,
+                and whether such rules are enforced by runtime warnings, 
errors, assertions, etc.
+                Examples: a class might be non-thread-safe (like Java 
Collections); might
+                be fully thread-safe (internal locking); might require 
access through a mutex
+                (and may or may not automatically acquire that mutex on 
behalf of a client method);
+                might be able to run only in the event queue; etc.
+                Also describe when any events are fired: synchronously, 
asynchronously, etc.
+                Ideas: <a 
href="http://core.netbeans.org/proposals/threading/index.html#recommendations";>Threading
 Recommendations</a> (in progress)
+            </hint>
+        </question>
+-->
+ <answer id="exec-threading">
+  <p>
+   XXX no answer for exec-threading
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="format-clipboard" when="impl">
+            Which data flavors (if any) does your code read from or insert to
+            the clipboard (by access to clipboard on means calling methods 
on <code>java.awt.datatransfer.Transferable</code>?
+            
+            <hint>
+            Often Node's deal with clipboard by usage of 
<code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+            Check your code for overriding these methods.
+            </hint>
+        </question>
+-->
+ <answer id="format-clipboard">
+  <p>
+   XXX no answer for format-clipboard
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="format-dnd" when="impl">
+            Which protocols (if any) does your code understand during Drag 
&amp; Drop?
+            <hint>
+            Often Node's deal with clipboard by usage of <code>Node.drag, 
Node.getDropType</code>. 
+            Check your code for overriding these methods. Btw. if they are 
not overridden, they
+            by default delegate to <code>Node.clipboardCopy, 
Node.clipboardCut and Node.pasteTypes</code>.
+            </hint>
+        </question>
+-->
+ <answer id="format-dnd">
+  <p>
+   XXX no answer for format-dnd
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="format-types" when="impl">
+            Which protocols and file formats (if any) does your module read 
or write on disk,
+            or transmit or receive over the network? Do you generate an ant 
build script?
+            Can it be edited and modified? 
+            
+            <hint>
+            <p>
+            Files can be read and written by other programs, modules and 
users. If they influence
+            your behaviour, make sure you either document the format or 
claim that it is a private
+            api (using the &lt;api&gt; tag). 
+            </p>
+            
+            <p>
+            If you generate an ant build file, this is very likely going to 
be seen by end users and
+            they will be attempted to edit it. You should be ready for that 
and provide here a link
+            to documentation that you have for such purposes and also 
describe how you are going to
+            understand such files during next release, when you (very 
likely) slightly change the 
+            format.
+            </p>
+            </hint>
+        </question>
+-->
+ <answer id="format-types">
+  <p>
+   XXX no answer for format-types
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="lookup-lookup" when="init">
+            Does your module use <code>org.openide.util.Lookup</code>
+            or any similar technology to find any components to communicate 
with? Which ones?
+            
+            <hint>
+            NetBeans is build around a generic registry of services called
+            lookup. It is preferable to use it for registration and discovery
+            if possible. See
+            <a 
href="http://www.netbeans.org/download/dev/javadoc/org-openide-util/org/openide/util/lookup/doc-files/index.html";>
+            The Solution to Comunication Between Components
+            </a>. If you do not plan to use lookup and insist usage
+            of other solution, then please describe why it is not working for
+            you.
+            <br/>
+            When filling the final version of your arch document, please
+            describe the interfaces you are searching for, where 
+            are defined, whether you are searching for just one or more of 
them,
+            if the order is important, etc. Also classify the stability of 
such
+            API contract. Use &lt;api group=&amp;lookup&amp; /&gt; tag, so
+            your information gets listed in the summary page of your javadoc.
+            </hint>
+        </question>
+-->
+ <answer id="lookup-lookup">
+  <p>
+   XXX no answer for lookup-lookup
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="lookup-register" when="final">
+            Do you register anything into lookup for other code to find?
+            <hint>
+            Do you register using layer file or using a declarative 
annotation such as <code>@ServiceProvider</code>?
+            Who is supposed to find your component?
+            </hint>
+        </question>
+-->
+ <answer id="lookup-register">
+  <p>
+   XXX no answer for lookup-register
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="lookup-remove" when="final">
+            Do you remove entries of other modules from lookup?
+            <hint>
+            Why? Of course, that is possible, but it can be dangerous. Is 
the module
+            your are masking resource from aware of what you are doing?
+            </hint>
+        </question>
+-->
+ <answer id="lookup-remove">
+  <p>
+   XXX no answer for lookup-remove
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-exit" when="final">
+            Does your module run any code on exit?
+        </question>
+-->
+ <answer id="perf-exit">
+  <p>
+   XXX no answer for perf-exit
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-huge_dialogs" when="final">
+            Does your module contain any dialogs or wizards with a large 
number of
+            GUI controls such as combo boxes, lists, trees, or text areas?
+        </question>
+-->
+ <answer id="perf-huge_dialogs">
+  <p>
+   XXX no answer for perf-huge_dialogs
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-limit" when="init">
+            Are there any hard-coded or practical limits in the number or 
size of
+            elements your code can handle?
+            <hint>
+                Most of algorithms have increasing memory and speed 
complexity
+                with respect to size of data they operate on. What is the 
critical
+                part of your project that can be seen as a bottleneck with
+                respect to speed or required memory? What are the practical
+                sizes of data you tested your project with? What is your 
estimate
+                of potential size of data that would cause visible 
performance
+                problems? Is there some kind of check to detect such 
situation
+                and prevent "hard" crashes - for example the 
CloneableEditorSupport
+                checks for size of a file to be opened in editor
+                and if it is larger than 1Mb it shows a dialog giving the
+                user the right to decide - e.g. to cancel or commit suicide.
+            </hint>
+        </question>
+-->
+ <answer id="perf-limit">
+  <p>
+   XXX no answer for perf-limit
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-mem" when="final">
+            How much memory does your component consume? Estimate
+            with a relation to the number of windows, etc.
+        </question>
+-->
+ <answer id="perf-mem">
+  <p>
+   XXX no answer for perf-mem
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-menus" when="final">
+            Does your module use dynamically updated context menus, or
+            context-sensitive actions with complicated and slow enablement 
logic?
+            <hint>
+                If you do a lot of tricks when adding actions to regular or 
context menus, you can significantly
+                slow down display of the menu, even when the user is not 
using your action. Pay attention to
+                actions you add to the main menu bar, and to context menus 
of foreign nodes or components. If
+                the action is conditionally enabled, or changes its display 
dynamically, you need to check the
+                impact on performance. In some cases it may be more 
appropriate to make a simple action that is
+                always enabled but does more detailed checks in a dialog if 
it is actually run.
+            </hint>
+        </question>
+-->
+ <answer id="perf-menus">
+  <p>
+   XXX no answer for perf-menus
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-progress" when="final">
+            Does your module execute any long-running tasks?
+            
+            <hint>Long running tasks should never block 
+            AWT thread as it badly hurts the UI
+            <a 
href="http://performance.netbeans.org/responsiveness/issues.html";>
+            responsiveness</a>.
+            Tasks like connecting over
+            network, computing huge amount of data, compilation
+            be done asynchronously (for example
+            using <code>RequestProcessor</code>), definitively it should 
+            not block AWT thread.
+            </hint>
+        </question>
+-->
+ <answer id="perf-progress">
+  <p>
+   XXX no answer for perf-progress
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-scale" when="init">
+            Which external criteria influence the performance of your
+            program (size of file in editor, number of files in menu, 
+            in source directory, etc.) and how well your code scales?
+            <hint>
+            Please include some estimates, there are other more detailed 
+            questions to answer in later phases of implementation. 
+            </hint>
+        </question>
+-->
+ <answer id="perf-scale">
+  <p>
+   XXX no answer for perf-scale
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-spi" when="init">
+            How the performance of the plugged in code will be enforced?
+            <hint>
+            If you allow foreign code to be plugged into your own module, how
+            do you enforce that it will behave correctly and quickly and 
will not
+            negatively influence the performance of your own module?
+            </hint>
+        </question>
+-->
+ <answer id="perf-spi">
+  <p>
+   XXX no answer for perf-spi
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-startup" when="final">
+            Does your module run any code on startup?
+        </question>
+-->
+ <answer id="perf-startup">
+  <p>
+   XXX no answer for perf-startup
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="perf-wakeup" when="final">
+            Does any piece of your code wake up periodically and do something
+            even when the system is otherwise idle (no user interaction)?
+        </question>
+-->
+ <answer id="perf-wakeup">
+  <p>
+   XXX no answer for perf-wakeup
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="resources-file" when="final">
+            Does your module use <code>java.io.File</code> directly?
+            
+            <hint>
+            NetBeans provide a logical wrapper over plain files called 
+            <code>org.openide.filesystems.FileObject</code> that
+            provides uniform access to such resources and is the preferred
+            way that should be used. But of course there can be situations 
when
+            this is not suitable.
+            </hint>
+        </question>
+-->
+ <answer id="resources-file">
+  <p>
+   XXX no answer for resources-file
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="resources-layer" when="final">
+            Does your module provide own layer? Does it create any files or
+            folders in it? What it is trying to communicate by that and with 
which 
+            components?
+            
+            <hint>
+            NetBeans allows automatic and declarative installation of 
resources 
+            by module layers. Module register files into appropriate places
+            and other components use that information to perform their task
+            (build menu, toolbar, window layout, list of templates, set of
+            options, etc.). 
+            </hint>
+        </question>
+-->
+ <answer id="resources-layer">
+  <p>
+   XXX no answer for resources-layer
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="resources-mask" when="final">
+            Does your module mask/hide/override any resources provided by 
other modules in
+            their layers?
+            
+            <hint>
+            If you mask a file provided by another module, you probably 
depend
+            on that and do not want the other module to (for example) change
+            the file's name. That module shall thus make that file available 
as an API
+            of some stability category.
+            </hint>
+        </question>
+-->
+ <answer id="resources-mask">
+  <p>
+   XXX no answer for resources-mask
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="resources-preferences" when="final">
+            Does your module uses preferences via Preferences API? Does your 
module use NbPreferences or
+            or regular JDK Preferences ? Does it read, write or both ? 
+            Does it share preferences with other modules ? If so, then why ?
+            <hint>
+                You may use
+                    &lt;api type="export" group="preferences"
+                    name="preference node name" category="private"&gt;
+                    description of individual keys, where it is used, what it
+                    influences, whether the module reads/write it, etc.
+                    &lt;/api&gt;
+                Due to XML ID restrictions, rather than 
/org/netbeans/modules/foo give the "name" as org.netbeans.modules.foo.
+                Note that if you use NbPreferences this name will then be 
the same as the code name base of the module.
+            </hint>
+        </question>
+-->
+ <answer id="resources-preferences">
+  <p>
+   XXX no answer for resources-preferences
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="resources-read" when="final">
+            Does your module read any resources from layers? For what 
purpose?
+            
+            <hint>
+            As this is some kind of intermodule dependency, it is a kind of 
API.
+            Please describe it and classify according to 
+            <a href="http://wiki.netbeans.org/API_Design#What_is_an_API.3F";>
+            common stability categories</a>.
+            </hint>
+        </question>
+-->
+ <answer id="resources-read">
+  <p>
+   XXX no answer for resources-read
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="security-grant" when="final">
+            Does your code grant additional rights to some other code?
+            <hint>Avoid using a class loader that adds extra
+            permissions to loaded code unless really necessary.
+            Also note that your API implementation
+            can also expose unneeded permissions to enemy code by
+            calling AccessController.doPrivileged().</hint>
+        </question>
+-->
+ <answer id="security-grant">
+  <p>
+   XXX no answer for security-grant
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="security-policy" when="final">
+            Does your functionality require modifications to the standard 
policy file?
+            <hint>Your code might pass control to third-party code not
+            coming from trusted domains. This could be code downloaded over 
the
+            network or code coming from libraries that are not bundled
+            with NetBeans. Which permissions need to be granted to which 
domains?</hint>
+        </question>
+-->
+ <answer id="security-policy">
+  <p>
+   XXX no answer for security-policy
+  </p>
+ </answer>
+
+</api-answers>
diff --git a/editor.tools.storage/build.xml b/editor.tools.storage/build.xml
new file mode 100644
--- /dev/null
+++ b/editor.tools.storage/build.xml
@@ -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 --git a/editor.tools.storage/manifest.mf 
b/editor.tools.storage/manifest.mf
new file mode 100644
--- /dev/null
+++ b/editor.tools.storage/manifest.mf
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.modules.editor.tools.storage
+OpenIDE-Module-Layer: org/netbeans/modules/editor/tools/storage/layer.xml
+OpenIDE-Module-Localizing-Bundle: 
org/netbeans/modules/editor/tools/storage/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/editor.tools.storage/nbproject/project.properties 
b/editor.tools.storage/nbproject/project.properties
new file mode 100644
--- /dev/null
+++ b/editor.tools.storage/nbproject/project.properties
@@ -0,0 +1,3 @@
+javac.source=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+javadoc.arch=${basedir}/arch.xml
diff --git a/editor.tools.storage/nbproject/project.xml 
b/editor.tools.storage/nbproject/project.xml
new file mode 100644
--- /dev/null
+++ b/editor.tools.storage/nbproject/project.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1";>
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3";>
+            
<code-name-base>org.netbeans.modules.editor.tools.storage</code-name-base>
+            <module-dependencies>
+                <dependency>
+                    
<code-name-base>org.netbeans.api.annotations.common</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.6</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    
<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>3</release-version>
+                        <specification-version>3.24</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    
<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    
<code-name-base>org.netbeans.modules.editor.settings</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.11</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    
<code-name-base>org.netbeans.modules.editor.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.17</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    
<code-name-base>org.netbeans.modules.options.api</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.33</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    
<code-name-base>org.netbeans.modules.projectapi</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.52</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    
<code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.69</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.5</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.30</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.filesystems</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.loaders</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>5.5</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.modules</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.3</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.nodes</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.5</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.text</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.16</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.windows</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.5</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <test-dependencies>
+                <test-type>
+                    <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.insane</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        
<code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                </test-type>
+            </test-dependencies>
+            <public-packages>
+                
<package>org.netbeans.modules.editor.tools.storage.api</package>
+            </public-packages>
+        </data>
+    </configuration>
+</project>
diff --git 
a/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties
 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties
new file mode 100644
--- /dev/null
+++ 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/Bundle.properties
@@ -0,0 +1,1 @@
+OpenIDE-Module-Name=Editor Tools Storage
diff --git 
a/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd
 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd
new file mode 100644
--- /dev/null
+++ 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/ToolConfiguration-1_0.dtd
@@ -0,0 +1,71 @@
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License.  When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 2013 Sun
+Microsystems, Inc. All Rights Reserved.
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+-->
+
+<!--
+
+This is DTD for Editor's Fonts & Colors options file.
+
+Public ID: "-//NetBeans//DTD Tool Configuration 1.0//EN"
+System ID: http://www.netbeans.org/dtds/ToolConfiguration-1_0.dtd
+
+-->
+<!ELEMENT configuration (tool*)>
+
+<!ELEMENT tool (node*)>
+<!ATTLIST tool
+     kind CDATA #REQUIRED
+     type CDATA #REQUIRED
+>
+
+<!ELEMENT node (node|attribute)*>
+<!ATTLIST node
+     name CDATA #REQUIRED
+>
+
+<!ELEMENT attribute EMPTY>
+<!ATTLIST attribute
+     name CDATA #REQUIRED
+     value CDATA #REQUIRED
+>
diff --git 
a/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java
 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java
new file mode 100644
--- /dev/null
+++ 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferences.java
@@ -0,0 +1,89 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.editor.tools.storage.api;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.prefs.Preferences;
+import 
org.netbeans.modules.editor.tools.storage.api.XMLHintPreferences.HintPreferencesProviderImpl;
+
+/**Persistent storage of {@link Preferences}, sorted by tools and mime-types.
+ *
+ * @author lahvac
+ */
+public class ToolPreferences {
+    private final HintPreferencesProviderImpl prefs;
+
+    private ToolPreferences(HintPreferencesProviderImpl prefs) {
+        this.prefs = prefs;
+    }
+
+    /**Read the specified file and construct the {@link ToolPreferences}.
+     * 
+     * @param source from which the settings should be read
+     * @return a new instance of {@link ToolPreferences}
+     */
+    public static ToolPreferences from(URI source) {
+        return new ToolPreferences(XMLHintPreferences.from(source));
+    }
+    
+    /**Get {@link Preferences} for the given tool and mime-type. The 
settings are
+     * read-write, and are saved automatically, but it is recommended to call
+     * {@link Preferences#flush() } or {@link #save() } to ensure they are 
saved
+     * immediately.
+     * 
+     * @param toolId id of the tool
+     * @param mimeType mime-type for which the settings should be gathered
+     * @return the settings
+     */
+    public Preferences getPreferences(String toolId, String mimeType) {
+        return prefs.getPreferences(toolId, mimeType);
+    }
+    
+    /**Saves any changes done to the {@link Preferences}.
+     * 
+     * @throws IOException if the settings cannot be written
+     */
+    public void save() throws IOException {
+        prefs.save();
+    }
+}
diff --git 
a/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java
 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java
new file mode 100644
--- /dev/null
+++ 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/api/XMLHintPreferences.java
@@ -0,0 +1,330 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2012 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.editor.tools.storage.api;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+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.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.prefs.AbstractPreferences;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
+import org.netbeans.api.annotations.common.NonNull;
+import org.openide.util.Exceptions;
+import org.openide.util.RequestProcessor;
+import org.openide.util.Utilities;
+import org.openide.xml.XMLUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ * @author lahvac
+ */
+class XMLHintPreferences extends AbstractPreferences {
+
+    private final HintPreferencesProviderImpl driver;
+    private final Element node;
+
+    private XMLHintPreferences(HintPreferencesProviderImpl driver, 
XMLHintPreferences parent, String nodeName, Element node) {
+        super(parent, nodeName);
+        this.driver = driver;
+        this.node = node;
+    }
+
+    private Element findAttribute(String key) {
+        NodeList nl = node.getElementsByTagName("attribute");
+        
+        for (int i = 0; i < nl.getLength(); i++) {
+            Element attribute = (Element) nl.item(i);
+            
+            if (key.equals(resolve(attribute.getAttribute("name")))) {
+                return attribute;
+            }
+        }
+        
+        return null;
+    }
+    
+    @Override
+    protected void putSpi(String key, String value) {
+        Element found = findAttribute(key);
+        
+        if (found == null) {
+            found = node.getOwnerDocument().createElement("attribute");
+            found.setAttribute("name", escape(key));
+            node.appendChild(found);
+        }
+        
+        found.setAttribute("value", value);
+        
+        driver.writeNotify();
+    }
+
+    @Override
+    protected String getSpi(String key) {
+        Element found = findAttribute(key);
+        
+        return found != null ? found.getAttribute("value") : null;
+    }
+
+    @Override
+    protected void removeSpi(String key) {
+        Element found = findAttribute(key);
+        
+        node.removeChild(found);
+        
+        driver.writeNotify();
+    }
+
+    @Override
+    protected void removeNodeSpi() throws BackingStoreException {
+        node.getParentNode().removeChild(node);
+        
+        driver.writeNotify();
+    }
+
+    @Override
+    protected String[] keysSpi() throws BackingStoreException {
+        List<String> keys = new ArrayList<>();
+        NodeList nl = node.getElementsByTagName("attribute");
+        
+        for (int i = 0; i < nl.getLength(); i++) {
+            keys.add(resolve(((Element) nl.item(i)).getAttribute("name")));
+        }
+
+        return keys.toArray(new String[keys.size()]);
+    }
+
+    @Override
+    protected String[] childrenNamesSpi() throws BackingStoreException {
+        List<String> names = new ArrayList<>();
+        NodeList nl = node.getElementsByTagName("node");
+        
+        for (int i = 0; i < nl.getLength(); i++) {
+            names.add(resolve(((Element) nl.item(i)).getAttribute("name")));
+        }
+
+        return names.toArray(new String[names.size()]);
+    }
+
+    @Override
+    protected AbstractPreferences childSpi(String name) {
+        String escapedName = escape(name);
+        NodeList nl = node.getElementsByTagName("node");
+        
+        for (int i = 0; i < nl.getLength(); i++) {
+            Node n = nl.item(i);
+
+            if (n instanceof Element && escapedName.equals(((Element) 
n).getAttribute("name"))) {
+                return new XMLHintPreferences(driver, this, name, (Element) 
n);
+            }
+        }
+
+        Element nue = node.getOwnerDocument().createElement("node");
+        
+        nue.setAttribute("name", escapedName);
+
+        node.appendChild(nue);
+
+        driver.writeNotify();
+        
+        return new XMLHintPreferences(driver, this, name, nue);
+    }
+
+    @Override
+    protected void syncSpi() throws BackingStoreException {
+        //TODO:
+    }
+
+    @Override
+    public void flush() throws BackingStoreException {
+        driver.save();
+    }
+
+    @Override
+    protected void flushSpi() throws BackingStoreException {
+        throw new IllegalStateException();
+    }
+
+    private static String escape(String what) {
+        return what;
+    }
+
+    private static String resolve(String what) {
+        return what;
+    }
+
+    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
+        
+        if (file.canRead()) {
+            try(InputStream in = new BufferedInputStream(new 
FileInputStream(file))) {
+                doc = XMLUtil.parse(new InputSource(in), false, false, null, 
null);
+            } catch (SAXException | IOException ex) {
+                LOG.log(Level.FINE, null, ex);
+            }
+        }
+        
+        if (doc == null) {
+            doc = XMLUtil.createDocument("configuration", null, 
"-//NetBeans//DTD Tool Configuration 1.0//EN", 
"http://www.netbeans.org/dtds/ToolConfiguration-1_0.dtd";);
+        }
+        
+        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());
+
+    public static class HintPreferencesProviderImpl {//implements 
HintPreferencesProvider {
+
+        private final URI settings;
+        private final Document doc;
+
+        public HintPreferencesProviderImpl(URI settings, Document doc) {
+            this.settings = settings;
+            this.doc = doc;
+        }
+
+        public Preferences getPreferences(String toolKind, String mimeType) {
+            NodeList nl = 
doc.getDocumentElement().getElementsByTagName("tool");
+            String escapedToolKind = escape(toolKind);
+            String escapedMimeType = escape(mimeType);
+
+            for (int i = 0; i < nl.getLength(); i++) {
+                Element el = (Element) nl.item(i);
+                
+                if (escapedToolKind.equals(el.getAttribute("kind")) && 
escapedMimeType.equals(el.getAttribute("type"))) {
+                    return new XMLHintPreferences(this, null, "", el);
+                }
+            }
+            
+            Element el = doc.createElement("tool");
+            
+            el.setAttribute("kind", escapedToolKind);
+            el.setAttribute("type", escapedMimeType);
+            
+            doc.getDocumentElement().appendChild(el);
+            
+            return new XMLHintPreferences(this, null, "", el);
+        }
+        
+        private long modificationCount = 0;
+        private long lastSave = 0;
+        
+        public void save() {
+            synchronized (this) {
+                if (lastSave >= modificationCount) return ; //already saved
+                lastSave = modificationCount;
+            }
+            
+            File file = Utilities.toFile(settings); //XXX: non-file:// scheme
+            try (OutputStream out = new BufferedOutputStream(new 
FileOutputStream(file))) {
+                XMLUtil.write(doc, out, "UTF-8");
+            } catch (IOException ex) {
+                Exceptions.printStackTrace(ex);
+            }
+        }
+
+        private synchronized void writeNotify() {
+            modificationCount++;
+            SAVER.post(new Runnable() {
+                @Override public void run() {
+                    save();
+                }
+            }, SAVE_DELAY);
+        }
+        
+        private static final RequestProcessor SAVER = new 
RequestProcessor(XMLHintPreferences.class.getName(), 1, false, false);
+        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 --git 
a/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml
 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml
new file mode 100644
--- /dev/null
+++ 
b/editor.tools.storage/src/org/netbeans/modules/editor/tools/storage/layer.xml
@@ -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";>
+<filesystem>
+    <folder name="xml">
+        <folder name="entities">
+            <folder name="NetBeans">
+                <file name="DTD_Tool_Configuration_1.0" 
url="ToolConfiguration-1_0.dtd">
+                    <attr name="hint.originalPublicID" 
stringvalue="-//NetBeans//DTD Tool Configuration 1.0//EN"/>
+                </file>
+            </folder>
+        </folder>
+    </folder>
+</filesystem>
diff --git 
a/editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java
 
b/editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java
new file mode 100644
--- /dev/null
+++ 
b/editor.tools.storage/test/unit/src/org/netbeans/modules/editor/tools/storage/api/ToolPreferencesTest.java
@@ -0,0 +1,87 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.editor.tools.storage.api;
+
+import java.io.File;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import org.netbeans.junit.NbTestCase;
+
+/**
+ *
+ * @author lahvac
+ */
+public class ToolPreferencesTest extends NbTestCase {
+    
+    public ToolPreferencesTest(String testName) {
+        super(testName);
+    }
+    
+    public void testWriteToPreferences() throws Exception {
+        clearWorkDir();
+        File wd = getWorkDir();
+        File settingsFile = new File(wd, "settings.xml");
+        ToolPreferences prefs = ToolPreferences.from(settingsFile.toURI());
+        assertNull(prefs.getPreferences("test", "text/x-test").get("test", 
null));
+        prefs.getPreferences("test", "text/x-test").put("test", "testValue");
+        assertEquals("testValue", 
ToolPreferences.from(settingsFile.toURI()).getPreferences("test", 
"text/x-test").get("test", null));
+        prefs.save();
+        assertEquals("testValue", 
ToolPreferences.from(settingsFile.toURI()).getPreferences("test", 
"text/x-test").get("test", null));
+        
+        Reference<ToolPreferences> ref = new WeakReference<>(prefs);
+        prefs = null;
+        assertGC("Must not hold onto the ToolPreferences", ref);
+    }
+    
+    public void testEscaping() throws Exception {
+        clearWorkDir();
+        File wd = getWorkDir();
+        File settingsFile = new File(wd, "settings.xml");
+        ToolPreferences prefs = ToolPreferences.from(settingsFile.toURI());
+        String key = "\"'<>&";
+        String value = "&><'\"";
+        assertNull(prefs.getPreferences("test", "text/x-test").get(key, 
null));
+        prefs.getPreferences("test", "text/x-test").put(key, value);
+        assertEquals(value, 
ToolPreferences.from(settingsFile.toURI()).getPreferences("test", 
"text/x-test").get(key, null));
+        prefs.save();
+    }
+}
diff --git 
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java
 
b/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
+++ 
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTask.java
@@ -77,6 +77,7 @@
 import org.netbeans.modules.java.hints.declarative.conditionapi.Matcher;
 import org.netbeans.modules.java.hints.declarative.test.TestTokenId;
 import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;
+import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 import org.netbeans.modules.parsing.api.Snapshot;
 import org.netbeans.modules.parsing.spi.*;
 import org.netbeans.modules.parsing.spi.Parser.Result;
@@ -216,7 +217,7 @@
 
             variables.put("$_", tp);
 
-            HintContext ctx = 
SPIAccessor.getINSTANCE().createHintContext(info, null, tp, variables, 
multiVariables, variableNames);
+            HintContext ctx = 
SPIAccessor.getINSTANCE().createHintContext(info, 
HintsSettings.getSettingsFor(info.getFileObject()), null, tp, variables, 
multiVariables, variableNames);
             String pattern = d.spec.substring(d.desc.textStart, 
d.desc.textEnd);
             Context context = new Context(ctx);
 
diff --git 
a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
 
b/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
+++ 
b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
@@ -39,6 +39,7 @@
 
 package org.netbeans.modules.java.hints.declarative.test;
 
+import com.sun.source.util.TreePath;
 import org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry;
 import java.util.Map.Entry;
 import java.io.ByteArrayInputStream;
@@ -64,11 +65,13 @@
 import org.netbeans.api.java.source.Task;
 import org.netbeans.api.queries.FileEncodingQuery;
 import org.netbeans.modules.java.hints.declarative.test.TestParser.TestCase;
-import org.netbeans.modules.java.hints.jackpot.spi.HintsRunner;
 import org.netbeans.spi.editor.hints.ErrorDescription;
 import org.netbeans.spi.editor.hints.Fix;
 import org.netbeans.spi.java.classpath.ClassPathProvider;
 import org.netbeans.modules.java.hints.providers.spi.HintDescription;
+import org.netbeans.modules.java.hints.spiimpl.MessageImpl;
+import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker;
+import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
@@ -147,7 +150,7 @@
                         }
                     });
                     
-                    Map<HintDescription, List<ErrorDescription>> 
computedHints = HintsRunner.computeErrors(parameter, hints, cancel);
+                    Map<HintDescription, List<ErrorDescription>> 
computedHints = new HintsInvoker(HintsSettings.getGlobalSettings(), 
cancel).computeHints(parameter, new TreePath(parameter.getCompilationUnit()), 
hints, new LinkedList<MessageImpl>());
 
                     if (computedHints == null || cancel.get()) return;
                     
diff --git 
a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java
 
b/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
+++ 
b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestUtils.java
@@ -45,6 +45,12 @@
 import org.netbeans.api.lexer.TokenSequence;
 
 import static org.junit.Assert.*;
+import org.netbeans.api.editor.mimelookup.MimePath;
+import 
org.netbeans.modules.java.hints.spiimpl.options.HintsSettings.GlobalSettingsProvider;
+import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
+import org.openide.util.Lookup;
+import org.openide.util.lookup.Lookups;
+import org.openide.util.lookup.ServiceProvider;
 
 /**
  *
@@ -67,4 +73,19 @@
         assertEquals(text, t.text().toString());
     }
 
+    @ServiceProvider(service=MimeDataProvider.class)
+    public static class HintGlobalPreferencesMimeProviderImpl implements 
MimeDataProvider {
+
+        private final Lookup L = Lookups.fixed(new GlobalSettingsProvider());
+        
+        @Override
+        public Lookup getLookup(MimePath mimePath) {
+            if ("text/x-java".equals(mimePath.getPath())) {
+                return L;
 }
+            return Lookup.EMPTY;
+        }
+        
+    }
+
+}
diff --git 
a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java
 
b/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
+++ 
b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/ContextTest.java
@@ -48,7 +48,7 @@
 import java.util.regex.Pattern;
 import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;
 import org.netbeans.modules.java.hints.spiimpl.TestBase;
-import org.netbeans.spi.java.hints.HintContext;
+import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 
 /**
  *
@@ -75,7 +75,7 @@
         variables.put("$3", tp.getParentPath().getParentPath());
         Map<String, Collection<? extends TreePath>> multiVariables = 
Collections.<String, Collection<? extends TreePath>>emptyMap();
         Map<String, String> variables2Names = Collections.emptyMap();
-        Context ctx = new 
Context(SPIAccessor.getINSTANCE().createHintContext(info, null, null, 
variables, multiVariables, variables2Names));
+        Context ctx = new 
Context(SPIAccessor.getINSTANCE().createHintContext(info, 
HintsSettings.getGlobalSettings(), null, null, variables, multiVariables, 
variables2Names));
 
         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 --git 
a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java
 
b/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
+++ 
b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/DefaultRuleUtilitiesTest.java
@@ -44,7 +44,7 @@
 import java.util.regex.Pattern;
 import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;
 import org.netbeans.modules.java.hints.spiimpl.TestBase;
-import org.netbeans.spi.java.hints.HintContext;
+import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 
 /**
  *
@@ -68,7 +68,7 @@
         Map<String, TreePath> variables = Collections.<String, 
TreePath>emptyMap();
         Map<String, Collection<? extends TreePath>> multiVariables = 
Collections.<String, Collection<? extends TreePath>>emptyMap();
         Map<String, String> variables2Names = Collections.emptyMap();
-        Context ctx = new 
Context(SPIAccessor.getINSTANCE().createHintContext(info, null, tp, 
variables, multiVariables, variables2Names));
+        Context ctx = new 
Context(SPIAccessor.getINSTANCE().createHintContext(info, 
HintsSettings.getGlobalSettings(), null, tp, variables, multiVariables, 
variables2Names));
         DefaultRuleUtilities utils = new DefaultRuleUtilities(ctx, new 
Matcher(ctx));
 
         assertTrue(utils.inClass("test.Test.X"));
diff --git 
a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java
 
b/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
+++ 
b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/MatcherTest.java
@@ -47,6 +47,7 @@
 import java.util.regex.Pattern;
 import org.netbeans.modules.java.hints.spiimpl.SPIAccessor;
 import org.netbeans.modules.java.hints.spiimpl.TestBase;
+import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 
 /**
  *
@@ -75,7 +76,7 @@
         Map<String, TreePath> variables = Collections.singletonMap("$1", 
var);
         Map<String, Collection<? extends TreePath>> multiVariables = 
Collections.<String, Collection<? extends TreePath>>singletonMap("$2$", 
Arrays.asList(tp));
         Map<String, String> variables2Names = Collections.emptyMap();
-        Context ctx = new 
Context(SPIAccessor.getINSTANCE().createHintContext(info, null, null, 
variables, multiVariables, variables2Names));
+        Context ctx = new 
Context(SPIAccessor.getINSTANCE().createHintContext(info, 
HintsSettings.getGlobalSettings(), null, null, variables, multiVariables, 
variables2Names));
 
         new Matcher(ctx).referencedIn(new Variable("$1"), new 
Variable("$2$"));
     }
diff --git 
a/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java
 
b/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
+++ 
b/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/legacy/spi/RulesManager.java
@@ -389,6 +389,8 @@
         }
     }
 
+    public static final ThreadLocal<Preferences> currentHintPreferences = 
new ThreadLocal<Preferences>();
+    
     private static class WorkerImpl implements Worker {
         private final TreeRule tr;
 
@@ -397,7 +399,9 @@
         }
 
         public Collection<? extends ErrorDescription> 
createErrors(HintContext ctx) {
+            currentHintPreferences.set(ctx.getPreferences());
             Collection<? extends ErrorDescription> result = 
tr.run(ctx.getInfo(), ctx.getPath());
+            currentHintPreferences.set(null); //XXX: in finally
 
             if (result == null) return result;
 
diff --git 
a/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java
 
b/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
+++ 
b/java.hints.legacy.spi/src/org/netbeans/modules/java/hints/spi/AbstractHint.java
@@ -84,7 +84,8 @@
      * @return Preferences node for given hint.
      */
     public Preferences getPreferences( String profile ) {
-        return HintsSettings.getPreferences(getId(), profile);
+        //TODO: better?
+        return RulesManager.currentHintPreferences.get();
     }
         
     /** Gets the UI description for this rule. It is fine to return null
@@ -106,14 +107,16 @@
      * @return true if enabled false otherwise.
      */
     public final boolean isEnabled() {
-        return 
HintsSettings.isEnabled(getPreferences(HintsSettings.getCurrentProfileId()), 
enableDefault);
+        //XXX: read current settings
+        return enableDefault;
     }
     
     /** Gets current severity of the hint.
      * @return Hints severity in current profile.
      */
     public final HintSeverity getSeverity() {
-        return 
HintSeverity.fromOfficialHintSeverity(HintsSettings.getSeverity(null, 
getPreferences(HintsSettings.getCurrentProfileId())), severityDefault);
+        //XXX: read current settings
+        return severityDefault;
     }
     
     /** Severity of hint
diff --git 
a/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java 
b/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
+++ 
b/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java
@@ -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.editor.hints.Severity;
 import org.netbeans.spi.java.classpath.ClassPathProvider;
 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
 import org.netbeans.spi.java.hints.Hint.Kind;
@@ -190,6 +191,7 @@
     private final FileObject buildRoot;
     private final FileObject cache;
     private final Preferences testPreferences;
+    private final HintsSettings hintSettings;
     private final List<FileObject> checkCompilable = new 
ArrayList<FileObject>();
     private String sourceLevel = "1.5";
     private Character caretMarker;
@@ -243,44 +245,23 @@
 
         TreeLoader.DISABLE_CONFINEMENT_TEST = true;
         testPreferences = new TempPreferences();
-        HintsSettings.setPreferencesOverride(new Map<String, Preferences>() {
-            @Override public int size() {
-                throw new UnsupportedOperationException("Not supported 
yet.");
+        hintSettings = new HintsSettings() {
+            @Override public boolean isEnabled(HintMetadata hint) {
+                return true;
             }
-            @Override public boolean isEmpty() {
-                throw new UnsupportedOperationException("Not supported 
yet.");
+            @Override public void setEnabled(HintMetadata hint, boolean 
value) {
+                throw new UnsupportedOperationException("Not supported.");
             }
-            @Override public boolean containsKey(Object key) {
-                throw new UnsupportedOperationException("Not supported 
yet.");
-            }
-            @Override public boolean containsValue(Object value) {
-                throw new UnsupportedOperationException("Not supported 
yet.");
-            }
-            @Override public Preferences get(Object key) {
+            @Override public Preferences getHintPreferences(HintMetadata 
hint) {
                 return testPreferences;
             }
-            @Override public Preferences put(String key, Preferences value) {
-                throw new UnsupportedOperationException("Not supported 
yet.");
+            @Override public Severity getSeverity(HintMetadata hint) {
+                return hint.severity;
             }
-            @Override public Preferences remove(Object key) {
-                throw new UnsupportedOperationException("Not supported 
yet.");
+            @Override public void setSeverity(HintMetadata hint, Severity 
severity) {
+                throw new UnsupportedOperationException("Not supported.");
             }
-            @Override public void putAll(Map<? extends String, ? extends 
Preferences> m) {
-                throw new UnsupportedOperationException("Not supported 
yet.");
-            }
-            @Override public void clear() {
-                throw new UnsupportedOperationException("Not supported 
yet.");
-            }
-            @Override public Set<String> keySet() {
-                throw new UnsupportedOperationException("Not supported 
yet.");
-            }
-            @Override public Collection<Preferences> values() {
-                throw new UnsupportedOperationException("Not supported 
yet.");
-            }
-            @Override public Set<Entry<String, Preferences>> entrySet() {
-                throw new UnsupportedOperationException("Not supported 
yet.");
-            }
-        });
+        };
 
         workDir = getWorkDir();
         deleteSubFiles(workDir);
@@ -597,7 +578,7 @@
     }
 
     private Map<HintDescription, List<ErrorDescription>> 
computeErrors(CompilationInfo info, Iterable<? extends HintDescription> 
hints, AtomicBoolean cancel) {
-        return new HintsInvoker(info, caret, cancel).computeHints(info, new 
TreePath(info.getCompilationUnit()), hints, new LinkedList<MessageImpl>());
+        return new HintsInvoker(hintSettings, caret, 
cancel).computeHints(info, new TreePath(info.getCompilationUnit()), hints, 
new LinkedList<MessageImpl>());
     }
 
     FileObject getSourceRoot() {
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java
@@ -41,19 +41,15 @@
  */
 package org.netbeans.modules.java.hints.analysis;
 
-import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.prefs.Preferences;
 import org.netbeans.api.java.source.CompilationController;
 import org.netbeans.modules.analysis.spi.Analyzer;
 import org.netbeans.modules.java.hints.providers.spi.HintDescription;
@@ -71,6 +67,7 @@
 import org.netbeans.modules.java.hints.spiimpl.refactoring.Utilities;
 import 
org.netbeans.modules.java.hints.spiimpl.refactoring.Utilities.ClassPathBasedHintWrapper;
 import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.Severity;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.NbBundle;
@@ -107,13 +104,14 @@
         final List<ErrorDescription> result = new 
ArrayList<ErrorDescription>();
         ProgressHandleWrapper w = new ProgressHandleWrapper(ctx, 10, 90);
         Collection<HintDescription> hints = new ArrayList<HintDescription>();
+        HintsSettings settings = 
HintsSettings.createPreferencesBasedHintsSettings(ctx.getSettings(), false, 
null);
 
         for (Entry<? extends HintMetadata, ? extends Collection<? extends 
HintDescription>> e : Utilities.getBatchSupportedHints(new 
ClassPathBasedHintWrapper()).entrySet()) {
             if (singleWarning != null) {
                 if (!singleWarning.equals(e.getKey().id)) continue;
             } else if (ctx.getSettings() != null) {
-                if (!HintsSettings.isEnabled(e.getKey(), 
ctx.getSettings().node(e.getKey().id))) continue;
-            } else if (!HintsSettings.isEnabled(e.getKey())) continue;
+                if (!settings.isEnabled(e.getKey())) continue;
+            }
 
             hints.addAll(e.getValue());
         }
@@ -124,22 +122,9 @@
         todo.addAll(ctx.getScope().getFolders());
         todo.addAll(ctx.getScope().getFiles());
 
-        BatchResult candidates = BatchSearch.findOccurrences(hints, 
Scopes.specifiedFoldersScope(Folder.convert(todo)), w);
+        BatchResult candidates = BatchSearch.findOccurrences(hints, 
Scopes.specifiedFoldersScope(Folder.convert(todo)), w, settings);
         List<MessageImpl> problems = new 
LinkedList<MessageImpl>(candidates.problems);
-        Map<String, Preferences> origOverride = 
HintsSettings.getPreferencesOverride();
         
-        try {
-            final Preferences settings = ctx.getSettings();
-            if (settings != null) {
-                HintsSettings.setPreferencesOverride(new AbstractMap<String, 
Preferences>() {
-                    @Override public Preferences get(Object key) {
-                        return settings.node((String) key);
-                    }
-                    @Override public Set<Entry<String, Preferences>> 
entrySet() {
-                        throw new UnsupportedOperationException("Should not 
be called.");
-                    }
-                });
-            }
             BatchSearch.getVerifiedSpans(candidates, w, new 
BatchSearch.VerifiedSpansCallBack() {
                 public void groupStarted() {}
                 public boolean spansVerified(CompilationController wc, 
Resource r, Collection<? extends ErrorDescription> inHints) throws Exception {
@@ -150,9 +135,6 @@
                 public void cannotVerifySpan(Resource r) {
                 }
             }, problems, cancel);
-        } finally {
-            HintsSettings.setPreferencesOverride(origOverride);
-        }
 
         w.finish();
 
@@ -222,7 +204,7 @@
                     if (context.getPreselectId() == null) {
                         HintsPanel prev = context.getPreviousComponent();
                         if (prev != null) {
-                            
prev.setOverlayPreferences(context.getSettings());
+                            
prev.setOverlayPreferences(HintsSettings.createPreferencesBasedHintsSettings(context.getSettings(),
 false, Severity.VERIFIER));
                             return prev;
                         }
                         return new HintsPanel(context.getSettings(), 
context.getData());
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml 
b/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
+++ b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/layer.xml
@@ -28,5 +28,17 @@
           </folder>
       </folder>
   </folder>
+  <folder name="Projects">
+      <folder name="hints">
+          <folder name="java-based">
+              <file name="JavaHints.instance">
+                  <attr name="instanceOf" 
stringvalue="org.netbeans.spi.options.OptionsPanelController"/>
+                  <attr name="instanceCreate" 
newvalue="org.netbeans.modules.java.hints.spiimpl.options.HintsOptionsPanelController"/>
+                  <attr name="mimeType" stringvalue="text/x-java"/>
+              </file>
+          </folder>
+      </folder>
+  </folder>
+    
 
 </filesystem>
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsOptionsPanelController.java
@@ -47,15 +47,20 @@
 import java.beans.PropertyChangeSupport;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.prefs.Preferences;
 import org.netbeans.modules.java.hints.spiimpl.RulesManager;
 import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
+import 
org.netbeans.modules.java.hints.spiimpl.refactoring.Utilities.ClassPathBasedHintWrapper;
 import org.netbeans.modules.options.editor.spi.OptionsFilter;
+import org.netbeans.spi.editor.hints.settings.FileHintPreferences;
 import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
 
+//XXX: not finished!
 public final class HintsOptionsPanelController extends 
OptionsPanelController {
     
+    private HintsSettings settings;
     private HintsPanel panel;
     
     private final PropertyChangeSupport pcs = new 
PropertyChangeSupport(this);
@@ -63,13 +68,15 @@
                     
     public void update() {
         if (panel != null) {
-            panel.update(true);
+            panel.update();
+            panel.setOverlayPreferences(settings);
         }
     }
     
     public void applyChanges() {
         if ( isChanged() ) {
             panel.applyChanges();
+            FileHintPreferences.fireChange();
         }
     }
     
@@ -92,8 +99,14 @@
     }
     
     public synchronized HintsPanel getComponent(Lookup masterLookup) {
+        Preferences prefs = masterLookup.lookup(Preferences.class);
+        if (prefs != null) {
+            settings = 
HintsSettings.createPreferencesBasedHintsSettings(prefs, true, null);
+        } else {
+            settings = null;
+        }
         if ( panel == null ) {
-            panel = new HintsPanel(masterLookup.lookup(OptionsFilter.class));
+            panel = new HintsPanel(masterLookup.lookup(OptionsFilter.class), 
settings);
         }
         return panel;
     }
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
@@ -116,6 +116,8 @@
 import 
org.netbeans.modules.java.hints.spiimpl.refactoring.Utilities.ClassPathBasedHintWrapper;
 import org.netbeans.modules.options.editor.spi.OptionsFilter;
 import org.netbeans.modules.options.editor.spi.OptionsFilter.Acceptor;
+import org.netbeans.spi.editor.hints.Severity;
+import org.netbeans.spi.java.hints.Hint.Kind;
 import org.openide.cookies.EditorCookie;
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataFolder;
@@ -148,7 +150,7 @@
     private boolean confirmed;
     
     @Messages("LBL_Loading=Loading...")
-    HintsPanel(@NullAllowed final OptionsFilter filter) {
+    HintsPanel(@NullAllowed final OptionsFilter filter, @NullAllowed final 
HintsSettings overlay) {
         this.cpBased = null;
         this.queryStatus = QueryStatus.SHOW_QUERIES;
         this.showHeavyInspections = false;
@@ -162,7 +164,10 @@
                     @Override
                     public void run() {
                         HintsPanel.this.removeAll();
-                        HintsPanel.this.init(filter, true, false, false, 
true);
+                        HintsPanel.this.init(filter, false, overlay != null, 
true, false, true, true);
+                        if (overlay != null) {
+                            HintsPanel.this.setOverlayPreferences(overlay);
+                        }
                         buttonsPanel.setVisible(false);
                         searchPanel.setVisible(false);
                         configurationsPanel.setVisible(false);
@@ -179,14 +184,14 @@
         this.cpBased = cpBased;
         this.queryStatus = QueryStatus.ONLY_ENABLED;
         this.showHeavyInspections = true;
-        init(null, false, true, true, true);
+        init(null, true, false, false, true, true, true);
         configCombo.setSelectedItem(preselected);
     }
     public HintsPanel(HintMetadata preselected, @NullAllowed final 
CustomizerContext<?, ?> cc, ClassPathBasedHintWrapper cpBased) {
         this.cpBased = cpBased;
         this.queryStatus = cc == null ? QueryStatus.NEVER : 
QueryStatus.SHOW_QUERIES;
         this.showHeavyInspections = true;
-        init(null, false, false, cc == null, false);
+        init(null, true, false, false, false, cc == null, false);
         select(preselected);
         configurationsPanel.setVisible(false);
         
@@ -207,12 +212,13 @@
         this.cpBased = cpBased;
         this.queryStatus = QueryStatus.SHOW_QUERIES;
         this.showHeavyInspections = true;
-        init(null, false, false, false, true);
-        setOverlayPreferences(configurations);
+        init(null, true, false, false, false, false, true);
+        
setOverlayPreferences(HintsSettings.createPreferencesBasedHintsSettings(configurations,
 false, Severity.VERIFIER));
         configurationsPanel.setVisible(false);
     }
 
-    public void setOverlayPreferences(Preferences configurations) {
+    public void setOverlayPreferences(HintsSettings configurations) {
+        if (logic != null)
         logic.setOverlayPreferences(configurations);
     }
 
@@ -230,11 +236,11 @@
         }
     }
     
-    private void init(@NullAllowed OptionsFilter filter, boolean 
inOptionsDialog, boolean useConfigCombo, boolean showOkCancel, boolean 
showCheckBoxes) {
+    private void init(@NullAllowed OptionsFilter filter, boolean batchOnly, 
boolean filterSuggestions, boolean ignoreMissingFilter, boolean 
showSeverityCombo, boolean showOkCancel, boolean showCheckBoxes) {
         initComponents();
         scriptScrollPane.setVisible(false);
         optionsFilter = null;
-        if (!inOptionsDialog && filter==null) {
+        if (!ignoreMissingFilter && filter==null) {
             optionsFilter = new 
org.netbeans.modules.java.hints.spiimpl.refactoring.OptionsFilter(
                     searchTextField.getDocument(), new Runnable() {
         
@@ -247,9 +253,9 @@
         }
         configCombo.setModel(new ConfigurationsComboModel(true));
         configCombo.setRenderer(new ConfigurationRenderer());
-        if (useConfigCombo || inOptionsDialog) {
+//        if (useConfigCombo || inOptionsDialog) {
             configCombo.setSelectedItem(null);
-        }
+//        }
         
         descriptionTextArea.setContentType("text/html"); // NOI18N
         descriptionTextArea.putClientProperty( 
JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE );
@@ -303,9 +309,9 @@
 
         toProblemCheckBox.setVisible(false);
         
-        Collection<? extends HintMetadata> hints = 
inOptionsDialog?filterCustom(RulesManager.getInstance().readHints(null, null, 
null).keySet()):Utilities.getBatchSupportedHints(cpBased).keySet();
+        Collection<? extends HintMetadata> hints = 
!batchOnly?filterCustom(RulesManager.getInstance().readHints(null, null, 
null).keySet(), 
filterSuggestions):Utilities.getBatchSupportedHints(cpBased).keySet();
 
-        errorTreeModel = constructTM(hints, inOptionsDialog);
+        errorTreeModel = constructTM(hints, !batchOnly && 
!filterSuggestions);
 
         if (filter != null) {
              ((OptionsFilter) filter).installFilteringModel(errorTree, 
errorTreeModel, new AcceptorImpl());
@@ -314,7 +320,7 @@
         }
 
         initialized.set(true);
-        update(inOptionsDialog);
+        update();
         
         if (toSelect != null) {
             select(toSelect, true);
@@ -329,8 +335,8 @@
         editScriptButton.setVisible(editEnabled);
         editingButtons.setVisible(false);
         
-        severityComboBox.setVisible(useConfigCombo || inOptionsDialog);
-        severityLabel.setVisible(useConfigCombo || inOptionsDialog);
+        severityComboBox.setVisible(showSeverityCombo);
+        severityLabel.setVisible(showSeverityCombo);
         okButton.setVisible(showOkCancel);
         cancelButton.setVisible(showOkCancel);
         validate();
@@ -724,7 +730,7 @@
             setModel(errorTreeModel);
             logic.errorTreeModel = errorTreeModel;
             HintMetadata newHint = 
getHintByName(newIfcDO.getPrimaryFile().getNameExt());
-            HintsSettings.setEnabled(logic.getCurrentPrefernces(newHint.id), 
true);
+            logic.writableSettings.setEnabled(newHint, true);
             select(newHint);
             hasNewHints = true;
         } catch (IOException ex) {
@@ -849,13 +855,15 @@
         }
         return null;
     }    
-    synchronized void update(boolean inOptionsDialog) {
+    synchronized void update() {
         if (!initialized.get()) return;
+        HintsSettings overlay = null;
         if ( logic != null ) {
             logic.disconnect();
+            overlay = logic.getOverlayPreferences();
         }
         logic = new HintsPanelLogic();
-        logic.connect(errorTree, errorTreeModel, severityLabel, 
severityComboBox, toProblemCheckBox, customizerPanel, descriptionTextArea, 
configCombo, editScriptButton, inOptionsDialog);
+        logic.connect(errorTree, errorTreeModel, severityLabel, 
severityComboBox, toProblemCheckBox, customizerPanel, descriptionTextArea, 
configCombo, editScriptButton, overlay);
     }
     
     void cancel() {
@@ -868,7 +876,7 @@
         return logic != null ? logic.isChanged() : false;
     }
     
-    void applyChanges() {
+    public void applyChanges() {
         if (!initialized.get()) return;
         logic.applyChanges();
         logic.disconnect();
@@ -890,6 +898,7 @@
             renderer.setForeground(selected ? dr.getTextSelectionColor() : 
dr.getTextNonSelectionColor());
             renderer.setFont(renderer.getFont().deriveFont(Font.PLAIN));
             renderer.setOpaque(true);
+            renderer.setEnabled(tree.isEnabled());
 
             Object data = ((DefaultMutableTreeNode) value).getUserObject();
             if (data instanceof HintCategory) {
@@ -920,6 +929,7 @@
             renderer.setBackground(selected ? 
dr.getBackgroundSelectionColor() : dr.getBackgroundNonSelectionColor());
             renderer.setForeground(selected ? dr.getTextSelectionColor() : 
dr.getTextNonSelectionColor());
             renderer.setFont(renderer.getFont().deriveFont(Font.PLAIN));
+            renderer.setEnabled(tree.isEnabled());
 
             Object data = ((DefaultMutableTreeNode) value).getUserObject();
             if (data instanceof HintCategory) {
@@ -1275,12 +1285,13 @@
         return null;
     }
 
-    private Collection<? extends HintMetadata> 
filterCustom(Set<HintMetadata> keySet) {
+    private Collection<? extends HintMetadata> 
filterCustom(Set<HintMetadata> keySet, boolean filterSuggestions) {
         ArrayList<HintMetadata> list = new ArrayList<HintMetadata>();
         for (HintMetadata hint:keySet) {
             if (HintCategory.CUSTOM_CATEGORY.equals(hint.category)) {
                 continue;
             }
+            if (hint.kind == Kind.ACTION && filterSuggestions) continue;
             list.add(hint);
         }
         return list;
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanelLogic.java
@@ -58,6 +58,7 @@
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.prefs.AbstractPreferences;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
@@ -83,6 +84,7 @@
 import org.netbeans.modules.java.hints.spiimpl.options.HintsPanel.State;
 import org.netbeans.modules.java.hints.spiimpl.refactoring.Configuration;
 import org.netbeans.spi.editor.hints.Severity;
+import org.netbeans.spi.editor.hints.settings.FileHintPreferences;
 import org.netbeans.spi.java.hints.Hint.Kind;
 import org.openide.awt.Mnemonics;
 import org.openide.filesystems.FileObject;
@@ -97,7 +99,7 @@
  */
 public class HintsPanelLogic implements MouseListener, KeyListener, 
TreeSelectionListener, ChangeListener, ActionListener, ItemListener {
 
-    private Map<String,ModifiedPreferences> changes = new HashMap<String, 
ModifiedPreferences>();
+    private Map<HintMetadata,ModifiedPreferences> changes = new 
HashMap<HintMetadata, ModifiedPreferences>();
     private DependencyTracking depScn = null;
     
     private static final Map<Severity,Integer> severity2index;
@@ -142,10 +144,10 @@
     private String depScanningLabel = NbBundle.getMessage(HintsPanel.class, 
"CTL_Scope_Label"); //NOI18N
     private String depScanningDescription = 
NbBundle.getMessage(HintsPanel.class, "CTL_Scope_Desc"); //NOI18N
     private JComboBox configCombo;
-    private String currentProfileId = HintsSettings.getCurrentProfileId();
+//    private String currentProfileId = HintsSettings.getCurrentProfileId();
     private JButton editScript;
-    private Preferences overlayPreferences;
-    private boolean inOptionsDialog;
+    private HintsSettings originalSettings;
+            WritableSettings writableSettings;
     
     HintsPanelLogic() {
         defModel.addElement(NbBundle.getMessage(HintsPanel.class, 
"CTL_AsError")); //NOI18N
@@ -160,7 +162,7 @@
     void connect( final JTree errorTree, DefaultTreeModel errorTreeModel, 
JLabel severityLabel, JComboBox severityComboBox,
                   JCheckBox tasklistCheckBox, JPanel customizerPanel,
                   JEditorPane descriptionTextArea, final JComboBox 
configCombo, JButton editScript,
-                  boolean inOptionsDialog) {
+                  HintsSettings settings) {
         
         this.errorTree = errorTree;
         this.errorTreeModel = errorTreeModel;
@@ -171,12 +173,18 @@
         this.descriptionTextArea = descriptionTextArea;        
         this.configCombo = configCombo;
         this.editScript = editScript;
-        this.inOptionsDialog = inOptionsDialog;
         
         
         if (configCombo.getSelectedItem() !=null) {
-            currentProfileId = ((Configuration) 
configCombo.getSelectedItem()).id();
+            originalSettings = ((Configuration) 
configCombo.getSelectedItem()).getSettings();
+        } else if (settings != null) {
+            originalSettings = settings;
+        } else {
+            originalSettings = HintsSettings.getGlobalSettings();
         }        
+        
+        writableSettings = new WritableSettings(originalSettings);
+        
         valueChanged( null );
         
         errorTree.addKeyListener(this);
@@ -202,26 +210,27 @@
         componentsSetEnabled( false );
     }
     
-    String getCurrentProfileId() {
-        return currentProfileId;
-    }
+//    String getCurrentProfileId() {
+//        return currentProfileId;
+//    }
 
-    synchronized void setOverlayPreferences(Preferences prefs) {
+    synchronized void setOverlayPreferences(HintsSettings settings) {
         applyChanges();
-        this.overlayPreferences = prefs;
+        this.originalSettings = settings != null ? settings : 
HintsSettings.getGlobalSettings();
+        this.writableSettings = new WritableSettings(settings);
         valueChanged(null);
         errorTree.repaint();
     }
     
+    synchronized HintsSettings getOverlayPreferences() {
+        return originalSettings;
+    }
+    
     synchronized void applyChanges() {
-       boolean containsChanges = false;
-        for (String hint : changes.keySet()) {
-            ModifiedPreferences mn = changes.get(hint);
-           containsChanges |= !mn.isEmpty();
-            mn.store(HintsSettings.getPreferences(hint, 
getCurrentProfileId()));
-        }
+       boolean containsChanges = writableSettings.isModified();
+        writableSettings.commit();
        if (containsChanges) {
-           HintsSettings.fireChangeEvent();
+            FileHintPreferences.fireChange();
        }
         if (depScn != null)
             DepScanningSettings.setDependencyTracking(depScn);
@@ -231,24 +240,22 @@
     /** Were there any changes in the settings
      */
     boolean isChanged() {
-        return !changes.isEmpty() || depScn != null;
+        return writableSettings.isModified()|| depScn != null;
     }
     
-    synchronized Preferences getCurrentPrefernces( String id ) {
-        if (overlayPreferences != null) return overlayPreferences.node(id);
-        Preferences node = changes.get(id);
-        return node == null ? HintsSettings.getPreferences(id, 
getCurrentProfileId() ) : node;
-    }
-    
-    synchronized Preferences getPreferences4Modification(String hint ) {
-        if (overlayPreferences != null) return overlayPreferences.node(hint);
-        Preferences node = changes.get(hint);        
-        if ( node == null ) {
-            node = new 
ModifiedPreferences(HintsSettings.getPreferences(hint, getCurrentProfileId() 
) );
-            changes.put( hint, (ModifiedPreferences)node);
-        }        
-        return node;                
-    }
+//    synchronized Preferences getCurrentPrefernces(HintMetadata hm) {
+//        Preferences node = changes.get(hm);
+//        return node == null ? settings.getHintPreferences(hm) : node;
+//    }
+//    
+//    synchronized Preferences getPreferences4Modification(HintMetadata hm) {
+//        Preferences node = changes.get(hm);
+//        if ( node == null ) {
+//            node = new 
ModifiedPreferences(settings.getHintPreferences(hm));
+//            changes.put(hm, (ModifiedPreferences)node);
+//        }        
+//        return node;                
+//    }
     
     synchronized DependencyTracking getCurrentDependencyTracking() {
         return depScn != null ? depScn : 
DepScanningSettings.getDependencyTracking();
@@ -357,13 +364,11 @@
             
             // Set proper values to the componetnts
             
-            Preferences p = getCurrentPrefernces(hint.id);
-
             if (hint.kind == Kind.ACTION) {
                 
severityComboBox.setSelectedIndex(severity2index.get(Severity.HINT));
                 severityComboBox.setEnabled(false);
             } else {
-                Severity severity = HintsSettings.getSeverity(hint, p);
+                Severity severity = writableSettings.getSeverity(hint);
                 if (severity != null) {
                     
severityComboBox.setSelectedIndex(severity2index.get(severity));
                     severityComboBox.setEnabled(true);
@@ -373,17 +378,16 @@
                 }
             }
             
-            boolean toTasklist = HintsSettings.isShowInTaskList(hint, p);
-            tasklistCheckBox.setSelected(toTasklist);
+            //TODO: tasklist checkbox
+//            boolean toTasklist = HintsSettings.isShowInTaskList(hint, p);
+//            tasklistCheckBox.setSelected(toTasklist);
             
             String description = hint.description;
             descriptionTextArea.setText( description == null ? "" : 
wrapDescription(description, hint)); // NOI18N
                                     
             // Optionally show the customizer
             customizerPanel.removeAll();
-            JComponent c = hint.customizer != null ? 
hint.customizer.getCustomizer(ex == null ?
-                getCurrentPrefernces(hint.id) :
-                getPreferences4Modification(hint.id)) : null;
+            JComponent c = hint.customizer != null ? 
hint.customizer.getCustomizer(/*TODO: will always create modified 
prefs*/writableSettings.getHintPreferences(hint)) : null;
 
             if ( c != null ) {               
                 customizerPanel.add(c, BorderLayout.CENTER);
@@ -426,10 +430,9 @@
         
         if ( o instanceof HintMetadata ) {
             HintMetadata hint = (HintMetadata) o;
-            Preferences p = getPreferences4Modification(hint.id);
             
-            if(HintsSettings.getSeverity(hint, p) != null)
-                HintsSettings.setSeverity(p, 
index2severity(severityComboBox.getSelectedIndex()));            
+            if(writableSettings.getSeverity(hint) != null)
+                writableSettings.setSeverity(hint, 
index2severity(severityComboBox.getSelectedIndex()));            
         } else if (o instanceof String) {
             if (getCurrentDependencyTracking() != 
DependencyTracking.DISABLED)
                 depScn = 
index2deptracking(severityComboBox.getSelectedIndex());
@@ -496,8 +499,7 @@
         if ( o instanceof HintMetadata ) {
             HintMetadata hint = (HintMetadata)o;
             boolean value = isEnabled(hint);
-            Preferences mn = getPreferences4Modification(hint.id);
-            HintsSettings.setEnabled(mn, !value);
+            writableSettings.setEnabled(hint, !value);
             model.nodeChanged(node);
             model.nodeChanged(node.getParent());
         }
@@ -511,8 +513,7 @@
                     HintMetadata hint = (HintMetadata)cho;
                     boolean cv = isEnabled(hint);
                     if ( cv != value ) {                    
-                        Preferences mn = 
getPreferences4Modification(hint.id);
-                        HintsSettings.setEnabled(mn, value);
+                        writableSettings.setEnabled(hint, value);
                         model.nodeChanged( ch );
                     }
                 }
@@ -550,14 +551,14 @@
         Object o = configCombo.getSelectedItem();
         if (o instanceof Configuration) {
             applyChanges();
-            currentProfileId = ((Configuration) o).id();
+//            currentProfileId = ((Configuration) o).id();
             valueChanged(null);
             errorTree.repaint();
         }
     }
 
     public boolean isEnabled(HintMetadata hint) {
-        return 
HintsSettings.isEnabledWithDefault(getCurrentPrefernces(hint.id), 
inOptionsDialog && hint.enabled);
+        return writableSettings.isEnabled(hint);
     }
     
     public static final class HintCategory {
@@ -690,4 +691,84 @@
         }
     };
 
+    static final class WritableSettings extends HintsSettings {
+        private final HintsSettings delegate;
+        private Map<HintMetadata,ModifiedHint> changes = new 
HashMap<HintMetadata, ModifiedHint>();
+
+        public WritableSettings(HintsSettings delegate) {
+            this.delegate = delegate;
 }
+
+        @Override
+        public boolean isEnabled(HintMetadata hint) {
+            ModifiedHint modified = changes.get(hint);
+            Boolean enabled = modified != null ? modified.enabledOverride : 
null;
+            
+            if (enabled != null) return enabled;
+            else return delegate.isEnabled(hint);
+        }
+
+        private ModifiedHint forWriting(HintMetadata hint) {
+            ModifiedHint result = changes.get(hint);
+            
+            if (result == null) {
+                changes.put(hint, result = new ModifiedHint());
+            }
+            
+            return result;
+        }
+        
+        @Override
+        public void setEnabled(HintMetadata hint, boolean value) {
+            forWriting(hint).enabledOverride = value;
+        }
+
+        @Override
+        public Preferences getHintPreferences(HintMetadata hint) {
+            Preferences prefs = forWriting(hint).preferencesOverride;
+            
+            if (prefs == null) {
+                //will always create the modified preferences
+                forWriting(hint).preferencesOverride = new 
ModifiedPreferences(delegate.getHintPreferences(hint));
+            }
+            
+            return prefs;
+        }
+
+        @Override
+        public Severity getSeverity(HintMetadata hint) {
+            ModifiedHint modified = changes.get(hint);
+            Severity severity = modified != null ? modified.severityOverride 
: null;
+            
+            if (severity != null) return severity;
+            else return delegate.getSeverity(hint);
+        }
+
+        @Override
+        public void setSeverity(HintMetadata hint, Severity severity) {
+            forWriting(hint).severityOverride = severity;
+        }
+        
+        public boolean isModified() {
+            return true; //XXX
+        }
+        
+        public void commit() {
+            for (Entry<HintMetadata, ModifiedHint> e : changes.entrySet()) {
+                if (e.getValue().preferencesOverride != null)
+                    
e.getValue().preferencesOverride.store(delegate.getHintPreferences(e.getKey()));
+                if (e.getValue().enabledOverride != null)
+                    delegate.setEnabled(e.getKey(), 
e.getValue().enabledOverride);
+                if (e.getValue().severityOverride != null)
+                    delegate.setSeverity(e.getKey(), 
e.getValue().severityOverride);
+            }
+        }
+        
+        private static final class ModifiedHint {
+            private Boolean enabledOverride;
+            private Severity severityOverride;
+            private ModifiedPreferences preferencesOverride;
+        }
+    }
+
+}
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/AbstractApplyHintsRefactoringPlugin.java
@@ -74,6 +74,7 @@
 import 
org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper.ProgressHandleAbstraction;
 import org.netbeans.spi.java.hints.HintContext.MessageKind;
 import org.netbeans.modules.java.hints.providers.spi.HintDescription;
+import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 import org.netbeans.modules.refactoring.api.AbstractRefactoring;
 import org.netbeans.modules.refactoring.api.Problem;
 import org.netbeans.modules.refactoring.api.ProgressEvent;
@@ -132,7 +133,7 @@
 
     protected Collection<MessageImpl> performApplyPattern(Iterable<? extends 
HintDescription> pattern, Scope scope, RefactoringElementsBag 
refactoringElements) {
         ProgressHandleWrapper w = new ProgressHandleWrapper(this, 30, 70);
-        BatchResult candidates = BatchSearch.findOccurrences(pattern, scope, 
w);
+        BatchResult candidates = BatchSearch.findOccurrences(pattern, scope, 
w, /*XXX:*/HintsSettings.getGlobalSettings());
         Collection<RefactoringElementImplementation> fileChanges = new 
ArrayList<RefactoringElementImplementation>();
         Collection<MessageImpl> problems = new 
LinkedList<MessageImpl>(candidates.problems);
         Map<JavaFix, ModificationResult> changesPerFix = new 
IdentityHashMap<JavaFix, ModificationResult>();
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/Configuration.java
@@ -41,15 +41,12 @@
  */
 package org.netbeans.modules.java.hints.spiimpl.refactoring;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import java.util.prefs.Preferences;
+import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
 import org.netbeans.modules.java.hints.spiimpl.RulesManager;
-import org.netbeans.modules.java.hints.providers.spi.HintDescription;
-import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
 import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
+import static 
org.netbeans.modules.java.hints.spiimpl.options.HintsSettings.createPreferencesBasedHintsSettings;
+import org.netbeans.spi.editor.hints.Severity;
 import org.openide.util.NbPreferences;
 
 /**
@@ -68,15 +65,10 @@
         prefs.put("display.name", displayName);
     }
     
-    public List<HintMetadata> getHints(Map<? extends HintMetadata, ? extends 
Iterable<? extends HintDescription>> allHints) {
-        ArrayList<HintMetadata> hints = new ArrayList();
-        for (HintMetadata hint : allHints.keySet()) {
-            Preferences prefs = HintsSettings.getPreferences(hint.id, id());
-            if (HintsSettings.isEnabled(hint, prefs)) {
-                hints.add(hint);
-            }
-        }
-        return Collections.unmodifiableList(hints);
+    private static final String DEFAULT_PROFILE = "default"; // NOI18N
+    private static final String PREFERENCES_LOCATION = 
"org/netbeans/modules/java/hints";
+    public HintsSettings getSettings() {
+        return 
createPreferencesBasedHintsSettings(NbPreferences.root().node(PREFERENCES_LOCATION).node(DEFAULT_PROFILE),
 false, Severity.VERIFIER);
     }
     
     public String getDisplayName() {
@@ -100,6 +92,11 @@
     }
 
     public void enable(String hintId) {
-        HintsSettings.getPreferences(hintId, id()).putBoolean("enabled", 
true);
+        for (HintMetadata hm : RulesManager.getInstance().readHints(null, 
null, null).keySet()) {
+            if (hintId.equals(hm.id)) {
+                getSettings().setEnabled(hm, true);
+                return ;
     }
 }
+    }
+}
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/FindDuplicatesRefactoringPlugin.java
@@ -49,6 +49,7 @@
 import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch;
 import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult;
 import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper;
+import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 import org.netbeans.modules.refactoring.api.Problem;
 import org.netbeans.modules.refactoring.spi.RefactoringElementsBag;
 import org.netbeans.spi.java.hints.Hint.Kind;
@@ -102,7 +103,7 @@
     private List<MessageImpl> performSearchForPattern(final 
RefactoringElementsBag refactoringElements) {
         ProgressHandleWrapper w = new ProgressHandleWrapper(this, 10, 90);
         Iterable<? extends HintDescription> queries = 
filterQueries(refactoring.getPattern(), true);
-        BatchResult candidates = BatchSearch.findOccurrences(queries, 
refactoring.getScope(), w);
+        BatchResult candidates = BatchSearch.findOccurrences(queries, 
refactoring.getScope(), w, /*XXX:*/HintsSettings.getGlobalSettings());
         List<MessageImpl> problems = new 
LinkedList<MessageImpl>(candidates.problems);
 
         if (queries.iterator().hasNext()) {
diff --git 
a/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java
 
b/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
+++ 
b/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java
@@ -67,6 +67,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;

[hg] main-silver: #181726: ability to specify hints settings per...

Jan Lahoda 04/26/2013

Project Features

About this Project

Editor was started in November 2009, is owned by Martin Ryzl, and has 147 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close