1.1 --- a/.hgignore	Sat Feb 18 22:14:42 2012 +0100
     1.2 +++ b/.hgignore	Tue Feb 21 22:37:57 2012 +0100
     1.3 @@ -8,7 +8,7 @@
     1.4  ^external$
     1.5  .*/external$
     1.6  \.old$
     1.7 -^server/lib$
     1.8 +^lib$
     1.9  .*/nbproject-.*/private.xml
    1.10  \.aux$
    1.11  \.dvi$

     2.1 --- a/api/build.xml	Sat Feb 18 22:14:42 2012 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,23 +0,0 @@
     2.4 -<?xml version="1.0" encoding="UTF-8"?>
     2.5 -<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
     2.6 -<!-- for some information on what you could do (e.g. targets to override). -->
     2.7 -<!-- If you delete this file and reopen the project it will be recreated. -->
     2.8 -<project name="org.netbeans.modules.jackpot30.api" default="netbeans" basedir=".">
     2.9 -    <description>Builds, tests, and runs the project org.netbeans.modules.jackpot30.api.</description>
    2.10 -    <import file="nbproject/build-impl.xml"/>
    2.11 -    <import file="${suite.dir}/findbugs-import.xml"/>
    2.12 -
    2.13 -    <!-- Mac -->
    2.14 -    <pathconvert property="retouche.javac">
    2.15 -        <fileset dir="${nbplatform.active.dir}">
    2.16 -            <filename name="java*/modules/ext/javac*.jar"/>
    2.17 -        </fileset>
    2.18 -        <fileset dir="${java.home}/../Classes" erroronmissingdir="false">
    2.19 -            <include name="*.jar"/>
    2.20 -        </fileset>
    2.21 -    </pathconvert>
    2.22 -    <echo message="${retouche.javac}"/>
    2.23 -    <condition property="bootclasspath.mac" value="${retouche.javac}">
    2.24 -        <os family="mac"/>
    2.25 -    </condition>
    2.26 -</project>

     3.1 --- a/api/manifest.mf	Sat Feb 18 22:14:42 2012 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,7 +0,0 @@
     3.4 -Manifest-Version: 1.0
     3.5 -AutoUpdate-Show-In-Client: false
     3.6 -OpenIDE-Module: org.netbeans.modules.jackpot30.api
     3.7 -OpenIDE-Module-Implementation-Version: 1
     3.8 -OpenIDE-Module-Layer: org/netbeans/modules/jackpot30/impl/resources/layer.xml
     3.9 -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jackpot30/impl/resources/Bundle.properties
    3.10 -

     4.1 --- a/api/nbproject/build-impl.xml	Sat Feb 18 22:14:42 2012 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,45 +0,0 @@
     4.4 -<?xml version="1.0" encoding="UTF-8"?>
     4.5 -<!--
     4.6 -*** GENERATED FROM project.xml - DO NOT EDIT  ***
     4.7 -***         EDIT ../build.xml INSTEAD         ***
     4.8 --->
     4.9 -<project name="org.netbeans.modules.jackpot30.api-impl" basedir="..">
    4.10 -    <fail message="Please build using Ant 1.7.1 or higher.">
    4.11 -        <condition>
    4.12 -            <not>
    4.13 -                <antversion atleast="1.7.1"/>
    4.14 -            </not>
    4.15 -        </condition>
    4.16 -    </fail>
    4.17 -    <property file="nbproject/private/suite-private.properties"/>
    4.18 -    <property file="nbproject/suite.properties"/>
    4.19 -    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
    4.20 -    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
    4.21 -    <property file="${suite.dir}/nbproject/platform.properties"/>
    4.22 -    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
    4.23 -        <attribute name="name"/>
    4.24 -        <attribute name="value"/>
    4.25 -        <sequential>
    4.26 -            <property name="@{name}" value="${@{value}}"/>
    4.27 -        </sequential>
    4.28 -    </macrodef>
    4.29 -    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
    4.30 -        <attribute name="property"/>
    4.31 -        <attribute name="value"/>
    4.32 -        <sequential>
    4.33 -            <property name="@{property}" value="@{value}"/>
    4.34 -        </sequential>
    4.35 -    </macrodef>
    4.36 -    <property file="${user.properties.file}"/>
    4.37 -    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
    4.38 -    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
    4.39 -    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
    4.40 -    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
    4.41 -        <condition>
    4.42 -            <not>
    4.43 -                <contains string="${cluster.path.evaluated}" substring="platform"/>
    4.44 -            </not>
    4.45 -        </condition>
    4.46 -    </fail>
    4.47 -    <import file="${harness.dir}/build.xml"/>
    4.48 -</project>

     5.1 --- a/api/nbproject/genfiles.properties	Sat Feb 18 22:14:42 2012 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,8 +0,0 @@
     5.4 -build.xml.data.CRC32=f9c1509c
     5.5 -build.xml.script.CRC32=0abcaef9
     5.6 -build.xml.stylesheet.CRC32=79c3b980@1.28.0.7
     5.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     5.8 -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     5.9 -nbproject/build-impl.xml.data.CRC32=6500fcd0
    5.10 -nbproject/build-impl.xml.script.CRC32=c4574e66
    5.11 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49

     6.1 --- a/api/nbproject/project.properties	Sat Feb 18 22:14:42 2012 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,3 +0,0 @@
     6.4 -javac.source=1.5
     6.5 -javac.compilerargs=-Xlint -Xlint:-serial
     6.6 -spec.version.base=1.16.0

     7.1 --- a/api/nbproject/project.xml	Sat Feb 18 22:14:42 2012 +0100
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,437 +0,0 @@
     7.4 -<?xml version="1.0" encoding="UTF-8"?>
     7.5 -<project xmlns="http://www.netbeans.org/ns/project/1">
     7.6 -    <type>org.netbeans.modules.apisupport.project</type>
     7.7 -    <configuration>
     7.8 -        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
     7.9 -            <code-name-base>org.netbeans.modules.jackpot30.api</code-name-base>
    7.10 -            <suite-component/>
    7.11 -            <module-dependencies>
    7.12 -                <dependency>
    7.13 -                    <code-name-base>org.jdesktop.layout</code-name-base>
    7.14 -                    <build-prerequisite/>
    7.15 -                    <compile-dependency/>
    7.16 -                    <run-dependency>
    7.17 -                        <release-version>1</release-version>
    7.18 -                        <specification-version>1.7.0.103</specification-version>
    7.19 -                    </run-dependency>
    7.20 -                </dependency>
    7.21 -                <dependency>
    7.22 -                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
    7.23 -                    <build-prerequisite/>
    7.24 -                    <compile-dependency/>
    7.25 -                    <run-dependency>
    7.26 -                        <release-version>1</release-version>
    7.27 -                        <specification-version>1.0</specification-version>
    7.28 -                    </run-dependency>
    7.29 -                </dependency>
    7.30 -                <dependency>
    7.31 -                    <code-name-base>org.netbeans.api.java.classpath</code-name-base>
    7.32 -                    <build-prerequisite/>
    7.33 -                    <compile-dependency/>
    7.34 -                    <run-dependency>
    7.35 -                        <release-version>1</release-version>
    7.36 -                        <specification-version>1.19</specification-version>
    7.37 -                    </run-dependency>
    7.38 -                </dependency>
    7.39 -                <dependency>
    7.40 -                    <code-name-base>org.netbeans.api.progress</code-name-base>
    7.41 -                    <build-prerequisite/>
    7.42 -                    <compile-dependency/>
    7.43 -                    <run-dependency>
    7.44 -                        <release-version>1</release-version>
    7.45 -                        <specification-version>1.13.0.1</specification-version>
    7.46 -                    </run-dependency>
    7.47 -                </dependency>
    7.48 -                <dependency>
    7.49 -                    <code-name-base>org.netbeans.libs.javacapi</code-name-base>
    7.50 -                    <build-prerequisite/>
    7.51 -                    <compile-dependency/>
    7.52 -                    <run-dependency>
    7.53 -                        <specification-version>7.5.0.3</specification-version>
    7.54 -                    </run-dependency>
    7.55 -                </dependency>
    7.56 -                <dependency>
    7.57 -                    <code-name-base>org.netbeans.libs.javacimpl</code-name-base>
    7.58 -                    <build-prerequisite/>
    7.59 -                    <compile-dependency/>
    7.60 -                    <run-dependency>
    7.61 -                        <release-version>1</release-version>
    7.62 -                        <implementation-version/>
    7.63 -                    </run-dependency>
    7.64 -                </dependency>
    7.65 -                <dependency>
    7.66 -                    <code-name-base>org.netbeans.libs.lucene</code-name-base>
    7.67 -                    <build-prerequisite/>
    7.68 -                    <compile-dependency/>
    7.69 -                    <run-dependency>
    7.70 -                        <release-version>1-3</release-version>
    7.71 -                        <specification-version>2.13</specification-version>
    7.72 -                    </run-dependency>
    7.73 -                </dependency>
    7.74 -                <dependency>
    7.75 -                    <code-name-base>org.netbeans.modules.diff</code-name-base>
    7.76 -                    <build-prerequisite/>
    7.77 -                    <compile-dependency/>
    7.78 -                    <run-dependency>
    7.79 -                        <release-version>1</release-version>
    7.80 -                        <implementation-version/>
    7.81 -                    </run-dependency>
    7.82 -                </dependency>
    7.83 -                <dependency>
    7.84 -                    <code-name-base>org.netbeans.modules.editor</code-name-base>
    7.85 -                    <build-prerequisite/>
    7.86 -                    <compile-dependency/>
    7.87 -                    <run-dependency>
    7.88 -                        <release-version>3</release-version>
    7.89 -                        <specification-version>1.56.0.5.13.6</specification-version>
    7.90 -                    </run-dependency>
    7.91 -                </dependency>
    7.92 -                <dependency>
    7.93 -                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
    7.94 -                    <build-prerequisite/>
    7.95 -                    <compile-dependency/>
    7.96 -                    <run-dependency>
    7.97 -                        <release-version>1-3</release-version>
    7.98 -                        <specification-version>1.38.0.9.2</specification-version>
    7.99 -                    </run-dependency>
   7.100 -                </dependency>
   7.101 -                <dependency>
   7.102 -                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
   7.103 -                    <build-prerequisite/>
   7.104 -                    <compile-dependency/>
   7.105 -                    <run-dependency>
   7.106 -                        <release-version>1</release-version>
   7.107 -                        <specification-version>1.13.0.2</specification-version>
   7.108 -                    </run-dependency>
   7.109 -                </dependency>
   7.110 -                <dependency>
   7.111 -                    <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
   7.112 -                    <build-prerequisite/>
   7.113 -                    <compile-dependency/>
   7.114 -                    <run-dependency>
   7.115 -                        <release-version>1</release-version>
   7.116 -                        <specification-version>1.12</specification-version>
   7.117 -                    </run-dependency>
   7.118 -                </dependency>
   7.119 -                <dependency>
   7.120 -                    <code-name-base>org.netbeans.modules.editor.settings</code-name-base>
   7.121 -                    <build-prerequisite/>
   7.122 -                    <compile-dependency/>
   7.123 -                    <run-dependency>
   7.124 -                        <release-version>1</release-version>
   7.125 -                        <specification-version>1.25</specification-version>
   7.126 -                    </run-dependency>
   7.127 -                </dependency>
   7.128 -                <dependency>
   7.129 -                    <code-name-base>org.netbeans.modules.jackpot30.remoting.api</code-name-base>
   7.130 -                    <build-prerequisite/>
   7.131 -                    <compile-dependency/>
   7.132 -                    <run-dependency>
   7.133 -                        <specification-version>1.0</specification-version>
   7.134 -                    </run-dependency>
   7.135 -                </dependency>
   7.136 -                <dependency>
   7.137 -                    <code-name-base>org.netbeans.modules.java.editor</code-name-base>
   7.138 -                    <build-prerequisite/>
   7.139 -                    <compile-dependency/>
   7.140 -                    <run-dependency>
   7.141 -                        <release-version>1</release-version>
   7.142 -                        <implementation-version/>
   7.143 -                    </run-dependency>
   7.144 -                </dependency>
   7.145 -                <dependency>
   7.146 -                    <code-name-base>org.netbeans.modules.java.hints</code-name-base>
   7.147 -                    <build-prerequisite/>
   7.148 -                    <compile-dependency/>
   7.149 -                    <run-dependency>
   7.150 -                        <release-version>1</release-version>
   7.151 -                        <implementation-version/>
   7.152 -                    </run-dependency>
   7.153 -                </dependency>
   7.154 -                <dependency>
   7.155 -                    <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
   7.156 -                    <build-prerequisite/>
   7.157 -                    <compile-dependency/>
   7.158 -                    <run-dependency>
   7.159 -                        <release-version>1</release-version>
   7.160 -                        <specification-version>1.9</specification-version>
   7.161 -                    </run-dependency>
   7.162 -                </dependency>
   7.163 -                <dependency>
   7.164 -                    <code-name-base>org.netbeans.modules.java.platform</code-name-base>
   7.165 -                    <build-prerequisite/>
   7.166 -                    <compile-dependency/>
   7.167 -                    <run-dependency>
   7.168 -                        <release-version>1</release-version>
   7.169 -                        <specification-version>1.12</specification-version>
   7.170 -                    </run-dependency>
   7.171 -                </dependency>
   7.172 -                <dependency>
   7.173 -                    <code-name-base>org.netbeans.modules.java.preprocessorbridge</code-name-base>
   7.174 -                    <build-prerequisite/>
   7.175 -                    <compile-dependency/>
   7.176 -                    <run-dependency>
   7.177 -                        <implementation-version/>
   7.178 -                    </run-dependency>
   7.179 -                </dependency>
   7.180 -                <dependency>
   7.181 -                    <code-name-base>org.netbeans.modules.java.source</code-name-base>
   7.182 -                    <build-prerequisite/>
   7.183 -                    <compile-dependency/>
   7.184 -                    <run-dependency>
   7.185 -                        <implementation-version/>
   7.186 -                    </run-dependency>
   7.187 -                </dependency>
   7.188 -                <dependency>
   7.189 -                    <code-name-base>org.netbeans.modules.lexer</code-name-base>
   7.190 -                    <build-prerequisite/>
   7.191 -                    <compile-dependency/>
   7.192 -                    <run-dependency>
   7.193 -                        <release-version>2</release-version>
   7.194 -                        <specification-version>1.34</specification-version>
   7.195 -                    </run-dependency>
   7.196 -                </dependency>
   7.197 -                <dependency>
   7.198 -                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
   7.199 -                    <build-prerequisite/>
   7.200 -                    <compile-dependency/>
   7.201 -                    <run-dependency>
   7.202 -                        <release-version>1</release-version>
   7.203 -                        <specification-version>1.20</specification-version>
   7.204 -                    </run-dependency>
   7.205 -                </dependency>
   7.206 -                <dependency>
   7.207 -                    <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
   7.208 -                    <build-prerequisite/>
   7.209 -                    <compile-dependency/>
   7.210 -                    <run-dependency>
   7.211 -                        <release-version>1</release-version>
   7.212 -                        <implementation-version/>
   7.213 -                    </run-dependency>
   7.214 -                </dependency>
   7.215 -                <dependency>
   7.216 -                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
   7.217 -                    <build-prerequisite/>
   7.218 -                    <compile-dependency/>
   7.219 -                    <run-dependency>
   7.220 -                        <release-version>1</release-version>
   7.221 -                        <specification-version>1.24</specification-version>
   7.222 -                    </run-dependency>
   7.223 -                </dependency>
   7.224 -                <dependency>
   7.225 -                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
   7.226 -                    <build-prerequisite/>
   7.227 -                    <compile-dependency/>
   7.228 -                    <run-dependency>
   7.229 -                        <release-version>1</release-version>
   7.230 -                        <specification-version>1.35.0.6</specification-version>
   7.231 -                    </run-dependency>
   7.232 -                </dependency>
   7.233 -                <dependency>
   7.234 -                    <code-name-base>org.netbeans.modules.queries</code-name-base>
   7.235 -                    <build-prerequisite/>
   7.236 -                    <compile-dependency/>
   7.237 -                    <run-dependency>
   7.238 -                        <release-version>1</release-version>
   7.239 -                        <specification-version>1.15</specification-version>
   7.240 -                    </run-dependency>
   7.241 -                </dependency>
   7.242 -                <dependency>
   7.243 -                    <code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
   7.244 -                    <build-prerequisite/>
   7.245 -                    <compile-dependency/>
   7.246 -                    <run-dependency>
   7.247 -                        <specification-version>1.6</specification-version>
   7.248 -                    </run-dependency>
   7.249 -                </dependency>
   7.250 -                <dependency>
   7.251 -                    <code-name-base>org.netbeans.modules.refactoring.java</code-name-base>
   7.252 -                    <build-prerequisite/>
   7.253 -                    <compile-dependency/>
   7.254 -                    <run-dependency>
   7.255 -                        <release-version>1</release-version>
   7.256 -                        <specification-version>1.6</specification-version>
   7.257 -                    </run-dependency>
   7.258 -                </dependency>
   7.259 -                <dependency>
   7.260 -                    <code-name-base>org.netbeans.modules.sendopts</code-name-base>
   7.261 -                    <build-prerequisite/>
   7.262 -                    <compile-dependency/>
   7.263 -                    <run-dependency>
   7.264 -                        <release-version>2</release-version>
   7.265 -                        <specification-version>2.4</specification-version>
   7.266 -                    </run-dependency>
   7.267 -                </dependency>
   7.268 -                <dependency>
   7.269 -                    <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
   7.270 -                    <build-prerequisite/>
   7.271 -                    <compile-dependency/>
   7.272 -                    <run-dependency>
   7.273 -                        <release-version>0-1</release-version>
   7.274 -                        <specification-version>1.7.0.7.2</specification-version>
   7.275 -                    </run-dependency>
   7.276 -                </dependency>
   7.277 -                <dependency>
   7.278 -                    <code-name-base>org.openide.awt</code-name-base>
   7.279 -                    <build-prerequisite/>
   7.280 -                    <compile-dependency/>
   7.281 -                    <run-dependency>
   7.282 -                        <specification-version>7.7.0.1</specification-version>
   7.283 -                    </run-dependency>
   7.284 -                </dependency>
   7.285 -                <dependency>
   7.286 -                    <code-name-base>org.openide.dialogs</code-name-base>
   7.287 -                    <build-prerequisite/>
   7.288 -                    <compile-dependency/>
   7.289 -                    <run-dependency>
   7.290 -                        <specification-version>7.10</specification-version>
   7.291 -                    </run-dependency>
   7.292 -                </dependency>
   7.293 -                <dependency>
   7.294 -                    <code-name-base>org.openide.filesystems</code-name-base>
   7.295 -                    <build-prerequisite/>
   7.296 -                    <compile-dependency/>
   7.297 -                    <run-dependency>
   7.298 -                        <specification-version>7.21.0.1.1</specification-version>
   7.299 -                    </run-dependency>
   7.300 -                </dependency>
   7.301 -                <dependency>
   7.302 -                    <code-name-base>org.openide.loaders</code-name-base>
   7.303 -                    <build-prerequisite/>
   7.304 -                    <compile-dependency/>
   7.305 -                    <run-dependency>
   7.306 -                        <specification-version>7.5</specification-version>
   7.307 -                    </run-dependency>
   7.308 -                </dependency>
   7.309 -                <dependency>
   7.310 -                    <code-name-base>org.openide.modules</code-name-base>
   7.311 -                    <build-prerequisite/>
   7.312 -                    <compile-dependency/>
   7.313 -                    <run-dependency>
   7.314 -                        <specification-version>7.10</specification-version>
   7.315 -                    </run-dependency>
   7.316 -                </dependency>
   7.317 -                <dependency>
   7.318 -                    <code-name-base>org.openide.nodes</code-name-base>
   7.319 -                    <build-prerequisite/>
   7.320 -                    <compile-dependency/>
   7.321 -                    <run-dependency>
   7.322 -                        <specification-version>7.9.0.1</specification-version>
   7.323 -                    </run-dependency>
   7.324 -                </dependency>
   7.325 -                <dependency>
   7.326 -                    <code-name-base>org.openide.text</code-name-base>
   7.327 -                    <build-prerequisite/>
   7.328 -                    <compile-dependency/>
   7.329 -                    <run-dependency>
   7.330 -                        <specification-version>6.22</specification-version>
   7.331 -                    </run-dependency>
   7.332 -                </dependency>
   7.333 -                <dependency>
   7.334 -                    <code-name-base>org.openide.util</code-name-base>
   7.335 -                    <build-prerequisite/>
   7.336 -                    <compile-dependency/>
   7.337 -                    <run-dependency>
   7.338 -                        <specification-version>8.0</specification-version>
   7.339 -                    </run-dependency>
   7.340 -                </dependency>
   7.341 -                <dependency>
   7.342 -                    <code-name-base>org.openide.util.lookup</code-name-base>
   7.343 -                    <build-prerequisite/>
   7.344 -                    <compile-dependency/>
   7.345 -                    <run-dependency>
   7.346 -                        <specification-version>8.0.0.1</specification-version>
   7.347 -                    </run-dependency>
   7.348 -                </dependency>
   7.349 -                <dependency>
   7.350 -                    <code-name-base>org.openide.windows</code-name-base>
   7.351 -                    <build-prerequisite/>
   7.352 -                    <compile-dependency/>
   7.353 -                    <run-dependency>
   7.354 -                        <specification-version>6.27</specification-version>
   7.355 -                    </run-dependency>
   7.356 -                </dependency>
   7.357 -            </module-dependencies>
   7.358 -            <test-dependencies>
   7.359 -                <test-type>
   7.360 -                    <name>unit</name>
   7.361 -                    <test-dependency>
   7.362 -                        <code-name-base>org.netbeans.bootstrap</code-name-base>
   7.363 -                    </test-dependency>
   7.364 -                    <test-dependency>
   7.365 -                        <code-name-base>org.netbeans.core.startup</code-name-base>
   7.366 -                    </test-dependency>
   7.367 -                    <test-dependency>
   7.368 -                        <code-name-base>org.netbeans.insane</code-name-base>
   7.369 -                        <compile-dependency/>
   7.370 -                    </test-dependency>
   7.371 -                    <test-dependency>
   7.372 -                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
   7.373 -                        <compile-dependency/>
   7.374 -                    </test-dependency>
   7.375 -                    <test-dependency>
   7.376 -                        <code-name-base>org.netbeans.modules.classfile</code-name-base>
   7.377 -                    </test-dependency>
   7.378 -                    <test-dependency>
   7.379 -                        <code-name-base>org.netbeans.modules.defaults</code-name-base>
   7.380 -                    </test-dependency>
   7.381 -                    <test-dependency>
   7.382 -                        <code-name-base>org.netbeans.modules.editor</code-name-base>
   7.383 -                    </test-dependency>
   7.384 -                    <test-dependency>
   7.385 -                        <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
   7.386 -                    </test-dependency>
   7.387 -                    <test-dependency>
   7.388 -                        <code-name-base>org.netbeans.modules.editor.settings</code-name-base>
   7.389 -                    </test-dependency>
   7.390 -                    <test-dependency>
   7.391 -                        <code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
   7.392 -                    </test-dependency>
   7.393 -                    <test-dependency>
   7.394 -                        <code-name-base>org.netbeans.modules.editor.util</code-name-base>
   7.395 -                    </test-dependency>
   7.396 -                    <test-dependency>
   7.397 -                        <code-name-base>org.netbeans.modules.jackpot30.common.test</code-name-base>
   7.398 -                        <compile-dependency/>
   7.399 -                    </test-dependency>
   7.400 -                    <test-dependency>
   7.401 -                        <code-name-base>org.netbeans.modules.jackpot30.test.borrowed</code-name-base>
   7.402 -                        <recursive/>
   7.403 -                        <compile-dependency/>
   7.404 -                    </test-dependency>
   7.405 -                    <test-dependency>
   7.406 -                        <code-name-base>org.netbeans.modules.java.hints</code-name-base>
   7.407 -                        <compile-dependency/>
   7.408 -                    </test-dependency>
   7.409 -                    <test-dependency>
   7.410 -                        <code-name-base>org.netbeans.modules.java.hints.declarative</code-name-base>
   7.411 -                    </test-dependency>
   7.412 -                    <test-dependency>
   7.413 -                        <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
   7.414 -                    </test-dependency>
   7.415 -                    <test-dependency>
   7.416 -                        <code-name-base>org.netbeans.modules.masterfs</code-name-base>
   7.417 -                    </test-dependency>
   7.418 -                    <test-dependency>
   7.419 -                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
   7.420 -                        <compile-dependency/>
   7.421 -                    </test-dependency>
   7.422 -                    <test-dependency>
   7.423 -                        <code-name-base>org.netbeans.modules.progress.ui</code-name-base>
   7.424 -                    </test-dependency>
   7.425 -                    <test-dependency>
   7.426 -                        <code-name-base>org.netbeans.modules.projectui</code-name-base>
   7.427 -                    </test-dependency>
   7.428 -                    <test-dependency>
   7.429 -                        <code-name-base>org.openidex.util</code-name-base>
   7.430 -                    </test-dependency>
   7.431 -                </test-type>
   7.432 -            </test-dependencies>
   7.433 -            <public-packages>
   7.434 -                <package>org.netbeans.modules.jackpot30.spi</package>
   7.435 -                <package>org.netbeans.modules.jackpot30.spi.refactoring</package>
   7.436 -                <package>org.netbeans.modules.jackpot30.spi.support</package>
   7.437 -            </public-packages>
   7.438 -        </data>
   7.439 -    </configuration>
   7.440 -</project>

     8.1 --- a/api/nbproject/suite.properties	Sat Feb 18 22:14:42 2012 +0100
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,1 +0,0 @@
     8.4 -suite.dir=${basedir}/..

     9.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/Bundle.properties	Sat Feb 18 22:14:42 2012 +0100
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,46 +0,0 @@
     9.4 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     9.5 -#
     9.6 -# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
     9.7 -#
     9.8 -# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
     9.9 -# Other names may be trademarks of their respective owners.
    9.10 -#
    9.11 -# The contents of this file are subject to the terms of either the GNU
    9.12 -# General Public License Version 2 only ("GPL") or the Common
    9.13 -# Development and Distribution License("CDDL") (collectively, the
    9.14 -# "License"). You may not use this file except in compliance with the
    9.15 -# License. You can obtain a copy of the License at
    9.16 -# http://www.netbeans.org/cddl-gplv2.html
    9.17 -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    9.18 -# specific language governing permissions and limitations under the
    9.19 -# License.  When distributing the software, include this License Header
    9.20 -# Notice in each file and include the License file at
    9.21 -# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    9.22 -# particular file as subject to the "Classpath" exception as provided
    9.23 -# by Oracle in the GPL Version 2 section of the License file that
    9.24 -# accompanied this code. If applicable, add the following below the
    9.25 -# License Header, with the fields enclosed by brackets [] replaced by
    9.26 -# your own identifying information:
    9.27 -# "Portions Copyrighted [year] [name of copyright owner]"
    9.28 -#
    9.29 -# If you wish your version of this file to be governed by only the CDDL
    9.30 -# or only the GPL Version 2, indicate your decision by adding
    9.31 -# "[Contributor] elects to include this software in this distribution
    9.32 -# under the [CDDL or GPL Version 2] license." If you do not indicate a
    9.33 -# single choice of license, a recipient has the option to distribute
    9.34 -# your version of this file under either the CDDL, the GPL Version 2 or
    9.35 -# to extend the choice of license to its licensees as provided above.
    9.36 -# However, if you add GPL Version 2 code and therefore, elected the GPL
    9.37 -# Version 2 license, then the option applies only if the new code is
    9.38 -# made subject to such option by the copyright holder.
    9.39 -#
    9.40 -# Contributor(s):
    9.41 -#
    9.42 -# Portions Copyrighted 2010 Sun Microsystems, Inc.
    9.43 -
    9.44 -double-checked-locking=Double Checked Locking
    9.45 -double-checked-locking-verify=Double Checked Locking Strict
    9.46 -double-checked-locking-fix=Double Checked Locking
    9.47 -new-string=New String Creation
    9.48 -lambda-candidate=Find candidates for Lambda expression
    9.49 -ExamplesList.pattern.contentType=text/x-javahints

    10.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/Example.java	Sat Feb 18 22:14:42 2012 +0100
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,83 +0,0 @@
    10.4 -/*
    10.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    10.6 - *
    10.7 - * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
    10.8 - *
    10.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   10.10 - * Other names may be trademarks of their respective owners.
   10.11 - *
   10.12 - * The contents of this file are subject to the terms of either the GNU
   10.13 - * General Public License Version 2 only ("GPL") or the Common
   10.14 - * Development and Distribution License("CDDL") (collectively, the
   10.15 - * "License"). You may not use this file except in compliance with the
   10.16 - * License. You can obtain a copy of the License at
   10.17 - * http://www.netbeans.org/cddl-gplv2.html
   10.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   10.19 - * specific language governing permissions and limitations under the
   10.20 - * License.  When distributing the software, include this License Header
   10.21 - * Notice in each file and include the License file at
   10.22 - * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   10.23 - * particular file as subject to the "Classpath" exception as provided
   10.24 - * by Oracle in the GPL Version 2 section of the License file that
   10.25 - * accompanied this code. If applicable, add the following below the
   10.26 - * License Header, with the fields enclosed by brackets [] replaced by
   10.27 - * your own identifying information:
   10.28 - * "Portions Copyrighted [year] [name of copyright owner]"
   10.29 - *
   10.30 - * If you wish your version of this file to be governed by only the CDDL
   10.31 - * or only the GPL Version 2, indicate your decision by adding
   10.32 - * "[Contributor] elects to include this software in this distribution
   10.33 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   10.34 - * single choice of license, a recipient has the option to distribute
   10.35 - * your version of this file under either the CDDL, the GPL Version 2 or
   10.36 - * to extend the choice of license to its licensees as provided above.
   10.37 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   10.38 - * Version 2 license, then the option applies only if the new code is
   10.39 - * made subject to such option by the copyright holder.
   10.40 - *
   10.41 - * Contributor(s):
   10.42 - *
   10.43 - * Portions Copyrighted 2010 Sun Microsystems, Inc.
   10.44 - */
   10.45 -
   10.46 -package org.netbeans.modules.jackpot30.impl.examples;
   10.47 -
   10.48 -import java.util.Set;
   10.49 -import org.openide.util.NbBundle;
   10.50 -
   10.51 -/**
   10.52 - *
   10.53 - * @author lahvac
   10.54 - */
   10.55 -public class Example {
   10.56 -
   10.57 -    private final String key;
   10.58 -    private final String code;
   10.59 -    private final Set<Option> options;
   10.60 -
   10.61 -    Example(String key, String code, Set<Option> options) {
   10.62 -        this.key = key;
   10.63 -        this.code = code;
   10.64 -        this.options = options;
   10.65 -    }
   10.66 -
   10.67 -    String getKey() {
   10.68 -        return key;
   10.69 -    }
   10.70 -
   10.71 -    public String getDisplayName() {
   10.72 -        return NbBundle.getMessage(LoadExamples.class, key);
   10.73 -    }
   10.74 -
   10.75 -    public String getCode() {
   10.76 -        return code;
   10.77 -    }
   10.78 -
   10.79 -    public Set<Option> getOptions() {
   10.80 -        return options;
   10.81 -    }
   10.82 -    
   10.83 -    public enum Option {
   10.84 -        VERIFY, FIX;
   10.85 -    }
   10.86 -}

    11.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/ExamplesList.form	Sat Feb 18 22:14:42 2012 +0100
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,95 +0,0 @@
    11.4 -<?xml version="1.0" encoding="UTF-8" ?>
    11.5 -
    11.6 -<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
    11.7 -  <AuxValues>
    11.8 -    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
    11.9 -    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
   11.10 -    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
   11.11 -    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
   11.12 -    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
   11.13 -    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
   11.14 -    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
   11.15 -    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
   11.16 -    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
   11.17 -  </AuxValues>
   11.18 -
   11.19 -  <Layout>
   11.20 -    <DimensionLayout dim="0">
   11.21 -      <Group type="103" groupAlignment="0" attributes="0">
   11.22 -          <Group type="102" alignment="1" attributes="0">
   11.23 -              <EmptySpace max="-2" attributes="0"/>
   11.24 -              <Group type="103" groupAlignment="1" attributes="0">
   11.25 -                  <Component id="jScrollPane2" alignment="0" pref="376" max="32767" attributes="0"/>
   11.26 -                  <Component id="jScrollPane1" alignment="0" pref="376" max="32767" attributes="0"/>
   11.27 -                  <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
   11.28 -              </Group>
   11.29 -              <EmptySpace max="-2" attributes="0"/>
   11.30 -          </Group>
   11.31 -      </Group>
   11.32 -    </DimensionLayout>
   11.33 -    <DimensionLayout dim="1">
   11.34 -      <Group type="103" groupAlignment="0" attributes="0">
   11.35 -          <Group type="102" alignment="0" attributes="0">
   11.36 -              <EmptySpace max="-2" attributes="0"/>
   11.37 -              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
   11.38 -              <EmptySpace max="-2" attributes="0"/>
   11.39 -              <Component id="jScrollPane1" pref="130" max="32767" attributes="0"/>
   11.40 -              <EmptySpace max="-2" attributes="0"/>
   11.41 -              <Component id="jScrollPane2" min="-2" pref="119" max="-2" attributes="0"/>
   11.42 -              <EmptySpace max="-2" attributes="0"/>
   11.43 -          </Group>
   11.44 -      </Group>
   11.45 -    </DimensionLayout>
   11.46 -  </Layout>
   11.47 -  <SubComponents>
   11.48 -    <Component class="javax.swing.JLabel" name="jLabel1">
   11.49 -      <Properties>
   11.50 -        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   11.51 -          <Connection code="convertor.getHeader()" type="code"/>
   11.52 -        </Property>
   11.53 -      </Properties>
   11.54 -    </Component>
   11.55 -    <Container class="javax.swing.JScrollPane" name="jScrollPane1">
   11.56 -      <AuxValues>
   11.57 -        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
   11.58 -      </AuxValues>
   11.59 -
   11.60 -      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
   11.61 -      <SubComponents>
   11.62 -        <Component class="javax.swing.JList" name="list">
   11.63 -          <Properties>
   11.64 -            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
   11.65 -              <StringArray count="5">
   11.66 -                <StringItem index="0" value="Item 1"/>
   11.67 -                <StringItem index="1" value="Item 2"/>
   11.68 -                <StringItem index="2" value="Item 3"/>
   11.69 -                <StringItem index="3" value="Item 4"/>
   11.70 -                <StringItem index="4" value="Item 5"/>
   11.71 -              </StringArray>
   11.72 -            </Property>
   11.73 -          </Properties>
   11.74 -          <Events>
   11.75 -            <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="listMouseClicked"/>
   11.76 -            <EventHandler event="valueChanged" listener="javax.swing.event.ListSelectionListener" parameters="javax.swing.event.ListSelectionEvent" handler="listValueChanged"/>
   11.77 -          </Events>
   11.78 -        </Component>
   11.79 -      </SubComponents>
   11.80 -    </Container>
   11.81 -    <Container class="javax.swing.JScrollPane" name="jScrollPane2">
   11.82 -      <AuxValues>
   11.83 -        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
   11.84 -      </AuxValues>
   11.85 -
   11.86 -      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
   11.87 -      <SubComponents>
   11.88 -        <Component class="javax.swing.JEditorPane" name="pattern">
   11.89 -          <Properties>
   11.90 -            <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
   11.91 -              <ResourceString bundle="org/netbeans/modules/jackpot30/impl/examples/Bundle.properties" key="ExamplesList.pattern.contentType" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
   11.92 -            </Property>
   11.93 -          </Properties>
   11.94 -        </Component>
   11.95 -      </SubComponents>
   11.96 -    </Container>
   11.97 -  </SubComponents>
   11.98 -</Form>

    12.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/ExamplesList.java	Sat Feb 18 22:14:42 2012 +0100
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,223 +0,0 @@
    12.4 -/*
    12.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    12.6 - *
    12.7 - * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
    12.8 - *
    12.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   12.10 - * Other names may be trademarks of their respective owners.
   12.11 - *
   12.12 - * The contents of this file are subject to the terms of either the GNU
   12.13 - * General Public License Version 2 only ("GPL") or the Common
   12.14 - * Development and Distribution License("CDDL") (collectively, the
   12.15 - * "License"). You may not use this file except in compliance with the
   12.16 - * License. You can obtain a copy of the License at
   12.17 - * http://www.netbeans.org/cddl-gplv2.html
   12.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   12.19 - * specific language governing permissions and limitations under the
   12.20 - * License.  When distributing the software, include this License Header
   12.21 - * Notice in each file and include the License file at
   12.22 - * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   12.23 - * particular file as subject to the "Classpath" exception as provided
   12.24 - * by Oracle in the GPL Version 2 section of the License file that
   12.25 - * accompanied this code. If applicable, add the following below the
   12.26 - * License Header, with the fields enclosed by brackets [] replaced by
   12.27 - * your own identifying information:
   12.28 - * "Portions Copyrighted [year] [name of copyright owner]"
   12.29 - *
   12.30 - * If you wish your version of this file to be governed by only the CDDL
   12.31 - * or only the GPL Version 2, indicate your decision by adding
   12.32 - * "[Contributor] elects to include this software in this distribution
   12.33 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   12.34 - * single choice of license, a recipient has the option to distribute
   12.35 - * your version of this file under either the CDDL, the GPL Version 2 or
   12.36 - * to extend the choice of license to its licensees as provided above.
   12.37 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   12.38 - * Version 2 license, then the option applies only if the new code is
   12.39 - * made subject to such option by the copyright holder.
   12.40 - *
   12.41 - * Contributor(s):
   12.42 - *
   12.43 - * Portions Copyrighted 2010 Sun Microsystems, Inc.
   12.44 - */
   12.45 -package org.netbeans.modules.jackpot30.impl.examples;
   12.46 -
   12.47 -import java.awt.Component;
   12.48 -import java.awt.Dialog;
   12.49 -import java.awt.Rectangle;
   12.50 -import java.util.Collections;
   12.51 -import java.util.Set;
   12.52 -import javax.swing.DefaultListCellRenderer;
   12.53 -import javax.swing.DefaultListModel;
   12.54 -import javax.swing.JList;
   12.55 -import javax.swing.text.BadLocationException;
   12.56 -import org.netbeans.modules.jackpot30.impl.examples.Example.Option;
   12.57 -import org.openide.DialogDescriptor;
   12.58 -import org.openide.DialogDisplayer;
   12.59 -import org.openide.util.Exceptions;
   12.60 -
   12.61 -/**
   12.62 - *
   12.63 - * @author lahvac
   12.64 - */
   12.65 -public class ExamplesList<T> extends javax.swing.JPanel {
   12.66 -
   12.67 -    private final DialogDescription<T> convertor;
   12.68 -    private final Class<T> dataClass;
   12.69 -
   12.70 -    public ExamplesList(Iterable<? extends T> data, DialogDescription<T> convertor, Class<T> dataClass, Set<Option> require, Set<Option> forbidden) {
   12.71 -        this.convertor = convertor;
   12.72 -        this.dataClass = dataClass;
   12.73 -        
   12.74 -        initComponents();
   12.75 -
   12.76 -        DefaultListModel listModel = new DefaultListModel();
   12.77 -
   12.78 -        for (T t : data) {
   12.79 -            Set<Option> options = convertor.getOptions(t);
   12.80 -            if (!options.containsAll(require)) continue;
   12.81 -            if (!Collections.disjoint(options, forbidden)) continue;
   12.82 -            
   12.83 -            listModel.addElement(t);
   12.84 -        }
   12.85 -
   12.86 -        list.setModel(listModel);
   12.87 -        list.setCellRenderer(new ExamplesRenderer());
   12.88 -        list.setSelectedIndex(0);
   12.89 -    }
   12.90 -
   12.91 -    /** This method is called from within the constructor to
   12.92 -     * initialize the form.
   12.93 -     * WARNING: Do NOT modify this code. The content of this method is
   12.94 -     * always regenerated by the Form Editor.
   12.95 -     */
   12.96 -    @SuppressWarnings("unchecked")
   12.97 -    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
   12.98 -    private void initComponents() {
   12.99 -
  12.100 -        jLabel1 = new javax.swing.JLabel();
  12.101 -        jScrollPane1 = new javax.swing.JScrollPane();
  12.102 -        list = new javax.swing.JList();
  12.103 -        jScrollPane2 = new javax.swing.JScrollPane();
  12.104 -        pattern = new javax.swing.JEditorPane();
  12.105 -
  12.106 -        jLabel1.setText(convertor.getHeader());
  12.107 -
  12.108 -        list.setModel(new javax.swing.AbstractListModel() {
  12.109 -            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
  12.110 -            public int getSize() { return strings.length; }
  12.111 -            public Object getElementAt(int i) { return strings[i]; }
  12.112 -        });
  12.113 -        list.addMouseListener(new java.awt.event.MouseAdapter() {
  12.114 -            public void mouseClicked(java.awt.event.MouseEvent evt) {
  12.115 -                listMouseClicked(evt);
  12.116 -            }
  12.117 -        });
  12.118 -        list.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
  12.119 -            public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
  12.120 -                listValueChanged(evt);
  12.121 -            }
  12.122 -        });
  12.123 -        jScrollPane1.setViewportView(list);
  12.124 -
  12.125 -        pattern.setContentType(org.openide.util.NbBundle.getMessage(ExamplesList.class, "ExamplesList.pattern.contentType")); // NOI18N
  12.126 -        jScrollPane2.setViewportView(pattern);
  12.127 -
  12.128 -        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
  12.129 -        this.setLayout(layout);
  12.130 -        layout.setHorizontalGroup(
  12.131 -            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
  12.132 -            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
  12.133 -                .addContainerGap()
  12.134 -                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
  12.135 -                    .addComponent(jScrollPane2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)
  12.136 -                    .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)
  12.137 -                    .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.LEADING))
  12.138 -                .addContainerGap())
  12.139 -        );
  12.140 -        layout.setVerticalGroup(
  12.141 -            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
  12.142 -            .addGroup(layout.createSequentialGroup()
  12.143 -                .addContainerGap()
  12.144 -                .addComponent(jLabel1)
  12.145 -                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
  12.146 -                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 130, Short.MAX_VALUE)
  12.147 -                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
  12.148 -                .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 119, javax.swing.GroupLayout.PREFERRED_SIZE)
  12.149 -                .addContainerGap())
  12.150 -        );
  12.151 -    }// </editor-fold>//GEN-END:initComponents
  12.152 -
  12.153 -    private void listMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_listMouseClicked
  12.154 -        if (evt.getClickCount() > 1) {
  12.155 -            desc.setValue(DialogDescriptor.OK_OPTION);
  12.156 -            dialog.setVisible(false);
  12.157 -        }
  12.158 -    }//GEN-LAST:event_listMouseClicked
  12.159 -
  12.160 -    private void listValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_listValueChanged
  12.161 -        T ex = dataClass.cast(list.getSelectedValue());
  12.162 -
  12.163 -        pattern.setText(convertor.getCode(ex));
  12.164 -        
  12.165 -        try {
  12.166 -            Rectangle rect = pattern.modelToView(0);
  12.167 -
  12.168 -            if (rect != null) {
  12.169 -                pattern.scrollRectToVisible(rect);
  12.170 -            }
  12.171 -        } catch (BadLocationException ex1) {
  12.172 -            Exceptions.printStackTrace(ex1);
  12.173 -        }
  12.174 -    }//GEN-LAST:event_listValueChanged
  12.175 -
  12.176 -    // Variables declaration - do not modify//GEN-BEGIN:variables
  12.177 -    private javax.swing.JLabel jLabel1;
  12.178 -    private javax.swing.JScrollPane jScrollPane1;
  12.179 -    private javax.swing.JScrollPane jScrollPane2;
  12.180 -    private javax.swing.JList list;
  12.181 -    private javax.swing.JEditorPane pattern;
  12.182 -    // End of variables declaration//GEN-END:variables
  12.183 -
  12.184 -    private DialogDescriptor desc;
  12.185 -    private Dialog           dialog;
  12.186 -
  12.187 -    public void setDialog(DialogDescriptor desc, Dialog dialog) {
  12.188 -        this.desc = desc;
  12.189 -        this.dialog = dialog;
  12.190 -    }
  12.191 -
  12.192 -    public T getSelectedExample() {
  12.193 -        return dataClass.cast(list.getSelectedValue());
  12.194 -    }
  12.195 -    
  12.196 -    private class ExamplesRenderer extends DefaultListCellRenderer {
  12.197 -        @Override
  12.198 -        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
  12.199 -            value = convertor.getDisplayName(dataClass.cast(value));
  12.200 -            return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
  12.201 -        }
  12.202 -    }
  12.203 -
  12.204 -    public static <T> T chooseExample(Iterable<? extends T> examplesList, DialogDescription<T> convertor, Class<T> dataClass, Set<Option> require, Set<Option> forbidden) {
  12.205 -        ExamplesList<T> examples = new ExamplesList<T>(examplesList, convertor, dataClass, require, forbidden);
  12.206 -        DialogDescriptor dd = new DialogDescriptor(examples, convertor.getCaption(), true, DialogDescriptor.OK_CANCEL_OPTION, DialogDescriptor.OK_OPTION, null);
  12.207 -        Dialog dialog = DialogDisplayer.getDefault().createDialog(dd);
  12.208 -
  12.209 -        examples.setDialog(dd, dialog);
  12.210 -        dialog.setVisible(true);
  12.211 -
  12.212 -        if (dd.getValue() == DialogDescriptor.OK_OPTION) {
  12.213 -            return examples.getSelectedExample();
  12.214 -        }
  12.215 -
  12.216 -        return null;
  12.217 -    }
  12.218 -
  12.219 -    public interface DialogDescription<T> {
  12.220 -        public String getCaption();
  12.221 -        public String getHeader();
  12.222 -        public String getDisplayName(T t);
  12.223 -        public String getCode(T t);
  12.224 -        public Set<Option> getOptions(T t);
  12.225 -    }
  12.226 -}

    13.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/LoadExamples.java	Sat Feb 18 22:14:42 2012 +0100
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,135 +0,0 @@
    13.4 -/*
    13.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    13.6 - *
    13.7 - * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
    13.8 - *
    13.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   13.10 - * Other names may be trademarks of their respective owners.
   13.11 - *
   13.12 - * The contents of this file are subject to the terms of either the GNU
   13.13 - * General Public License Version 2 only ("GPL") or the Common
   13.14 - * Development and Distribution License("CDDL") (collectively, the
   13.15 - * "License"). You may not use this file except in compliance with the
   13.16 - * License. You can obtain a copy of the License at
   13.17 - * http://www.netbeans.org/cddl-gplv2.html
   13.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   13.19 - * specific language governing permissions and limitations under the
   13.20 - * License.  When distributing the software, include this License Header
   13.21 - * Notice in each file and include the License file at
   13.22 - * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   13.23 - * particular file as subject to the "Classpath" exception as provided
   13.24 - * by Oracle in the GPL Version 2 section of the License file that
   13.25 - * accompanied this code. If applicable, add the following below the
   13.26 - * License Header, with the fields enclosed by brackets [] replaced by
   13.27 - * your own identifying information:
   13.28 - * "Portions Copyrighted [year] [name of copyright owner]"
   13.29 - *
   13.30 - * If you wish your version of this file to be governed by only the CDDL
   13.31 - * or only the GPL Version 2, indicate your decision by adding
   13.32 - * "[Contributor] elects to include this software in this distribution
   13.33 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   13.34 - * single choice of license, a recipient has the option to distribute
   13.35 - * your version of this file under either the CDDL, the GPL Version 2 or
   13.36 - * to extend the choice of license to its licensees as provided above.
   13.37 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   13.38 - * Version 2 license, then the option applies only if the new code is
   13.39 - * made subject to such option by the copyright holder.
   13.40 - *
   13.41 - * Contributor(s):
   13.42 - *
   13.43 - * Portions Copyrighted 2010 Sun Microsystems, Inc.
   13.44 - */
   13.45 -
   13.46 -package org.netbeans.modules.jackpot30.impl.examples;
   13.47 -
   13.48 -import java.io.File;
   13.49 -import java.io.IOException;
   13.50 -import java.io.InputStream;
   13.51 -import java.util.Collections;
   13.52 -import java.util.EnumSet;
   13.53 -import java.util.LinkedList;
   13.54 -import java.util.List;
   13.55 -import java.util.Set;
   13.56 -import java.util.regex.Pattern;
   13.57 -import org.netbeans.modules.jackpot30.impl.examples.Example.Option;
   13.58 -import org.openide.filesystems.FileUtil;
   13.59 -import org.openide.modules.InstalledFileLocator;
   13.60 -import org.openide.util.Exceptions;
   13.61 -
   13.62 -/**
   13.63 - *
   13.64 - * @author lahvac
   13.65 - */
   13.66 -public class LoadExamples {
   13.67 -
   13.68 -    public static Iterable<? extends Example> loadExamples() {
   13.69 -        return loadExamples("examples.list");
   13.70 -    }
   13.71 -
   13.72 -    private static final Pattern EXAMPLE_SPLIT = Pattern.compile("^%%", Pattern.MULTILINE);
   13.73 -    
   13.74 -    static Iterable<? extends Example> loadExamples(String examplesListName) {
   13.75 -        String examplesList = loadToString(examplesListName);
   13.76 -
   13.77 -        if (examplesList == null) return Collections.emptyList();
   13.78 -
   13.79 -        List<Example> examples = new LinkedList<Example>();
   13.80 -
   13.81 -        for (String exampleName : examplesList.split("\n")) {
   13.82 -            if (exampleName.isEmpty()) continue;
   13.83 -
   13.84 -            String exampleCode = loadToString(exampleName);
   13.85 -
   13.86 -            for (String oneExample : EXAMPLE_SPLIT.split(exampleCode)) {
   13.87 -                if (oneExample.isEmpty()) continue;
   13.88 -                
   13.89 -                String[] parts = oneExample.split("\n", 2);
   13.90 -                String key = null;
   13.91 -                Set<Option> options = EnumSet.noneOf(Option.class);
   13.92 -                
   13.93 -                for (String option : parts[0].split(",")) {
   13.94 -                    if (option.startsWith("example=")) {
   13.95 -                        key = option.substring("example=".length());
   13.96 -                        continue;
   13.97 -                    }
   13.98 -
   13.99 -                    options.add(Option.valueOf(option.toUpperCase()));
  13.100 -                }
  13.101 -
  13.102 -                examples.add(new Example(key, parts[1], options));
  13.103 -            }
  13.104 -        }
  13.105 -
  13.106 -        return examples;
  13.107 -    }
  13.108 -
  13.109 -    private static String loadToString(String name) {
  13.110 -        InputStream examplesList = null;
  13.111 -
  13.112 -        try {
  13.113 -            examplesList = LoadExamples.class.getResourceAsStream(name);
  13.114 -
  13.115 -            if (examplesList == null) return null;
  13.116 -
  13.117 -            StringBuilder result = new StringBuilder();
  13.118 -            int read;
  13.119 -
  13.120 -            while ((read = examplesList.read()) != (-1)) {
  13.121 -                result.append((char) read);
  13.122 -            }
  13.123 -
  13.124 -            return result.toString();
  13.125 -        } catch (IOException ex) {
  13.126 -            Exceptions.printStackTrace(ex);
  13.127 -            return null;
  13.128 -        } finally {
  13.129 -            if (examplesList != null) {
  13.130 -                try {
  13.131 -                    examplesList.close();
  13.132 -                } catch (IOException ex) {
  13.133 -                    Exceptions.printStackTrace(ex);
  13.134 -                }
  13.135 -            }
  13.136 -        }
  13.137 -    }
  13.138 -}

    14.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/double-checked-locking.example	Sat Feb 18 22:14:42 2012 +0100
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,33 +0,0 @@
    14.4 -%%example=double-checked-locking
    14.5 -if ($var == null) {
    14.6 -   $preinit$;
    14.7 -   synchronized ($lock) {
    14.8 -       if ($var == null) {
    14.9 -           $s2$;
   14.10 -       }
   14.11 -   }
   14.12 -}
   14.13 -%%example=double-checked-locking-verify,verify
   14.14 -if ($var == null) {
   14.15 -   $preinit$;
   14.16 -   synchronized ($lock) {
   14.17 -       if ($var == null) {
   14.18 -           $s2$;
   14.19 -       }
   14.20 -   }
   14.21 -} :: !hasModifier($var, Modifier.VOLATILE);;
   14.22 -%%example=double-checked-locking-fix,verify,fix
   14.23 -if ($var == null) {
   14.24 -   $preinit$;
   14.25 -   synchronized ($lock) {
   14.26 -       if ($var == null) {
   14.27 -           $s2$;
   14.28 -       }
   14.29 -   }
   14.30 -} :: !hasModifier($var, Modifier.VOLATILE)
   14.31 -=>
   14.32 -synchronized ($lock) {
   14.33 -   if ($var == null) {
   14.34 -       $s2$;
   14.35 -   }
   14.36 -};;

    15.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/examples.list	Sat Feb 18 22:14:42 2012 +0100
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,3 +0,0 @@
    15.4 -double-checked-locking.example
    15.5 -new-string.example
    15.6 -lambda-candidate.example

    16.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/lambda-candidate.example	Sat Feb 18 22:14:42 2012 +0100
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,6 +0,0 @@
    16.4 -%%example=lambda-candidate
    16.5 -new $type() {
    16.6 -    $mods$ $resultType $methodName($args$) {
    16.7 -        $statements$;
    16.8 -    }
    16.9 -}

    17.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/examples/new-string.example	Sat Feb 18 22:14:42 2012 +0100
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,5 +0,0 @@
    17.4 -%%example=new-string,verify
    17.5 -new String($orig) :: $orig instanceof String && !matchesAny($orig, "$o.substring($s)", "$o.substring($s, $e)");;
    17.6 -%%example=new-string,verify,fix
    17.7 -new String($orig) :: $orig instanceof String && !matchesAny($orig, "$o.substring($s)", "$o.substring($s, $e)")
    17.8 -=> $orig;;

    18.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/hints/ExplicitFindDuplicates.java	Sat Feb 18 22:14:42 2012 +0100
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,379 +0,0 @@
    18.4 -/*
    18.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    18.6 - *
    18.7 - * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
    18.8 - *
    18.9 - * The contents of this file are subject to the terms of either the GNU
   18.10 - * General Public License Version 2 only ("GPL") or the Common
   18.11 - * Development and Distribution License("CDDL") (collectively, the
   18.12 - * "License"). You may not use this file except in compliance with the
   18.13 - * License. You can obtain a copy of the License at
   18.14 - * http://www.netbeans.org/cddl-gplv2.html
   18.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   18.16 - * specific language governing permissions and limitations under the
   18.17 - * License.  When distributing the software, include this License Header
   18.18 - * Notice in each file and include the License file at
   18.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   18.20 - * particular file as subject to the "Classpath" exception as provided
   18.21 - * by Sun in the GPL Version 2 section of the License file that
   18.22 - * accompanied this code. If applicable, add the following below the
   18.23 - * License Header, with the fields enclosed by brackets [] replaced by
   18.24 - * your own identifying information:
   18.25 - * "Portions Copyrighted [year] [name of copyright owner]"
   18.26 - *
   18.27 - * If you wish your version of this file to be governed by only the CDDL
   18.28 - * or only the GPL Version 2, indicate your decision by adding
   18.29 - * "[Contributor] elects to include this software in this distribution
   18.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   18.31 - * single choice of license, a recipient has the option to distribute
   18.32 - * your version of this file under either the CDDL, the GPL Version 2 or
   18.33 - * to extend the choice of license to its licensees as provided above.
   18.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   18.35 - * Version 2 license, then the option applies only if the new code is
   18.36 - * made subject to such option by the copyright holder.
   18.37 - *
   18.38 - * Contributor(s):
   18.39 - *
   18.40 - * Portions Copyrighted 2009 Sun Microsystems, Inc.
   18.41 - */
   18.42 -
   18.43 -package org.netbeans.modules.jackpot30.impl.hints;
   18.44 -
   18.45 -import com.sun.source.tree.BlockTree;
   18.46 -import com.sun.source.tree.ExpressionTree;
   18.47 -import com.sun.source.tree.NewClassTree;
   18.48 -import com.sun.source.tree.StatementTree;
   18.49 -import com.sun.source.tree.Tree;
   18.50 -import com.sun.source.tree.Tree.Kind;
   18.51 -import com.sun.source.tree.VariableTree;
   18.52 -import com.sun.source.util.TreePath;
   18.53 -import java.util.Collection;
   18.54 -import java.util.Collections;
   18.55 -import java.util.EnumSet;
   18.56 -import java.util.Set;
   18.57 -import javax.lang.model.type.ErrorType;
   18.58 -import javax.lang.model.type.TypeKind;
   18.59 -import javax.lang.model.type.TypeMirror;
   18.60 -import javax.swing.SwingUtilities;
   18.61 -import org.netbeans.api.java.lexer.JavaTokenId;
   18.62 -import org.netbeans.api.java.source.CancellableTask;
   18.63 -import org.netbeans.api.java.source.CompilationController;
   18.64 -import org.netbeans.api.java.source.CompilationInfo;
   18.65 -import org.netbeans.api.java.source.JavaSource;
   18.66 -import org.netbeans.api.java.source.JavaSource.Phase;
   18.67 -import org.netbeans.api.java.source.JavaSource.Priority;
   18.68 -import org.netbeans.api.java.source.JavaSourceTaskFactory;
   18.69 -import org.netbeans.api.java.source.Task;
   18.70 -import org.netbeans.api.java.source.TreePathHandle;
   18.71 -import org.netbeans.api.java.source.support.CaretAwareJavaSourceTaskFactory;
   18.72 -import org.netbeans.api.java.source.support.SelectionAwareJavaSourceTaskFactory;
   18.73 -import org.netbeans.api.lexer.TokenSequence;
   18.74 -import org.netbeans.modules.jackpot30.impl.refactoring.FindDuplicatesRefactoringUI;
   18.75 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
   18.76 -import org.netbeans.modules.java.hints.jackpot.impl.batch.Scopes;
   18.77 -import org.netbeans.modules.refactoring.spi.ui.UI;
   18.78 -import org.netbeans.spi.editor.hints.ChangeInfo;
   18.79 -import org.netbeans.spi.editor.hints.ErrorDescription;
   18.80 -import org.netbeans.spi.editor.hints.ErrorDescriptionFactory;
   18.81 -import org.netbeans.spi.editor.hints.Fix;
   18.82 -import org.netbeans.spi.editor.hints.HintsController;
   18.83 -import org.netbeans.spi.editor.hints.Severity;
   18.84 -import org.openide.filesystems.FileObject;
   18.85 -import org.openide.util.lookup.ServiceProvider;
   18.86 -
   18.87 -/**
   18.88 - *
   18.89 - * @author lahvac
   18.90 - */
   18.91 -public class ExplicitFindDuplicates implements CancellableTask<CompilationInfo> {
   18.92 -
   18.93 -    public void run(CompilationInfo info) throws Exception {
   18.94 -        Collection<? extends ErrorDescription> eds = computeErrorDescription(info);
   18.95 -
   18.96 -        if (eds == null) {
   18.97 -            eds = Collections.emptyList();
   18.98 -        }
   18.99 -
  18.100 -        HintsController.setErrors(info.getFileObject(), ExplicitFindDuplicates.class.getName(), eds);
  18.101 -    }
  18.102 -
  18.103 -    private Collection<? extends ErrorDescription> computeErrorDescription(CompilationInfo info) throws Exception {
  18.104 -        int[] span = SelectionAwareJavaSourceTaskFactory.getLastSelection(info.getFileObject());
  18.105 -
  18.106 -        if (span == null) {
  18.107 -            return null;
  18.108 -        }
  18.109 -
  18.110 -        TreePath selection = selectionForExpressionHack(info, span[0], span[1]);
  18.111 -
  18.112 -        if (selection == null) {
  18.113 -            if (selectionForStatementsHack(info, span[0], span[1], new int[2]) == null) {
  18.114 -                return null;
  18.115 -            }
  18.116 -        }
  18.117 -
  18.118 -        Fix f = new FixImpl(info.getFileObject(), span[0], span[1]);
  18.119 -        int caret = CaretAwareJavaSourceTaskFactory.getLastPosition(info.getFileObject());
  18.120 -        ErrorDescription ed = ErrorDescriptionFactory.createErrorDescription(Severity.HINT, "Look for Duplicates", Collections.singletonList(f), info.getFileObject(), caret, caret);
  18.121 -
  18.122 -        return Collections.singletonList(ed);
  18.123 -    }
  18.124 -
  18.125 -    public void cancel() {
  18.126 -        //XXX
  18.127 -    }
  18.128 -
  18.129 -    static Tree resolveAndGeneralizePattern(CompilationInfo info, int start, int end) {
  18.130 -        TreePath selection = selectionForExpressionHack(info, start, end);
  18.131 -
  18.132 -        if (selection == null) {
  18.133 -            int[] statementSpan = new int[2];
  18.134 -            TreePathHandle statementSelection = selectionForStatementsHack(info, start, end, statementSpan);
  18.135 -
  18.136 -            if (statementSelection == null) {
  18.137 -                return null;
  18.138 -            }
  18.139 -
  18.140 -            selection = statementSelection.resolve(info);
  18.141 -
  18.142 -            if (selection == null) {
  18.143 -                return null; //XXX
  18.144 -            }
  18.145 -
  18.146 -            return Utilities.generalizePattern(info, selection, statementSpan[0], statementSpan[1]);
  18.147 -        } else {
  18.148 -            return Utilities.generalizePattern(info, selection);
  18.149 -        }
  18.150 -    }
  18.151 -
  18.152 -    private static final class FixImpl implements Fix {
  18.153 -
  18.154 -        private final FileObject file;
  18.155 -        private final int start;
  18.156 -        private final int end;
  18.157 -
  18.158 -        public FixImpl(FileObject file, int start, int end) {
  18.159 -            this.file = file;
  18.160 -            this.start = start;
  18.161 -            this.end = end;
  18.162 -        }
  18.163 -
  18.164 -        public String getText() {
  18.165 -            return "Look for Duplicates in Opened Projects";
  18.166 -        }
  18.167 -
  18.168 -        public ChangeInfo implement() throws Exception {
  18.169 -            JavaSource.forFileObject(file).runUserActionTask(new Task<CompilationController>() {
  18.170 -                public void run(CompilationController cc) throws Exception {
  18.171 -                    cc.toPhase(Phase.RESOLVED);
  18.172 -
  18.173 -                    Tree generalized = resolveAndGeneralizePattern(cc, start, end);
  18.174 -
  18.175 -                    if (generalized == null) {
  18.176 -                        return ;
  18.177 -                    }
  18.178 -
  18.179 -                    final String pattern = generalized.toString(); //XXX
  18.180 -
  18.181 -                    SwingUtilities.invokeLater(new Runnable() {
  18.182 -                        public void run() {
  18.183 -                            UI.openRefactoringUI(new FindDuplicatesRefactoringUI(pattern, Scopes.allOpenedProjectsScope()));
  18.184 -                        }
  18.185 -                    });
  18.186 -                }
  18.187 -            }, true);
  18.188 -            
  18.189 -            return null;
  18.190 -        }
  18.191 -
  18.192 -    }
  18.193 -
  18.194 -    private static final Set<TypeKind> NOT_ACCEPTED_TYPES = EnumSet.of(TypeKind.NONE, TypeKind.OTHER);
  18.195 -    
  18.196 -    static TreePath selectionForExpressionHack(CompilationInfo info, int start, int end) {
  18.197 -        return validateSelection(info, start, end, NOT_ACCEPTED_TYPES);
  18.198 -    }
  18.199 -
  18.200 -    static TreePathHandle selectionForStatementsHack(CompilationInfo info, int start, int end, int[] outSpan)  {
  18.201 -        return validateSelectionForIntroduceMethod(info, start, end, outSpan);
  18.202 -    }
  18.203 -
  18.204 -    private static final Set<JavaTokenId> WHITESPACES = EnumSet.of(JavaTokenId.WHITESPACE, JavaTokenId.BLOCK_COMMENT, JavaTokenId.LINE_COMMENT, JavaTokenId.JAVADOC_COMMENT);
  18.205 -    static int[] ignoreWhitespaces(CompilationInfo ci, int start, int end) {
  18.206 -        TokenSequence<JavaTokenId> ts = ci.getTokenHierarchy().tokenSequence(JavaTokenId.language());
  18.207 -
  18.208 -        if (ts == null) {
  18.209 -            return new int[] {start, end};
  18.210 -        }
  18.211 -
  18.212 -        ts.move(start);
  18.213 -
  18.214 -        if (ts.moveNext()) {
  18.215 -            boolean wasMoveNext = true;
  18.216 -
  18.217 -            while (WHITESPACES.contains(ts.token().id()) && (wasMoveNext = ts.moveNext()))
  18.218 -                ;
  18.219 -
  18.220 -            if (wasMoveNext && ts.offset() > start)
  18.221 -                start = ts.offset();
  18.222 -        }
  18.223 -
  18.224 -        ts.move(end);
  18.225 -
  18.226 -        while (ts.movePrevious() && WHITESPACES.contains(ts.token().id()) && ts.offset() < end)
  18.227 -            end = ts.offset();
  18.228 -
  18.229 -        return new int[] {start, end};
  18.230 -    }
  18.231 -    
  18.232 -    private static boolean isInsideClass(TreePath tp) {
  18.233 -        while (tp != null) {
  18.234 -            if (tp.getLeaf().getKind() == Kind.CLASS)
  18.235 -                return true;
  18.236 -
  18.237 -            tp = tp.getParentPath();
  18.238 -        }
  18.239 -
  18.240 -        return false;
  18.241 -    }
  18.242 -    
  18.243 -    private static TreePath validateSelection(CompilationInfo ci, int start, int end, Set<TypeKind> ignoredTypes) {
  18.244 -        TreePath tp = ci.getTreeUtilities().pathFor((start + end) / 2 + 1);
  18.245 -
  18.246 -        for ( ; tp != null; tp = tp.getParentPath()) {
  18.247 -            Tree leaf = tp.getLeaf();
  18.248 -
  18.249 -            if (!ExpressionTree.class.isAssignableFrom(leaf.getKind().asInterface()))
  18.250 -               continue;
  18.251 -
  18.252 -            long treeStart = ci.getTrees().getSourcePositions().getStartPosition(ci.getCompilationUnit(), leaf);
  18.253 -            long treeEnd   = ci.getTrees().getSourcePositions().getEndPosition(ci.getCompilationUnit(), leaf);
  18.254 -
  18.255 -            if (treeStart != start || treeEnd != end) {
  18.256 -                continue;
  18.257 -            }
  18.258 -
  18.259 -            TypeMirror type = ci.getTrees().getTypeMirror(tp);
  18.260 -
  18.261 -            if (type != null && type.getKind() == TypeKind.ERROR) {
  18.262 -                type = ci.getTrees().getOriginalType((ErrorType) type);
  18.263 -            }
  18.264 -
  18.265 -            if (type == null || ignoredTypes.contains(type.getKind()))
  18.266 -                continue;
  18.267 -
  18.268 -            if(tp.getLeaf().getKind() == Kind.ASSIGNMENT)
  18.269 -                continue;
  18.270 -
  18.271 -            if (tp.getLeaf().getKind() == Kind.ANNOTATION)
  18.272 -                continue;
  18.273 -
  18.274 -            if (!isInsideClass(tp))
  18.275 -                return null;
  18.276 -
  18.277 -            TreePath candidate = tp;
  18.278 -
  18.279 -            tp = tp.getParentPath();
  18.280 -
  18.281 -            while (tp != null) {
  18.282 -                switch (tp.getLeaf().getKind()) {
  18.283 -                    case VARIABLE:
  18.284 -                        VariableTree vt = (VariableTree) tp.getLeaf();
  18.285 -                        if (vt.getInitializer() == leaf) {
  18.286 -                            return candidate;
  18.287 -                        } else {
  18.288 -                            return null;
  18.289 -                        }
  18.290 -                    case NEW_CLASS:
  18.291 -                        NewClassTree nct = (NewClassTree) tp.getLeaf();
  18.292 -
  18.293 -                        if (nct.getIdentifier().equals(candidate.getLeaf())) { //avoid disabling hint ie inside of anonymous class higher in treepath
  18.294 -                            for (Tree p : nct.getArguments()) {
  18.295 -                                if (p == leaf) {
  18.296 -                                    return candidate;
  18.297 -                                }
  18.298 -                            }
  18.299 -
  18.300 -                            return null;
  18.301 -                        }
  18.302 -                }
  18.303 -
  18.304 -                leaf = tp.getLeaf();
  18.305 -                tp = tp.getParentPath();
  18.306 -            }
  18.307 -
  18.308 -            return candidate;
  18.309 -        }
  18.310 -
  18.311 -        return null;
  18.312 -    }
  18.313 -
  18.314 -    private static TreePathHandle validateSelectionForIntroduceMethod(CompilationInfo ci, int start, int end, int[] statementsSpan) {
  18.315 -        int[] span = ignoreWhitespaces(ci, Math.min(start, end), Math.max(start, end));
  18.316 -
  18.317 -        start = span[0];
  18.318 -        end   = span[1];
  18.319 -
  18.320 -        if (start >= end)
  18.321 -            return null;
  18.322 -
  18.323 -        TreePath tpStart = ci.getTreeUtilities().pathFor(start);
  18.324 -        TreePath tpEnd = ci.getTreeUtilities().pathFor(end);
  18.325 -
  18.326 -        if (tpStart.getLeaf() != tpEnd.getLeaf() || tpStart.getLeaf().getKind() != Kind.BLOCK) {
  18.327 -            //??? not in the same block:
  18.328 -            return null;
  18.329 -        }
  18.330 -
  18.331 -        int from = -1;
  18.332 -        int to   = -1;
  18.333 -
  18.334 -        BlockTree block = (BlockTree) tpStart.getLeaf();
  18.335 -        int index = 0;
  18.336 -
  18.337 -        for (StatementTree s : block.getStatements()) {
  18.338 -            long sStart = ci.getTrees().getSourcePositions().getStartPosition(ci.getCompilationUnit(), s);
  18.339 -
  18.340 -            if (sStart == start) {
  18.341 -                from = index;
  18.342 -            }
  18.343 -
  18.344 -            if (end < sStart && to == (-1)) {
  18.345 -                to = index - 1;
  18.346 -            }
  18.347 -
  18.348 -            index++;
  18.349 -        }
  18.350 -
  18.351 -        if (from == (-1)) {
  18.352 -            return null;
  18.353 -        }
  18.354 -
  18.355 -        if (to == (-1))
  18.356 -            to = block.getStatements().size() - 1;
  18.357 -
  18.358 -        if (to < from) {
  18.359 -            return null;
  18.360 -        }
  18.361 -
  18.362 -        statementsSpan[0] = from;
  18.363 -        statementsSpan[1] = to;
  18.364 -
  18.365 -        return TreePathHandle.create(tpStart, ci);
  18.366 -    }
  18.367 -
  18.368 -    @ServiceProvider(service=JavaSourceTaskFactory.class)
  18.369 -    public static final class FactoryImpl extends SelectionAwareJavaSourceTaskFactory {
  18.370 -
  18.371 -        public FactoryImpl() {
  18.372 -            super(Phase.RESOLVED, Priority.LOW);
  18.373 -        }
  18.374 -
  18.375 -        @Override
  18.376 -        protected CancellableTask<CompilationInfo> createTask(FileObject file) {
  18.377 -            return new ExplicitFindDuplicates();
  18.378 -        }
  18.379 -        
  18.380 -    }
  18.381 -
  18.382 -}

    19.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/resources/Bundle.properties	Sat Feb 18 22:14:42 2012 +0100
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,40 +0,0 @@
    19.4 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    19.5 -#
    19.6 -# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
    19.7 -#
    19.8 -# The contents of this file are subject to the terms of either the GNU
    19.9 -# General Public License Version 2 only ("GPL") or the Common
   19.10 -# Development and Distribution License("CDDL") (collectively, the
   19.11 -# "License"). You may not use this file except in compliance with the
   19.12 -# License. You can obtain a copy of the License at
   19.13 -# http://www.netbeans.org/cddl-gplv2.html
   19.14 -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   19.15 -# specific language governing permissions and limitations under the
   19.16 -# License.  When distributing the software, include this License Header
   19.17 -# Notice in each file and include the License file at
   19.18 -# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   19.19 -# particular file as subject to the "Classpath" exception as provided
   19.20 -# by Sun in the GPL Version 2 section of the License file that
   19.21 -# accompanied this code. If applicable, add the following below the
   19.22 -# License Header, with the fields enclosed by brackets [] replaced by
   19.23 -# your own identifying information:
   19.24 -# "Portions Copyrighted [year] [name of copyright owner]"
   19.25 -#
   19.26 -# If you wish your version of this file to be governed by only the CDDL
   19.27 -# or only the GPL Version 2, indicate your decision by adding
   19.28 -# "[Contributor] elects to include this software in this distribution
   19.29 -# under the [CDDL or GPL Version 2] license." If you do not indicate a
   19.30 -# single choice of license, a recipient has the option to distribute
   19.31 -# your version of this file under either the CDDL, the GPL Version 2 or
   19.32 -# to extend the choice of license to its licensees as provided above.
   19.33 -# However, if you add GPL Version 2 code and therefore, elected the GPL
   19.34 -# Version 2 license, then the option applies only if the new code is
   19.35 -# made subject to such option by the copyright holder.
   19.36 -#
   19.37 -# Contributor(s):
   19.38 -#
   19.39 -# Portions Copyrighted 2009 Sun Microsystems, Inc.
   19.40 -
   19.41 -Actions/Refactoring/org-netbeans-modules-jackpot30-impl-refactoring-ApplyPatternAction.instance=Apply Pattern
   19.42 -Actions/Refactoring/org-netbeans-modules-jackpot30-impl-refactoring-FindOccurrencesAction.instance=Find Pattern Occurrences
   19.43 -OpenIDE-Module-Name=Jackpot 3.0 API

    20.1 Binary file api/src/org/netbeans/modules/jackpot30/impl/resources/examples_icon.png has changed

    21.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/resources/layer.xml	Sat Feb 18 22:14:42 2012 +0100
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,68 +0,0 @@
    21.4 -<?xml version="1.0" encoding="UTF-8"?>
    21.5 -<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
    21.6 -<filesystem>
    21.7 -    <folder name="Actions">
    21.8 -        <folder name="Refactoring">
    21.9 -            <file name="org-netbeans-modules-jackpot30-impl-duplicates-GlobalFindDuplicates.instance">
   21.10 -                <attr name="delegate" newvalue="org.netbeans.modules.jackpot30.impl.duplicates.GlobalFindDuplicates"/>
   21.11 -                <attr name="displayName" bundlevalue="org.netbeans.modules.jackpot30.impl.duplicates.Bundle#CTL_GlobalFindDuplicates"/>
   21.12 -                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
   21.13 -                <attr name="noIconInMenu" boolvalue="false"/>
   21.14 -            </file>
   21.15 -            <file name="org-netbeans-modules-jackpot30-impl-refactoring-ApplyPatternAction.instance">
   21.16 -                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.jackpot30.impl.resources.Bundle"/>
   21.17 -                <attr name="delegate" newvalue="org.netbeans.modules.jackpot30.impl.refactoring.ApplyPatternAction"/>
   21.18 -                <attr name="displayName" bundlevalue="org.netbeans.modules.jackpot30.impl.refactoring.Bundle#CTL_ApplyPatternAction"/>
   21.19 -                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
   21.20 -                <attr name="noIconInMenu" boolvalue="false"/>
   21.21 -            </file>
   21.22 -            <file name="org-netbeans-modules-jackpot30-impl-refactoring-FindOccurrencesAction.instance">
   21.23 -                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.jackpot30.impl.resources.Bundle"/>
   21.24 -                <attr name="delegate" newvalue="org.netbeans.modules.jackpot30.impl.refactoring.FindOccurrencesAction"/>
   21.25 -                <attr name="displayName" bundlevalue="org.netbeans.modules.jackpot30.impl.refactoring.Bundle#CTL_FindOccurrencesAction"/>
   21.26 -                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
   21.27 -                <attr name="noIconInMenu" boolvalue="false"/>
   21.28 -            </file>
   21.29 -            <file name="org-netbeans-modules-jackpot30-impl-refactoring-upgrade-UpgradeAction.instance">
   21.30 -                <attr name="delegate" newvalue="org.netbeans.modules.jackpot30.impl.refactoring.upgrade.UpgradeAction"/>
   21.31 -                <attr name="displayName" bundlevalue="org.netbeans.modules.jackpot30.impl.refactoring.upgrade.Bundle#CTL_UpgradeAction"/>
   21.32 -                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
   21.33 -                <attr name="noIconInMenu" boolvalue="false"/>
   21.34 -            </file>
   21.35 -        </folder>
   21.36 -    </folder>
   21.37 -
   21.38 -    <!--XXX:-->
   21.39 -    <folder name="Menu">
   21.40 -        <folder name="Edit">
   21.41 -            <file name="org-netbeans-modules-jackpot30-impl-refactoring-FindOccurrencesAction.shadow">
   21.42 -                <attr name="originalFile" stringvalue="Actions/Refactoring/org-netbeans-modules-jackpot30-impl-refactoring-FindOccurrencesAction.instance"/>
   21.43 -                <attr name="position" intvalue="2250"/>
   21.44 -            </file>
   21.45 -        </folder>
   21.46 -        <folder name="Refactoring">
   21.47 -            <file name="org-netbeans-modules-jackpot30-impl-duplicates-GlobalFindDuplicates.shadow">
   21.48 -                <attr name="originalFile" stringvalue="Actions/Refactoring/org-netbeans-modules-jackpot30-impl-duplicates-GlobalFindDuplicates.instance"/>
   21.49 -                <attr name="position" intvalue="2300"/>
   21.50 -            </file>
   21.51 -            <file name="org-netbeans-modules-jackpot30-impl-refactoring-ApplyPatternAction.shadow">
   21.52 -                <attr name="originalFile" stringvalue="Actions/Refactoring/org-netbeans-modules-jackpot30-impl-refactoring-ApplyPatternAction.instance"/>
   21.53 -                <attr name="position" intvalue="2200"/>
   21.54 -            </file>
   21.55 -            <file name="org-netbeans-modules-jackpot30-impl-refactoring-upgrade-UpgradeAction.shadow">
   21.56 -                <attr name="originalFile" stringvalue="Actions/Refactoring/org-netbeans-modules-jackpot30-impl-refactoring-upgrade-UpgradeAction.instance"/>
   21.57 -                <attr name="position" intvalue="2187"/>
   21.58 -            </file>
   21.59 -        </folder>
   21.60 -    </folder>
   21.61 -
   21.62 -    <folder name="Editors">
   21.63 -        <folder name="text">
   21.64 -            <folder name="x-java">
   21.65 -                <file name="org-netbeans-modules-jackpot30-impl-hints-HintsInvoker$FactoryImpl.instance"/>
   21.66 -                <file name="org-netbeans-modules-jackpot30-impl-indexing-CustomIndexerImpl$CustomIndexerFactoryImpl.instance"/>
   21.67 -                <file name="org-netbeans-modules-jackpot30-impl-duplicates-indexing-DuplicatesCustomIndexerImpl$FactoryImpl.instance"/>
   21.68 -            </folder>
   21.69 -        </folder>
   21.70 -    </folder>
   21.71 -</filesystem>

    22.1 Binary file api/src/org/netbeans/modules/jackpot30/impl/resources/recent_icon.png has changed

    23.1 --- a/api/src/org/netbeans/modules/jackpot30/spi/Hacks.java	Sat Feb 18 22:14:42 2012 +0100
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,89 +0,0 @@
    23.4 -/*
    23.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    23.6 - *
    23.7 - * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
    23.8 - *
    23.9 - * The contents of this file are subject to the terms of either the GNU
   23.10 - * General Public License Version 2 only ("GPL") or the Common
   23.11 - * Development and Distribution License("CDDL") (collectively, the
   23.12 - * "License"). You may not use this file except in compliance with the
   23.13 - * License. You can obtain a copy of the License at
   23.14 - * http://www.netbeans.org/cddl-gplv2.html
   23.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   23.16 - * specific language governing permissions and limitations under the
   23.17 - * License.  When distributing the software, include this License Header
   23.18 - * Notice in each file and include the License file at
   23.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   23.20 - * particular file as subject to the "Classpath" exception as provided
   23.21 - * by Sun in the GPL Version 2 section of the License file that
   23.22 - * accompanied this code. If applicable, add the following below the
   23.23 - * License Header, with the fields enclosed by brackets [] replaced by
   23.24 - * your own identifying information:
   23.25 - * "Portions Copyrighted [year] [name of copyright owner]"
   23.26 - *
   23.27 - * If you wish your version of this file to be governed by only the CDDL
   23.28 - * or only the GPL Version 2, indicate your decision by adding
   23.29 - * "[Contributor] elects to include this software in this distribution
   23.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   23.31 - * single choice of license, a recipient has the option to distribute
   23.32 - * your version of this file under either the CDDL, the GPL Version 2 or
   23.33 - * to extend the choice of license to its licensees as provided above.
   23.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   23.35 - * Version 2 license, then the option applies only if the new code is
   23.36 - * made subject to such option by the copyright holder.
   23.37 - *
   23.38 - * Contributor(s):
   23.39 - *
   23.40 - * Portions Copyrighted 2009 Sun Microsystems, Inc.
   23.41 - */
   23.42 -
   23.43 -package org.netbeans.modules.jackpot30.spi;
   23.44 -
   23.45 -import com.sun.source.util.TreePath;
   23.46 -import java.util.ArrayList;
   23.47 -import java.util.Collections;
   23.48 -import java.util.LinkedList;
   23.49 -import java.util.List;
   23.50 -import java.util.Set;
   23.51 -import java.util.concurrent.atomic.AtomicBoolean;
   23.52 -import java.util.prefs.Preferences;
   23.53 -import org.netbeans.api.java.source.WorkingCopy;
   23.54 -import org.netbeans.api.project.Project;
   23.55 -import org.netbeans.modules.java.hints.jackpot.impl.MessageImpl;
   23.56 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchUtilities;
   23.57 -import org.netbeans.modules.java.hints.jackpot.impl.hints.HintsInvoker;
   23.58 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription;
   23.59 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata;
   23.60 -import org.netbeans.spi.editor.hints.ErrorDescription;
   23.61 -import org.openide.util.Exceptions;
   23.62 -
   23.63 -/**
   23.64 - *
   23.65 - * @author lahvac
   23.66 - */
   23.67 -public class Hacks {
   23.68 -
   23.69 -    public static interface HintPreferencesProvider {
   23.70 -        public Preferences findPreferences(HintMetadata hm);
   23.71 -    }
   23.72 -
   23.73 -    public static void findHintsAndApplyFixes(WorkingCopy copy, Iterable<? extends HintDescription> hints, TreePath on, AtomicBoolean cancel) {
   23.74 -        HintsInvoker inv = new HintsInvoker(copy, cancel);
   23.75 -        List<ErrorDescription> errs = new ArrayList<ErrorDescription>(inv.computeHints(copy, hints));
   23.76 -        List<MessageImpl> problems = new LinkedList<MessageImpl>();
   23.77 -
   23.78 -        try {
   23.79 -            if (BatchUtilities.applyFixes(copy, Collections.<Project, Set<String>>emptyMap(), errs, problems)) {
   23.80 -                throw new IllegalStateException();
   23.81 -            }
   23.82 -        } catch (IllegalStateException ex) {
   23.83 -            Exceptions.printStackTrace(ex);
   23.84 -        } catch (Exception ex) {
   23.85 -            Exceptions.printStackTrace(ex);
   23.86 -        }
   23.87 -
   23.88 -        if (!problems.isEmpty()) {
   23.89 -            throw new IllegalStateException(problems.get(0).text);
   23.90 -        }
   23.91 -    }
   23.92 -}

    24.1 --- a/api/test/unit/src/org/netbeans/modules/jackpot30/impl/TestBase.java	Sat Feb 18 22:14:42 2012 +0100
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,120 +0,0 @@
    24.4 -/*
    24.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    24.6 - *
    24.7 - * Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved.
    24.8 - *
    24.9 - * The contents of this file are subject to the terms of either the GNU
   24.10 - * General Public License Version 2 only ("GPL") or the Common
   24.11 - * Development and Distribution License("CDDL") (collectively, the
   24.12 - * "License"). You may not use this file except in compliance with the
   24.13 - * License. You can obtain a copy of the License at
   24.14 - * http://www.netbeans.org/cddl-gplv2.html
   24.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   24.16 - * specific language governing permissions and limitations under the
   24.17 - * License.  When distributing the software, include this License Header
   24.18 - * Notice in each file and include the License file at
   24.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   24.20 - * particular file as subject to the "Classpath" exception as provided
   24.21 - * by Sun in the GPL Version 2 section of the License file that
   24.22 - * accompanied this code. If applicable, add the following below the
   24.23 - * License Header, with the fields enclosed by brackets [] replaced by
   24.24 - * your own identifying information:
   24.25 - * "Portions Copyrighted [year] [name of copyright owner]"
   24.26 - *
   24.27 - * If you wish your version of this file to be governed by only the CDDL
   24.28 - * or only the GPL Version 2, indicate your decision by adding
   24.29 - * "[Contributor] elects to include this software in this distribution
   24.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   24.31 - * single choice of license, a recipient has the option to distribute
   24.32 - * your version of this file under either the CDDL, the GPL Version 2 or
   24.33 - * to extend the choice of license to its licensees as provided above.
   24.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   24.35 - * Version 2 license, then the option applies only if the new code is
   24.36 - * made subject to such option by the copyright holder.
   24.37 - *
   24.38 - * Contributor(s):
   24.39 - *
   24.40 - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc.
   24.41 - */
   24.42 -
   24.43 -package org.netbeans.modules.jackpot30.impl;
   24.44 -
   24.45 -import java.io.File;
   24.46 -import javax.swing.text.Document;
   24.47 -import org.netbeans.api.java.lexer.JavaTokenId;
   24.48 -import org.netbeans.api.java.source.CompilationInfo;
   24.49 -import org.netbeans.api.java.source.JavaSource;
   24.50 -import org.netbeans.api.java.source.JavaSource.Phase;
   24.51 -import org.netbeans.api.java.source.SourceUtilsTestUtil;
   24.52 -import org.netbeans.api.java.source.TestUtilities;
   24.53 -import org.netbeans.api.lexer.Language;
   24.54 -import org.netbeans.junit.NbTestCase;
   24.55 -import org.netbeans.modules.java.source.TreeLoader;
   24.56 -import org.openide.cookies.EditorCookie;
   24.57 -import org.openide.filesystems.FileObject;
   24.58 -import org.openide.filesystems.FileUtil;
   24.59 -import org.openide.loaders.DataObject;
   24.60 -
   24.61 -/**
   24.62 - *
   24.63 - * @author Jan Lahoda
   24.64 - */
   24.65 -public class TestBase extends NbTestCase {
   24.66 -
   24.67 -    public TestBase(String name) {
   24.68 -        super(name);
   24.69 -    }
   24.70 -
   24.71 -    @Override
   24.72 -    protected void setUp() throws Exception {
   24.73 -        super.setUp();
   24.74 -        SourceUtilsTestUtil.prepareTest(new String[0], new Object[0]);
   24.75 -        TreeLoader.DISABLE_CONFINEMENT_TEST = true;
   24.76 -    }
   24.77 -
   24.78 -    protected void prepareTest(String fileName, String code) throws Exception {
   24.79 -        clearWorkDir();
   24.80 -
   24.81 -        FileUtil.refreshFor(File.listRoots());
   24.82 -
   24.83 -        FileObject workFO = FileUtil.toFileObject(getWorkDir());
   24.84 -
   24.85 -        assertNotNull(workFO);
   24.86 -
   24.87 -        workFO.refresh();
   24.88 -
   24.89 -        sourceRoot = workFO.createFolder("src");
   24.90 -        FileObject buildRoot  = workFO.createFolder("build");
   24.91 -        FileObject cache = workFO.createFolder("cache");
   24.92 -
   24.93 -        FileObject data = FileUtil.createData(sourceRoot, fileName);
   24.94 -        File dataFile = FileUtil.toFile(data);
   24.95 -
   24.96 -        assertNotNull(dataFile);
   24.97 -
   24.98 -        TestUtilities.copyStringToFile(dataFile, code);
   24.99 -
  24.100 -        SourceUtilsTestUtil.prepareTest(sourceRoot, buildRoot, cache);
  24.101 -
  24.102 -        DataObject od = DataObject.find(data);
  24.103 -        EditorCookie ec = od.getLookup().lookup(EditorCookie.class);
  24.104 -
  24.105 -        assertNotNull(ec);
  24.106 -
  24.107 -        doc = ec.openDocument();
  24.108 -        doc.putProperty(Language.class, JavaTokenId.language());
  24.109 -
  24.110 -        JavaSource js = JavaSource.forFileObject(data);
  24.111 -
  24.112 -        assertNotNull(js);
  24.113 -
  24.114 -        info = SourceUtilsTestUtil.getCompilationInfo(js, Phase.RESOLVED);
  24.115 -
  24.116 -        assertNotNull(info);
  24.117 -    }
  24.118 -
  24.119 -    protected FileObject sourceRoot;
  24.120 -    protected CompilationInfo info;
  24.121 -    protected Document doc;
  24.122 -
  24.123 -}

    25.1 --- a/api/test/unit/src/org/netbeans/modules/jackpot30/impl/examples/LoadExamplesTest.java	Sat Feb 18 22:14:42 2012 +0100
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,71 +0,0 @@
    25.4 -/*
    25.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    25.6 - *
    25.7 - * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
    25.8 - *
    25.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   25.10 - * Other names may be trademarks of their respective owners.
   25.11 - *
   25.12 - * The contents of this file are subject to the terms of either the GNU
   25.13 - * General Public License Version 2 only ("GPL") or the Common
   25.14 - * Development and Distribution License("CDDL") (collectively, the
   25.15 - * "License"). You may not use this file except in compliance with the
   25.16 - * License. You can obtain a copy of the License at
   25.17 - * http://www.netbeans.org/cddl-gplv2.html
   25.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   25.19 - * specific language governing permissions and limitations under the
   25.20 - * License.  When distributing the software, include this License Header
   25.21 - * Notice in each file and include the License file at
   25.22 - * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   25.23 - * particular file as subject to the "Classpath" exception as provided
   25.24 - * by Oracle in the GPL Version 2 section of the License file that
   25.25 - * accompanied this code. If applicable, add the following below the
   25.26 - * License Header, with the fields enclosed by brackets [] replaced by
   25.27 - * your own identifying information:
   25.28 - * "Portions Copyrighted [year] [name of copyright owner]"
   25.29 - *
   25.30 - * If you wish your version of this file to be governed by only the CDDL
   25.31 - * or only the GPL Version 2, indicate your decision by adding
   25.32 - * "[Contributor] elects to include this software in this distribution
   25.33 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   25.34 - * single choice of license, a recipient has the option to distribute
   25.35 - * your version of this file under either the CDDL, the GPL Version 2 or
   25.36 - * to extend the choice of license to its licensees as provided above.
   25.37 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   25.38 - * Version 2 license, then the option applies only if the new code is
   25.39 - * made subject to such option by the copyright holder.
   25.40 - *
   25.41 - * Contributor(s):
   25.42 - *
   25.43 - * Portions Copyrighted 2010 Sun Microsystems, Inc.
   25.44 - */
   25.45 -
   25.46 -package org.netbeans.modules.jackpot30.impl.examples;
   25.47 -
   25.48 -import java.util.Arrays;
   25.49 -import java.util.LinkedList;
   25.50 -import java.util.List;
   25.51 -import org.netbeans.junit.NbTestCase;
   25.52 -import static org.junit.Assert.*;
   25.53 -
   25.54 -/**
   25.55 - *
   25.56 - * @author lahvac
   25.57 - */
   25.58 -public class LoadExamplesTest extends NbTestCase {
   25.59 -
   25.60 -    public LoadExamplesTest(String name) {
   25.61 -        super(name);
   25.62 -    }
   25.63 -
   25.64 -    public void testLoadExamples() {
   25.65 -        List<String> actual = new LinkedList<String>();
   25.66 -
   25.67 -        for (Example e : LoadExamples.loadExamples("test-examples.list")) {
   25.68 -            actual.add("" + e.getKey() + ":" + e.getOptions() + ":" + e.getCode());
   25.69 -        }
   25.70 -
   25.71 -        assertEquals(Arrays.asList("key1:[]:EX1\n", "key2:[VERIFY, FIX]:EX2\n", "key3:[FIX]:EX3\n"), actual);
   25.72 -    }
   25.73 -
   25.74 -}
   25.75 \ No newline at end of file

    26.1 --- a/api/test/unit/src/org/netbeans/modules/jackpot30/impl/examples/test-example1.example	Sat Feb 18 22:14:42 2012 +0100
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,6 +0,0 @@
    26.4 -%%example=key1
    26.5 -EX1
    26.6 -%%example=key2,verify,fix
    26.7 -EX2
    26.8 -%%example=key3,fix
    26.9 -EX3

    27.1 --- a/api/test/unit/src/org/netbeans/modules/jackpot30/impl/examples/test-examples.list	Sat Feb 18 22:14:42 2012 +0100
    27.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.3 @@ -1,1 +0,0 @@
    27.4 -test-example1.example

    28.1 --- a/api/test/unit/src/org/netbeans/modules/jackpot30/impl/hints/ExplicitFindDuplicatesTest.java	Sat Feb 18 22:14:42 2012 +0100
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,138 +0,0 @@
    28.4 -/*
    28.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    28.6 - *
    28.7 - * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
    28.8 - *
    28.9 - * The contents of this file are subject to the terms of either the GNU
   28.10 - * General Public License Version 2 only ("GPL") or the Common
   28.11 - * Development and Distribution License("CDDL") (collectively, the
   28.12 - * "License"). You may not use this file except in compliance with the
   28.13 - * License. You can obtain a copy of the License at
   28.14 - * http://www.netbeans.org/cddl-gplv2.html
   28.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   28.16 - * specific language governing permissions and limitations under the
   28.17 - * License.  When distributing the software, include this License Header
   28.18 - * Notice in each file and include the License file at
   28.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   28.20 - * particular file as subject to the "Classpath" exception as provided
   28.21 - * by Sun in the GPL Version 2 section of the License file that
   28.22 - * accompanied this code. If applicable, add the following below the
   28.23 - * License Header, with the fields enclosed by brackets [] replaced by
   28.24 - * your own identifying information:
   28.25 - * "Portions Copyrighted [year] [name of copyright owner]"
   28.26 - *
   28.27 - * If you wish your version of this file to be governed by only the CDDL
   28.28 - * or only the GPL Version 2, indicate your decision by adding
   28.29 - * "[Contributor] elects to include this software in this distribution
   28.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   28.31 - * single choice of license, a recipient has the option to distribute
   28.32 - * your version of this file under either the CDDL, the GPL Version 2 or
   28.33 - * to extend the choice of license to its licensees as provided above.
   28.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   28.35 - * Version 2 license, then the option applies only if the new code is
   28.36 - * made subject to such option by the copyright holder.
   28.37 - *
   28.38 - * Contributor(s):
   28.39 - *
   28.40 - * Portions Copyrighted 2009 Sun Microsystems, Inc.
   28.41 - */
   28.42 -
   28.43 -package org.netbeans.modules.jackpot30.impl.hints;
   28.44 -
   28.45 -import com.sun.source.tree.Tree;
   28.46 -import com.sun.tools.javac.tree.JCTree;
   28.47 -import java.util.regex.Pattern;
   28.48 -import org.netbeans.modules.jackpot30.impl.TestBase;
   28.49 -import org.netbeans.modules.java.source.pretty.VeryPretty;
   28.50 -import org.netbeans.modules.java.source.save.DiffContext;
   28.51 -
   28.52 -/**
   28.53 - *
   28.54 - * @author lahvac
   28.55 - */
   28.56 -public class ExplicitFindDuplicatesTest extends TestBase {
   28.57 -
   28.58 -    public ExplicitFindDuplicatesTest(String name) {
   28.59 -        super(name);
   28.60 -    }
   28.61 -
   28.62 -    public void testLocalVariablesGeneralization() throws Exception {
   28.63 -        performGeneralizationTest("package test;\n" +
   28.64 -                    "public class Test {\n" +
   28.65 -                    "    private void test() {\n" +
   28.66 -                    "        |int i = 0;\n" +
   28.67 -                    "        i++;\n" +
   28.68 -                    "        int j = i;|\n" +
   28.69 -                    "    }\n" +
   28.70 -                    "}\n" +
   28.71 -                    "",
   28.72 -                    "{\n" +
   28.73 -                    "    $s0$;\n" +
   28.74 -                    "    int $0 = 0;\n" +
   28.75 -                    "    $0++;\n" +
   28.76 -                    "    int $1 = $0;\n" +
   28.77 -                    "    $s1$;\n" +
   28.78 -                    "}");
   28.79 -    }
   28.80 -    
   28.81 -    public void testSingleStatementPattern() throws Exception {
   28.82 -        performGeneralizationTest("package test;\n" +
   28.83 -                    "public class Test {\n" +
   28.84 -                    "    private void test() {\n" +
   28.85 -                    "        int i = 0;\n" +
   28.86 -                    "        |i++;|\n" +
   28.87 -                    "        int j = i;\n" +
   28.88 -                    "    }\n" +
   28.89 -                    "}\n" +
   28.90 -                    "",
   28.91 -                    "$0++;");
   28.92 -    }
   28.93 -
   28.94 -    public void testExpressionPattern() throws Exception {
   28.95 -        performGeneralizationTest("package test;\n" +
   28.96 -                    "public class Test {\n" +
   28.97 -                    "    private void test() {\n" +
   28.98 -                    "        int i = 0;\n" +
   28.99 -                    "        i++;\n" +
  28.100 -                    "        int j = |i|;\n" +
  28.101 -                    "    }\n" +
  28.102 -                    "}\n" +
  28.103 -                    "",
  28.104 -                    "$0");
  28.105 -    }
  28.106 -
  28.107 -    public void testVoidMethod() throws Exception {
  28.108 -        performGeneralizationTest("package test;\n" +
  28.109 -                    "public class Test {\n" +
  28.110 -                    "    private void test() {\n" +
  28.111 -                    "        |System.err.println()|;\n" +
  28.112 -                    "    }\n" +
  28.113 -                    "}\n" +
  28.114 -                    "",
  28.115 -                    "System.err.println()");
  28.116 -    }
  28.117 -
  28.118 -    private void performGeneralizationTest(String code, String generalized) throws Exception {
  28.119 -        String[] split = code.split(Pattern.quote("|"));
  28.120 -
  28.121 -        assertEquals(3, split.length);
  28.122 -
  28.123 -        int start = split[0].length();
  28.124 -        int end   = split[1].length() + start;
  28.125 -        
  28.126 -        code = split[0] + split[1] + split[2];
  28.127 -
  28.128 -        prepareTest("test/Test.java", code);
  28.129 -
  28.130 -        Tree generalizedTree = ExplicitFindDuplicates.resolveAndGeneralizePattern(info, start, end);
  28.131 -        VeryPretty vp = new VeryPretty(new DiffContext(info));
  28.132 -
  28.133 -        vp.print((JCTree) generalizedTree);
  28.134 -        
  28.135 -        String repr = vp.toString();
  28.136 -        
  28.137 -        assertEquals(generalized.replaceAll("[ \n\t]+", " "),
  28.138 -                     repr.replaceAll("[ \n\t]+", " "));
  28.139 -    }
  28.140 -
  28.141 -}
  28.142 \ No newline at end of file

    29.1 --- a/api/test/unit/src/org/netbeans/modules/jackpot30/impl/pm/BulkSearchPerformance.java	Sat Feb 18 22:14:42 2012 +0100
    29.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.3 @@ -1,226 +0,0 @@
    29.4 -/*
    29.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    29.6 - *
    29.7 - * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
    29.8 - *
    29.9 - * The contents of this file are subject to the terms of either the GNU
   29.10 - * General Public License Version 2 only ("GPL") or the Common
   29.11 - * Development and Distribution License("CDDL") (collectively, the
   29.12 - * "License"). You may not use this file except in compliance with the
   29.13 - * License. You can obtain a copy of the License at
   29.14 - * http://www.netbeans.org/cddl-gplv2.html
   29.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   29.16 - * specific language governing permissions and limitations under the
   29.17 - * License.  When distributing the software, include this License Header
   29.18 - * Notice in each file and include the License file at
   29.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   29.20 - * particular file as subject to the "Classpath" exception as provided
   29.21 - * by Sun in the GPL Version 2 section of the License file that
   29.22 - * accompanied this code. If applicable, add the following below the
   29.23 - * License Header, with the fields enclosed by brackets [] replaced by
   29.24 - * your own identifying information:
   29.25 - * "Portions Copyrighted [year] [name of copyright owner]"
   29.26 - *
   29.27 - * If you wish your version of this file to be governed by only the CDDL
   29.28 - * or only the GPL Version 2, indicate your decision by adding
   29.29 - * "[Contributor] elects to include this software in this distribution
   29.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   29.31 - * single choice of license, a recipient has the option to distribute
   29.32 - * your version of this file under either the CDDL, the GPL Version 2 or
   29.33 - * to extend the choice of license to its licensees as provided above.
   29.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   29.35 - * Version 2 license, then the option applies only if the new code is
   29.36 - * made subject to such option by the copyright holder.
   29.37 - *
   29.38 - * Contributor(s):
   29.39 - *
   29.40 - * Portions Copyrighted 2009 Sun Microsystems, Inc.
   29.41 - */
   29.42 -
   29.43 -package org.netbeans.modules.jackpot30.impl.pm;
   29.44 -
   29.45 -import com.sun.source.util.TreePath;
   29.46 -import java.io.ByteArrayInputStream;
   29.47 -import java.io.ByteArrayOutputStream;
   29.48 -import java.io.File;
   29.49 -import java.io.IOException;
   29.50 -import java.util.LinkedList;
   29.51 -import java.util.List;
   29.52 -import org.netbeans.api.java.source.ClasspathInfo;
   29.53 -import org.netbeans.api.java.source.CompilationController;
   29.54 -import org.netbeans.api.java.source.JavaSource;
   29.55 -import org.netbeans.api.java.source.JavaSource.Phase;
   29.56 -import org.netbeans.api.java.source.Task;
   29.57 -import org.netbeans.junit.NbTestCase;
   29.58 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
   29.59 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
   29.60 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.BulkPattern;
   29.61 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.EncodingContext;
   29.62 -import org.netbeans.modules.java.hints.jackpot.impl.pm.CopyFinderBasedBulkSearch;
   29.63 -import org.netbeans.modules.java.hints.jackpot.impl.pm.NFABasedBulkSearch;
   29.64 -import org.openide.filesystems.FileObject;
   29.65 -import org.openide.filesystems.FileUtil;
   29.66 -
   29.67 -/**
   29.68 - *
   29.69 - * @author lahvac
   29.70 - */
   29.71 -public class BulkSearchPerformance extends NbTestCase {
   29.72 -
   29.73 -    public BulkSearchPerformance(String name) {
   29.74 -        super(name);
   29.75 -    }
   29.76 -
   29.77 -    public void testPerformance() throws Exception {
   29.78 -        File root = new File("/media/karta/space/src/nb-main/uml");
   29.79 -        List<FileObject> files = new LinkedList<FileObject>();
   29.80 -
   29.81 -        gatherFiles(FileUtil.toFileObject(root), files);
   29.82 -
   29.83 -        String[] patterns = new String[] {"$1.isDirectory()", "new ImageIcon()"};
   29.84 -
   29.85 -        for (int c = 0; c < 5; c++) {
   29.86 -            performPerformanceTest(files, new NFABasedBulkSearch(), patterns);
   29.87 -            performPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
   29.88 -        }
   29.89 -
   29.90 -        performPerformanceTest(files, new NFABasedBulkSearch(), patterns);
   29.91 -        long nfa1 = performPerformanceTest(files, new NFABasedBulkSearch(), patterns);
   29.92 -        performPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
   29.93 -        long cf1 = performPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
   29.94 -
   29.95 -        performPerformanceTest(files, new NFABasedBulkSearch(), patterns);
   29.96 -        long nfa2 = performPerformanceTest(files, new NFABasedBulkSearch(), patterns);
   29.97 -        performPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
   29.98 -        long cf2 = performPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
   29.99 -
  29.100 -        System.err.println("nfa1=" + nfa1);
  29.101 -        System.err.println("cf1=" + cf1);
  29.102 -        System.err.println("nfa2=" + nfa2);
  29.103 -        System.err.println("cf2=" + cf2);
  29.104 -
  29.105 -        System.err.println("perf (cf1/nfa1): " + ((1000 * cf1 / nfa1) /10.0) + "%");
  29.106 -        System.err.println("perf (cf2/nfa2): " + ((1000 * cf2 / nfa2) /10.0) + "%");
  29.107 -    }
  29.108 -
  29.109 -    public void testIndexingPerformance() throws Exception {
  29.110 -        File root = new File("/media/karta/space/src/nb-main/uml");
  29.111 -//        File root = new File("/media/karta/space/src/nb-main/contrib/javahints");
  29.112 -        List<FileObject> files = new LinkedList<FileObject>();
  29.113 -
  29.114 -        gatherFiles(FileUtil.toFileObject(root), files);
  29.115 -
  29.116 -        String[] patterns = new String[] {"$1.isDirectory()", "new ImageIcon()"};
  29.117 -
  29.118 -        for (int c = 0; c < 5; c++) {
  29.119 -            performIndexingPerformanceTest(files, new NFABasedBulkSearch(), patterns);
  29.120 -//            performIndexingPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
  29.121 -        }
  29.122 -
  29.123 -        performIndexingPerformanceTest(files, new NFABasedBulkSearch(), patterns);
  29.124 -        long[] nfa1 = performIndexingPerformanceTest(files, new NFABasedBulkSearch(), patterns);
  29.125 -//        performIndexingPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
  29.126 -//        long cf1 = performIndexingPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
  29.127 -
  29.128 -        performIndexingPerformanceTest(files, new NFABasedBulkSearch(), patterns);
  29.129 -        long[] nfa2 = performIndexingPerformanceTest(files, new NFABasedBulkSearch(), patterns);
  29.130 -//        performIndexingPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
  29.131 -//        long cf2 = performIndexingPerformanceTest(files, new CopyFinderBasedBulkSearch(), patterns);
  29.132 -
  29.133 -        System.err.println("i.nfa1=" + nfa1[0]);
  29.134 -        System.err.println("m.nfa1=" + nfa1[1]);
  29.135 -//        System.err.println("cf1=" + cf1);
  29.136 -        System.err.println("i.nfa2=" + nfa2[0]);
  29.137 -        System.err.println("m.nfa2=" + nfa2[1]);
  29.138 -//        System.err.println("cf2=" + cf2);
  29.139 -
  29.140 -//        System.err.println("perf i.(nfa1/regexp1): " + ((1000 * nfa1[0] / regexp1[0]) /10.0) + "%");
  29.141 -//        System.err.println("perf m.(nfa1/regexp1): " + ((1000 * nfa1[1] / regexp1[1]) /10.0) + "%");
  29.142 -//        System.err.println("perf i.(nfa2/regexp2): " + ((1000 * nfa2[0] / regexp2[0]) /10.0) + "%");
  29.143 -//        System.err.println("perf m.(nfa2/regexp2): " + ((1000 * nfa2[1] / regexp2[1]) /10.0) + "%");
  29.144 -//        System.err.println("perf (cf1/regexp1): " + ((1000 * cf1 / regexp1) /10.0) + "%");
  29.145 -//        System.err.println("perf (cf2/regexp2): " + ((1000 * cf2 / regexp2) /10.0) + "%");
  29.146 -    }
  29.147 -    
  29.148 -    private long performPerformanceTest(List<FileObject> files, final BulkSearch search, final String... pattern) throws IOException {
  29.149 -        ClasspathInfo cpInfo = Utilities.createUniversalCPInfo();
  29.150 -
  29.151 -        final BulkPattern[] bulkPattern = new BulkPattern[1];
  29.152 -        JavaSource.create(cpInfo).runUserActionTask(new Task<CompilationController>() {
  29.153 -
  29.154 -            public void run(CompilationController parameter) throws Exception {
  29.155 -                bulkPattern[0] = search.create(parameter, pattern);
  29.156 -            }
  29.157 -        }, true);
  29.158 -
  29.159 -        long start = System.currentTimeMillis();
  29.160 -        JavaSource.create(cpInfo, files).runUserActionTask(new Task<CompilationController>() {
  29.161 -
  29.162 -            public void run(CompilationController parameter) throws Exception {
  29.163 -                if (parameter.toPhase(Phase.PARSED).compareTo(Phase.PARSED) < 0)
  29.164 -                    return;
  29.165 -
  29.166 -                search.match(parameter, new TreePath(parameter.getCompilationUnit()), bulkPattern[0]);
  29.167 -            }
  29.168 -        }, true);
  29.169 -        long end = System.currentTimeMillis();
  29.170 -
  29.171 -        return end - start;
  29.172 -    }
  29.173 -
  29.174 -    private long[] performIndexingPerformanceTest(List<FileObject> files, final BulkSearch search, final String... pattern) throws IOException {
  29.175 -        final List<byte[]> index = new LinkedList<byte[]>();
  29.176 -        long[] result = new long[2];
  29.177 -        ClasspathInfo cpInfo = Utilities.createUniversalCPInfo();
  29.178 -
  29.179 -        final BulkPattern[] bulkPattern = new BulkPattern[1];
  29.180 -        JavaSource.create(cpInfo).runUserActionTask(new Task<CompilationController>() {
  29.181 -
  29.182 -            public void run(CompilationController parameter) throws Exception {
  29.183 -                bulkPattern[0] = search.create(parameter, pattern);
  29.184 -            }
  29.185 -        }, true);
  29.186 -
  29.187 -        long start = System.currentTimeMillis();
  29.188 -        JavaSource.create(cpInfo, files).runUserActionTask(new Task<CompilationController>() {
  29.189 -
  29.190 -            public void run(CompilationController parameter) throws Exception {
  29.191 -                if (parameter.toPhase(Phase.PARSED).compareTo(Phase.PARSED) < 0)
  29.192 -                    return;
  29.193 -
  29.194 -                ByteArrayOutputStream out = new ByteArrayOutputStream();
  29.195 -                EncodingContext ec = new EncodingContext(out, false);
  29.196 -                search.encode(parameter.getCompilationUnit(), ec);
  29.197 -
  29.198 -                index.add(out.toByteArray());
  29.199 -            }
  29.200 -        }, true);
  29.201 -        long end = System.currentTimeMillis();
  29.202 -
  29.203 -        result[0] = end - start;
  29.204 -
  29.205 -        start = System.currentTimeMillis();
  29.206 -
  29.207 -        for (byte[] data : index) {
  29.208 -            search.matches(new ByteArrayInputStream(data), bulkPattern[0]);
  29.209 -        }
  29.210 -
  29.211 -        end = System.currentTimeMillis();
  29.212 -
  29.213 -        result[1] = end - start;
  29.214 -
  29.215 -        return result;
  29.216 -    }
  29.217 -    
  29.218 -    private static void gatherFiles(FileObject root, List<FileObject> files) {
  29.219 -        if ("java".equals(root.getExt())) {
  29.220 -            files.add(root);
  29.221 -        }
  29.222 -        
  29.223 -        if (root.isFolder()) {
  29.224 -            for (FileObject c : root.getChildren()) {
  29.225 -                gatherFiles(c, files);
  29.226 -            }
  29.227 -        }
  29.228 -    }
  29.229 -}

    30.1 --- a/api/test/unit/src/org/netbeans/modules/jackpot30/impl/pm/IndexBulkTest.java	Sat Feb 18 22:14:42 2012 +0100
    30.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.3 @@ -1,182 +0,0 @@
    30.4 -/*
    30.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    30.6 - *
    30.7 - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved.
    30.8 - *
    30.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   30.10 - * Other names may be trademarks of their respective owners.
   30.11 - *
   30.12 - * The contents of this file are subject to the terms of either the GNU
   30.13 - * General Public License Version 2 only ("GPL") or the Common
   30.14 - * Development and Distribution License("CDDL") (collectively, the
   30.15 - * "License"). You may not use this file except in compliance with the
   30.16 - * License. You can obtain a copy of the License at
   30.17 - * http://www.netbeans.org/cddl-gplv2.html
   30.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
   30.19 - * specific language governing permissions and limitations under the
   30.20 - * License.  When distributing the software, include this License Header
   30.21 - * Notice in each file and include the License file at
   30.22 - * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   30.23 - * particular file as subject to the "Classpath" exception as provided
   30.24 - * by Oracle in the GPL Version 2 section of the License file that
   30.25 - * accompanied this code. If applicable, add the following below the
   30.26 - * License Header, with the fields enclosed by brackets [] replaced by
   30.27 - * your own identifying information:
   30.28 - * "Portions Copyrighted [year] [name of copyright owner]"
   30.29 - *
   30.30 - * If you wish your version of this file to be governed by only the CDDL
   30.31 - * or only the GPL Version 2, indicate your decision by adding
   30.32 - * "[Contributor] elects to include this software in this distribution
   30.33 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
   30.34 - * single choice of license, a recipient has the option to distribute
   30.35 - * your version of this file under either the CDDL, the GPL Version 2 or
   30.36 - * to extend the choice of license to its licensees as provided above.
   30.37 - * However, if you add GPL Version 2 code and therefore, elected the GPL
   30.38 - * Version 2 license, then the option applies only if the new code is
   30.39 - * made subject to such option by the copyright holder.
   30.40 - *
   30.41 - * Contributor(s):
   30.42 - *
   30.43 - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
   30.44 - */
   30.45 -
   30.46 -package org.netbeans.modules.jackpot30.impl.pm;
   30.47 -
   30.48 -import com.sun.source.tree.Tree;
   30.49 -import com.sun.source.util.TreePath;
   30.50 -import java.io.IOException;
   30.51 -import java.io.InputStream;
   30.52 -import java.io.Reader;
   30.53 -import java.util.Collection;
   30.54 -import java.util.Collections;
   30.55 -import java.util.Map;
   30.56 -import org.apache.lucene.analysis.Analyzer;
   30.57 -import org.apache.lucene.analysis.TokenStream;
   30.58 -import org.apache.lucene.index.IndexReader;
   30.59 -import org.apache.lucene.index.IndexWriter.MaxFieldLength;
   30.60 -import org.apache.lucene.store.Directory;
   30.61 -import org.apache.lucene.store.RAMDirectory;
   30.62 -import org.netbeans.api.java.source.CompilationInfo;
   30.63 -import org.netbeans.modules.jackpot30.impl.indexing.AbstractLuceneIndex;
   30.64 -import org.netbeans.modules.jackpot30.impl.indexing.Index.IndexWriter;
   30.65 -import org.netbeans.modules.jackpot30.impl.indexing.IndexInfo;
   30.66 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
   30.67 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.BulkPattern;
   30.68 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.EncodingContext;
   30.69 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearchTestPerformer;
   30.70 -import org.netbeans.modules.java.hints.jackpot.impl.pm.NFABasedBulkSearch;
   30.71 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription.AdditionalQueryConstraints;
   30.72 -
   30.73 -/**
   30.74 - *
   30.75 - * @author lahvac
   30.76 - */
   30.77 -public class IndexBulkTest extends BulkSearchTestPerformer {
   30.78 -
   30.79 -    public IndexBulkTest(String name) {
   30.80 -        super(name);
   30.81 -    }
   30.82 -
   30.83 -//    public static TestSuite suite() {
   30.84 -//        NbTestSuite r = new NbTestSuite();
   30.85 -//
   30.86 -//        r.addTest(new NFABasedBulkSearchTest("testField1"));
   30.87 -//        r.addTest(new NFABasedBulkSearchTest("testField2"));
   30.88 -//
   30.89 -//        return r;
   30.90 -//    }
   30.91 -
   30.92 -    @Override
   30.93 -    protected BulkSearch createSearch() {
   30.94 -        return new BulkSearchImpl(false);
   30.95 -    }
   30.96 -
   30.97 -    private static class BulkSearchImpl extends BulkSearch {
   30.98 -
   30.99 -        public BulkSearchImpl(boolean requiresLightweightVerification) {
  30.100 -            super(requiresLightweightVerification);
  30.101 -        }
  30.102 -
  30.103 -        @Override
  30.104 -        public Map<String, Collection<TreePath>> match(CompilationInfo info, TreePath toSearch, BulkPattern pattern, Map<String, Long> timeLog) {
  30.105 -            try {
  30.106 -                IndexImpl ii = new IndexImpl();
  30.107 -                IndexWriter writer = ii.openForWriting();
  30.108 -
  30.109 -                writer.record(toSearch.getCompilationUnit().getSourceFile().toUri().toURL(), toSearch.getCompilationUnit(), null);
  30.110 -                writer.close();
  30.111 -
  30.112 -                if (!ii.findCandidates(pattern).isEmpty()) {
  30.113 -                    return new NFABasedBulkSearch().match(info, toSearch, pattern, timeLog);
  30.114 -                } else {
  30.115 -                    assertTrue(new NFABasedBulkSearch().match(info, toSearch, pattern, timeLog).isEmpty());
  30.116 -                    return Collections.emptyMap();
  30.117 -                }
  30.118 -            } catch (IOException ex) {
  30.119 -                throw new IllegalStateException(ex);
  30.120 -            }
  30.121 -        }
  30.122 -
  30.123 -        @Override
  30.124 -        public boolean matches(InputStream encoded, BulkPattern pattern) {
  30.125 -            return new NFABasedBulkSearch().matches(encoded, pattern);
  30.126 -        }
  30.127 -
  30.128 -        @Override
  30.129 -        public boolean matches(CompilationInfo info, TreePath toSearch, BulkPattern pattern) {
  30.130 -            return new NFABasedBulkSearch().matches(info, toSearch, pattern);
  30.131 -        }
  30.132 -
  30.133 -        @Override
  30.134 -        public void encode(Tree tree, EncodingContext ctx) {
  30.135 -            new NFABasedBulkSearch().encode(tree, ctx);
  30.136 -        }
  30.137 -
  30.138 -        @Override
  30.139 -        public BulkPattern create(Collection<? extends String> code, Collection<? extends Tree> patterns, Collection<? extends AdditionalQueryConstraints> additionalConstraints) {
  30.140 -            return new NFABasedBulkSearch().create(code, patterns, additionalConstraints);
  30.141 -        }
  30.142 -
  30.143 -        @Override
  30.144 -        public Map<String, Integer> matchesWithFrequencies(InputStream encoded, BulkPattern pattern) {
  30.145 -            return new NFABasedBulkSearch().matchesWithFrequencies(encoded, pattern);
  30.146 -        }
  30.147 -    }
  30.148 -
  30.149 -    private static final class IndexImpl extends AbstractLuceneIndex {
  30.150 -
  30.151 -        private final Directory dir = new RAMDirectory();
  30.152 -
  30.153 -        public IndexImpl() {
  30.154 -            super(0, false, true);
  30.155 -        }
  30.156 -
  30.157 -        @Override
  30.158 -        protected IndexReader createReader() throws IOException {
  30.159 -            return IndexReader.open(dir, true);
  30.160 -        }
  30.161 -
  30.162 -        @Override
  30.163 -        protected org.apache.lucene.index.IndexWriter createWriter() throws IOException {
  30.164 -            return new org.apache.lucene.index.IndexWriter(dir, new NoAnalyzer(), MaxFieldLength.UNLIMITED);
  30.165 -        }
  30.166 -
  30.167 -        @Override
  30.168 -        public IndexInfo getIndexInfo() {
  30.169 -            return IndexInfo.empty();
  30.170 -        }
  30.171 -
  30.172 -        @Override
  30.173 -        protected void storeIndexInfo(IndexInfo info) throws IOException {}
  30.174 -    }
  30.175 -
  30.176 -    private static final class NoAnalyzer extends Analyzer {
  30.177 -
  30.178 -        @Override
  30.179 -        public TokenStream tokenStream(String string, Reader reader) {
  30.180 -            throw new UnsupportedOperationException("Should not be called");
  30.181 -        }
  30.182 -
  30.183 -    }
  30.184 -
  30.185 -}